remove bugs due to leading slash

Author: trondth

tsdapiclient/fileapi.py

@@ -117,21 +117,23 @@ def format_filename(filename: str) -> str:
 
 
 def upload_resource_name(filename: str, is_dir: bool, group: Optional[str] = None, remote_path: Optional[str] = None) -> str:
-    if not group:
-        group = ""
     if not is_dir:
         debug_step('uploading file')
-        resource = "/" / pathlib.Path(quote(format_filename(filename)))
+        resource = pathlib.Path(quote(format_filename(filename)))
         if remote_path:
             resource = quote(remote_path) / resource
         if group:
             resource = group / resource
     else:
         debug_step('uploading directory (file)')
-        if remote_path:
-            resource = pathlib.Path("/") / group / quote(remote_path) / quote(filename)
+        if filename.startswith('/'):
+            resource = pathlib.Path(filename[1:])
         else:
-            resource = pathlib.Path("/") / group / quote(filename)
+            resource = pathlib.Path(filename)
+        if remote_path:
+            resource = quote(remote_path) / resource
+        if group:
+            resource = group / resource
     return str(resource)
 
 
@@ -253,7 +255,7 @@ def streamfile(
     tokens = maybe_refresh(env, pnum, api_key, token, refresh_token, refresh_target)
     token = tokens.get('access_token') if tokens else token
     resource = upload_resource_name(filename, is_dir, group=group, remote_path=remote_path)
-    endpoint = str(pathlib.Path("stream") / f"{resource}?group={group}")
+    endpoint=f"stream/{resource}?group={group}"
     url = f'{file_api_url(env, pnum, backend, endpoint=endpoint)}'
     headers = {'Authorization': f'Bearer {token}'}
     debug_step(f'streaming data to {url}')
@@ -335,9 +337,9 @@ def import_list(
     if not group:
         group = ""
     if remote_path:
-        endpoint = str(pathlib.Path("stream") / group / quote(remote_path) / quote(resource))
+        endpoint = str(pathlib.Path("stream") / group / quote(remote_path) / resource)
     else:
-        endpoint = str(pathlib.Path("stream") / group / quote(resource))
+        endpoint = str(pathlib.Path("stream") / group / resource)
     url = f'{file_api_url(env, pnum, backend, endpoint=endpoint , page=page, per_page=per_page)}'
     headers = {'Authorization': 'Bearer {0}'.format(token)}
     debug_step(f'listing resources at {url}')
@@ -376,7 +378,7 @@ def survey_list(
     per_page: number of files to list per page
 
     """
-    endpoint = str(pathlib.Path(directory or "") / "attachments")
+    endpoint=f"{directory}/attachments"
     url = f'{file_api_url(env, pnum, backend, endpoint=endpoint, page=page, per_page=per_page)}'
     headers = {'Authorization': 'Bearer {0}'.format(token)}
     debug_step(f'listing resources at {url}')
@@ -403,12 +405,10 @@ def import_delete(
 ) -> requests.Response:
     tokens = maybe_refresh(env, pnum, api_key, token, refresh_token, refresh_target)
     token = tokens.get("access_token") if tokens else token
-    endpoint = pathlib.Path("stream")
-    if group:
-        endpoint = endpoint / group
     if remote_path:
-        endpoint = endpoint / quote(remote_path)
-    endpoint = str(endpoint / quote(filename))
+        endpoint = f'stream/{group}{quote(remote_path)}{quote(filename)}'
+    else:
+        endpoint = f'stream/{group}{quote(filename)}'
     url = f'{file_api_url(env, pnum, "files", endpoint=endpoint)}'
     headers = {'Authorization': f'Bearer {token}'}
     print(f'deleting: {filename}')
@@ -431,10 +431,10 @@ def export_delete(
 ) -> requests.Response:
     tokens = maybe_refresh(env, pnum, api_key, token, refresh_token, refresh_target)
     token = tokens.get("access_token") if tokens else token
-    endpoint = pathlib.Path("export")
     if remote_path:
-        endpoint = endpoint / quote(remote_path)
-    endpoint = str(endpoint / quote(filename))
+        endpoint = f'export{quote(remote_path)}{quote(filename)}'
+    else:
+        endpoint = f'export/{quote(filename)}'
     url = f'{file_api_url(env, pnum, "files", endpoint=endpoint)}'
     headers = {'Authorization': f'Bearer {token}'}
     print(f'deleting: {filename}')
@@ -491,10 +491,9 @@ def export_list(
                         sys.exit(f'{remote_path} is a file, not a directory')
             if not exists:
                 sys.exit(f'{remote_path} does not exist')
-    endpoint = pathlib.Path("export")
-    if remote_path:
-        endpoint = endpoint / quote(remote_path)
-    endpoint = str(endpoint / resource)
+        endpoint = f"export{quote(remote_path)}{resource}"
+    else:
+        endpoint = f'export/{resource}'
     url = f'{file_api_url(env, pnum, backend, endpoint=endpoint, page=page, per_page=per_page)}'
     headers = {'Authorization': 'Bearer {0}'.format(token)}
     debug_step(f'listing resources at {url}')
@@ -516,10 +515,10 @@ def export_head(
     remote_path: Optional[str] = None,
 ) -> requests.Response:
     headers = {'Authorization': 'Bearer {0}'.format(token), "Accept-Encoding": "*"}
-    endpoint = pathlib.Path("export")
     if remote_path:
-        endpoint = endpoint / quote(remote_path)
-    endpoint = str(endpoint / quote(filename))
+        endpoint = f"export{quote(remote_path)}{quote(filename)}"
+    else:
+        endpoint = f'export/{quote(filename)}'
     url = f'{file_api_url(env, pnum, backend, endpoint=endpoint)}'
     resp = session.head(url, headers=headers)
     return resp
@@ -589,12 +588,13 @@ def export_get(
         url = dev_url
     else:
         if backend == 'survey':
-            urlpath = pathlib.Path("")
+            urlpath = ''
         else:
-            urlpath = pathlib.Path("export")
             if remote_path:
-                urlpath = urlpath / quote(remote_path)
-        endpoint = str(urlpath / filename)
+                urlpath = f"export{quote(remote_path)}"
+            else:
+                urlpath = 'export/'
+        endpoint = f'{urlpath}{filename}'
         # make provision for unsatisfactory semantics
         if backend in ['export', 'files']:
             service = 'files'
@@ -671,7 +671,7 @@ def _resumable_url(
 ) -> str:
     resource = upload_resource_name(filename, is_dir, group=group, remote_path=remote_path)
     if not dev_url:
-        endpoint = str(pathlib.Path("stream") / resource)
+        endpoint = f"stream/{resource}"
         url = f'{file_api_url(env, pnum, backend, endpoint=endpoint)}'
     else:
         url = dev_url
@@ -1124,8 +1124,8 @@ def delete_resumable(
     if dev_url:
         url = dev_url
     else:
-        filename = quote(format_filename(filename)) if filename else ''
-        endpoint = str(pathlib.Path('resumables') / f'{filename}?id={upload_id}')
+        filename = f'/{quote(format_filename(filename))}' if filename else ''
+        endpoint = f'resumables{filename}?id={upload_id}'
         url = f'{file_api_url(env, pnum, backend, endpoint=endpoint)}'
     debug_step(f'deleting {filename} using: {url}')
     resp = session.delete(url, headers={'Authorization': 'Bearer {0}'.format(token)})

tsdapiclient/sync.py

@@ -1,5 +1,4 @@
 import os
-import pathlib
 import time
 import shutil
 import sqlite3
@@ -354,7 +353,7 @@ def _find_local_resources(self, path: str) -> list:
                         break
                 if ignore_suffix:
                     continue
-                target = os.path.normpath(f'{directory}/{file}')
+                target = f'{directory}/{file}'
                 if self.sync_mtime:
                     integrity_reference = str(os.stat(target).st_mtime)
                 if self.target_dir:
@@ -399,15 +398,15 @@ def _find_remote_resources(self, path: str) -> list:
                 group=self.group,
                 backend=list_funcs[self.remote_key]['backend'],
                 per_page=10000, # for better sync performance
-                remote_path=self.remote_path,
+                remote_path=self.remote_path,  
             )
             found = out.get('files')
             next_page = out.get('page')
             if found:
                 for entry in found:
                     import os
                     subdir_and_resource = os.path.basename(entry.get("href"))
-                    ref = str(pathlib.Path(path) / subdir_and_resource)
+                    ref = f'{path}/{subdir_and_resource}'
                     ignore_prefix = False
                     # check if we should ignore it
                     for prefix in self.ignore_prefixes:
@@ -459,7 +458,7 @@ def _transfer_local_to_remote(
             print(f'WARNING: could not find {resource} on local disk')
             return resource
         if os.stat(resource).st_size > self.chunk_threshold:
-            print(f'initiating resumable upload for {resource} {self.remote_path}')
+            print(f'initiating resumable upload for {resource} {self.remote_path}')   
             resp = initiate_resumable(
                 self.env,
                 self.pnum,
@@ -535,7 +534,7 @@ def _transfer_remote_to_local(
             refresh_token=self.refresh_token,
             refresh_target=self.refresh_target,
             public_key=self.public_key,
-            remote_path=self.remote_path,
+            remote_path=self.remote_path,   
         )
         if resp.get('tokens'):
             self.token = resp.get('tokens').get('access_token')

tsdapiclient/tacl.py

@@ -707,14 +707,10 @@ def cli(
 
         token_path = get_claims(token).get('path', None)
         if token_path:
-            if not token_path.startswith('/'):
-                token_path = f'/{token_path}'
             if not token_path.endswith('/'):
                 token_path = f'{token_path}/'
 
         if remote_path:
-            if not remote_path.startswith('/'):
-                remote_path = f"/{remote_path}"
             if not remote_path.endswith('/'):
                 remote_path = f'{remote_path}/'
             if token_path and remote_path.startswith(token_path):
@@ -835,7 +831,7 @@ def cli(
                     token,
                     etag=download_id,
                     public_key=public_key,
-                    remote_path=remote_path,    
+                    remote_path=remote_path,
                 )
         elif download_list:
             debug_step('listing export directory')