fixing imports

src/auto_archiver/archivers/__init__.py

@@ -1,15 +1,3 @@
-# we need to explicitly expose the available imports here
-# from .base_archiver import Archiver, ArchiveResult
-# from .telegram_archiver import TelegramArchiver
-# from .telethon_archiver import TelethonArchiver
-# from .tiktok_archiver import TiktokArchiver
-# from .wayback_archiver import WaybackArchiver
-# from .youtubedl_archiver import YoutubeDLArchiver
-# from .twitter_archiver import TwitterArchiver
-# from .vk_archiver import VkArchiver
-# from .twitter_api_archiver import TwitterApiArchiver
-# from .instagram_archiver import InstagramArchiver
-
 from .archiver import Archiver
 from .telethon_archiver import TelethonArchiver
 from .twitter_archiver import TwitterArchiver

src/auto_archiver/archivers/instagram_archiver.py

@@ -1,4 +1,4 @@
-import re, os, shutil, html, traceback
+import re, os, shutil, traceback
 import instaloader  # https://instaloader.github.io/as-module.html
 from loguru import logger
 

src/auto_archiver/archivers/telegram_archiver.py

@@ -1,12 +1,9 @@
-import requests, re
-
-import html
+import requests, re, html
 from bs4 import BeautifulSoup
 from loguru import logger
 
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class TelegramArchiver(Archiver):

src/auto_archiver/archivers/telethon_archiver.py

@@ -1,7 +1,6 @@
 
 from telethon.sync import TelegramClient
 from telethon.errors import ChannelInvalidError
-from telethon.tl.types import PeerUser, PeerChat, PeerChannel
 from telethon.tl.functions.messages import ImportChatInviteRequest
 from telethon.errors.rpcerrorlist import UserAlreadyParticipantError, FloodWaitError, InviteRequestSentError, InviteHashExpiredError
 from loguru import logger
@@ -9,8 +8,7 @@ from tqdm import tqdm
 import re, time, json, os
 
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class TelethonArchiver(Archiver):

src/auto_archiver/archivers/tiktok_archiver.py

@@ -1,13 +1,9 @@
-import json
-import os, traceback
-import re
-import uuid
+import json, os, traceback, uuid
 import tiktok_downloader
 from loguru import logger
 
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class TiktokArchiver(Archiver):
@@ -19,7 +15,7 @@ class TiktokArchiver(Archiver):
     @staticmethod
     def configs() -> dict:
         return {}
-    
+
     def is_rearchivable(self, url: str) -> bool:
         # TikTok posts are static
         return False
@@ -44,7 +40,6 @@ class TiktokArchiver(Archiver):
             error = traceback.format_exc()
             logger.warning(f'Other Tiktok error {error}')
 
-
         try:
             filename = os.path.join(item.get_tmp_dir(), f'{str(uuid.uuid4())[0:8]}.mp4')
             tiktok_media = tiktok_downloader.snaptik(url).get_media()

src/auto_archiver/archivers/twitter_api_archiver.py

@@ -1,16 +1,13 @@
 
-import json
+import json, mimetypes
 from datetime import datetime
-import mimetypes
-import os
 from loguru import logger
 from pytwitter import Api
 from slugify import slugify
 
 from . import Archiver
 from .twitter_archiver import TwitterArchiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata,Media
 
 
 class TwitterApiArchiver(TwitterArchiver, Archiver):

src/auto_archiver/archivers/twitter_archiver.py

@@ -1,15 +1,11 @@
-import html, re, requests
-import mimetypes
-import json
-import os
+import re, requests, mimetypes, json
 from datetime import datetime
 from loguru import logger
 from snscrape.modules.twitter import TwitterTweetScraper, Video, Gif, Photo
 from slugify import slugify
 
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class TwitterArchiver(Archiver):

src/auto_archiver/archivers/vk_archiver.py

@@ -3,8 +3,7 @@ from vk_url_scraper import VkScraper
 
 from ..utils.misc import dump_payload
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class VkArchiver(Archiver):

src/auto_archiver/archivers/youtubedl_archiver.py

@@ -1,12 +1,8 @@
-import datetime
-import os
-
-import yt_dlp
+import datetime, os, yt_dlp
 from loguru import logger
 
 from . import Archiver
-from ..core import Metadata
-from ..core import Media
+from ..core import Metadata, Media
 
 
 class YoutubeDLArchiver(Archiver):
@@ -22,6 +18,7 @@ class YoutubeDLArchiver(Archiver):
         }
 
     def download(self, item: Metadata) -> Metadata:
+        #TODO: yt-dlp for transcripts?
         url = item.get_url()
 
         if item.netloc in ['facebook.com', 'www.facebook.com'] and self.facebook_cookie: