Default URL Panel ; No File logger ; Grade 6.6

FlowArg · FlowArg · commit 6823128df8da · 2020-09-16T14:58:22.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'application'
 apply plugin: 'idea'
 
 group 'fr.flowarg'
-version '1.1.1'
+version '1.1.2'
 archivesBaseName = "FlowUpdaterJsonCreator"
 
 compileJava {
@@ -25,7 +25,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'fr.flowarg:flowmultitools:1.0.3'
+    implementation 'fr.flowarg:flowmultitools:1.+'
     implementation 'com.jfoenix:jfoenix:8.+'
     implementation 'com.google.code.gson:gson:2.+'
     implementation 'de.jensd:fontawesomefx:8.9'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/FlowUpdaterJsonCreator.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/FlowUpdaterJsonCreator.java
@@ -10,9 +10,6 @@
 import javafx.application.Application;
 import javafx.stage.Stage;
 
-import java.io.File;
-import java.io.IOException;
-
 public class FlowUpdaterJsonCreator
 {
     private static FlowUpdaterJsonCreator instance;
@@ -22,17 +19,17 @@ public class FlowUpdaterJsonCreator
     private final IProcessor externalFileProcessor;
     private PanelManager panelManager;
 
-    FlowUpdaterJsonCreator() throws IOException
+    FlowUpdaterJsonCreator()
     {
         instance = this;
-        final File logFile = new File(".", "jsoncreator.log");
-        logFile.getParentFile().mkdirs();
-        logFile.delete();
-        logFile.createNewFile();
-        this.logger = new Logger("[JsonCreator]", logFile);
+        this.logger = new Logger("[JsonCreator]", null);
         this.modProcessor = new ModProcessor();
         this.mcpProcessor = new MCPProcessor();
         this.externalFileProcessor = new ExternalFileProcessor();
+    }
+
+    public void start()
+    {
         this.logger.info("Starting json creator...");
         try
         {
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/Main.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/Main.java
@@ -6,6 +6,6 @@ public class Main
 {
     public static void main(String[] args) throws IOException
     {
-        new FlowUpdaterJsonCreator();
+        new FlowUpdaterJsonCreator().start();
     }
 }
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/ExternalFileProcessor.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/ExternalFileProcessor.java
@@ -6,6 +6,8 @@
 import com.google.gson.JsonObject;
 import fr.flowarg.flowio.FileUtils;
 import fr.flowarg.flowupdaterjsoncreator.json.ExternalFile;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.Panels;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.UrlPanel;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -24,13 +26,13 @@ public void process(File dir, Object... args)
     {
         this.externalFiles.clear();
         if(dir.listFiles() != null)
-            for (File mod : dir.listFiles())
-                if(!mod.isDirectory())
-                    this.externalFiles.add(new ExternalFile(mod.getName(), "", FileUtils.getSHA1(mod), FileUtils.getFileSizeBytes(mod)));
+            for (File extFile : dir.listFiles())
+                if(!extFile.isDirectory())
+                    this.externalFiles.add(new ExternalFile(extFile.getName(), ((UrlPanel)Panels.URL_PANEL).getDefaultUrl() + extFile.getName(), FileUtils.getSHA1(extFile), FileUtils.getFileSizeBytes(extFile)));
                 else
                 {
-                    for (File sub : this.getSubFiles(mod))
-                        this.externalFiles.add(new ExternalFile(sub.getAbsolutePath().replace(dir.getAbsolutePath(), ""), "", FileUtils.getSHA1(sub), FileUtils.getFileSizeBytes(sub)));
+                    for (File sub : this.getSubFiles(extFile))
+                        this.externalFiles.add(new ExternalFile(sub.getAbsolutePath().replace(dir.getAbsolutePath(), ""), ((UrlPanel)Panels.URL_PANEL).getDefaultUrl() + sub.getAbsolutePath().replace(dir.getAbsolutePath(), ""), FileUtils.getSHA1(sub), FileUtils.getFileSizeBytes(sub)));
                 }
     }
 
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/MCPProcessor.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/MCPProcessor.java
@@ -5,6 +5,8 @@
 import com.google.gson.JsonObject;
 import fr.flowarg.flowio.FileUtils;
 import fr.flowarg.flowupdaterjsoncreator.json.MCP;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.Panels;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.UrlPanel;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -23,9 +25,8 @@ public void process(File dir, Object... args)
         final boolean clientExist = client.exists();
         final File server = new File(dir, "server.jar");
         final boolean serverExist = server.exists();
-
-        this.mcp = new MCP("", clientExist ? FileUtils.getSHA1(client) : "", clientExist ? (int)FileUtils.getFileSizeBytes(client) : -1,
-                           "", serverExist ? FileUtils.getSHA1(server) : "", serverExist ? (int)FileUtils.getFileSizeBytes(server) : -1);
+        this.mcp = new MCP(((UrlPanel)Panels.URL_PANEL).getDefaultUrl() + client.getName(), clientExist ? FileUtils.getSHA1(client) : "", clientExist ? (int)FileUtils.getFileSizeBytes(client) : -1,
+                           ((UrlPanel)Panels.URL_PANEL).getDefaultUrl() + server.getName(), serverExist ? FileUtils.getSHA1(server) : "", serverExist ? (int)FileUtils.getFileSizeBytes(server) : -1);
     }
 
     @Override
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/ModProcessor.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/processors/ModProcessor.java
@@ -6,6 +6,8 @@
 import com.google.gson.JsonObject;
 import fr.flowarg.flowio.FileUtils;
 import fr.flowarg.flowupdaterjsoncreator.json.Mod;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.Panels;
+import fr.flowarg.flowupdaterjsoncreator.ui.panels.UrlPanel;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -26,9 +28,7 @@ public void process(File dir, Object... args)
         if(dir.listFiles() != null)
             for (File mod : dir.listFiles())
                 if(!mod.isDirectory())
-                {
-                    mods.add(new Mod(mod.getName(), "", FileUtils.getSHA1(mod), FileUtils.getFileSizeBytes(mod)));
-                }
+                    mods.add(new Mod(mod.getName(), ((UrlPanel)Panels.URL_PANEL).getDefaultUrl() + "mods/" + mod.getName(), FileUtils.getSHA1(mod), FileUtils.getFileSizeBytes(mod)));
     }
 
     @Override
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/FxApplication.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/FxApplication.java
@@ -13,6 +13,7 @@ public void start(Stage stage)
         final FlowUpdaterJsonCreator jsonCreator = FlowUpdaterJsonCreator.getInstance();
         jsonCreator.setPanelManager(stage);
         jsonCreator.getPanelManager().init();
-        jsonCreator.getPanelManager().showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);
+        jsonCreator.getPanelManager().showPanel(Panels.URL_PANEL);
+        //jsonCreator.getPanelManager().showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);
     }
 }
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/PanelManager.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/PanelManager.java
@@ -60,7 +60,7 @@ public void init()
 
     public void showPanel(IPanel panel)
     {
-        this.jsonCreator.getLogger().info("Opening : " + panel.getName());
+        this.jsonCreator.getLogger().debug("Opening : " + panel.getName());
         this.centerPanel.getChildren().clear();
         this.centerPanel.getChildren().add(panel.getLayout());
         panel.init(this);
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/Panels.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/Panels.java
@@ -5,4 +5,5 @@ public class Panels
     public static final IPanel CHOOSE_JSON_TYPE_PANEL = new ChooseJsonTypePanel();
     public static final IPanel LOADING_PANEL = new LoadingPanel();
     public static final IPanel END_PANEL = new EndPanel();
+    public static final IPanel URL_PANEL = new UrlPanel();
 }
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/UrlPanel.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/UrlPanel.java
@@ -0,0 +1,94 @@
+package fr.flowarg.flowupdaterjsoncreator.ui.panels;
+
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXTextArea;
+import fr.flowarg.flowupdaterjsoncreator.ui.PanelManager;
+import javafx.scene.Cursor;
+import javafx.scene.control.Label;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+
+public class UrlPanel extends AbstractPanel
+{
+    private String defaultUrl = "";
+
+    public UrlPanel()
+    {
+        super(null);
+    }
+
+    @Override
+    public void init(PanelManager panelManager)
+    {
+        super.init(panelManager);
+
+        final Label enterUrl = new Label("Enter the default URL");
+        enterUrl.setFont(Font.font("Consolas", 48));
+        enterUrl.setTextFill(Color.WHITE);
+
+        final JFXTextArea urlArea = new JFXTextArea();
+        urlArea.setMinSize(400, 90);
+        urlArea.setMaxSize(400, 90);
+        urlArea.setFocusColor(Color.WHITE);
+        urlArea.setUnFocusColor(Color.BLUEVIOLET);
+        urlArea.setFocusTraversable(false);
+        urlArea.setStyle("-fx-text-fill: white;");
+        urlArea.setFont(Font.font("Consolas", 24));
+
+        final JFXButton skip = new JFXButton("Skip this step ?");
+        skip.setUnderline(true);
+        skip.setStyle("-fx-text-fill: white; -fx-background-color: rgba(0, 0, 0, 0);");
+        skip.setButtonType(JFXButton.ButtonType.RAISED);
+        skip.setOnMouseEntered(event -> skip.setCursor(Cursor.HAND));
+        skip.setOnMouseExited(event -> skip.setCursor(Cursor.DEFAULT));
+        skip.setOnMouseClicked(event -> {
+            skip.setCursor(Cursor.DEFAULT);
+            this.defaultUrl = "/";
+            panelManager.showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);
+        });
+        skip.setFont(Font.font("Consolas", 22));
+
+        final JFXButton enter = new JFXButton("Done");
+        enter.setFont(Font.font("Consolas", 34));
+        enter.setButtonType(JFXButton.ButtonType.RAISED);
+        enter.setStyle("-fx-text-fill: white; -fx-background-color: rgb(59, 58, 58);");
+        enter.setOnMouseEntered(event -> enter.setCursor(Cursor.HAND));
+        enter.setOnMouseExited(event -> enter.setCursor(Cursor.DEFAULT));
+        enter.setOnMouseClicked(event -> {
+            skip.setCursor(Cursor.DEFAULT);
+            this.defaultUrl = urlArea.getText();
+            panelManager.showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);
+        });
+
+        this.setCenterH(enterUrl);
+        this.setCenterV(enterUrl);
+        this.setCenterV(urlArea);
+        this.setCenterH(urlArea);
+        this.setCenterH(skip);
+        this.setCenterV(skip);
+        this.setCenterH(enter);
+        this.setCenterV(enter);
+        this.setCanTakeAllSize(enterUrl);
+        this.setCanTakeAllSize(urlArea);
+        this.setCanTakeAllSize(skip);
+        this.setCanTakeAllSize(enter);
+
+        enterUrl.setTranslateY(-60);
+        urlArea.setTranslateY(20);
+        skip.setTranslateY(250);
+        enter.setTranslateY(120);
+
+        this.getLayout().getChildren().addAll(enterUrl, urlArea, skip, enter);
+    }
+
+    @Override
+    public String getName()
+    {
+        return "UrlPanel";
+    }
+
+    public String getDefaultUrl()
+    {
+        return this.defaultUrl.endsWith("/") ? defaultUrl : defaultUrl + '/';
+    }
+}
diff --git a/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/includes/TopPanel.java b/src/main/java/fr/flowarg/flowupdaterjsoncreator/ui/panels/includes/TopPanel.java
@@ -39,7 +39,7 @@ public void init(PanelManager panelManager)
         this.layout.getChildren().add(title);
         title.setFont(Font.font("Consolas", FontWeight.THIN, FontPosture.REGULAR, 19.0f));
         title.setStyle("-fx-text-fill: white;");
-        title.setText("FlowUpdater - JsonEditor");
+        title.setText("FlowUpdater - JsonCreator");
 
         this.setCenterH(title);
         topBarButton.setMinWidth(100);

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ public class Main`
`6`	`6`	`{`
`7`	`7`	`public static void main(String[] args) throws IOException`
`8`	`8`	`{`
`9`		`- new FlowUpdaterJsonCreator();`
	`9`	`+ new FlowUpdaterJsonCreator().start();`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public void start(Stage stage)`
`13`	`13`	`final FlowUpdaterJsonCreator jsonCreator = FlowUpdaterJsonCreator.getInstance();`
`14`	`14`	`jsonCreator.setPanelManager(stage);`
`15`	`15`	`jsonCreator.getPanelManager().init();`
`16`		`- jsonCreator.getPanelManager().showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);`
	`16`	`+ jsonCreator.getPanelManager().showPanel(Panels.URL_PANEL);`
	`17`	`+ //jsonCreator.getPanelManager().showPanel(Panels.CHOOSE_JSON_TYPE_PANEL);`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void init()`
`60`	`60`
`61`	`61`	`public void showPanel(IPanel panel)`
`62`	`62`	`{`
`63`		`- this.jsonCreator.getLogger().info("Opening : " + panel.getName());`
	`63`	`+ this.jsonCreator.getLogger().debug("Opening : " + panel.getName());`
`64`	`64`	`this.centerPanel.getChildren().clear();`
`65`	`65`	`this.centerPanel.getChildren().add(panel.getLayout());`
`66`	`66`	`panel.init(this);`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ public class Panels`
`5`	`5`	`public static final IPanel CHOOSE_JSON_TYPE_PANEL = new ChooseJsonTypePanel();`
`6`	`6`	`public static final IPanel LOADING_PANEL = new LoadingPanel();`
`7`	`7`	`public static final IPanel END_PANEL = new EndPanel();`
	`8`	`+ public static final IPanel URL_PANEL = new UrlPanel();`
`8`	`9`	`}`