Remove unused parameter

This commit is contained in:
Serene-Arc
2021-02-15 15:12:27 +10:00
committed by Ali Parlakci
parent f71a3c5326
commit 714b6c5b72
13 changed files with 28 additions and 39 deletions

View File

@@ -187,7 +187,7 @@ class RedditDownloader:
if self.download_filter.check_url(submission.url): if self.download_filter.check_url(submission.url):
try: try:
downloader_class = DownloadFactory.pull_lever(submission.url) downloader_class = DownloadFactory.pull_lever(submission.url)
downloader = downloader_class(self.download_directory, submission) downloader = downloader_class(submission)
if self.args.no_download: if self.args.no_download:
logger.info('Skipping download for submission {}'.format(submission.id)) logger.info('Skipping download for submission {}'.format(submission.id))
else: else:

View File

@@ -3,7 +3,6 @@
import logging import logging
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from pathlib import Path
import requests import requests
from praw.models import Submission from praw.models import Submission
@@ -15,8 +14,7 @@ logger = logging.getLogger(__name__)
class BaseDownloader(ABC): class BaseDownloader(ABC):
def __init__(self, directory: Path, post: Submission): def __init__(self, post: Submission):
self.directory = directory
self.post = post self.post = post
self.hashes = [] self.hashes = []

View File

@@ -1,15 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import pathlib
from praw.models import Submission from praw.models import Submission
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
class Direct(BaseDownloader): class Direct(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
return [self._download_resource(self.post.url)] return [self._download_resource(self.post.url)]

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging import logging
import pathlib
import re import re
import urllib.error import urllib.error
import urllib.request import urllib.request
@@ -16,8 +15,8 @@ logger = logging.getLogger(__name__)
class Erome(BaseDownloader): class Erome(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
try: try:

View File

@@ -2,7 +2,6 @@
import json import json
import logging import logging
import pathlib
import requests import requests
from praw.models import Submission from praw.models import Submission
@@ -14,8 +13,8 @@ logger = logging.getLogger(__name__)
class Gallery(BaseDownloader): class Gallery(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
link = self.post.url link = self.post.url
self.raw_data = self._get_data(link) self.raw_data = self._get_data(link)
@@ -39,7 +38,8 @@ class Gallery(BaseDownloader):
@staticmethod @staticmethod
def _get_data(link: str) -> dict: def _get_data(link: str) -> dict:
headers = { headers = {
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36 OPR/54.0.2952.64", "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko)"
" Chrome/67.0.3396.87 Safari/537.36 OPR/54.0.2952.64",
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
} }
res = requests.get(link, headers=headers) res = requests.get(link, headers=headers)

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import json import json
import pathlib
import re import re
import urllib.request import urllib.request
@@ -12,8 +11,8 @@ from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDelive
class Gfycat(GifDeliveryNetwork): class Gfycat(GifDeliveryNetwork):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
super().download() super().download()

View File

@@ -1,6 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import pathlib
import urllib.request import urllib.request
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
@@ -11,8 +10,8 @@ from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
class GifDeliveryNetwork(BaseDownloader): class GifDeliveryNetwork(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
try: try:

View File

@@ -2,7 +2,6 @@
import json import json
import logging import logging
import pathlib
import requests import requests
from praw.models import Submission from praw.models import Submission
@@ -18,15 +17,15 @@ class Imgur(BaseDownloader):
imgur_image_domain = "https://i.imgur.com/" imgur_image_domain = "https://i.imgur.com/"
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
self.raw_data = {} self.raw_data = {}
def download(self): def download(self):
link = self.post.url link = self.post.url
if link.endswith(".gifv"): if link.endswith(".gifv"):
direct_thing = Direct(self.directory, self.post) direct_thing = Direct(self.post)
return direct_thing.download() return direct_thing.download()
self.raw_data = self._get_data(link) self.raw_data = self._get_data(link)

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import json import json
import pathlib
import urllib.request import urllib.request
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
@@ -12,8 +11,8 @@ from bulkredditdownloader.site_downloaders.gif_delivery_network import GifDelive
class Redgifs(GifDeliveryNetwork): class Redgifs(GifDeliveryNetwork):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
super().download() super().download()

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging import logging
import pathlib
from praw.models import Submission from praw.models import Submission
@@ -12,8 +11,8 @@ logger = logging.getLogger(__name__)
class SelfPost(BaseDownloader): class SelfPost(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
return Resource(self.post, self.post.url, bytes(self.export_to_string())) return Resource(self.post, self.post.url, bytes(self.export_to_string()))

View File

@@ -16,8 +16,8 @@ logger = logging.getLogger(__name__)
class VReddit(BaseDownloader): class VReddit(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
try: try:

View File

@@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import logging import logging
import pathlib
import tempfile import tempfile
import youtube_dl import youtube_dl
@@ -14,8 +13,8 @@ logger = logging.getLogger(__name__)
class Youtube(BaseDownloader): class Youtube(BaseDownloader):
def __init__(self, directory: pathlib.Path, post: Submission): def __init__(self, post: Submission):
super().__init__(directory, post) super().__init__(post)
def download(self): def download(self):
return self._download_video() return self._download_video()

View File

@@ -11,8 +11,8 @@ from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
class BlankDownloader(BaseDownloader): class BlankDownloader(BaseDownloader):
def __init__(self, directory, post): def __init__(self, post):
super().__init__(directory, post) super().__init__(post)
def download(self) -> list[Resource]: def download(self) -> list[Resource]:
return [self._download_resource(self.post.url)] return [self._download_resource(self.post.url)]
@@ -24,7 +24,7 @@ class BlankDownloader(BaseDownloader):
def test_get_resource(test_url: str, expected_hash: str): def test_get_resource(test_url: str, expected_hash: str):
mock_submission = Mock mock_submission = Mock
mock_submission.url = test_url mock_submission.url = test_url
downloader = BlankDownloader(Path('.'), mock_submission) downloader = BlankDownloader(mock_submission)
result = downloader.download() result = downloader.download()
assert isinstance(result[0], Resource) assert isinstance(result[0], Resource)
assert result[0].hash.hexdigest() == expected_hash assert result[0].hash.hexdigest() == expected_hash