Implementing ruff suggestions.

src/auto_archiver/core/config.py

@@ -80,7 +80,7 @@ class AuthenticationJsonParseAction(argparse.Action):
                         auth_dict = auth_dict["authentication"]
                     auth_dict["load_from_file"] = path
                     return auth_dict
-            except:
+            except Exception:
                 return None
 
         if isinstance(auth_dict, dict) and auth_dict.get("from_file"):

src/auto_archiver/core/media.py

@@ -123,6 +123,6 @@ class Media:
             try:
                 fsize = os.path.getsize(self.filename)
                 return fsize > 20_000
-            except:
+            except Exception as e:
                 pass
         return True

src/auto_archiver/core/metadata.py

@@ -48,15 +48,16 @@ class Metadata:
                 self.status = right.status
             self._context.update(right._context)
             for k, v in right.metadata.items():
-                assert k not in self.metadata or type(v) == type(self.get(k))
-                if type(v) not in [dict, list, set] or k not in self.metadata:
+                assert k not in self.metadata or type(v) is type(self.get(k))
+                if not isinstance(v, (dict, list, set)) or k not in self.metadata:
                     self.set(k, v)
                 else:  # key conflict
-                    if type(v) in [dict, set]:
+                    if isinstance(v, (dict, set)):
                         self.set(k, self.get(k) | v)
-                    elif type(v) == list:
+                    elif type(v) is list:
                         self.set(k, self.get(k) + v)
             self.media.extend(right.media)
+
         else:  # invert and do same logic
             return right.merge(self)
         return self
@@ -126,28 +127,26 @@ class Metadata:
         return self.get("title")
 
     def set_timestamp(self, timestamp: datetime.datetime) -> Metadata:
-        if type(timestamp) == str:
+        if isinstance(timestamp, str):
             timestamp = parse_dt(timestamp)
-        assert type(timestamp) == datetime.datetime, "set_timestamp expects a datetime instance"
+        assert isinstance(timestamp, datetime.datetime), "set_timestamp expects a datetime instance"
         return self.set("timestamp", timestamp)
 
-    def get_timestamp(self, utc=True, iso=True) -> datetime.datetime:
+    def get_timestamp(self, utc=True, iso=True) -> datetime.datetime | str | None:
         ts = self.get("timestamp")
         if not ts:
-            return
+            return None
         try:
-            if type(ts) == str:
+            if isinstance(ts, str):
                 ts = datetime.datetime.fromisoformat(ts)
-            if type(ts) == float:
+            elif isinstance(ts, float):
                 ts = datetime.datetime.fromtimestamp(ts)
             if utc:
                 ts = ts.replace(tzinfo=datetime.timezone.utc)
-            if iso:
-                return ts.isoformat()
-            return ts
+            return ts.isoformat() if iso else ts
         except Exception as e:
             logger.error(f"Unable to parse timestamp {ts}: {e}")
-            return
+            return None
 
     def add_media(self, media: Media, id: str = None) -> Metadata:
         # adds a new media, optionally including an id

src/auto_archiver/core/module.py

@@ -47,7 +47,7 @@ class ModuleFactory:
 
             # see odoo/module/module.py -> initialize_sys_path
             if path not in auto_archiver.modules.__path__:
-                if HAS_SETUP_PATHS == True:
+                if HAS_SETUP_PATHS:
                     logger.warning(
                         f"You are attempting to re-initialise the module paths with: '{path}' for a 2nd time. \
                                        This could lead to unexpected behaviour. It is recommended to only use a single modules path. \
@@ -228,7 +228,7 @@ class LazyBaseModule:
                     # we must now load this module and set it up with the config
                     m.load(config)
                     return True
-                except:
+                except Exception:
                     logger.error(f"Unable to setup module '{dep}' for use in module '{self.name}'")
                     return False
             except IndexError:

src/auto_archiver/core/orchestrator.py

@@ -531,7 +531,7 @@ Here's how that would look: \n\nsteps:\n  extractors:\n  - [your_extractor_name_
         except Exception as e:
             logger.error(f"Got unexpected error on item {item}: {e}\n{traceback.format_exc()}")
             for d in self.databases:
-                if type(e) == AssertionError:
+                if isinstance(e, AssertionError):
                     d.failed(item, str(e))
                 else:
                     d.failed(item, reason="unexpected error")