Poprawki błędów i uzupełnienie dokumentacji

Author: koder95

pom.xml

@@ -9,7 +9,7 @@
     <url>https://github.com/koder95/eMetrykant</url>
     <groupId>pl.koder95</groupId>
     <artifactId>eMetrykant</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <scm>
         <url>https://github.com/koder95/eMetrykant</url>
         <tag>search, metric, church</tag>

src/main/java/pl/koder95/eme/Files.java

@@ -17,7 +17,6 @@
 
 package pl.koder95.eme;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -49,10 +48,18 @@ public final class Files {
      * Plik, który przechowuje dane na temat indeksów.
      */
     public static final Path INDICES_XML = XML_DIR.resolve("indices.xml");
-
+    /**
+     * Folder tymczasowy eMetrykant, gdzie zapisywane są pliki pobrane z repozytorium.
+     */
     public static final Path TEMP_DIR = Paths.get(System.getProperty("java.io.tmpdir"), "eMetrykant");
-    public static final Path UPDATE_WIN = Files.WORKDIR.resolve("update.bat");
-    public static final Path UPDATE_UNIX = Files.WORKDIR.resolve("update");
+    /**
+     * Plik skryptu aktualizującego program, w formie bez rozszerzenia.
+     */
+    public static final Path UPDATE_SCRIPT = Files.WORKDIR.resolve("update");
+    /**
+     * Ścieżka do archiwum JAR. Jeśli program jest uruchomiony standardowo, ścieżka wskazuje archiwum
+     * uruchamiające.
+     */
     public static final Path SELF = WORKDIR.resolve("eMetrykant.jar");
 
     private Files() {}

src/main/java/pl/koder95/eme/Main.java

@@ -17,22 +17,17 @@
 package pl.koder95.eme;
 
 import javafx.application.Application;
-import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
-import javafx.scene.control.ProgressIndicator;
+import javafx.scene.control.ProgressBar;
 import javafx.scene.image.Image;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafx.scene.paint.Color;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-import pl.koder95.eme.au.AutoUpdateTask;
+import pl.koder95.eme.au.SelfUpdateTask;
 import pl.koder95.eme.core.*;
 import pl.koder95.eme.core.spi.CabinetAnalyzer;
 import pl.koder95.eme.core.spi.FilingCabinet;
@@ -46,9 +41,10 @@
 import java.util.regex.Pattern;
 
 /**
- * Klasa uruchamiająca i inicjalizująca podstawowe elementy aplikacji.
+ * Klasa uruchamiająca i inicjująca podstawowe elementy aplikacji.
+ *
  * @author Kamil Jan Mularski [@koder95]
- * @version 0.4.1, 2021-11-05
+ * @version 0.4.1, 2021-11-07
  * @since 0.0.201
  */
 public class Main extends Application {
@@ -76,13 +72,20 @@ public class Main extends Application {
      */
     public static final Pattern DIGITS_STRING_PATTERN
             = Pattern.compile("([0-9]*)");
+    /**
+     * Sprawdzenie, czy system operacyjny należy do rodziny "Windows".
+     */
+    public static final boolean IS_WINDOWS_OS = System.getProperty("os.name").toLowerCase().contains("windows");
 
     public static void main(String[] args) {
         if (args.length == 1) {
             if (args[0].equals("-v")) {
                 System.out.println(Version.get());
                 System.exit(0);
             }
+            else if (args[0].equals("-u")) {
+
+            }
         }
         Main.launch(args);
     }
@@ -96,13 +99,15 @@ public static void releaseMemory() {
     }
 
     private Parent root = null;
-    private AutoUpdateTask task = null;
+    private SelfUpdateTask task = null;
 
     @Override
     public void init() throws Exception {
-        RepositoryInfo.get().reload();
         super.init();
-        Arrays.stream(IndexList.values()).forEach(IndexList::load);
+        RepositoryInfo.get().reload();
+        if (getParameters().getUnnamed().isEmpty()) {
+            Arrays.stream(IndexList.values()).forEach(IndexList::load);
+        }
 
         FilingCabinet cabinet = new TreeFilingCabinet();
         IndexListDataSource source = new IndexListDataSource();
@@ -113,37 +118,35 @@ public void init() throws Exception {
         worker.load();
 
         root = FXMLLoader.load(ClassLoader.getSystemResource("pl/koder95/eme/fx/PersonalDataView.fxml"));
-        task = new AutoUpdateTask();
+        task = new SelfUpdateTask();
     }
 
     @Override
     public void start(Stage primaryStage) {
         primaryStage.getIcons().add(new Image(FAVICON_PATH));
         primaryStage.setTitle("eMetrykant " + Version.get());
         Version latestRelease = RepositoryInfo.get().getLatestReleaseVersion();
-        if (latestRelease.compareTo(Version.get()) > 0) {
-            primaryStage.initStyle(StageStyle.UNDECORATED);
-
-            ProgressIndicator updating = new ProgressIndicator();
+        if (latestRelease.compareTo(Version.get()) > 0 || !getParameters().getUnnamed().isEmpty()) {
+            ProgressBar updating = new ProgressBar();
             Label title = new Label();
             Label message = new Label();
+            VBox root = new VBox(5d, title, updating, message);
+
+            updating.setMinSize(400d, 35d);
             updating.progressProperty().bind(task.progressProperty());
             title.textProperty().bind(task.titleProperty());
             message.textProperty().bind(task.messageProperty());
 
-            VBox texts = new VBox(5d, title, message);
-            texts.setAlignment(Pos.CENTER_LEFT);
-            VBox progressing = new VBox(updating);
-            progressing.setAlignment(Pos.CENTER_RIGHT);
-            HBox root = new HBox(5d, progressing, texts);
             root.setAlignment(Pos.CENTER);
 
+            primaryStage.initStyle(StageStyle.UTILITY);
             primaryStage.setScene(new Scene(root));
             primaryStage.setAlwaysOnTop(true);
-            primaryStage.setMinWidth(300);
-            primaryStage.setMinHeight(150);
+            primaryStage.setResizable(false);
+            primaryStage.setMinWidth(400);
+            primaryStage.setMinHeight(100);
             primaryStage.show();
-            Platform.runLater(task);
+            new Thread(task).start();
         }
         else {
             primaryStage.setScene(new Scene(root));

src/main/java/pl/koder95/eme/Version.java

@@ -261,7 +261,7 @@ private static Version parse0(String str) {
      * @return wersja
      */
     public static Version parse(String str) {
-        return parse0(str.startsWith("v")? str.substring(1) : str);
+        return parse0(str == null? "0.0.0" : str.startsWith("v")? str.substring(1) : str);
     }
 
     /**