Rename file and class
This commit is contained in:
parent
3bc305c037
commit
0973e1e451
13 changed files with 25 additions and 25 deletions
|
@ -13,7 +13,7 @@ import appdirs
|
||||||
import praw
|
import praw
|
||||||
import praw.models
|
import praw.models
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.download_filter import DownloadFilter
|
from bulkredditdownloader.download_filter import DownloadFilter
|
||||||
from bulkredditdownloader.errors import NotADownloadableLinkError, RedditAuthenticationError
|
from bulkredditdownloader.errors import NotADownloadableLinkError, RedditAuthenticationError
|
||||||
from bulkredditdownloader.file_name_formatter import FileNameFormatter
|
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, ())]
|
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)
|
return DownloadFilter(excluded_extensions, self.args.skip_domain)
|
||||||
|
|
||||||
def _create_authenticator(self) -> Authenticator:
|
def _create_authenticator(self) -> SiteAuthenticator:
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
def download(self):
|
def download(self):
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
# coding=utf-8
|
# coding=utf-8
|
||||||
|
|
||||||
|
|
||||||
class Authenticator:
|
class SiteAuthenticator:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.imgur_authentication = None
|
self.imgur_authentication = None
|
|
@ -7,7 +7,7 @@ from typing import Optional
|
||||||
|
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
@ -19,6 +19,6 @@ class BaseDownloader(ABC):
|
||||||
self.typical_extension = typical_extension
|
self.typical_extension = typical_extension
|
||||||
|
|
||||||
@abstractmethod
|
@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"""
|
"""Return list of all un-downloaded Resources from submission"""
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
|
@ -4,7 +4,7 @@ from typing import Optional
|
||||||
|
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
|
||||||
|
@ -13,5 +13,5 @@ class Direct(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
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)]
|
return [Resource(self.post, self.post.url)]
|
||||||
|
|
|
@ -9,7 +9,7 @@ from typing import Optional
|
||||||
|
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.errors import NotADownloadableLinkError
|
from bulkredditdownloader.errors import NotADownloadableLinkError
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
@ -21,7 +21,7 @@ class Erome(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
super().__init__(post)
|
||||||
|
|
||||||
def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]:
|
def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]:
|
||||||
try:
|
try:
|
||||||
images = self._get_links(self.post.url)
|
images = self._get_links(self.post.url)
|
||||||
except urllib.error.HTTPError:
|
except urllib.error.HTTPError:
|
||||||
|
|
|
@ -7,7 +7,7 @@ from typing import Optional
|
||||||
import requests
|
import requests
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.errors import NotADownloadableLinkError, ResourceNotFound
|
from bulkredditdownloader.errors import NotADownloadableLinkError, ResourceNotFound
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
@ -21,7 +21,7 @@ class Gallery(BaseDownloader):
|
||||||
link = self.post.url
|
link = self.post.url
|
||||||
self.raw_data = self._get_data(link)
|
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 = {}
|
images = {}
|
||||||
count = 0
|
count = 0
|
||||||
for model in self.raw_data['posts']['models']:
|
for model in self.raw_data['posts']['models']:
|
||||||
|
|
|
@ -8,7 +8,7 @@ from typing import Optional
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork
|
from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ class Gfycat(GifDeliveryNetwork):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
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)
|
return super().find_resources(authenticator)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
@ -6,7 +6,7 @@ from typing import Optional
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.errors import NotADownloadableLinkError
|
from bulkredditdownloader.errors import NotADownloadableLinkError
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
@ -16,7 +16,7 @@ class GifDeliveryNetwork(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
super().__init__(post)
|
||||||
|
|
||||||
def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]:
|
def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]:
|
||||||
try:
|
try:
|
||||||
media_url = self._get_link(self.post.url)
|
media_url = self._get_link(self.post.url)
|
||||||
except IndexError:
|
except IndexError:
|
||||||
|
|
|
@ -7,7 +7,7 @@ from typing import Optional
|
||||||
import requests
|
import requests
|
||||||
from praw.models import Submission
|
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.errors import NotADownloadableLinkError, ResourceNotFound, SiteDownloaderError
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
@ -23,7 +23,7 @@ class Imgur(BaseDownloader):
|
||||||
super().__init__(post)
|
super().__init__(post)
|
||||||
self.raw_data = {}
|
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
|
link = self.post.url
|
||||||
|
|
||||||
if link.endswith(".gifv"):
|
if link.endswith(".gifv"):
|
||||||
|
|
|
@ -7,7 +7,7 @@ from typing import Optional
|
||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.errors import NotADownloadableLinkError
|
from bulkredditdownloader.errors import NotADownloadableLinkError
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork
|
from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDeliveryNetwork
|
||||||
|
@ -17,7 +17,7 @@ class Redgifs(GifDeliveryNetwork):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
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)
|
return super().find_resources(authenticator)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
@ -5,7 +5,7 @@ from typing import Optional
|
||||||
|
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ class SelfPost(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
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 = Resource(self.post, self.post.url)
|
||||||
out.content = self.export_to_string()
|
out.content = self.export_to_string()
|
||||||
return out
|
return out
|
||||||
|
|
|
@ -10,7 +10,7 @@ from typing import Optional
|
||||||
import requests
|
import requests
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ class VReddit(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
super().__init__(post)
|
||||||
|
|
||||||
def find_resources(self, authenticator: Optional[Authenticator] = None) -> list[Resource]:
|
def find_resources(self, authenticator: Optional[SiteAuthenticator] = None) -> list[Resource]:
|
||||||
try:
|
try:
|
||||||
fnull = open(os.devnull, 'w')
|
fnull = open(os.devnull, 'w')
|
||||||
subprocess.call("ffmpeg", stdout=fnull, stderr=subprocess.STDOUT)
|
subprocess.call("ffmpeg", stdout=fnull, stderr=subprocess.STDOUT)
|
||||||
|
|
|
@ -7,7 +7,7 @@ from typing import Optional
|
||||||
import youtube_dl
|
import youtube_dl
|
||||||
from praw.models import Submission
|
from praw.models import Submission
|
||||||
|
|
||||||
from bulkredditdownloader.authenticator import Authenticator
|
from bulkredditdownloader.site_authenticator import SiteAuthenticator
|
||||||
from bulkredditdownloader.resource import Resource
|
from bulkredditdownloader.resource import Resource
|
||||||
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ class Youtube(BaseDownloader):
|
||||||
def __init__(self, post: Submission):
|
def __init__(self, post: Submission):
|
||||||
super().__init__(post)
|
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()]
|
return [self._download_video()]
|
||||||
|
|
||||||
def _download_video(self) -> Resource:
|
def _download_video(self) -> Resource:
|
||||||
|
|
Loading…
Reference in a new issue