From efffc3ee3fb6c17fc92169561bdda8d29a4e94d0 Mon Sep 17 00:00:00 2001
From: Serene-Arc <serenical@gmail.com>
Date: Mon, 15 Feb 2021 16:30:39 +1000
Subject: [PATCH] Simplify errors

---
 bulkredditdownloader/errors.py                     | 14 +++-----------
 .../site_downloaders/base_downloader.py            |  6 +++---
 bulkredditdownloader/site_downloaders/gallery.py   |  4 ++--
 bulkredditdownloader/site_downloaders/imgur.py     |  6 +++---
 4 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/bulkredditdownloader/errors.py b/bulkredditdownloader/errors.py
index d7c5041..c677b38 100644
--- a/bulkredditdownloader/errors.py
+++ b/bulkredditdownloader/errors.py
@@ -4,25 +4,17 @@ class BulkDownloaderException(Exception):
     pass
 
 
-class NotADownloadableLinkError(BulkDownloaderException):
-    pass
-
-
 class RedditAuthenticationError(BulkDownloaderException):
     pass
 
 
-class InvalidJSONFile(BulkDownloaderException):
+class SiteDownloaderError(BulkDownloaderException):
     pass
 
 
-class FailedToDownload(BulkDownloaderException):
+class NotADownloadableLinkError(SiteDownloaderError):
     pass
 
 
-class ImageNotFound(BulkDownloaderException):
-    pass
-
-
-class ExtensionError(BulkDownloaderException):
+class ResourceNotFound(SiteDownloaderError):
     pass
diff --git a/bulkredditdownloader/site_downloaders/base_downloader.py b/bulkredditdownloader/site_downloaders/base_downloader.py
index c8cb39a..4a0d871 100644
--- a/bulkredditdownloader/site_downloaders/base_downloader.py
+++ b/bulkredditdownloader/site_downloaders/base_downloader.py
@@ -7,7 +7,7 @@ from abc import ABC, abstractmethod
 import requests
 from praw.models import Submission
 
-from bulkredditdownloader.errors import FailedToDownload
+from bulkredditdownloader.errors import SiteDownloaderError
 from bulkredditdownloader.resource import Resource
 
 logger = logging.getLogger(__name__)
@@ -38,7 +38,7 @@ class BaseDownloader(ABC):
             try:
                 download_content = requests.get(resource_url, headers=headers).content
             except ConnectionResetError:
-                raise FailedToDownload
+                raise SiteDownloaderError
             return Resource(self.post, resource_url, download_content)
 
-        raise FailedToDownload
+        raise SiteDownloaderError
diff --git a/bulkredditdownloader/site_downloaders/gallery.py b/bulkredditdownloader/site_downloaders/gallery.py
index 73bb2e9..16b145f 100644
--- a/bulkredditdownloader/site_downloaders/gallery.py
+++ b/bulkredditdownloader/site_downloaders/gallery.py
@@ -6,7 +6,7 @@ import logging
 import requests
 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
 
 logger = logging.getLogger(__name__)
@@ -44,7 +44,7 @@ class Gallery(BaseDownloader):
         }
         res = requests.get(link, headers=headers)
         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
 
         starting_string = "_r = {"
diff --git a/bulkredditdownloader/site_downloaders/imgur.py b/bulkredditdownloader/site_downloaders/imgur.py
index 15cefe4..d555800 100644
--- a/bulkredditdownloader/site_downloaders/imgur.py
+++ b/bulkredditdownloader/site_downloaders/imgur.py
@@ -6,7 +6,7 @@ import logging
 import requests
 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.direct import Direct
 
@@ -63,7 +63,7 @@ class Imgur(BaseDownloader):
         cookies = {"over18": "1", "postpagebeta": "0"}
         res = requests.get(link, cookies=cookies)
         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
 
         starting_string = "image               : "
@@ -94,4 +94,4 @@ class Imgur(BaseDownloader):
             if extension in extension_suffix:
                 return extension
         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')