Exclude query parameters from file names is casda.download_file

Author: jd-au

astroquery/casda/core.py

@@ -2,7 +2,8 @@
 
 # 1. standard library imports
 from io import BytesIO
-from urllib.parse import unquote
+import os
+from urllib.parse import unquote, urlparse
 import time
 from xml.etree import ElementTree
 from datetime import datetime, timezone
@@ -239,9 +240,15 @@ def download_files(self, urls, savedir=''):
         # for each url in list, download file and checksum
         filenames = []
         for url in urls:
-            fn = self._request('GET', url, save=True, savedir=savedir, timeout=self.TIMEOUT, cache=False)
-            if fn:
-                filenames.append(fn)
+            parseResult = urlparse(url)
+            local_filename = os.path.basename(parseResult.path)
+            if os.name == 'nt':
+                # Windows doesn't allow special characters in filenames like
+                # ":" so replace them with an underscore
+                local_filename = local_filename.replace(':', '_')
+            local_filepath = os.path.join(savedir or self.cache_location or '.', local_filename)
+            self._download_file(url, local_filepath, timeout=self.TIMEOUT, cache=False)
+            filenames.append(local_filepath)
 
         return filenames
 

astroquery/casda/tests/test_casda.py

@@ -280,3 +280,17 @@ def test_stage_data(patch_get):
     urls = casda.stage_data(table, verbose=True)
     assert urls == ['http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum',
                     'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits']
+
+
+def test_download_file(patch_get):
+    urls = ['https://ingest.pawsey.org/bucket_name/path/askap_img.fits?security=stuff',
+            'http://casda.csiro.au/download/web/111-000-111-000/askap_img.fits.checksum']
+    casda = Casda('user', 'password')
+
+    # skip the actual downloading of the file
+    download_mock = MagicMock()
+    casda._download_file = download_mock
+
+    filenames = casda.download_files(urls)
+    assert filenames[0].endswith('askap_img.fits')
+    assert filenames[1].endswith('askap_img.fits.checksum')