[core] Improved how errors are caught

Author: xenova

chat_downloader/chat_downloader.py

@@ -39,20 +39,10 @@
 from .errors import (
     URLNotProvided,
     SiteNotSupported,
-    LoginRequired,
-    VideoUnavailable,
-    NoChatReplay,
-    VideoUnplayable,
-    InvalidParameter,
     InvalidURL,
-    RetriesExceeded,
-    NoContinuation,
-    UserNotFound,
+    ChatDownloaderError,
     ChatGeneratorError,
     ParsingError,
-    SiteError,
-    NoVideos,
-    FormatError
 )
 
 
@@ -397,29 +387,15 @@ def callback(item):
         log('info', 'Finished retrieving chat{}.'.format(
             '' if chat.is_live else ' replay'))
 
-    except (
-        URLNotProvided,
-        SiteNotSupported,
-        LoginRequired,
-        VideoUnavailable,
-        NoChatReplay,
-        VideoUnplayable,
-        InvalidParameter,
-        InvalidURL,
-        RetriesExceeded,
-        NoContinuation,
-        UserNotFound,
-        SiteError,
-        NoVideos,
-        FormatError
-    ) as e:  # Expected errors
-        log('error', e)
     except (
         ChatGeneratorError,
         ParsingError
     ) as e:  # Errors which may be bugs
         log('error', '{}. Please report this at https://github.com/xenova/chat-downloader/issues/new/choose'.format(e))
 
+    except ChatDownloaderError as e:  # Expected errors
+        log('error', e)
+
     except ConnectionError as e:
         log('error', 'Unable to establish a connection. Please check your internet connection. {}'.format(e))
 

chat_downloader/errors.py

@@ -82,13 +82,13 @@ class ChatGeneratorError(ChatDownloaderError):
     pass
 
 
-class SiteNotSupported(ChatDownloaderError):
-    """Raised when the url is valid, but the site is not supported."""
+class SiteError(ChatDownloaderError):
+    """Raised when an error occurs with a specific site."""
     pass
 
 
-class SiteError(ChatDownloaderError):
-    """Raised when an error occurs with a specific site."""
+class SiteNotSupported(SiteError):
+    """Raised when the url is valid, but the site is not supported."""
     pass
 
 
@@ -111,6 +111,7 @@ class FormatNotFound(FormatError):
     """Raised when a specified format can not be found"""
     pass
 
+
 class FormatFileNotFound(FormatError):
     """Raised when the format file can not be found"""
     pass