Merge pull request #41 from GalaxyPay/dev

fix: move data directory cross-drive

Author: acfunk

.github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.0.0
+          tag: v3.0.1
           artifacts: "Output/*"

FUNC.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FUNC"
-#define MyAppVersion "3.0.0"
+#define MyAppVersion "3.0.1"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

FUNC/Node.cs

@@ -221,9 +221,29 @@ public static void SetDir(string name, Dir model)
         {
             string currentPath = Path.Combine(Utils.NodeDataParent(name), name);
             string requestPath = Path.Combine(model.Path, name);
-            Directory.Move(currentPath, requestPath);
+            CopyFolder(currentPath, requestPath);
             string filePath = Path.Combine(Utils.appDataDir, $"{name}.data");
             File.WriteAllText(filePath, model.Path);
+            Directory.Delete(currentPath, true);
+        }
+
+        public static void CopyFolder(string sourceFolder, string destFolder)
+        {
+            Directory.CreateDirectory(destFolder);
+            string[] files = Directory.GetFiles(sourceFolder);
+            foreach (string file in files)
+            {
+                string name = Path.GetFileName(file);
+                string dest = Path.Combine(destFolder, name);
+                File.Copy(file, dest);
+            }
+            string[] folders = Directory.GetDirectories(sourceFolder);
+            foreach (string folder in folders)
+            {
+                string name = Path.GetFileName(folder);
+                string dest = Path.Combine(destFolder, name);
+                CopyFolder(folder, dest);
+            }
         }
 
         public static async Task EnableTelemetry(string name)

FUNC/Utils.cs

@@ -13,7 +13,7 @@ public static string NodeDataParent(string name)
             string nodeDataParent = appDataDir;
             string path = Path.Combine(appDataDir, $"{name}.data");
             try { nodeDataParent = File.ReadAllText(path); } catch { }
-            return nodeDataParent;
+            return nodeDataParent.Trim();
         }
 
         public static string Cap(string name)

create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.0.0_linux-$1
+PKG=Output/func_3.0.1_linux-$1
 
 mkdir -p $PKG/lib/systemd/system
 mkdir -p $PKG/opt/func

create-package-pkg.sh

@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.0.0_darwin-$1.pkg
+    Output/func_3.0.1_darwin-$1.pkg

deb/amd64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.0.0
+Version: 3.0.1
 Section: base
 Priority: optional
 Architecture: amd64

deb/arm64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.0.0
+Version: 3.0.1
 Section: base
 Priority: optional
 Architecture: arm64

webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",