Merge pull request #226 from CertifaiAI/sh_empty_folder

Sh empty folder
CertifaiAI · Nov 22, 2020 · 6b7b59c · 6b7b59c
2 parents 5a73529 + 4c31fa0
commit 6b7b59c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/classifai-core/src/main/java/ai/classifai/selector/annotation/ToolFolderSelector.java b/classifai-core/src/main/java/ai/classifai/selector/annotation/ToolFolderSelector.java
@@ -23,6 +23,7 @@
 import ai.classifai.ui.launcher.WelcomeLauncher;
 import ai.classifai.util.ParamConfig;
 import ai.classifai.util.ProjectHandler;
+import ai.classifai.util.data.FileHandler;
 import ai.classifai.util.data.ImageHandler;
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,7 @@
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import java.io.File;
+import java.util.ArrayList;
 
 /**
  * Open browser to select folder with importing list of data points in the folder
@@ -97,6 +99,7 @@ protected JDialog createDialog(Component parent)
                             loader.setFileSystemStatus(FileSystemStatus.WINDOW_CLOSE_LOADING_FILES);
 
                             ImageHandler.processFolder(projectID, rootFolder);
+
                         }
                         else
                         {

diff --git a/classifai-core/src/main/java/ai/classifai/util/data/ImageHandler.java b/classifai-core/src/main/java/ai/classifai/util/data/ImageHandler.java
@@ -297,11 +297,19 @@ public static void processFile(@NonNull Integer projectID, @NonNull List<File> f
     public static void processFolder(@NonNull Integer projectID, @NonNull File rootPath)
     {
         List<File> totalFilelist = new ArrayList<>();
-
         Stack<File> folderStack = new Stack<>();
+        ProjectLoader loader = ProjectHandler.getProjectLoader(projectID);
+        String[] fileExtension = ImageFileType.getImageFileTypes();
+        java.util.List<File> checkFileFormat = FileHandler.processFolder(rootPath, fileExtension);
 
         folderStack.push(rootPath);
 
+        if(checkFileFormat.isEmpty())
+        {
+            loader.reset(FileSystemStatus.WINDOW_CLOSE_DATABASE_NOT_UPDATED);
+            return;
+        }
+
         while(folderStack.isEmpty() != true)
         {
             File currentFolderPath = folderStack.pop();
@@ -320,8 +328,9 @@ public static void processFolder(@NonNull Integer projectID, @NonNull File rootP
                     totalFilelist.addAll(files);
                 }
             }
+
         }
 
         saveToDatabase(projectID, totalFilelist);
     }
-}
+}