From: Debayan Sutradhar <debayansutradhar3@gmail.com>
Date: Thu, 29 Apr 2021 13:10:00 +0530
Subject: Moved default unzipper to Config
---
Moved default unzipper to Config
---


--- 'a/src/main/java/com/stream_pi/server/controller/Controller.java'
+++ b/src/main/java/com/stream_pi/server/controller/Controller.java
@@ -233,6 +233,7 @@ public class Controller extends Base imp
         }
         finally
         {
+            getLogger().info("Shut down");
             closeLogger();
         }
     }

--- 'a/src/main/java/com/stream_pi/server/io/Config.java'
+++ b/src/main/java/com/stream_pi/server/io/Config.java
@@ -8,7 +8,9 @@ handler for config.xml
 
 package com.stream_pi.server.io;
 
+import java.awt.*;
 import java.io.File;
+import java.util.Objects;
 import java.util.logging.Logger;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -20,8 +22,10 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import com.stream_pi.server.Main;
 import com.stream_pi.server.info.ServerInfo;
 import com.stream_pi.util.exception.SevereException;
+import com.stream_pi.util.iohelper.IOHelper;
 import com.stream_pi.util.xmlconfighelper.XMLConfigHelper;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -322,4 +326,19 @@ public class Config
     {
         getOthersElement().getElementsByTagName("allow-donate-popup").item(0).setTextContent(value+"");
     }
+
+    public static void unzipToDefaultPrePath() throws Exception
+    {
+        IOHelper.unzip(Objects.requireNonNull(Main.class.getResourceAsStream("Default.zip")), ServerInfo.getInstance().getPrePath());
+
+        Config.getInstance().setThemesPath(ServerInfo.getInstance().getPrePath()+"Themes/");
+        Config.getInstance().setPluginsPath(ServerInfo.getInstance().getPrePath()+"Plugins/");
+
+        if(SystemTray.isSupported())
+        {
+            Config.getInstance().setMinimiseToSystemTrayOnClose(true);
+        }
+
+        Config.getInstance().save();
+    }
 }

--- 'a/src/main/java/com/stream_pi/server/window/Base.java'
+++ b/src/main/java/com/stream_pi/server/window/Base.java
@@ -156,17 +156,7 @@ public abstract class Base extends Stack
                 boolean result = filex.mkdirs();
                 if(result)
                 {
-                    IOHelper.unzip(Main.class.getResourceAsStream("Default.zip"), ServerInfo.getInstance().getPrePath());
-
-                    Config.getInstance().setThemesPath(ServerInfo.getInstance().getPrePath()+"Themes/");
-                    Config.getInstance().setPluginsPath(ServerInfo.getInstance().getPrePath()+"Plugins/");
-
-                    if(SystemTray.isSupported())
-                    {
-                        Config.getInstance().setMinimiseToSystemTrayOnClose(true);
-                    }
-
-                    Config.getInstance().save();
+                    Config.unzipToDefaultPrePath();
 
                     initLogger();
                 }