Fix download windows paths (#29)

* Fix downloading paths that have windows style path separators * Fix tests so that they can run on windows too Co-authored-by: David Sternlicht <[email protected]>
getslash · Apr 12, 2020 · dd7650f · dd7650f
1 parent 5b16872
commit dd7650f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/scottypy/file.py b/scottypy/file.py
@@ -6,7 +6,7 @@
 
 from .exc import NotOverwriting
 from .types import JSON
-from .utils import raise_for_status
+from .utils import fix_path_sep_for_current_platform, raise_for_status
 
 if typing.TYPE_CHECKING:
     from requests import Session
@@ -76,7 +76,7 @@ def stream_to(self, fileobj: "typing.BinaryIO") -> None:
 
     def download(self, directory: str = ".", overwrite: bool = False) -> None:
         """Download the file to the specified directory, retaining its name"""
-        subdir, file_ = os.path.split(self.file_name)
+        subdir, file_ = os.path.split(fix_path_sep_for_current_platform(self.file_name))
         subdir = os.path.join(directory, subdir)
         file_ = os.path.join(subdir, file_)
 

diff --git a/scottypy/utils.py b/scottypy/utils.py
@@ -1,3 +1,5 @@
+import os
+
 import requests
 
 
@@ -21,3 +23,7 @@ def raise_for_status(response: requests.Response) -> None:
             ),
             response=response,
         )
+
+
+def fix_path_sep_for_current_platform(file_name: str) -> str:
+    return file_name.replace("\\", os.path.sep).replace("/", os.path.sep)
diff --git a/unittests/test_utils.py b/unittests/test_utils.py
@@ -1,3 +1,4 @@
+import os
 from http import HTTPStatus
 
 import pytest
@@ -30,3 +31,15 @@ def test_raise_for_status_server_error():
 
 def test_raise_for_status_no_error():
     utils.raise_for_status(MockResponse(status_code=HTTPStatus.OK))
+
+
+def test_fix_path_sep_for_current_platform_windows_path():
+    assert utils.fix_path_sep_for_current_platform(r"a\b\c") == os.path.join(
+        "a", "b", "c"
+    )
+
+
+def test_fix_path_sep_for_current_platform_linux_path():
+    assert utils.fix_path_sep_for_current_platform("a/b/c") == os.path.join(
+        "a", "b", "c"
+    )