Fix sync on Windows

Author: const-cloudinary

cloudinary_cli/modules/sync.py

@@ -8,7 +8,7 @@
 
 from cloudinary_cli.utils.api_utils import query_cld_folder, upload_file, download_file
 from cloudinary_cli.utils.file_utils import walk_dir, delete_empty_dirs, get_destination_folder, \
-    normalize_file_extension
+    normalize_file_extension, posix_rel_path
 from cloudinary_cli.utils.json_utils import print_json, read_json_from_file, write_json_to_file
 from cloudinary_cli.utils.utils import logger, run_tasks_concurrently, get_user_action, invert_dict
 
@@ -171,8 +171,8 @@ def _print_sync_status(self, success, errors):
     def _save_sync_meta_file(self, upload_results):
         diverse_filenames = {}
         for local_path, remote_path in upload_results.items():
-            local = normalize_file_extension(path.relpath(local_path, self.local_dir))
-            remote = normalize_file_extension(path.relpath(remote_path, self.remote_dir))
+            local = normalize_file_extension(posix_rel_path(local_path, self.local_dir))
+            remote = normalize_file_extension(posix_rel_path(remote_path, self.remote_dir))
             if local != remote:
                 diverse_filenames[local] = remote
 

cloudinary_cli/utils/api_utils.py

@@ -8,7 +8,7 @@
 from cloudinary.utils import cloudinary_url
 
 from cloudinary_cli.defaults import logger
-from cloudinary_cli.utils.file_utils import normalize_file_extension
+from cloudinary_cli.utils.file_utils import normalize_file_extension, posix_rel_path
 from cloudinary_cli.utils.json_utils import print_json, write_json_to_file
 from cloudinary_cli.utils.utils import print_help, log_exception, confirm_action, \
     get_command_params, merge_responses, normalize_list_params
@@ -31,7 +31,7 @@ def query_cld_folder(folder):
         res = expression.execute()
 
         for asset in res['resources']:
-            rel_path = path.relpath(asset_source(asset), folder)
+            rel_path = posix_rel_path(asset_source(asset), folder)
             files[normalize_file_extension(rel_path)] = {
                 "type": asset['type'],
                 "resource_type": asset['resource_type'],

cloudinary_cli/utils/file_utils.py

@@ -2,6 +2,7 @@
 import stat
 from os import walk, path, listdir, rmdir, sep
 from os.path import split, relpath, abspath
+from pathlib import PurePath
 
 from cloudinary_cli.defaults import logger
 from cloudinary_cli.utils.utils import etag
@@ -45,7 +46,7 @@ def walk_dir(root_dir, include_hidden=False):
             files = [f for f in files if not is_hidden(root, f)]
             dirs[:] = [d for d in dirs if not is_hidden(root, d)]
 
-        relative_path = relpath(root, root_dir) if root_dir != root else ""
+        relative_path = posix_rel_path(root, root_dir) if root_dir != root else ""
         for file in files:
             full_path = path.join(root, file)
             relative_file_path = "/".join(p for p in [relative_path, file] if p)
@@ -107,7 +108,7 @@ def get_destination_folder(cloudinary_folder: str, file_path: str, parent: str =
     folder_path = []
 
     parent_path = abspath(parent) if parent else None
-    splitted = split(relpath(file_path, parent_path))
+    splitted = split(posix_rel_path(file_path, parent_path))
 
     if splitted[0]:
         folder_path = splitted[0].split(sep)
@@ -127,3 +128,14 @@ def normalize_file_extension(filename: str) -> str:
     extension_alias = FORMAT_ALIASES.get(extension, extension)
 
     return ".".join([p for p in [filename, extension_alias] if p])
+
+
+def posix_rel_path(end, start) -> str:
+    """
+    Returns a relative path in posix style on any system.
+
+    :param end: The end path.
+    :param start: The start path.
+    :return: The Relative path.
+    """
+    return PurePath(relpath(end, start)).as_posix()