From 5c68a008c931546ef371015e8ef1d277cc084d28 Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 13:06:17 -0500 Subject: [PATCH 1/6] Basic framework to post submission, doesn't actually submit it yet --- rtv/docs.py | 10 ++++++++++ rtv/subreddit.py | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/rtv/docs.py b/rtv/docs.py index b47a31b..81f4ec9 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -52,3 +52,13 @@ COMMENT_FILE = """ # Replying to {author}'s {type} {content} """ + +SUBMISSION_FILE = """ +# Please enter your submission. Lines starting with '#' will be ignored, +# and an empty field aborts the submission. +# +# The first line will be interpreted as the title +# Following titles will be interpreted as the content +# +# Posting to /r/{name} +""" diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 5dfe990..f57a989 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -1,12 +1,13 @@ import curses - +import time import requests from .exceptions import SubredditError from .page import BasePage, Navigator, BaseController from .submission import SubmissionPage from .content import SubredditContent -from .helpers import clean, open_browser +from .helpers import clean, open_browser, open_editor +from .docs import SUBMISSION_FILE from .curses_helpers import (BULLET, UARROW, DARROW, Color, LoadScreen, text_input, show_notification) @@ -89,6 +90,37 @@ class SubredditPage(BasePage): global opened_links opened_links.add(url) + @SubredditController.register('p') + def post_submission(self): + # Abort if user isn't logged in + if not self.reddit.is_logged_in(): + show_notification(self.stdscr, ["Login to reply"]) + return + + name = self.content.name + if '+' in name: + show_notification(self.stdscr, ['Can\'t post to a multireddit']) + return + + # Open the submission window + submission_info = SUBMISSION_FILE.format(name=name) + curses.endwin() + submission_text = open_editor(submission_info) + curses.doupdate() + + # Abort if there is no content + if not submission_text: + curses.flash() + return + try: + title, content = submission_text.split('\n', 1) + show_notification(self.stdscr, [title]) + except praw.errors.APIException as e: + show_notification(self.stdscr, [e.message]) + else: + time.sleep(0.5) + self.refresh_content() + @staticmethod def draw_item(win, data, inverted=False): From 19aea61d4e6ba86d1ff79c54b88cac61fb7b1244 Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 13:07:14 -0500 Subject: [PATCH 2/6] typo --- rtv/docs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtv/docs.py b/rtv/docs.py index 81f4ec9..13ab5a4 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -58,7 +58,7 @@ SUBMISSION_FILE = """ # and an empty field aborts the submission. # # The first line will be interpreted as the title -# Following titles will be interpreted as the content +# Following lines will be interpreted as the content # # Posting to /r/{name} """ From e3db8d4ee4eaadfbfb7f2d1c8bdfb8b752df5e8c Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 13:20:18 -0500 Subject: [PATCH 3/6] properly strip subreddit name and post submission --- rtv/subreddit.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rtv/subreddit.py b/rtv/subreddit.py index f57a989..4559476 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -1,6 +1,7 @@ import curses import time import requests +import praw from .exceptions import SubredditError from .page import BasePage, Navigator, BaseController @@ -102,6 +103,10 @@ class SubredditPage(BasePage): show_notification(self.stdscr, ['Can\'t post to a multireddit']) return + name = name.strip(' /') # Strip leading and trailing backslashes + if name.startswith('r/'): + name = name[2:] + # Open the submission window submission_info = SUBMISSION_FILE.format(name=name) curses.endwin() @@ -114,7 +119,7 @@ class SubredditPage(BasePage): return try: title, content = submission_text.split('\n', 1) - show_notification(self.stdscr, [title]) + self.reddit.submit(name, title, text=content) except praw.errors.APIException as e: show_notification(self.stdscr, [e.message]) else: From feffe83e060491818d134bb0f01f6c403efa3d93 Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 15:07:57 -0500 Subject: [PATCH 4/6] Disallow posting to /r/all, /r/front. Use subreddit instead of name --- rtv/docs.py | 2 +- rtv/subreddit.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rtv/docs.py b/rtv/docs.py index 13ab5a4..fe691e3 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -60,5 +60,5 @@ SUBMISSION_FILE = """ # The first line will be interpreted as the title # Following lines will be interpreted as the content # -# Posting to /r/{name} +# Posting to {name} """ diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 4559476..7f0a745 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -95,20 +95,20 @@ class SubredditPage(BasePage): def post_submission(self): # Abort if user isn't logged in if not self.reddit.is_logged_in(): - show_notification(self.stdscr, ["Login to reply"]) + show_notification(self.stdscr, ['Login to reply']) return - name = self.content.name - if '+' in name: - show_notification(self.stdscr, ['Can\'t post to a multireddit']) - return + subreddit = self.reddit.get_subreddit(self.content.name) - name = name.strip(' /') # Strip leading and trailing backslashes - if name.startswith('r/'): - name = name[2:] + # Make sure it is a valid subreddit for submission + sub = str(subreddit) + if '+' in sub or sub == '/r/all' or sub == '/r/front': + message = 'Can\'t post to {0}'.format(sub) + show_notification(self.stdscr, [message]) + return # Open the submission window - submission_info = SUBMISSION_FILE.format(name=name) + submission_info = SUBMISSION_FILE.format(name=sub) curses.endwin() submission_text = open_editor(submission_info) curses.doupdate() @@ -119,7 +119,7 @@ class SubredditPage(BasePage): return try: title, content = submission_text.split('\n', 1) - self.reddit.submit(name, title, text=content) + self.reddit.submit(subreddit, title, text=content) except praw.errors.APIException as e: show_notification(self.stdscr, [e.message]) else: From 26d4d247b0acc54accb25de06c94f63a40ded264 Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 16:27:42 -0500 Subject: [PATCH 5/6] fix subreddit name when user tries to post to /new etc. --- rtv/docs.py | 2 +- rtv/subreddit.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rtv/docs.py b/rtv/docs.py index fe691e3..13ab5a4 100644 --- a/rtv/docs.py +++ b/rtv/docs.py @@ -60,5 +60,5 @@ SUBMISSION_FILE = """ # The first line will be interpreted as the title # Following lines will be interpreted as the content # -# Posting to {name} +# Posting to /r/{name} """ diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 7f0a745..5003b6a 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -101,9 +101,10 @@ class SubredditPage(BasePage): subreddit = self.reddit.get_subreddit(self.content.name) # Make sure it is a valid subreddit for submission - sub = str(subreddit) - if '+' in sub or sub == '/r/all' or sub == '/r/front': - message = 'Can\'t post to {0}'.format(sub) + # Strips the subreddit to just the name + sub = str(subreddit).split('/')[2] + if '+' in sub or sub == 'all' or sub == 'front': + message = 'Can\'t post to /r/{0}'.format(sub) show_notification(self.stdscr, [message]) return @@ -119,7 +120,7 @@ class SubredditPage(BasePage): return try: title, content = submission_text.split('\n', 1) - self.reddit.submit(subreddit, title, text=content) + self.reddit.submit(sub, title, text=content) except praw.errors.APIException as e: show_notification(self.stdscr, [e.message]) else: From 49977151d1f0e3ca6b14eb1e63bf7380021c76ce Mon Sep 17 00:00:00 2001 From: Tobin Date: Wed, 1 Apr 2015 21:26:12 -0500 Subject: [PATCH 6/6] Make sure the post has content, show dialog if not --- rtv/subreddit.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rtv/subreddit.py b/rtv/subreddit.py index 5003b6a..beacc0d 100644 --- a/rtv/subreddit.py +++ b/rtv/subreddit.py @@ -123,6 +123,8 @@ class SubredditPage(BasePage): self.reddit.submit(sub, title, text=content) except praw.errors.APIException as e: show_notification(self.stdscr, [e.message]) + except ValueError: + show_notification(self.stdscr, ['No post content! Post aborted.']) else: time.sleep(0.5) self.refresh_content()