Przygotowanie do v0.4.1

Author: koder95

manifest.mf

@@ -139,9 +139,10 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>
-                                pl.koder95.eme.Main
-                            </mainClass>
+                            <mainClass>pl.koder95.eme.Main</mainClass>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addExtensions>true</addExtensions>
                         </manifest>
                     </archive>
                 </configuration>

pom.xml

@@ -37,6 +37,7 @@
 import pl.koder95.eme.core.spi.CabinetAnalyzer;
 import pl.koder95.eme.core.spi.FilingCabinet;
 import pl.koder95.eme.dfs.IndexList;
+import pl.koder95.eme.git.RepositoryInfo;
 
 import java.text.Collator;
 import java.util.Arrays;
@@ -47,7 +48,7 @@
 /**
  * Klasa uruchamiająca i inicjalizująca podstawowe elementy aplikacji.
  * @author Kamil Jan Mularski [@koder95]
- * @version 0.4.0, 2020-08-26
+ * @version 0.4.1, 2021-11-05
  * @since 0.0.201
  */
 public class Main extends Application {
@@ -63,8 +64,8 @@ public class Main extends Application {
     /**
      * Domyślny sposób porównywania stringów (polski).
      */
-    public static final Collator DEFAULT_COLLATOR
-            = Collator.getInstance(POLISH); //NOI18N
+    public static final Collator DEFAULT_COLLATOR = Collator.getInstance(POLISH); //NOI18N
+
     private static final String FAV_PATH_START = "pl/koder95/eme/favicon";
     /**
      * Ścieżka ikony dla okienek.
@@ -77,6 +78,12 @@ public class Main extends Application {
             = Pattern.compile("([0-9]*)");
 
     public static void main(String[] args) {
+        if (args.length == 1) {
+            if (args[0].equals("-v")) {
+                System.out.println(Version.get());
+                System.exit(0);
+            }
+        }
         Main.launch(args);
     }
 
@@ -93,6 +100,7 @@ public static void releaseMemory() {
 
     @Override
     public void init() throws Exception {
+        RepositoryInfo.get().reload();
         super.init();
         Arrays.stream(IndexList.values()).forEach(IndexList::load);
 
@@ -112,31 +120,35 @@ public void init() throws Exception {
     public void start(Stage primaryStage) {
         primaryStage.getIcons().add(new Image(FAVICON_PATH));
         primaryStage.setTitle("eMetrykant " + Version.get());
-        primaryStage.setScene(new Scene(root));
-        primaryStage.setOnCloseRequest(event -> System.exit(0));
-
-        Stage secondary = new Stage();
-        secondary.initStyle(StageStyle.UNDECORATED);
+        Version latestRelease = RepositoryInfo.get().getLatestReleaseVersion();
+        if (latestRelease.compareTo(Version.get()) > 0) {
+            primaryStage.initStyle(StageStyle.UNDECORATED);
 
-        ProgressIndicator updating = new ProgressIndicator();
-        Label title = new Label();
-        Label message = new Label();
-        updating.progressProperty().bind(task.progressProperty());
-        title.textProperty().bind(task.titleProperty());
-        message.textProperty().bind(task.messageProperty());
+            ProgressIndicator updating = new ProgressIndicator();
+            Label title = new Label();
+            Label message = new Label();
+            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);
+            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);
 
-        secondary.setScene(new Scene(root));
-        secondary.setAlwaysOnTop(true);
-        secondary.setMinWidth(300);
-        secondary.setMinHeight(150);
-        secondary.show();
-        Platform.runLater(task);
+            primaryStage.setScene(new Scene(root));
+            primaryStage.setAlwaysOnTop(true);
+            primaryStage.setMinWidth(300);
+            primaryStage.setMinHeight(150);
+            primaryStage.show();
+            Platform.runLater(task);
+        }
+        else {
+            primaryStage.setScene(new Scene(root));
+            primaryStage.setOnCloseRequest(event -> System.exit(0));
+            primaryStage.show();
+        }
     }
 }

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

@@ -27,7 +27,7 @@
  * <a href="https://semver.org/lang/pl/">Wersjonowania semantycznego 2.0.0</a>.
  *
  * @author Kamil Jan Mularski [@koder95]
- * @version 0.4.0, 2020-08-13
+ * @version 0.4.1, 2021-11-05
  * @since 0.2.0
  */
 public class Version implements Comparable<Version> {
@@ -157,7 +157,7 @@ public final int compareTo(Version o) {
             < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0.
             */
             else if (!i0.hasNext() && i1.hasNext()) return -1;
-            else if (i0.hasNext() && !i1.hasNext()) return 1;
+            return 1;
         }
         return 0;
     }
@@ -223,32 +223,33 @@ public String toString() {
         } else return stable;
     }
 
-    private static Version parse(String str, boolean preRelease) {
+    private static Version parse0(String str) {
         boolean isPreRelease = str.contains("-"),
                 hasBuildMetadata = str.contains("+");
         if (hasBuildMetadata) {
             String[] mainParts = str.split(Pattern.quote("+"));
-            Version r = parse(mainParts[0], preRelease);
-            r.getBuildMetadata().addAll(
-                    Arrays.asList(mainParts[1].split(Pattern.quote(".")))
-            );
-            return r;
+            Version r = parse0(mainParts[0]);
+            if (r == null) return null;
+            return new Version(r.major, r.minor, r.patch, r.preRelease, r.identifiers,
+                    Arrays.asList(mainParts[1].split(Pattern.quote("."))));
         } else {
             if (isPreRelease) {
                 // 0 - stable, 1 - pre-release:
                 String[] nonBuildParts = str.split(Pattern.quote("-"));
                 String[] preReleaseParts = nonBuildParts[1]
                         .split(Pattern.quote("."));
-                Version r = parse(nonBuildParts[0], true);
-                r.getIdentifiers().addAll(Arrays.asList(preReleaseParts));
-                return r;
+                Version r = parse0(nonBuildParts[0]);
+                if (r == null) return null;
+                return new Version(r.major, r.minor, r.patch, true, Arrays.asList(preReleaseParts),
+                        Collections.emptyList());
             } else {
                 String[] stableParts = str.split(Pattern.quote("."));
-                return new Version(
-                        Integer.parseInt(stableParts[0]),
-                        Integer.parseInt(stableParts[1]),
-                        Integer.parseInt(stableParts[2]),
-                        preRelease, new LinkedList<>(), new LinkedList<>());
+                for (String part : stableParts) {
+                    if (!part.matches("(\\d)+")) {
+                        return null;
+                    }
+                }
+                return new Version(Integer.parseInt(stableParts[0]), Integer.parseInt(stableParts[1]), Integer.parseInt(stableParts[2]));
             }
         }
     }
@@ -260,9 +261,7 @@ private static Version parse(String str, boolean preRelease) {
      * @return wersja
      */
     public static Version parse(String str) {
-        if (str.startsWith("v"))
-            return parse(str.substring(1), str.contains("-"));
-        return parse(str, str.contains("-"));
+        return parse0(str.startsWith("v")? str.substring(1) : str);
     }
 
     /**
@@ -271,13 +270,14 @@ public static Version parse(String str) {
      * metody {@link Object#toString()}.
      *
      * @param klasa klasa, która ma zostać odczytana
-     * @return wersja
+     * @return instancja klasy {@link Version} utworzona na podstawie podanej klasy,
+     * {@code null} — gdy nie można odczytać wersji z podanej klasy
      */
-    public static Version parse(Class klasa) {
+    public static Version parse(Class<?> klasa) {
         try {
             Method get = Arrays.stream(klasa.getMethods())
                     .reduce(null, (r, c) -> c.getName().equals("get")? c : r);
-            
+
             if (get != null) return parse(get.invoke(null).toString());
             return null;
         } catch (IllegalAccessException | IllegalArgumentException
@@ -290,6 +290,6 @@ public static Version parse(Class klasa) {
      * @return wersja tego programu
      */
     public static Version get() {
-        return parse("0.5.0");
+        return parse(Main.class.getPackage().getSpecificationVersion());
     }
 }

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

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2018 Kamil Jan Mularski [@koder95]
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package pl.koder95.eme.au;
+
+import pl.koder95.eme.Version;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Path;
+
+/**
+ * Klasa umożliwia w łatwy sposób zarządzać plikiem JAR na potrzeby aplikacji.
+ *
+ * @author Kamil Jan Mularski [@koder95]
+ * @version 0.4.1, 2021-11-05
+ * @since 0.4.1
+ */
+public class JarAnalyzer {
+
+    private final Path jar;
+
+    public JarAnalyzer(Path jar) {
+        this.jar = jar;
+    }
+
+    /**
+     * Pobiera wersję z archiwum JAR poprzez uruchomienie paczki z argumentem {@code -v}.
+     *
+     * @return null — jeśli archiwum JAR nie zwraca wersji, w przeciwnym razie zwraca wersję JAR
+     * @throws IOException w przypadku problemów z odczytaniem strumieni wejścia / wyjścia
+     */
+    public Version getVersion() throws IOException {
+        if (jar.endsWith(".jar")) {
+            ProcessBuilder builder = new ProcessBuilder("java", "-jar", jar.toString(), "-v");
+            Process process = builder.start();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            Version fromLine = Version.parse(reader.readLine());
+            if (process.isAlive()) process.destroy();
+            reader.close();
+            return fromLine;
+        }
+        return null;
+    }
+}

src/main/java/pl/koder95/eme/au/JarAnalyzer.java

@@ -28,7 +28,7 @@
  * Zawiera wszystkie typy ksiąg i zawierających się w nich zbiorach indeksów.
  *
  * @author Kamil Jan Mularski [@koder95]
- * @version 0.4.0, 2020-08-26
+ * @version 0.4.1, 2021-11-05
  * @since 0.1.11
  */
 public enum IndexList implements IndexContainer {
@@ -157,7 +157,7 @@ public void clear() {
 
     private static void loadBooks() {
         try {
-            BOOKS = Book.load(Files.INDICES_XML);
+            BOOKS = Book.load(Files.INDICES_XML.toFile());
         } catch (IOException | SAXException | ParserConfigurationException ex) {
             System.err.println(ex);
         }