diff --git a/src/de/mas/jnus/lib/ExtractionService.java b/src/de/mas/jnus/lib/ExtractionService.java index 588012c..b8a0550 100644 --- a/src/de/mas/jnus/lib/ExtractionService.java +++ b/src/de/mas/jnus/lib/ExtractionService.java @@ -62,7 +62,6 @@ public class ExtractionService { Utils.createDir(outputFolder); NUSDataProvider dataProvider = getDataProvider(); for(Content c : list){ - System.out.println("Saving " + c.getFilename()); if(withHashes){ dataProvider.saveEncryptedContentWithH3Hash(c, outputFolder); }else{ diff --git a/src/de/mas/jnus/lib/NUSTitleLoaderWUD.java b/src/de/mas/jnus/lib/NUSTitleLoaderWUD.java index ae2bbb4..b220680 100644 --- a/src/de/mas/jnus/lib/NUSTitleLoaderWUD.java +++ b/src/de/mas/jnus/lib/NUSTitleLoaderWUD.java @@ -29,7 +29,7 @@ public class NUSTitleLoaderWUD extends NUSTitleLoader { WUDImage image = new WUDImage(wudFile); if(titleKey == null){ - File keyFile = new File(wudFile.getParentFile().getPath() + File.separator + Settings.WUD_KEY_FILENAME); + File keyFile = new File(new File(wudFile.getAbsolutePath()).getParentFile().getPath() + File.separator + Settings.WUD_KEY_FILENAME); if(!keyFile.exists()){ System.out.println(keyFile.getAbsolutePath() + " does not exist and no title key was provided."); return null; diff --git a/src/de/mas/jnus/lib/implementations/NUSDataProvider.java b/src/de/mas/jnus/lib/implementations/NUSDataProvider.java index 26e24ce..80ddc27 100644 --- a/src/de/mas/jnus/lib/implementations/NUSDataProvider.java +++ b/src/de/mas/jnus/lib/implementations/NUSDataProvider.java @@ -96,6 +96,7 @@ public abstract class NUSDataProvider { log.info("Encrypted content alreadys exists, but the length is not as expected. Saving it again"); } } + System.out.println("Saving " + content.getFilename()); FileUtils.saveInputStreamToFile(output,inputStream,content.getEncryptedFileSize()); } diff --git a/src/de/mas/jnus/lib/implementations/wud/WUDImage.java b/src/de/mas/jnus/lib/implementations/wud/WUDImage.java index bef9b73..5f40d36 100644 --- a/src/de/mas/jnus/lib/implementations/wud/WUDImage.java +++ b/src/de/mas/jnus/lib/implementations/wud/WUDImage.java @@ -94,7 +94,7 @@ public class WUDImage { private long calculateSplittedFileSize() { long result = 0; - File filehandlePart1 = getFileHandle(); + File filehandlePart1 = new File(getFileHandle().getAbsolutePath()); String pathToFiles = filehandlePart1.getParentFile().getAbsolutePath(); for(int i = 1; i<=WUDDiscReaderSplitted.NUMBER_OF_FILES;i++){ String filePartPath = pathToFiles + File.separator + String.format(WUDDiscReaderSplitted.WUD_SPLITTED_DEFAULT_FILEPATTERN, i); diff --git a/src/de/mas/jnus/lib/implementations/wud/reader/WUDDiscReaderSplitted.java b/src/de/mas/jnus/lib/implementations/wud/reader/WUDDiscReaderSplitted.java index f809ae6..c21078e 100644 --- a/src/de/mas/jnus/lib/implementations/wud/reader/WUDDiscReaderSplitted.java +++ b/src/de/mas/jnus/lib/implementations/wud/reader/WUDDiscReaderSplitted.java @@ -76,7 +76,7 @@ public class WUDDiscReaderSplitted extends WUDDiscReader{ } private RandomAccessFile getFileByOffset(long offset) throws IOException{ - File filehandlePart1 = getImage().getFileHandle(); + File filehandlePart1 = new File(getImage().getFileHandle().getAbsolutePath()); //Create copy String pathToFiles = filehandlePart1.getParentFile().getAbsolutePath(); int filePart = getFilePartByOffset(offset); diff --git a/src/de/mas/jnus/lib/utils/FileUtils.java b/src/de/mas/jnus/lib/utils/FileUtils.java index dfbd121..9a699cf 100644 --- a/src/de/mas/jnus/lib/utils/FileUtils.java +++ b/src/de/mas/jnus/lib/utils/FileUtils.java @@ -14,7 +14,7 @@ public class FileUtils { if(target.isDirectory()){ return false; } - File parent = target.getParentFile(); + File parent = new File(target.getAbsolutePath()).getParentFile(); if(parent != null){ Utils.createDir(parent.getAbsolutePath()); }