Added windows folder name cleaning

Flameish · Apr 19, 2021 · 89f11ac · 89f11ac
1 parent 3c00157
commit 89f11ac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/grabber/NovelMetadata.java b/src/main/java/grabber/NovelMetadata.java
@@ -28,8 +28,8 @@ public NovelMetadata() {
      */
     public void saveCover(String destDir) {
         // Save cover
+        GrabberUtils.createDir(destDir);
         File outputfile = new File(destDir + coverName + "." + coverFormat);
-        outputfile.mkdirs();
         try {
             // cover name + file extension
             ImageIO.write(getBufferedCover(), getCoverFormat(), outputfile);

diff --git a/src/main/java/grabber/formats/Text.java b/src/main/java/grabber/formats/Text.java
@@ -26,7 +26,11 @@ public void write() {
         GrabberUtils.info(novel.window,"Writing TXT...");
         if (init.config.isSeparateChapters()) {
             // Create dir for chapter files
-            String saveLocation = novel.saveLocation + "/" + filename;
+            String cleanFolderName = filename
+                    .replace("^\\.+", "")
+                    .replaceAll("[\\\\/:*?\"<>|]", "");
+            if (cleanFolderName.length() > 240) cleanFolderName = cleanFolderName.substring(0,240);
+            String saveLocation = novel.saveLocation + "/" + cleanFolderName;
             GrabberUtils.createDir(saveLocation);
 
             for(Chapter chapter: novel.successfulChapters) {

diff --git a/src/main/java/library/Library.java b/src/main/java/library/Library.java
@@ -143,11 +143,16 @@ public LibraryNovel toLibraryNovel(Novel novel) {
         libNovel.setWaitTime(novel.waitTime);
         libNovel.setGetImages(novel.getImages);
         libNovel.metadata = novel.metadata;
+
         String destDir;
+        String cleanFolderName = libNovel.metadata.getTitle().trim()
+                .replace("^\\.+", "")
+                .replaceAll("[\\\\/:*?\"<>|]", "");
+        if (cleanFolderName.length() > 240) cleanFolderName = cleanFolderName.substring(0,240);
         if(Config.getInstance().isUseStandardLocation()) {
-            destDir = Config.getInstance().getSaveLocation() + "/" + libNovel.metadata.getTitle() + "/";
+            destDir = Config.getInstance().getSaveLocation() + "/" + cleanFolderName + "/";
         } else {
-            destDir = Library.libraryFolder+ "/" + libNovel.metadata.getTitle() + "/";
+            destDir = Library.libraryFolder+ "/" + cleanFolderName + "/";
         }
         libNovel.metadata.saveCover(destDir);
         libNovel.setSaveLocation(destDir);