prompt to log out/in when logged in/out

rtv/curses_helpers.py

@@ -52,12 +52,14 @@ def show_notification(stdscr, message):
     for index, line in enumerate(message, start=1):
         window.addstr(index, 1, line)
     window.refresh()
-    stdscr.getch()
+    ch = stdscr.getch()
 
     window.clear()
     window = None
     stdscr.refresh()
 
+    return ch
+
 
 def show_help(stdscr):
     """

rtv/page.py

@@ -229,31 +229,38 @@ class BasePage(object):
 
     @BaseController.register('u')
     def login(self):
-        username = self.prompt_input('Enter username: ')
+        """
-        password = self.prompt_input('Enter password: ', hide=True)
+        Prompt to log out if logged in.
+        Prompt to log in if looged out.
+        """
 
-        if username == '' or username is None:
+        if self.reddit.is_logged_in():
-            self.reddit.clear_authentication()
+            ch = show_notification(self.stdscr, ["Log out? (y/N)"])
-            show_notification(self.stdscr,
+
-                              ['Logged out'])
+            if ch == 121:  # 'y'
-            return
+                self.reddit.clear_authentication()
-        elif password == '' or password is None:
+                show_notification(self.stdscr,
-            curses.flash()
+                                  ['Logged out'])
-            return
+            else:
+                curses.flash()
 
-        try:
-            curses.endwin()
-            print('Connecting...')
-            _reddit = praw.Reddit(user_agent=AGENT)
-            _reddit.login(username, password)
-            curses.doupdate()
-        except praw.errors.InvalidUserPass:
-            show_notification(self.stdscr,
-                              ['Invalid password for username: {}'.format(username)])
         else:
-            self.reddit.login(username, password)
+            username = self.prompt_input('Enter username: ')
-            show_notification(self.stdscr,
+            password = self.prompt_input('Enter password: ', hide=True)
-                              ['Successfully logged in as: {}'.format(username)])
+
+            if (username == '' or username is None) \
+               or (password == '' or password is None):
+                curses.flash()
+                return
+
+            try:
+                self.reddit.login(username, password)
+            except praw.errors.InvalidUserPass:
+                show_notification(self.stdscr,
+                                  ['Invalid password for username: {}'.format(username)])
+            else:
+                show_notification(self.stdscr,
+                                  ['Successfully logged in as: {}'.format(username)])
 
         return