diff --git a/README.md b/README.md index 9c8a90a..c58f0b6 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ It should redirect to a page which shows your **imgur_client_id** and **imgur_cl ## Changelog ### 19/07/2018 +- Added v.redd.it support - Added custom exception descriptions to FAILED.json file ### [13/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/9f831e1b784a770c82252e909462871401a05c11) diff --git a/script.py b/script.py index afd10cb..8cb4673 100644 --- a/script.py +++ b/script.py @@ -246,7 +246,6 @@ class PromptUser: # DELETE THE PLUS (+) AT THE END GLOBAL.arguments.subreddit = GLOBAL.arguments.subreddit[:-1] - print(GLOBAL.arguments.subreddit) print("\nselect sort type:") sortTypes = [ "hot","top","new","rising","controversial" diff --git a/src/downloader.py b/src/downloader.py index c3ed595..9515529 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -36,7 +36,10 @@ def getExtension(link): if TYPE in parsed: return "."+parsed[-1] else: - return '.jpg' + if not "v.redd.it" in link: + return '.jpg' + else: + return '.mp4' def getFile(fileDir,tempDir,imageURL,indent=0): """Downloads given file to given directory. diff --git a/src/searcher.py b/src/searcher.py index 86f6d94..78424af 100644 --- a/src/searcher.py +++ b/src/searcher.py @@ -397,8 +397,9 @@ def checkIfMatching(submission): imgurCount += 1 return details - elif isDirectLink(submission.url): + elif isDirectLink(submission.url) is not None: details['postType'] = 'direct' + details['postURL'] = isDirectLink(submission.url) directCount += 1 return details @@ -435,7 +436,7 @@ def printSubmission(SUB,validNumber,totalNumber): def isDirectLink(URL): """Check if link is a direct image link. - If so, return True, + If so, return URL, if not, return False """ @@ -444,10 +445,13 @@ def isDirectLink(URL): URL = URL[:-1] if "i.reddituploads.com" in URL: - return True + return URL + + elif "v.redd.it" in URL: + return URL+"/DASH_600_K" for extension in imageTypes: if extension in URL: - return True + return URL else: return False