merge from HoverHell#23

reddit.py

@@ -6,13 +6,27 @@
 from json import JSONDecoder
 
 
-def getitems(subreddit, previd=''):
+def getitems(subreddit, multireddit, previd=''):
     """Return list of items from a subreddit."""
-    url = 'http://www.reddit.com/r/%s.json' % subreddit
+    if multireddit:
+        if not '/m/' in subreddit:
+            warning = ('That doesn\'t look like a multireddit. Are you sure'
+                        'you need that -multireddit flag?')
+            print warning
+            sys.exit(1)
+        url = 'http://www.reddit.com/user/%s.json' % subreddit
+    if not multireddit:
+        if '/m/' in subreddit:
+            warning = ('It looks like you are trying to fetch a multireddit. \n'
+                       'Check the -multireddit flag. '
+                       'Call --help for more info')
+            print warning
+            sys.exit(1)
+        url = 'http://www.reddit.com/r/%s.json' % subreddit
     # Get items after item with 'id' of previd.
-    
+
     hdr = { 'User-Agent' : 'RedditImageGrab script.' }
-    
+
     if previd:
         url = '%s?after=t3_%s' % (url, previd)
     try:

redditdownload.py

@@ -233,6 +233,7 @@ def extract_urls(url):
     PARSER = ArgumentParser(description='Downloads files with specified extension from the specified subreddit.')
     PARSER.add_argument('reddit', metavar='<subreddit>', help='Subreddit name.')
     PARSER.add_argument('dir', metavar='<dest_file>',nargs='?', default=getcwd(), help='Dir to put downloaded files in.')
+    PARSER.add_argument('-multireddit', default=False, action='store_true', required=False, help='Take multirredit instead of subreddit as input. If so, provide /user/m/multireddit-name as argument')
     PARSER.add_argument('-last', metavar='l', default='', required=False, help='ID of the last downloaded file.')
     PARSER.add_argument('-score', metavar='s', default=0, type=int, required=False, help='Minimum score of images to download.')
     PARSER.add_argument('-num', metavar='n', default=0, type=int, required=False, help='Number of images to download.')
@@ -263,7 +264,7 @@ def extract_urls(url):
     LAST = ARGS.last
 
     while not FINISHED:
-        ITEMS = getitems(ARGS.reddit, LAST)
+        ITEMS = getitems(ARGS.reddit, ARGS.multireddit, LAST)
         if not ITEMS:
             # No more items to process
             break