From 0973e1e4515fb01f1a152786aae4380774820663 Mon Sep 17 00:00:00 2001 From: Serene-Arc Date: Fri, 26 Feb 2021 18:57:05 +1000 Subject: [PATCH] Rename file and class --- bulkredditdownloader/downloader.py | 4 ++-- .../{authenticator.py => site_authenticator.py} | 2 +- bulkredditdownloader/site_downloaders/base_downloader.py | 4 ++-- bulkredditdownloader/site_downloaders/direct.py | 4 ++-- bulkredditdownloader/site_downloaders/erome.py | 4 ++-- bulkredditdownloader/site_downloaders/gallery.py | 4 ++-- bulkredditdownloader/site_downloaders/gfycat.py | 4 ++-- bulkredditdownloader/site_downloaders/gif_delivery_network.py | 4 ++-- bulkredditdownloader/site_downloaders/imgur.py | 4 ++-- bulkredditdownloader/site_downloaders/redgifs.py | 4 ++-- bulkredditdownloader/site_downloaders/self_post.py | 4 ++-- bulkredditdownloader/site_downloaders/vreddit.py | 4 ++-- bulkredditdownloader/site_downloaders/youtube.py | 4 ++-- 13 files changed, 25 insertions(+), 25 deletions(-) rename bulkredditdownloader/{authenticator.py => site_authenticator.py} (80%) diff --git a/bulkredditdownloader/downloader.py b/bulkredditdownloader/downloader.py index 6c1368f..d6a5e5f 100644 --- a/bulkredditdownloader/downloader.py +++ b/bulkredditdownloader/downloader.py @@ -13,7 +13,7 @@ import appdirs import praw import praw.models -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.download_filter import DownloadFilter from bulkredditdownloader.errors import NotADownloadableLinkError, RedditAuthenticationError from bulkredditdownloader.file_name_formatter import FileNameFormatter @@ -186,7 +186,7 @@ class RedditDownloader: excluded_extensions = [extension for ext_type in self.args.skip for extension in formats.get(ext_type, ())] return DownloadFilter(excluded_extensions, self.args.skip_domain) - def _create_authenticator(self) -> Authenticator: + def _create_authenticator(self) -> SiteAuthenticator: raise NotImplementedError def download(self): diff --git a/bulkredditdownloader/authenticator.py b/bulkredditdownloader/site_authenticator.py similarity index 80% rename from bulkredditdownloader/authenticator.py rename to bulkredditdownloader/site_authenticator.py index efe63e0..93cebf7 100644 --- a/bulkredditdownloader/authenticator.py +++ b/bulkredditdownloader/site_authenticator.py @@ -2,6 +2,6 @@ # coding=utf-8 -class Authenticator: +class SiteAuthenticator: def __init__(self): self.imgur_authentication = None diff --git a/bulkredditdownloader/site_downloaders/base_downloader.py b/bulkredditdownloader/site_downloaders/base_downloader.py index a872953..458f3bc 100644 --- a/bulkredditdownloader/site_downloaders/base_downloader.py +++ b/bulkredditdownloader/site_downloaders/base_downloader.py @@ -7,7 +7,7 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource logger = logging.getLogger(__name__) @@ -19,6 +19,6 @@ class BaseDownloader(ABC): self.typical_extension = typical_extension @abstractmethod - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: """Return list of all un-downloaded Resources from submission""" raise NotImplementedError diff --git a/bulkredditdownloader/site_downloaders/direct.py b/bulkredditdownloader/site_downloaders/direct.py index 450d409..6ab3d22 100644 --- a/bulkredditdownloader/site_downloaders/direct.py +++ b/bulkredditdownloader/site_downloaders/direct.py @@ -4,7 +4,7 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -13,5 +13,5 @@ class Direct(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: return [Resource(self.post, self.post.url)] diff --git a/bulkredditdownloader/site_downloaders/erome.py b/bulkredditdownloader/site_downloaders/erome.py index 8675cee..1220651 100644 --- a/bulkredditdownloader/site_downloaders/erome.py +++ b/bulkredditdownloader/site_downloaders/erome.py @@ -9,7 +9,7 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.errors import NotADownloadableLinkError from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -21,7 +21,7 @@ class Erome(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: try: images = self._get_links(self.post.url) except urllib.error.HTTPError: diff --git a/bulkredditdownloader/site_downloaders/gallery.py b/bulkredditdownloader/site_downloaders/gallery.py index 8d53056..012295f 100644 --- a/bulkredditdownloader/site_downloaders/gallery.py +++ b/bulkredditdownloader/site_downloaders/gallery.py @@ -7,7 +7,7 @@ from typing import Optional import requests from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.errors import NotADownloadableLinkError, ResourceNotFound from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -21,7 +21,7 @@ class Gallery(BaseDownloader): link = self.post.url self.raw_data = self._get_data(link) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: images = {} count = 0 for model in self.raw_data['posts']['models']: diff --git a/bulkredditdownloader/site_downloaders/gfycat.py b/bulkredditdownloader/site_downloaders/gfycat.py index cd33f46..3b6c48e 100644 --- a/bulkredditdownloader/site_downloaders/gfycat.py +++ b/bulkredditdownloader/site_downloaders/gfycat.py @@ -8,7 +8,7 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork @@ -17,7 +17,7 @@ class Gfycat(GifDeliveryNetwork): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: return super().find_resources(authenticator) @staticmethod diff --git a/bulkredditdownloader/site_downloaders/gif_delivery_network.py b/bulkredditdownloader/site_downloaders/gif_delivery_network.py index 072048e..03c291d 100644 --- a/bulkredditdownloader/site_downloaders/gif_delivery_network.py +++ b/bulkredditdownloader/site_downloaders/gif_delivery_network.py @@ -6,7 +6,7 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.errors import NotADownloadableLinkError from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -16,7 +16,7 @@ class GifDeliveryNetwork(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: try: media_url = self._get_link(self.post.url) except IndexError: diff --git a/bulkredditdownloader/site_downloaders/imgur.py b/bulkredditdownloader/site_downloaders/imgur.py index 2111b44..80d6b3b 100644 --- a/bulkredditdownloader/site_downloaders/imgur.py +++ b/bulkredditdownloader/site_downloaders/imgur.py @@ -7,7 +7,7 @@ from typing import Optional import requests from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.errors import NotADownloadableLinkError, ResourceNotFound, SiteDownloaderError from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -23,7 +23,7 @@ class Imgur(BaseDownloader): super().__init__(post) self.raw_data = {} - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: link = self.post.url if link.endswith(".gifv"): diff --git a/bulkredditdownloader/site_downloaders/redgifs.py b/bulkredditdownloader/site_downloaders/redgifs.py index 3e8ad8e..5517be2 100644 --- a/bulkredditdownloader/site_downloaders/redgifs.py +++ b/bulkredditdownloader/site_downloaders/redgifs.py @@ -7,7 +7,7 @@ from typing import Optional from bs4 import BeautifulSoup from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.errors import NotADownloadableLinkError from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork @@ -17,7 +17,7 @@ class Redgifs(GifDeliveryNetwork): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: return super().find_resources(authenticator) @staticmethod diff --git a/bulkredditdownloader/site_downloaders/self_post.py b/bulkredditdownloader/site_downloaders/self_post.py index f01b6f1..749a824 100644 --- a/bulkredditdownloader/site_downloaders/self_post.py +++ b/bulkredditdownloader/site_downloaders/self_post.py @@ -5,7 +5,7 @@ from typing import Optional from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -16,7 +16,7 @@ class SelfPost(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: out = Resource(self.post, self.post.url) out.content = self.export_to_string() return out diff --git a/bulkredditdownloader/site_downloaders/vreddit.py b/bulkredditdownloader/site_downloaders/vreddit.py index c92bf8a..83823fc 100644 --- a/bulkredditdownloader/site_downloaders/vreddit.py +++ b/bulkredditdownloader/site_downloaders/vreddit.py @@ -10,7 +10,7 @@ from typing import Optional import requests from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -21,7 +21,7 @@ class VReddit(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: try: fnull = open(os.devnull, 'w') subprocess.call("ffmpeg", stdout=fnull, stderr=subprocess.STDOUT) diff --git a/bulkredditdownloader/site_downloaders/youtube.py b/bulkredditdownloader/site_downloaders/youtube.py index d9da907..369835f 100644 --- a/bulkredditdownloader/site_downloaders/youtube.py +++ b/bulkredditdownloader/site_downloaders/youtube.py @@ -7,7 +7,7 @@ from typing import Optional import youtube_dl from praw.models import Submission -from bulkredditdownloader.authenticator import Authenticator +from bulkredditdownloader.site_authenticator import SiteAuthenticator from bulkredditdownloader.resource import Resource from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader @@ -18,7 +18,7 @@ class Youtube(BaseDownloader): def __init__(self, post: Submission): super().__init__(post) - def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]: + def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]: return [self._download_video()] def _download_video(self) -> Resource: