Merge branch 'v0.1.0' into dev

rahul4732saini · Jul 13, 2024 · 8cf5b80 · 8cf5b80
2 parents 22373f4 + 6ead23f
commit 8cf5b80
Showing 1 changed file with 7 additions and 23 deletions.
diff --git a/fise/query/operators.py b/fise/query/operators.py
@@ -50,9 +50,7 @@ def _get_field(field: Field | Size, file: File) -> Any:
 
         if isinstance(field, Size):
             # Extracts the size in bytes and converts into the parsed size unit.
-            return round(
-                getattr(file, "size") / constants.SIZE_CONVERSION_MAP.get(field.unit), 5
-            )
+            return round(file.size / constants.SIZE_CONVERSION_MAP.get(field.unit), 5)
 
         return getattr(file, field.field)
 
@@ -87,10 +85,6 @@ def get_dataframe(
             columns=columns,
         )
 
-        # Renames the column `size` -> `size[<size_unit>]` to also include
-        # the storage unit if not specified explicitly in the field name.
-        records.rename(columns={"size": "size[B]"}, inplace=True)
-
         return records
 
     def remove_files(self, condition: Callable[[File], bool], skip_err: bool) -> None:
@@ -120,22 +114,17 @@ def remove_files(self, condition: Callable[[File], bool], skip_err: bool) -> Non
                     skipped += 1
                     continue
 
-                raise OperationError(
-                    f"Permission Error: Cannot delete '{file.absolute()}'"
-                )
+                raise OperationError(f"Permission Error: Cannot delete '{file}'")
 
             else:
                 ctr += 1
 
-        # Extracts the absolute path to the directory and stores it locally.
-        directory: Path = self._directory.absolute()
-
-        Message(f"Successfully removed {ctr} files from '{directory}'.")
+        Message(f"Successfully removed {ctr} files from '{self._directory}'.")
 
         # Prints the skipped files message only is `skipped` is not 0.
         if skipped:
             Alert(
-                f"Skipped {skipped} files from '{directory}' due to permission errors."
+                f"Skipped {skipped} files from '{self._directory}' due to permission errors."
             )
 
 
@@ -329,20 +318,15 @@ def remove_directories(
                     skipped += 1
                     continue
 
-                raise OperationError(
-                    f"Permission Error: Cannot delete '{subdir.absolute()}'"
-                )
+                raise OperationError(f"Permission Error: Cannot delete '{subdir}'")
 
             else:
                 ctr += 1
 
-        # Extracts the absolute path to the directory and stores it locally.
-        directory: Path = self._directory.absolute()
-
-        Message(f"Successfully removed {ctr} directories from '{directory}'.")
+        Message(f"Successfully removed {ctr} directories from '{self._directory}'.")
 
         # Prints the skipped files message only is `skipped` is not 0.
         if skipped:
             Alert(
-                f"Skipped {skipped} directories from '{directory}' due to permission errors."
+                f"Skipped {skipped} directories from '{self._directory}' due to permission errors."
             )