ModerateWinGuy/BDFR_Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify errors

Browse Source
This commit is contained in:
Serene-Arc
2021-02-15 16:30:39 +10:00
committed by Ali Parlakci
parent dd2804eb97
commit efffc3ee3f
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bulkredditdownloader/errors.py
View File

@@ -4,25 +4,17 @@ class BulkDownloaderException(Exception):
pass pass
class NotADownloadableLinkError(BulkDownloaderException):
pass
class RedditAuthenticationError(BulkDownloaderException): class RedditAuthenticationError(BulkDownloaderException):
pass pass
class InvalidJSONFile(BulkDownloaderException): class SiteDownloaderError(BulkDownloaderException):
pass pass
class FailedToDownload(BulkDownloaderException): class NotADownloadableLinkError(SiteDownloaderError):
pass pass
class ImageNotFound(BulkDownloaderException): class ResourceNotFound(SiteDownloaderError):
pass
class ExtensionError(BulkDownloaderException):
pass pass

6
bulkredditdownloader/site_downloaders/base_downloader.py
View File

@@ -7,7 +7,7 @@ from abc import ABC, abstractmethod
import requests import requests
from praw.models import Submission from praw.models import Submission
from bulkredditdownloader.errors import FailedToDownload from bulkredditdownloader.errors import SiteDownloaderError
from bulkredditdownloader.resource import Resource from bulkredditdownloader.resource import Resource
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ class BaseDownloader(ABC):
try: try:
download_content = requests.get(resource_url, headers=headers).content download_content = requests.get(resource_url, headers=headers).content
except ConnectionResetError: except ConnectionResetError:
raise FailedToDownload raise SiteDownloaderError
return Resource(self.post, resource_url, download_content) return Resource(self.post, resource_url, download_content)
raise FailedToDownload raise SiteDownloaderError

4
bulkredditdownloader/site_downloaders/gallery.py
View File

@@ -6,7 +6,7 @@ import logging
import requests import requests
from praw.models import Submission from praw.models import Submission
from bulkredditdownloader.errors import ImageNotFound, NotADownloadableLinkError from bulkredditdownloader.errors import ResourceNotFound, NotADownloadableLinkError
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -44,7 +44,7 @@ class Gallery(BaseDownloader):
} }
res = requests.get(link, headers=headers) res = requests.get(link, headers=headers)
if res.status_code != 200: if res.status_code != 200:
raise ImageNotFound(f"Server responded with {res.status_code} to {link}") raise ResourceNotFound(f"Server responded with {res.status_code} to {link}")
page_source = res.text page_source = res.text
starting_string = "_r = {" starting_string = "_r = {"

6
bulkredditdownloader/site_downloaders/imgur.py
View File

@@ -6,7 +6,7 @@ import logging
import requests import requests
from praw.models import Submission from praw.models import Submission
from bulkredditdownloader.errors import ExtensionError, ImageNotFound, NotADownloadableLinkError from bulkredditdownloader.errors import NotADownloadableLinkError, ResourceNotFound, SiteDownloaderError
from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader from bulkredditdownloader.site_downloaders.base_downloader import BaseDownloader
from bulkredditdownloader.site_downloaders.direct import Direct from bulkredditdownloader.site_downloaders.direct import Direct
@@ -63,7 +63,7 @@ class Imgur(BaseDownloader):
cookies = {"over18": "1", "postpagebeta": "0"} cookies = {"over18": "1", "postpagebeta": "0"}
res = requests.get(link, cookies=cookies) res = requests.get(link, cookies=cookies)
if res.status_code != 200: if res.status_code != 200:
raise ImageNotFound(f"Server responded with {res.status_code} to {link}") raise ResourceNotFound(f"Server responded with {res.status_code} to {link}")
page_source = requests.get(link, cookies=cookies).text page_source = requests.get(link, cookies=cookies).text
starting_string = "image : " starting_string = "image : "
@@ -94,4 +94,4 @@ class Imgur(BaseDownloader):
if extension in extension_suffix: if extension in extension_suffix:
return extension return extension
else: else:
raise ExtensionError(f'"{extension_suffix}" is not recognized as a valid extension for Imgur') raise SiteDownloaderError(f'"{extension_suffix}" is not recognized as a valid extension for Imgur')