From 9c5a9e1bcd440be197b70576483e38b03318493c Mon Sep 17 00:00:00 2001
From: Patrick Robertson <robertson.patrick@gmail.com>
Date: Fri, 17 Jan 2025 17:06:04 +0100
Subject: [PATCH] Rename BaseArchiver to GenericArchiver + some other tidyups

---
 src/auto_archiver/archivers/__init__.py                      | 2 +-
 src/auto_archiver/archivers/base_archiver/__init__.py        | 1 -
 src/auto_archiver/archivers/generic_archiver/__init__.py     | 1 +
 .../archivers/{base_archiver => generic_archiver}/bluesky.py | 0
 .../generic_archiver.py}                                     | 5 +++--
 .../archivers/{base_archiver => generic_archiver}/twitter.py | 0
 src/auto_archiver/archivers/youtubedl_archiver.py            | 2 +-
 7 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 src/auto_archiver/archivers/base_archiver/__init__.py
 create mode 100644 src/auto_archiver/archivers/generic_archiver/__init__.py
 rename src/auto_archiver/archivers/{base_archiver => generic_archiver}/bluesky.py (100%)
 rename src/auto_archiver/archivers/{base_archiver/base_archiver.py => generic_archiver/generic_archiver.py} (99%)
 rename src/auto_archiver/archivers/{base_archiver => generic_archiver}/twitter.py (100%)

diff --git a/src/auto_archiver/archivers/__init__.py b/src/auto_archiver/archivers/__init__.py
index 24dde91..dc28269 100644
--- a/src/auto_archiver/archivers/__init__.py
+++ b/src/auto_archiver/archivers/__init__.py
@@ -5,5 +5,5 @@ from .instagram_archiver import InstagramArchiver
 from .instagram_tbot_archiver import InstagramTbotArchiver
 from .telegram_archiver import TelegramArchiver
 from .vk_archiver import VkArchiver
-from .base_archiver.base_archiver import BaseArchiver as YoutubeDLArchiver
+from .generic_archiver.generic_archiver import GenericArchiver as YoutubeDLArchiver
 from .instagram_api_archiver import InstagramAPIArchiver
\ No newline at end of file
diff --git a/src/auto_archiver/archivers/base_archiver/__init__.py b/src/auto_archiver/archivers/base_archiver/__init__.py
deleted file mode 100644
index 15ee4eb..0000000
--- a/src/auto_archiver/archivers/base_archiver/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .base_archiver import BaseArchiver
\ No newline at end of file
diff --git a/src/auto_archiver/archivers/generic_archiver/__init__.py b/src/auto_archiver/archivers/generic_archiver/__init__.py
new file mode 100644
index 0000000..0788ae0
--- /dev/null
+++ b/src/auto_archiver/archivers/generic_archiver/__init__.py
@@ -0,0 +1 @@
+from .generic_archiver import GenericArchiver
\ No newline at end of file
diff --git a/src/auto_archiver/archivers/base_archiver/bluesky.py b/src/auto_archiver/archivers/generic_archiver/bluesky.py
similarity index 100%
rename from src/auto_archiver/archivers/base_archiver/bluesky.py
rename to src/auto_archiver/archivers/generic_archiver/bluesky.py
diff --git a/src/auto_archiver/archivers/base_archiver/base_archiver.py b/src/auto_archiver/archivers/generic_archiver/generic_archiver.py
similarity index 99%
rename from src/auto_archiver/archivers/base_archiver/base_archiver.py
rename to src/auto_archiver/archivers/generic_archiver/generic_archiver.py
index b1cbabd..573f47f 100644
--- a/src/auto_archiver/archivers/base_archiver/base_archiver.py
+++ b/src/auto_archiver/archivers/generic_archiver/generic_archiver.py
@@ -9,7 +9,7 @@ from auto_archiver.archivers.archiver import Archiver
 from ...core import Metadata, Media, ArchivingContext
 
 
-class BaseArchiver(Archiver):
+class GenericArchiver(Archiver):
     name = "youtubedl_archiver" #left as is for backwards compat
 
     def __init__(self, config: dict) -> None:
@@ -76,7 +76,8 @@ class BaseArchiver(Archiver):
             return base_keys + [] 
         elif extractor_key == "Bluesky":
             # bluesky API response for non video URLs is already clean, nothing to add
-            return base_keys + [] 
+            return base_keys + []
+        
         
         return base_keys
     
diff --git a/src/auto_archiver/archivers/base_archiver/twitter.py b/src/auto_archiver/archivers/generic_archiver/twitter.py
similarity index 100%
rename from src/auto_archiver/archivers/base_archiver/twitter.py
rename to src/auto_archiver/archivers/generic_archiver/twitter.py
diff --git a/src/auto_archiver/archivers/youtubedl_archiver.py b/src/auto_archiver/archivers/youtubedl_archiver.py
index 1bc8966..8b61974 100644
--- a/src/auto_archiver/archivers/youtubedl_archiver.py
+++ b/src/auto_archiver/archivers/youtubedl_archiver.py
@@ -1,2 +1,2 @@
 # temporary hack, as we implement module
-from .youtubedl_archiver import *
+from .generic_archiver.generic_archiver import GenericArchiver as YoutubeDLArchiver