fixed url filename parsing

Author: jason-raitz

CHANGELOG.md

@@ -14,7 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added tests for this new behavior.
 
 ### Changed
-- slight change to raise a file not downloaded error if `tind_download()` fails to return a written file path.
+- Raises a file not downloaded error if `tind_download()` fails to return a written file path.
+
+### Fixed
+- Found a bug in the `fetch_file()` method where the "backup" filename parsing logic would always return
+  `download` as the filename.
 
 
 ## [0.2.4]

tind_client/api.py

@@ -87,7 +87,7 @@ def tind_download(url: str, output_dir: str, api_key: str) -> Tuple[int, str]:
         return status, ""
 
     # Fall-back to the file name in the URL if it isn't included in the response.
-    output_filename = url.rstrip("/").split("/")[-2]
+    output_filename = url.split("?")[0].rstrip("/").split("/")[-2]
 
     # See if we can extract the filename from the response headers.
     if "Content-Disposition" in resp.headers:

tind_client/client.py

@@ -95,7 +95,7 @@ def fetch_file(
 
         output_target = output_dir or self.default_storage_dir
 
-        expected_filename = file_url.rstrip("/").split("/")[-2]
+        expected_filename = file_url.split("?")[0].rstrip("/").split("/")[-2]
         expected_path = Path(output_target) / expected_filename
 
         if meta_mtime and expected_path.exists():