Merge pull request #21 from GedasFX/feature/19

Feature/19

Author: GedasFX

README.md

@@ -17,6 +17,7 @@ Support: **[SteamDeckHomebrew Discord](https://discord.gg/ZU74G2NJzk)**.
 * Ability to back up files automatically after a game is closed.
 * File counter, which estimates the number of files a sync path would pick up. Prevents accidental backing up of the entire steam deck.
 * Advanced filtering, allowing users to set up custom filtering rules with includes and excludes.
+* Ability to customize destination folder name (found in `plugin.properties` config).
 
 **IMPORTANT!** This plugin does not support bidirectional sync. In other words, this plugin is not intended for use cases to sync saves between devices, but rather just to keep your game progress safe in case of data loss.
 

main.py

@@ -54,7 +54,7 @@ def _regenerate_filter_file():
         f.write("# If you are editing this file manually, make sure to not use the UI file picker, as the saves done there will overwrite.\n")
         f.write("# Examples: https://rclone.org/filtering/#examples\n")
         f.write("\n")
-        
+
         for exclude in excludes:
             f.write(f"- {exclude}")
         f.write("\n")
@@ -63,6 +63,30 @@ def _regenerate_filter_file():
         f.write("\n")
         f.write("- **\n")
 
+
+def _get_config(): 
+    with open(cfg_property_file) as f:
+        lines = f.readlines()
+        lines = list(map(lambda x: x.strip().split('='), lines))
+        logger.debug("config %s", lines)
+        return lines
+
+def _set_config(key: str, value: str):
+    with open(cfg_property_file, "r") as f:
+        lines = f.readlines()
+
+    with open(cfg_property_file, "w") as f:
+        found = False
+        for line in lines:
+            if line.startswith(key + '='):
+                f.write(f"{key}={value}\n")
+                found = True
+            else:
+                f.write(line)
+
+        if not found:
+            f.write(f"{key}={value}\n")
+
 class Plugin:
     current_spawn = None
     current_sync = None
@@ -104,8 +128,11 @@ async def get_backend_type(self):
 
     async def sync_now(self):
         logger.debug("Executing: sync_now()")
-        logger.debug("Running command: %s copy --filter-from %s / backend:decky-cloud-save --copy-links", rclone_bin, cfg_syncpath_filter_file)
-        self.current_sync = await asyncio.subprocess.create_subprocess_exec(rclone_bin, *["copy", "--filter-from", cfg_syncpath_filter_file, "/", "backend:decky-cloud-save", "--copy-links"])
+
+        destination_path = next((x[1] for x in _get_config() if x[0] == "destination_directory"), "decky-cloud-save")
+        logger.debug("Running command: %s copy --filter-from %s / backend:%s --copy-links", rclone_bin, cfg_syncpath_filter_file, destination_path)
+
+        self.current_sync = await asyncio.subprocess.create_subprocess_exec(rclone_bin, *["copy", "--filter-from", cfg_syncpath_filter_file, "/", f"backend:{destination_path}", "--copy-links"])
 
     async def sync_now_probe(self):
         logger.debug("Executing: sync_now_probe()")
@@ -186,29 +213,11 @@ async def remove_syncpath(self, path: str, file: str):
 
     async def get_config(self):
         logger.debug("Executing: get_config()")
-        with open(cfg_property_file) as f:
-            lines = f.readlines()
-            lines = list(map(lambda x: x.strip().split('='), lines))
-            logger.debug("config %s", lines)
-            return lines
+        return _get_config()
 
     async def set_config(self, key: str, value: str):
         logger.debug("Executing: set_config(%s, %s)", key, value)
-        with open(cfg_property_file, "r") as f:
-            lines = f.readlines()
-
-        with open(cfg_property_file, "w") as f:
-            found = False
-            for line in lines:
-                if line.startswith(key + '='):
-                    f.write(f"{key}={value}\n")
-                    found = True
-                else:
-                    f.write(line)
-
-            if not found:
-                f.write(f"{key}={value}\n")
-
+        _set_config(key, value)
 
 # Asyncio-compatible long-running code, executed in a task when the plugin is loaded
 
@@ -228,6 +237,12 @@ async def _main(self):
         if not cfg_property_file.is_file():
             cfg_property_file.touch()
 
+        # Prepopulate config
+        config = _get_config()
+        logger.warn(config)
+        if not any(e[0] == "destination_directory" for e in config):
+            _set_config("destination_directory", "decky-cloud-save")
+
     # Function called first during the unload process, utilize this to handle your plugin being removed
     async def _unload(self):
         await _kill_previous_spawn(self.current_spawn)  # Kills only if exists

package.json

@@ -1,6 +1,6 @@
 {
   "name": "decky-cloud-save",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Manage cloud saves for games that do not support it in [current year].",
   "scripts": {
     "build": "shx rm -rf dist && rollup -c",
@@ -42,7 +42,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "decky-frontend-lib": "^3.20.7",
+    "decky-frontend-lib": "^3.21.2",
     "react-icons": "^4.8.0"
   },
   "pnpm": {

pnpm-lock.yaml

@@ -27,7 +27,7 @@ export async function syncNow(): Promise<void> {
       body = `Sync completed in ${(new Date().getTime() - start.getTime()) / 1000}s.`;
       break;
     default:
-      body = `Sync failed. Check journalctl for errors.`;
+      body = `Sync failed. Run journalctl -u plugin_loader.service to see the errors.`;
       break;
   }