Moved files around, tweaked content generators. Things are in a broken state atm.

rtv/main.py

@@ -1,8 +1,8 @@
 import argparse
 import praw
-from utils import curses_session
-from content import SubredditContainer
-from subreddit_viewer import SubredditViewer
+from utils import curses_session, LoadScreen
+from content import SubredditContent
+from subreddit import SubredditPage
 
 parser = argparse.ArgumentParser(description='Reddit Terminal Viewer')
 parser.add_argument('-s', dest='subreddit', default='front', help='subreddit name')
@@ -14,14 +14,17 @@ group.add_argument('-p', dest='password', help='reddit password')
 def main(args):
 
     r = praw.Reddit(user_agent='reddit terminal viewer v0.0')
+    r.config.decode_html_entities = True
+
     if args.username and args.password:
         r.login(args.username, args.password)
 
     with curses_session() as stdscr:
 
-        content = SubredditContainer(r, subreddit=args.subreddit)
-        viewer = SubredditViewer(stdscr, content)
-        viewer.loop()
+        loader = LoadScreen(stdscr)
+        content = SubredditContent(r, subreddit=args.subreddit, loader=loader)
+        page = SubredditPage(stdscr, content)
+        page.loop()
 
 if __name__ == '__main__':