fix: version, last status with statistics

Author: berdal84

pom.xml

@@ -14,7 +14,7 @@
 
     <groupId>com.berdal84</groupId>
     <artifactId>Mageek</artifactId>
-    <version>1</version>
+    <version>1.1.1</version>
 
     <name>Mageek</name>
     <description>A small plugin to colorize images channels, works with multi series/channels/slices.</description>
@@ -143,4 +143,19 @@
             <artifactId>bio-formats_plugins</artifactId>
         </dependency>
     </dependencies>
+    
+    <build>
+        <resources>        
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+            </resource>
+        </resources>
+    </build>
+
 </project>

src/main/java/com/berdal84/mageek/FileHelper.java

@@ -72,7 +72,7 @@ public static ArrayList<String> getFileExtensions(ArrayList<File> _files)
      * @param _recursively
      * @return
      */
-    public static ArrayList<File> getFiles(File _directory, boolean _recursively)
+    public static ArrayList<File> getFiles(File _directory, boolean _recursively, String _ignoreFolderName)
     {
         ArrayList<File> result = new ArrayList<>();
         File[] content = _directory.listFiles();
@@ -81,11 +81,11 @@ public static ArrayList<File> getFiles(File _directory, boolean _recursively)
         {
             for (File file : content)
             {
-                if (file.isDirectory())
+                if (file.isDirectory() && !file.getName().equals(_ignoreFolderName) )
                 {
                     if (_recursively)
                     {
-                        ArrayList<File> subFolderFiles = getFiles(file, true);
+                        ArrayList<File> subFolderFiles = getFiles(file, true, _ignoreFolderName);
                         result.addAll(subFolderFiles);
                     }
                 }

src/main/java/com/berdal84/mageek/PackageHelper.java

@@ -0,0 +1,57 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2022 Berdal84.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package com.berdal84.mageek;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Optional;
+
+public class PackageHelper
+{
+    // Reads the version from the version.txt file, where maven writes the value when compiling
+    public static String getVersion()
+    {
+        try
+        {
+            InputStream inputStream = PackageHelper.class.getClassLoader().getResourceAsStream("version.txt");
+            InputStreamReader inputStreamReader = new InputStreamReader(Optional.ofNullable(inputStream).orElseThrow(IOException::new));
+            try ( BufferedReader reader = new BufferedReader(inputStreamReader))
+            {
+                return reader.readLine();
+            }
+            finally
+            {
+                inputStream.close();
+                inputStreamReader.close();
+            }
+        }
+        catch (IOException e)
+        {
+            System.out.printf("Can't get version", e);
+        }
+        return "Unknown";
+    }
+}

src/main/java/com/berdal84/mageek/Plugin.java

@@ -14,13 +14,11 @@
 import io.scif.services.DatasetIOService;
 
 import net.imagej.DatasetService;
-import net.imagej.ImageJ;
 
 import net.imglib2.type.numeric.RealType;
 
 import org.scijava.command.Command;
 import org.scijava.plugin.Parameter;
-import org.scijava.run.RunService;
 import org.scijava.ui.DialogPrompt.MessageType;
 import org.scijava.ui.DialogPrompt.OptionType;
 import org.scijava.ui.DialogPrompt;
@@ -86,9 +84,6 @@ public class Plugin<T extends RealType<T>>  implements Command
     /* The script title */
     private final String title;
 
-    /* The script title */
-    private final String version;
-
     /* Scanned extensions */
     private ArrayList<String> scannedFileExtensions;
 
@@ -128,7 +123,6 @@ public Plugin()
     {
         currentProcessThread = null;
         title   = "Mageek";
-        version = "1.0.0";
         batchMode = true;
         analysedFolderName = "ANALYSED";
         scannedFileExtensions = new ArrayList<>();
@@ -182,7 +176,7 @@ public void run()
                     );
                     gui.setSourceDirectory(sourceFolder.toString());
 
-                    scannedFiles = FileHelper.getFiles(sourceFolder, true);
+                    scannedFiles = FileHelper.getFiles(sourceFolder, true, analysedFolderName);
                     gui.setFileList(scannedFiles);
                     scannedFileExtensions = FileHelper.getFileExtensions(scannedFiles);
                     gui.setFileExtensionList(scannedFileExtensions);
@@ -340,7 +334,7 @@ public void windowDeactivated(WindowEvent e)
             }
         });
 
-        gui.setStatus(String.format("Welcome to %s v%s", title, version));
+        gui.setStatus(String.format("Welcome to %s v%s", title, PackageHelper.getVersion() ));
         gui.setSourceDirectory("Select a source directory ...");
 
         gui.setAvailableColors(MetaColor.All);      
@@ -507,39 +501,6 @@ private boolean createOutputDirectory()
         }
         return success;
     }
-
-    /**
-     * Update the statistics in status bar
-     */
-    void displayStatisticsInStatusBar()
-    {
-        String innerMessage;
-
-        MessageType messageType;
-
-        if (this.sourceFolder == null)
-        {
-            innerMessage = "Nothing to process ...";
-            messageType = MessageType.INFORMATION_MESSAGE;
-        }
-        else
-        {
-            innerMessage = String.format(
-                    "Process done, %d file(s) processed (%d ignored)",
-                    processedFiles.size(),
-                    ignoredFiles.size()
-            );
-
-            messageType = MessageType.INFORMATION_MESSAGE;
-        }
-
-        String message = String.format(
-                "%s --- Hasta la vista, baby. ^^",
-                innerMessage
-        );
-
-        gui.setStatus(message);
-    }
 
     private ImagePlus[] open(File file) throws IOException, FormatException   
     {

src/main/java/com/berdal84/mageek/Process.java

@@ -243,8 +243,14 @@ public void run()
 
             setProgress( (int)(((float)processedFiles.size() / (float)files.size()) * 100.f) );
         }
-
-        setStatus("Processing DONE");
+        
+        String message = String.format(
+                "Process done, %d file(s) processed (%d ignored)"
+                + " --- Hasta la vista, baby. ^^",
+                processedFiles.size(),
+                ignoredFiles.size()
+        );
+        setStatus(message);    
     }
 
     /**
@@ -299,4 +305,5 @@ public void setListener(Listener _listener)
     {
         listener = _listener;
     }
+    
 }

src/main/resources/version.txt

@@ -0,0 +1,2 @@
+${project.version}
+// do not modify the first line