From: Adam Sampson Date: Sat, 19 Mar 2011 12:02:27 +0000 (+0000) Subject: Flatten out some nesting in add_feed. X-Git-Tag: v2.14~4 X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=b3fcd7003bdd7881e9258ff58b0e181dab08ce43;p=rawdog%2F.git Flatten out some nesting in add_feed. --- diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py index 54cbd96..172fc84 100644 --- a/rawdoglib/rawdog.py +++ b/rawdoglib/rawdog.py @@ -900,14 +900,16 @@ def add_feed(filename, url, rawdog, config): feeds = feedfinder.feeds(url) if feeds == []: print >>sys.stderr, "Cannot find any feeds in " + url - else: - feed = feeds[0] - if feed in rawdog.feeds: - print >>sys.stderr, "Feed " + feed + " is already in the config file" - else: - print >>sys.stderr, "Adding feed " + feed - feedline = "feed %s %s\n" % (config["newfeedperiod"], feed) - edit_file(filename, AddFeedEditor(feedline).edit) + return + + feed = feeds[0] + if feed in rawdog.feeds: + print >>sys.stderr, "Feed " + feed + " is already in the config file" + return + + print >>sys.stderr, "Adding feed " + feed + feedline = "feed %s %s\n" % (config["newfeedperiod"], feed) + edit_file(filename, AddFeedEditor(feedline).edit) class ChangeFeedEditor: def __init__(self, oldurl, newurl):