Fix extension (close #40)

redditdownload/reddit.py

@@ -15,14 +15,17 @@ def getitems(subreddit, multireddit=False, previd='', reddit_sort=None):
     :param reddit_sort: type of sorting post
     :returns: list -- list of post url
     """
+    # assume no advanced sorting.
+    is_advanced_sort = False
+    url_base = 'https://www.reddit.com'
 
     if multireddit:
         if '/m/' not 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
+        url = '{}/user/%s.json'.format(url_base, subreddit)
     if not multireddit:
         if '/m/' in subreddit:
             warning = ('It looks like you are trying to fetch a multireddit. \n'
@@ -32,15 +35,15 @@ def getitems(subreddit, multireddit=False, previd='', reddit_sort=None):
             sys.exit(1)
         # no sorting needed
         if reddit_sort is None:
-            url = 'http://www.reddit.com/r/{}.json'.format(subreddit)
+            url = '{}/r/{}.json'.format(url_base, subreddit)
         # if sort is top or controversial, may include advanced sort (ie week, all etc)
         elif 'top' in reddit_sort:
-            url = 'http://www.reddit.com/r/{}/{}.json'.format(subreddit, 'top')
+            url = '{}/r/{}/{}.json'.format(url_base, subreddit, 'top')
         elif 'controversial' in reddit_sort:
-            url = 'http://www.reddit.com/r/{}/{}.json'.format(subreddit, 'controversial')
+            url = '{}/r/{}/{}.json'.format(url_base, subreddit, 'controversial')
         # use default
         else:
-            url = 'http://www.reddit.com/r/{}/{}.json'.format(subreddit, reddit_sort)
+            url = '{}/r/{}/{}.json'.format(url_base, subreddit, reddit_sort)
 
     # Get items after item with 'id' of previd.
 

redditdownload/redditdownload.py

@@ -6,6 +6,7 @@
 import StringIO
 import sys
 import logging
+import imghdr
 from urllib2 import urlopen, HTTPError, URLError
 from httplib import InvalidURL
 from argparse import ArgumentParser
@@ -160,6 +161,11 @@ def download_from_url(url, dest_file):
     # Don't download files multiple times!
     if pathexists(dest_file):
         raise FileExistsException('URL [%s] already downloaded.' % url)
+    elif ('.jpg' in dest_file or '.jpeg' in dest_file) and 'imgur.com' in url:
+        dest_file_ext = '.jpg' if '.jpg' in dest_file else '.jpeg'
+        if pathexists(dest_file.replace(dest_file_ext, '.png')):
+            error_txt = 'URL [{}] may already downloaded with [.png] extensions.'
+            raise FileExistsException(error_txt.format(url))
 
     response = request(url)
     info = response.info()
@@ -190,6 +196,25 @@ def download_from_url(url, dest_file):
     filehandle.close()
 
 
+def fix_image_ext(filename):
+    """fix image extension using python imghdr."""
+    logger = logging.getLogger(__name__)
+    new_filename = None
+    basename, file_ext = pathsplitext(filename)
+    ihdr_ext = imghdr.what(filename)
+    if '.{}'.format(ihdr_ext) != file_ext and ihdr_ext is not None:
+        if ihdr_ext == 'jpeg' and file_ext in ['.jpeg', '.jpg']:
+            # don't do anything for jpg/jpeg file
+            pass
+        else:
+            new_filename = '{}.{}'.format(basename, ihdr_ext)
+    if new_filename is not None:
+        if pathexists(new_filename):
+            logger.debug('Can\'t fix file Extension, file already exist.')
+        else:
+            logger.info('Fix extension from [{}] to [{}]'.format(file_ext, ihdr_ext))
+            os.rename(filename, new_filename)
+
 def process_imgur_url(url):
     """
     Given an imgur URL, determine if it's a direct link to an image or an
@@ -507,6 +532,8 @@ def main():
                         print '    Sucessfully downloaded URL [%s] as [%s].' % (URL, FILENAME)
                         DOWNLOADED += 1
                         FILECOUNT += 1
+                        if 'imgur.com' in URL:
+                            fix_image_ext(FILEPATH)
 
                     except Exception,e:
                         print '    %s' % str(e)