Refactor

Author: TeWu

src/main/java/pl/geek/tewu/gmail_attachments_extractor/GmailAttachmentsExtractor.java

@@ -157,16 +157,13 @@ public boolean extractAttachments() throws IOException, MessagingException, Pars
                             continue;
                         String unsanitizedFileName = fileName;
                         fileName = Utils.resolvingSanitizeFileName(attachmentsDir, fileName);
+                        fileName = Utils.findUniqueFileName(attachmentsDir, fileName, 100);  // There can be multiple files with the same name, because file name can change during sanitization, or because the headers can be malformed (see Utils.getPartFileName)
                         Path filePath = attachmentsDir.resolve(fileName);
                         String contentType = part.getContentType();
                         String mimeType = contentType.indexOf(";") > 0 ?
                                 contentType.substring(0, contentType.indexOf(";")) :
                                 contentType;
                         // Save part to file
-                        int fileIdx = 2;
-                        while (filePath.toFile().exists())  // There can be multiple files with the same name, because the headers can be malformed (see Utils.getPartFileName)
-                            filePath = filePath.resolveSibling(fileName + " " + fileIdx++);
-                        fileName = filePath.getFileName().toString();
                         saveToFile(part, filePath);
                         // Calculate part/file size
                         long fileSize = Files.size(filePath);

src/main/java/pl/geek/tewu/gmail_attachments_extractor/Utils.java

@@ -183,6 +183,15 @@ public static FileOutputStream openOutputStream(final File file, final boolean a
         return new FileOutputStream(file, append);
     }
 
+    public static String findUniqueFileName(Path dirPath, String fileName, int maxNum) {
+        int i = 2;
+        Path path = dirPath.resolve(fileName);
+        while (path.toFile().exists() && i <= maxNum)
+            path = dirPath.resolve(fileName + " " + i++);
+        if (path.toFile().exists()) throw new RuntimeException("Can't find unique file patch for '" + dirPath.resolve(fileName) + "'");
+        return path.getFileName().toString();
+    }
+
     /***** Mail *****/
     public static final String CONTENT_TYPE_HNAME = "Content-Type";
     public static final String CONTENT_DISPOSITION_HNAME = "Content-Disposition";