Merge pull request #315 from michael-lazar/better_error_messages

Better error messages

rtv/content.py

@@ -429,7 +429,10 @@ class SubredditContent(Content):
         try:
             self.get(0)
         except IndexError:
-            raise exceptions.SubredditError('No submissions')
+            full_name = self.name
+            if self.order:
+                full_name += '/' + self.order
+            raise exceptions.NoSubmissionsError(full_name)
 
     @classmethod
     def from_name(cls, reddit, name, loader, order=None, query=None):
@@ -472,12 +475,12 @@ class SubredditContent(Content):
         elif len(parts) == 2:
             resource, resource_order = parts
         else:
-            raise InvalidSubreddit()
+            raise InvalidSubreddit('`{}` is an invalid format'.format(name))
 
         if not resource:
             # Praw does not correctly handle empty strings
             # https://github.com/praw-dev/praw/issues/615
-            raise InvalidSubreddit()
+            raise InvalidSubreddit('Subreddit cannot be empty')
 
         # If the order was explicitly passed in, it will take priority over
         # the order that was extracted from the name
@@ -493,11 +496,11 @@ class SubredditContent(Content):
             period = None
 
         if order not in ['hot', 'top', 'rising', 'new', 'controversial', None]:
-            raise InvalidSubreddit('Invalid order "%s"' % order)
+            raise InvalidSubreddit('Invalid order `%s`' % order)
         if period not in ['all', 'day', 'hour', 'month', 'week', 'year', None]:
-            raise InvalidSubreddit('Invalid period "%s"' % period)
+            raise InvalidSubreddit('Invalid period `%s`' % period)
         if period and order not in ['top', 'controversial']:
-            raise InvalidSubreddit('"%s" order does not allow sorting by'
+            raise InvalidSubreddit('`%s` order does not allow sorting by'
                                    ' period' % order)
 
         # On some objects, praw doesn't allow you to pass arguments for the

rtv/exceptions.py

@@ -22,8 +22,13 @@ class SubmissionError(RTVError):
     "Submission could not be loaded"
 
 
-class SubredditError(RTVError):
-    "Subreddit could not be reached"
+class NoSubmissionsError(RTVError):
+    "No submissions for the given page"
+
+    def __init__(self, name):
+        self.name = name
+        message = '`{0}` has no submissions'.format(name)
+        super(NoSubmissionsError, self).__init__(message)
 
 
 class SubscriptionError(RTVError):

rtv/objects.py

@@ -120,6 +120,7 @@ class LoadScreen(object):
         (praw.errors.OAuthScopeRequired, 'Not logged in'),
         (praw.errors.LoginRequired, 'Not logged in'),
         (praw.errors.InvalidCaptcha, 'Error, captcha required'),
+        (praw.errors.InvalidSubreddit, '{0.args[0]}'),
         (praw.errors.PRAWException, '{0.__class__.__name__}'),
         (requests.exceptions.RequestException, '{0.__class__.__name__}'),
     ]

tests/test_content.py

@@ -344,7 +344,8 @@ def test_content_subreddit_from_name_invalid(prompt, reddit, terminal):
     with terminal.loader():
         SubredditContent.from_name(reddit, prompt, terminal.loader)
     assert isinstance(terminal.loader.exception, praw.errors.InvalidSubreddit)
-
+    # Must always have an argument because it gets displayed
+    assert terminal.loader.exception.args[0]
 
 args, ids = SUBREDDIT_SEARCH_QUERIES.values(), list(SUBREDDIT_SEARCH_QUERIES)
 @pytest.mark.parametrize('prompt,query', args, ids=ids)
@@ -399,8 +400,9 @@ def test_content_subreddit_me(reddit, oauth, refresh_token, terminal):
 
     # If there is no submitted content, an error should be raised
     if terminal.loader.exception:
-        assert isinstance(terminal.loader.exception, exceptions.SubredditError)
-
+        assert isinstance(terminal.loader.exception,
+                          exceptions.NoSubmissionsError)
+        assert terminal.loader.exception.name == '/u/me'
 
 def test_content_subscription(reddit, terminal):