Brendon/gameyfin
1
0
Fork 0
mirror of https://github.com/BrenBroZAYT/gameyfin.git synced 2026-06-16 16:20:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Simplified logic on when to download single file vs when to zip folder

Browse Source
This commit is contained in:
grimsi
2022-07-24 20:52:29 +02:00
parent aa8fd0d613
commit 80e3ff05d5
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/de/grimsi/gameyfin/service/FilesystemService.java
+1 -31
View File
@@ -98,19 +98,6 @@ public class FilesystemService {
Path path = Path.of(g.getPath()); Path path = Path.of(g.getPath());
if(!path.toFile().isDirectory()) return getFilenameWithExtension(path); if(!path.toFile().isDirectory()) return getFilenameWithExtension(path);
Optional<Path> optionalGameArchive;
try (Stream<Path> filesStream = Files.list(path)) {
optionalGameArchive = filesStream.filter(this::hasGameArchiveExtension).findFirst();
} catch (IOException e) {
log.error("Error while accessing folder:", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Error while accessing folder '%s'.".formatted(path));
}
if(optionalGameArchive.isPresent()) {
return getFilenameWithExtension(optionalGameArchive.get());
}
return getFilenameWithExtension(path) + ".zip"; return getFilenameWithExtension(path) + ".zip";
} }
@@ -242,7 +229,7 @@ public class FilesystemService {
Path path = Path.of(game.getPath()); Path path = Path.of(game.getPath());
if(path.toFile().isDirectory()) { if(path.toFile().isDirectory()) {
downloadFromFolder(path, outputStream); downloadFilesAsZip(path, outputStream);
} else { } else {
downloadFile(path, outputStream); downloadFile(path, outputStream);
} }
@@ -260,23 +247,6 @@ public class FilesystemService {
} }
} }
private void downloadFromFolder(Path path, OutputStream outputStream) {
Optional<Path> optionalGameArchive;
try (Stream<Path> filesStream = Files.list(path)) {
optionalGameArchive = filesStream.filter(this::hasGameArchiveExtension).findFirst();
} catch (IOException e) {
log.error("Error while accessing folder:", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Error while accessing folder '%s'.".formatted(path));
}
if(optionalGameArchive.isPresent()) {
downloadFile(optionalGameArchive.get(), outputStream);
} else {
downloadFilesAsZip(path, outputStream);
}
}
private void downloadFilesAsZip(Path path, OutputStream outputStream) { private void downloadFilesAsZip(Path path, OutputStream outputStream) {
ZipOutputStream zos = new ZipOutputStream(outputStream){{ ZipOutputStream zos = new ZipOutputStream(outputStream){{
def.setLevel(Deflater.NO_COMPRESSION); def.setLevel(Deflater.NO_COMPRESSION);