fix(functions): changed return of find_missing_datasets to always ret… (

#76) * fix(functions): changed return of find_missing_datasets to always return a consistent data type * refactor(cli-ps-and-pull): simplify error message and standardise display method Signed-off-by: Tarik Zegmott <[email protected]> --------- Signed-off-by: Tarik Zegmott <[email protected]> Co-authored-by: Mawson Sammons <[email protected]> Co-authored-by: Tarik Zegmott <[email protected]>
CHIMEFRB · May 10, 2024 · a8c0f3d · a8c0f3d
1 parent 1d34e6f
commit a8c0f3d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/dtcli/ps.py b/dtcli/ps.py
@@ -69,7 +69,7 @@ def ps(
     try:
         files, policies = functions.ps(scope, dataset, verbose, quiet)
     except Exception as e:
-        logger.error(e)
+        error_console.print(e)
         return None
 
     if show_files and files:

diff --git a/dtcli/pull.py b/dtcli/pull.py
@@ -100,7 +100,10 @@ def pull(
     # Find files missing from localhost.
     console.print(f"\nSearching for files for {dataset} {scope}...\n")
     files = find_missing_dataset_files(scope, dataset, directory, verbose)
-    if len(files["missing"]) == 0 and len(files["existing"]) == 0:
+    if files.get("error"):
+        error_console.print(files["error"])
+        return None
+    elif len(files["missing"]) == 0 and len(files["existing"]) == 0:
         console.print("No files found at minoc.", style="bold red")
         return None
     files_paths = [f.replace("cadc:CHIMEFRB", "") for f in files["missing"]]

diff --git a/dtcli/src/functions.py b/dtcli/src/functions.py
@@ -220,8 +220,7 @@ def find_missing_dataset_files(
     # find dataset
     dataset_locations = get_dataset_file_info(scope, dataset, verbose=verbose)
     if "error" in dataset_locations:
-        print(dataset_locations["error"])
-        return {}
+        return {"error": dataset_locations["error"]}
 
     # check for local copy of the data.
     logger.info("Checking for local copies of files.")