From 797ad0752290c52520f74ff6174452ba401a6c15 Mon Sep 17 00:00:00 2001 From: Ihor Oleksandrov Date: Thu, 15 Jun 2017 08:45:36 +0300 Subject: [PATCH] fix: expand sync folder path closes #22 --- Package Syncing.py | 2 +- package_syncing/tools.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Package Syncing.py b/Package Syncing.py index c3230b0..b02c828 100644 --- a/Package Syncing.py +++ b/Package Syncing.py @@ -61,7 +61,7 @@ def run(self, mode=["pull", "push"], override=False): settings = sublime.load_settings("Package Syncing.sublime-settings") # Check for valid sync_folder - if not os.path.isdir(settings.get("sync_folder")): + if not os.path.isdir(tools.load_settings().get("sync_folder")): sublime.error_message("Invalid sync folder \"%s\", sync disabled! Please adjust your sync folder." % settings.get("sync_folder")) settings.set("sync", False) sublime.save_settings("Package Syncing.sublime-settings") diff --git a/package_syncing/tools.py b/package_syncing/tools.py index 91201c0..1808a70 100644 --- a/package_syncing/tools.py +++ b/package_syncing/tools.py @@ -21,11 +21,15 @@ watcher_remote = None +def expandpath(path): + return os.path.expandvars(os.path.expanduser(path)) + + def load_settings(): s = sublime.load_settings("Package Syncing.sublime-settings") return { "sync": s.get("sync", False), - "sync_folder": s.get("sync_folder", False), + "sync_folder": expandpath(s.get("sync_folder")) if s.get("sync_folder", False) else False, "sync_interval": s.get("sync_interval", 1), "files_to_include": s.get("files_to_include", []), "files_to_ignore": s.get("files_to_ignore", []),