Poprawki procesu uruchamiania

koder95 · koder95 · commit ea1db9425f41 · 2021-11-01T13:37:14.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>org.kohsuke</groupId>
             <artifactId>github-api</artifactId>
-            <version>1.119</version>
+            <version>1.133</version>
         </dependency>
     </dependencies>
 
diff --git a/src/main/java/pl/koder95/eme/Files.java b/src/main/java/pl/koder95/eme/Files.java
@@ -33,28 +33,27 @@ public final class Files {
     /**
      * Folder, gdzie znajdują się pliki programu.
      */
-    public static final File WORKDIR
-            = new File(System.getProperty("user.dir")); //NOI18N
+    public static final Path WORKDIR
+            = Paths.get(System.getProperty("user.dir")); //NOI18N
     /**
      * Folder, gdzie znajdują się pliki zawierające dane do wczytania
      * przez program.
      */
-    public static final File DATA_DIR = WORKDIR;
+    public static final Path DATA_DIR = WORKDIR;
     /**
      * Folder, gdzie znajdują się pliki zawierające dane do wczytania
      * przez program o rozszerzeniu XML.
      */
-    public static final File XML_DIR = DATA_DIR; //NOI18N
+    public static final Path XML_DIR = DATA_DIR; //NOI18N
     /**
      * Plik, który przechowuje dane na temat indeksów.
      */
-    public static final File INDICES_XML = new File(Files.XML_DIR, "indices.xml");
+    public static final Path INDICES_XML = XML_DIR.resolve("indices.xml");
 
     public static final Path TEMP_DIR = Paths.get(System.getProperty("java.io.tmpdir"), "eMetrykant");
-
-    public static final File UPDATE_WIN = new File(Files.WORKDIR, "update.bat");
-    public static final File UPDATE_UNIX = new File(Files.WORKDIR, "update");
-    public static final Path SELF = WORKDIR.toPath().resolve("eMetrykant.jar");
+    public static final Path UPDATE_WIN = Files.WORKDIR.resolve("update.bat");
+    public static final Path UPDATE_UNIX = Files.WORKDIR.resolve("update");
+    public static final Path SELF = WORKDIR.resolve("eMetrykant.jar");
 
     private Files() {}
 }
diff --git a/src/main/java/pl/koder95/eme/Main.java b/src/main/java/pl/koder95/eme/Main.java
@@ -17,19 +17,27 @@
 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.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.core.*;
 import pl.koder95.eme.core.spi.CabinetAnalyzer;
 import pl.koder95.eme.core.spi.FilingCabinet;
 import pl.koder95.eme.dfs.IndexList;
 
-import java.awt.*;
-import java.io.File;
 import java.text.Collator;
 import java.util.Arrays;
 import java.util.Locale;
@@ -86,9 +94,6 @@ public static void releaseMemory() {
     @Override
     public void init() throws Exception {
         super.init();
-        if (Files.UPDATE_WIN.exists() && !Files.UPDATE_WIN.delete()) Files.UPDATE_WIN.deleteOnExit();
-        if (Files.UPDATE_UNIX.exists() && !Files.UPDATE_UNIX.delete()) Files.UPDATE_UNIX.deleteOnExit();
-        /*
         Arrays.stream(IndexList.values()).forEach(IndexList::load);
 
         FilingCabinet cabinet = new TreeFilingCabinet();
@@ -100,19 +105,38 @@ public void init() throws Exception {
         worker.load();
 
         root = FXMLLoader.load(ClassLoader.getSystemResource("pl/koder95/eme/fx/PersonalDataView.fxml"));
-         */
         task = new AutoUpdateTask();
     }
 
     @Override
     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));
-        primaryStage.show();
-         */
-        task.run();
+
+        Stage secondary = new Stage();
+        secondary.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());
+
+        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);
     }
 }
diff --git a/src/main/java/pl/koder95/eme/au/AutoUpdateTask.java b/src/main/java/pl/koder95/eme/au/AutoUpdateTask.java
@@ -5,72 +5,93 @@
 import javafx.scene.control.Alert;
 import org.kohsuke.github.GHAsset;
 import org.kohsuke.github.GHRelease;
-import pl.koder95.eme.Files;
 
 import java.io.*;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
 import java.text.NumberFormat;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static pl.koder95.eme.Files.SELF;
-import static pl.koder95.eme.Files.TEMP_DIR;
+import static pl.koder95.eme.Files.*;
 
 public class AutoUpdateTask extends Task<Object> {
+
     @Override
     protected Object call() throws Exception {
         GHAsset zip;
         try {
             GitHubRepositoryController controller = new GitHubRepositoryController("koder95", "eMetrykant");
             controller.init();
             GHRelease latest = controller.getRepository().getLatestRelease();
-            zip = latest.listAssets().toList().stream().reduce(null, (r, c) -> {
-                System.out.println(c);
-                return c.getName().contains("eMetrykant") && c.getName().endsWith(".zip")? c : r;
-            });
+            zip = getGithubAsset(latest);
         } catch (IOException e) {
             e.printStackTrace();
-            Alert a = new Alert(Alert.AlertType.ERROR, "Nie można pobrać eMetrykanta.");
-            a.show();
+            showException(e);
             return null;
         }
 
         // pobieranie zip'a
         Path downloaded = downloadZip(zip.getBrowserDownloadUrl(), TEMP_DIR, zip.getName(), zip.getSize());
         // rozpakowywanie do folderu tymczasowego
         if (extractZip(downloaded, TEMP_DIR, true)) {
-            // TODO: tworzenie mapy aktualizacji
             Map<Path, Path> updateMap = new HashMap<>();
-            updateMap.put(TEMP_DIR.resolve("eMetrykant.jar"), SELF);
-			
-            restart(updateMap);
+            Files.list(TEMP_DIR).forEach(path -> {
+                updateMap.put(path, WORKDIR.resolve(path.getFileName()));
+            });
+            generateUpdateScript(UPDATE_WIN, updateMap);
         }
+        restart();
         return null;
     }
 
+    private void showException(Exception e) {
+        showException(e, "Nie można pobrać eMetrykanta.");
+    }
+
+    private void showException(Exception e, String title) {
+        Alert a = new Alert(Alert.AlertType.ERROR);
+        a.setTitle(title == null? "Wyjątek" : title);
+        a.setHeaderText(e.getClass().getName());
+        a.setContentText(e.getLocalizedMessage());
+        a.show();
+    }
+
+    private GHAsset getGithubAsset(GHRelease latest) throws IOException {
+        return latest.listAssets().toList().stream().reduce(null, (r, c) -> {
+            System.out.println(c);
+            return isMainZip(c) ? c : r;
+        });
+    }
+
+    private boolean isMainZip(GHAsset c) {
+        return c.getName().contains("eMetrykant") && c.getName().endsWith(".zip");
+    }
+
     private Path downloadZip(String url, Path dir, String name, long size) throws IOException {
         NumberFormat pF = NumberFormat.getPercentInstance();
-        String title = "Pobieranie " + name;
-        updateTitle(title);
+        updateTitle("Pobieranie " + name);
         updateProgress(0, 1);
 
         URLConnection connection = new URL(url).openConnection();
         Path forDownload = dir.resolve(name);
-        java.nio.file.Files.createFile(forDownload);
+        if (Files.notExists(forDownload.getParent()))
+            Files.createDirectories(forDownload.getParent());
+        if (Files.notExists(forDownload))
+            Files.createFile(forDownload);
 
-        try (InputStream in = connection.getInputStream();
-             ReadableByteChannel rbc = Channels.newChannel(in);
-             FileChannel channel = FileChannel.open(forDownload)) {
+        try (ReadableByteChannel rbc = Channels.newChannel(connection.getInputStream());
+             FileChannel channel = FileChannel.open(forDownload, StandardOpenOption.WRITE)) {
                 channel.truncate(size);
-                in.mark((int) size);
                 long workDone = 0;
                 long count = size > 100? size / 100: 1;
                 while (workDone < size) {
@@ -91,15 +112,14 @@ private boolean extractZip(Path forExtract, Path dir, boolean deleteZip) throws
         updateProgress(0, 1);
         updateMessage("");
         try (ZipFile zip = new ZipFile(forExtract.toFile())) {
-            updateProgress(0, java.nio.file.Files.size(forExtract));
+            updateProgress(0, Files.size(forExtract));
             double total = 0;
             if (dir == null) dir = forExtract.getParent();
             Enumeration<? extends ZipEntry> entries = zip.entries();
             while (entries.hasMoreElements()) {
                 ZipEntry entry = entries.nextElement();
-                System.out.println(entry);
                 if (entry.isDirectory()) {
-                    if (java.nio.file.Files.isDirectory(java.nio.file.Files.createDirectories(dir.resolve(entry.getName()))))
+                    if (Files.isDirectory(Files.createDirectories(dir.resolve(entry.getName()))))
                         System.out.println("Directory created!");
                 }
 
@@ -114,15 +134,15 @@ private boolean extractZip(Path forExtract, Path dir, boolean deleteZip) throws
                 Path outFile = dir.resolve(entry.getName());
 
                 if (!entry.isDirectory()) {
-                    if (java.nio.file.Files.isRegularFile(java.nio.file.Files.createFile(outFile))) {
+                    if (Files.isRegularFile(Files.createFile(outFile))) {
                         System.out.println("New file created: " + outFile);
                     }
                 }
                 else continue;
 
                 System.out.println("Entry: " + entry);
                 InputStream input = zip.getInputStream(entry);
-                try (OutputStream output = java.nio.file.Files.newOutputStream(outFile)) {
+                try (OutputStream output = Files.newOutputStream(outFile)) {
                     while (input.available() > 0) {
                         int b = input.read();
                         output.write(b);
@@ -134,24 +154,22 @@ private boolean extractZip(Path forExtract, Path dir, boolean deleteZip) throws
             }
         }
         updateProgress(Double.NaN, 0);
-        if (deleteZip) return java.nio.file.Files.deleteIfExists(forExtract);
+        if (deleteZip) return Files.deleteIfExists(forExtract);
         return false;
     }
 
-    private static void restart(Map<Path, Path> updateMap) {
+    private static void restart() {
         Platform.exit();
         try {
-            File update = Files.UPDATE_WIN;
-            generateUpdateScript(update, updateMap);
-            new ProcessBuilder(update.getPath()).start();
+            new ProcessBuilder(UPDATE_WIN.toString()).start();
         } catch (IOException e) {
             e.printStackTrace();
         }
         System.exit(0);
     }
 
-    private static void generateUpdateScript(File update, Map<Path, Path> updateMap) {
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(update))) {
+    private static void generateUpdateScript(Path update, Map<Path, Path> updateMap) {
+        try (BufferedWriter writer = Files.newBufferedWriter(update, StandardOpenOption.WRITE)) {
             generateWinUpdateScript(writer, updateMap);
         } catch (IOException e) {
             e.printStackTrace();
@@ -167,17 +185,21 @@ private static void generateWinUpdateScript(BufferedWriter writer, Map<Path, Pat
         for (Map.Entry<Path, Path> entry : updateMap.entrySet()) {
             Path oldFile = entry.getValue();
             Path newFile = entry.getKey();
-            if (java.nio.file.Files.exists(newFile)) {
+            if (Files.exists(newFile)) {
                 writer.write("copy " + '"');
                 writer.write(newFile.toString());
                 writer.write('"' + " " + '"');
                 writer.write(oldFile.toString());
                 writer.write('"' + " /y");
                 writer.newLine();
+                writer.write("rmdir -r " + '"');
+                writer.write(oldFile.getParent().toString());
+                writer.write('"' + " /y");
+                writer.newLine();
             } else throw new FileNotFoundException("Nie znaleziono odpowiednich plików do aktualizacji.");
         }
         final String javaBin = '"' + System.getProperty("java.home") + File.separator + "bin" + File.separator;
-        writer.write(javaBin + "java.exe\" -jar " + '"' + Files.SELF + '"');
+        writer.write(javaBin + "java.exe\" -jar " + '"' + SELF + '"');
         writer.newLine();
     }
 }
diff --git a/src/main/java/pl/koder95/eme/au/GitHubRepositoryController.java b/src/main/java/pl/koder95/eme/au/GitHubRepositoryController.java
@@ -11,8 +11,8 @@ private GitHub createNewConnection() throws IOException {
         return new GitHubBuilder().withRateLimitHandler(new RateLimitHandler() {
             @Override
             public void onError(IOException e, HttpURLConnection uc) {
-                e.printStackTrace();
                 System.out.println(uc);
+                e.printStackTrace();
             }
         }).build();
     }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ private GitHub createNewConnection() throws IOException {`
`11`	`11`	`return new GitHubBuilder().withRateLimitHandler(new RateLimitHandler() {`
`12`	`12`	`@Override`
`13`	`13`	`public void onError(IOException e, HttpURLConnection uc) {`
`14`		`- e.printStackTrace();`
`15`	`14`	`System.out.println(uc);`
	`15`	`+ e.printStackTrace();`
`16`	`16`	`}`
`17`	`17`	`}).build();`
`18`	`18`	`}`