Fix file size display

This commit is contained in:
Nassim Jahnke 2022-08-02 12:41:51 +02:00 committed by MiniDigger | Martin
parent 369f9b76df
commit 757e1eff65
2 changed files with 8 additions and 8 deletions

View File

@ -186,7 +186,7 @@ public class DownloadService extends HangarComponent {
}
final ProjectVersionDownloadTable downloadTable = versionDownloads.stream().filter(table -> table.getId() == platformDownload.getDownloadId()).findAny().orElseThrow(NullPointerException::new);
final FileInfo fileInfo = downloadTable.getFileName() != null ? new FileInfo(downloadTable.getFileName(), downloadTable.getVersionId(), downloadTable.getHash()) : null;
final FileInfo fileInfo = downloadTable.getFileName() != null ? new FileInfo(downloadTable.getFileName(), downloadTable.getFileSize(), downloadTable.getHash()) : null;
download = new PlatformVersionDownload(fileInfo, downloadTable.getExternalUrl());
downloads.put(platformDownload.getDownloadId(), download);
versionDownloadsMap.put(platformDownload.getPlatform(), download);

View File

@ -288,18 +288,18 @@ public class VersionFactory extends HangarComponent {
pendingVersion.isForumSync()
));
List<ProjectVersionPlatformDependencyTable> platformDependencyTables = new ArrayList<>();
for (Map.Entry<Platform, SortedSet<String>> entry : pendingVersion.getPlatformDependencies().entrySet()) {
for (String version : entry.getValue()) {
final List<ProjectVersionPlatformDependencyTable> platformDependencyTables = new ArrayList<>();
for (final Map.Entry<Platform, SortedSet<String>> entry : pendingVersion.getPlatformDependencies().entrySet()) {
for (final String version : entry.getValue()) {
PlatformVersionTable platformVersionTable = platformVersionDAO.getByPlatformAndVersion(entry.getKey(), version);
platformDependencyTables.add(new ProjectVersionPlatformDependencyTable(projectVersionTable.getId(), platformVersionTable.getId()));
}
}
projectVersionPlatformDependenciesDAO.insertAll(platformDependencyTables);
List<ProjectVersionDependencyTable> pluginDependencyTables = new ArrayList<>();
for (Map.Entry<Platform, Set<PluginDependency>> platformListEntry : pendingVersion.getPluginDependencies().entrySet()) {
for (PluginDependency pluginDependency : platformListEntry.getValue()) {
final List<ProjectVersionDependencyTable> pluginDependencyTables = new ArrayList<>();
for (final Map.Entry<Platform, Set<PluginDependency>> platformListEntry : pendingVersion.getPluginDependencies().entrySet()) {
for (final PluginDependency pluginDependency : platformListEntry.getValue()) {
Long depProjectId = null;
if (pluginDependency.getNamespace() != null) {
Optional<ProjectTable> depProjectTable = Optional.ofNullable(projectService.getProjectTable(pluginDependency.getNamespace().getOwner(), pluginDependency.getNamespace().getSlug()));
@ -350,7 +350,7 @@ public class VersionFactory extends HangarComponent {
Files.createDirectories(platformPath);
}
final Path platformJarPath = platformPath.resolve(tmpVersionJar.getFileName());
Files.createLink(newVersionJarPath, platformJarPath);
Files.createLink(platformJarPath, newVersionJarPath);
}
final ProjectVersionDownloadTable table = new ProjectVersionDownloadTable(projectVersionTable.getVersionId(), fileInfo.getSizeBytes(), fileInfo.getMd5Hash(), fileInfo.getName(), null);