mirror/Hangar
2
0
Fork 0
mirror of https://github.com/HangarMC/Hangar.git synced 2025-02-17 15:01:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix file size display

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/papermc/hangar/service/internal/versions/DownloadService.java
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 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()); download = new PlatformVersionDownload(fileInfo, downloadTable.getExternalUrl());
downloads.put(platformDownload.getDownloadId(), download); downloads.put(platformDownload.getDownloadId(), download);
versionDownloadsMap.put(platformDownload.getPlatform(), download); versionDownloadsMap.put(platformDownload.getPlatform(), download);

14
src/main/java/io/papermc/hangar/service/internal/versions/VersionFactory.java
View File

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