27 jan update

Added Verbose mode

.gitignore

@@ -2,4 +2,5 @@ build/
 dist/
 MANIFEST
 __pycache__/
-src/__pycache__/
+src/__pycache__/
+config.json

README.md

@@ -1,7 +1,7 @@
 # Bulk Downloader for Reddit
-This program downloads imgur, gfycat and direct image and video links of saved posts from a reddit account. It is written in Python 3.
-  
-**PLEASE** post any issue you have with the script to [Issues](https://github.com/aliparlakci/bulk-downloader-for-reddit/issues) tab. Since I don't have any testers or contributers I need your feedback.
+Downloads media from reddit posts.
+
+## [Download the latest release](https://github.com/aliparlakci/bulk-downloader-for-reddit/releases/latest)
 
 ## What it can do
 - Can get posts from: frontpage, subreddits, multireddits, redditor's submissions, upvoted and saved posts; search results or just plain reddit links
@@ -13,93 +13,17 @@ This program downloads imgur, gfycat and direct image and video links of saved p
 - Saves a reusable copy of posts' details that are found so that they can be re-downloaded again
 - Logs failed ones in a file to so that you can try to download them later
 
-## [Download the latest release](https://github.com/aliparlakci/bulk-downloader-for-reddit/releases/latest)
+## **[Compiling it from source code](docs/COMPILE_FROM_SOURCE.md)**
+*\* MacOS users have to use this option.*
 
-## How it works
-  
-- For **Windows** and **Linux** users, there are executable files to run easily without installing a third party program. But if you are a paranoid like me, you can **[compile it from source code](docs/COMPILE_FROM_SOURCE.md)**.
-  - In Windows, double click on bulk-downloader-for-reddit file
-  - In Linux, extract files to a folder and open terminal inside it. Type **`./bulk-downloader-for-reddit`**
-  
-- **MacOS** users have to **[compile it from source code](docs/COMPILE_FROM_SOURCE.md)**.
-
-Script also accepts **command-line arguments**, get further information from **[`--help`](docs/COMMAND_LINE_ARGUMENTS.md)**
+## Additional options
+Script also accepts additional options via command-line arguments. Get further information from **[`--help`](docs/COMMAND_LINE_ARGUMENTS.md)**
 
 ## Setting up the script
-Because this is not a commercial app, you need to create an imgur developer app in order API to work.
-
-### Creating an imgur app
-* Go to https://api.imgur.com/oauth2/addclient
-* Enter a name into the **Application Name** field.
-* Pick **Anonymous usage without user authorization** as an **Authorization type**\*
-* Enter your email into the Email field.
-* Correct CHAPTCHA
-* Click **submit** button  
+You need to create an imgur developer app in order API to work. Go to https://api.imgur.com/oauth2/addclient and fill the form (It does not really matter how you fill it).
   
-It should redirect to a page which shows your **imgur_client_id** and **imgur_client_secret**
+It should redirect you to a page where it shows your **imgur_client_id** and **imgur_client_secret**.
   
-\* Select **OAuth 2 authorization without a callback URL** first then select **Anonymous usage without user authorization** if it says *Authorization callback URL: required*
+## [FAQ](docs/FAQ.md)
 
-## FAQ
-### How downloaded files' names are formatted?
-- Images that are not belong to an album or self posts are formatted as **`[SUBMITTER NAME]_[POST TITLE]_[REDDIT ID]`**.
-  You can use *reddit id* to go to post's reddit page by going to link **reddit.com/[REDDIT ID]**
-  
-- An image in an imgur album is formatted as **`[ITEM NUMBER]_[IMAGE TITLE]_[IMGUR ID]`**
-  Similarly, you can use *imgur id* to go to image's imgur page by going to link **imgur.com/[IMGUR ID]**.
-
-### How do I open self post files?
-- Self posts are held at reddit as styled with markdown. So, the script downloads them as they are in order not to lose their stylings.
-  However, there is a [great Chrome extension](https://chrome.google.com/webstore/detail/markdown-viewer/ckkdlimhmcjmikdlpkmbgfkaikojcbjk) for viewing Markdown files with its styling. Install it and open the files with [Chrome](https://www.google.com/intl/tr/chrome/).  
-
-  However, they are basically text files. You can also view them with any text editor such as Notepad on Windows, gedit on Linux or Text Editor on MacOS
-
-### How can I change my credentials?
-- All of the user data is held in **config.json** file which is in a folder named "Bulk Downloader for Reddit" in your **Home** directory. You can edit 
-  them, there.
-
-## Changes on *master*
-### [24/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/7a68ff3efac9939f9574c2cef6184b92edb135f4)
-- Added OP's name to file names (backwards compatible)
-- Deleted # char from file names (backwards compatible)
-- Improved exception handling
-
-### [23/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/7314e17125aa78fd4e6b28e26fda7ec7db7e0147)
-- Split download() function
-- Added erome support
-- Remove exclude feature
-- Bug fix
-
-### [22/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/a67da461d2fcd70672effcb20c8179e3224091bb)
-- Put log files in a folder named "LOG_FILES"
-- Fixed the bug that makes multireddit mode unusable
-
-### [21/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/4a8c2377f9fb4d60ed7eeb8d50aaf9a26492462a)
-- Added exclude mode
-
-### [20/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/commit/7548a010198fb693841ca03654d2c9bdf5742139)
-- "0" input for no limit
-- Fixed the bug that recognizes none image direct links as image links
-
-### [19/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/41cbb58db34f500a8a5ecc3ac4375bf6c3b275bb)
-- Added v.redd.it support
-- Added custom exception descriptions to FAILED.json file
-- Fixed the bug that prevents downloading some gfycat URLs
-
-### [13/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/9f831e1b784a770c82252e909462871401a05c11)
-- Change config.json file's path to home directory
-
-### [12/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/50a77f6ba54c24f5647d5ea4e177400b71ff04a7)
-- Added binaries for Windows and Linux
-- Wait on KeyboardInterrupt
-- Accept multiple subreddit input
-- Fixed the bug that prevents choosing "[0] exit" with typing "exit"
-
-### [11/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/a28a7776ab826dea2a8d93873a94cd46db3a339b)
-- Improvements on UX and UI
-- Added logging errors to CONSOLE_LOG.txt
-- Using current directory if directory has not been given yet.
-
-### [10/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/ffe3839aee6dc1a552d95154d817aefc2b66af81)
-- Added support for *self* post
-- Now getting posts is quicker
+## [Changes on *master*](docs/CHANGELOG.md)

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/CHANGELOG.md

@@ -0,0 +1,83 @@
+# Changes on *master*
+## [27/01/2019](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/b7baf07fb5998368d87e3c4c36aed40daf820609)
+- Clarified the instructions
+
+## [28/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/d56efed1c6833a66322d9158523b89d0ce57f5de)
+- Adjusted algorith used for extracting gfycat links because of gfycat's design change
+- Ignore space at the end of the given directory
+
+## [16/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/d56efed1c6833a66322d9158523b89d0ce57f5de)
+- Fix the bug that prevents downloading imgur videos
+
+## [15/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/adccd8f3ba03ad124d58643d78dab287a4123a6f)
+- Prints out the title of posts' that are already downloaded
+
+## [13/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/50cb7c15b9cb4befce0cfa2c23ab5de4af9176c6)
+- Added alternative location of current directory for config file
+- Fixed console prints on Linux
+
+## [10/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/8f1ff10a5e11464575284210dbba4a0d387bc1c3)
+- Added reddit username to config file
+
+## [06/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/210238d0865febcb57fbd9f0b0a7d3da9dbff384)
+- Sending headers when requesting a file in order not to be rejected by server
+
+## [04/08/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/426089d0f35212148caff0082708a87017757bde)
+- Disabled printing post types to console
+
+## [30/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/af294929510f884d92b25eaa855c29fc4fb6dcaa)
+- Now opens web browser and goes to Imgur when prompts for Imgur credentials
+
+## [26/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/1623722138bad80ae39ffcd5fb38baf80680deac)
+- Improved verbose mode
+- Minimalized the console output
+- Added quit option for auto quitting the program after process finishes
+
+## [25/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/1623722138bad80ae39ffcd5fb38baf80680deac)
+- Added verbose mode
+- Stylized the console output
+
+## [24/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/7a68ff3efac9939f9574c2cef6184b92edb135f4)
+- Added OP's name to file names (backwards compatible)
+- Deleted # char from file names (backwards compatible)
+- Improved exception handling
+
+## [23/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/7314e17125aa78fd4e6b28e26fda7ec7db7e0147)
+- Splited download() function
+- Added erome support
+- Removed exclude feature
+- Bug fixes
+
+## [22/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/6e7463005051026ad64006a8580b0b5dc9536b8c)
+- Put log files in a folder named "LOG_FILES"
+- Fixed the bug that makes multireddit mode unusable
+
+## [21/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/4a8c2377f9fb4d60ed7eeb8d50aaf9a26492462a)
+- Added exclude mode
+
+## [20/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/7548a010198fb693841ca03654d2c9bdf5742139)
+- "0" input for no limit
+- Fixed the bug that recognizes none image direct links as image links
+
+## [19/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/41cbb58db34f500a8a5ecc3ac4375bf6c3b275bb)
+- Added v.redd.it support
+- Added custom exception descriptions to FAILED.json file
+- Fixed the bug that prevents downloading some gfycat URLs
+
+## [13/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/9f831e1b784a770c82252e909462871401a05c11)
+- Changed config.json file's path to home directory
+
+## [12/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/50a77f6ba54c24f5647d5ea4e177400b71ff04a7)
+- Added binaries for Windows and Linux
+- Wait on KeyboardInterrupt
+- Accept multiple subreddit input
+- Fixed the bug that prevents choosing "[0] exit" with typing "exit"
+
+## [11/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/a28a7776ab826dea2a8d93873a94cd46db3a339b)
+- Improvements on UX and UI
+- Added logging errors to CONSOLE_LOG.txt
+- Using current directory if directory has not been given yet.
+
+## [10/07/2018](https://github.com/aliparlakci/bulk-downloader-for-reddit/tree/ffe3839aee6dc1a552d95154d817aefc2b66af81)
+- Added support for *self* post
+- Now getting posts is quicker

docs/COMMAND_LINE_ARGUMENTS.md

@@ -5,20 +5,24 @@ See **[compiling from source](COMPILE_FROM_SOURCE.md)** page first unless you ar
 ***Use*** `.\bulk-downloader-for-reddit.exe` ***or*** `./bulk-downloader-for-reddit` ***if you are using the executable***.
 ```console
 $ python script.py --help
-usage: script.py [-h] [--directory DIRECTORY] [--link link] [--saved]
-                 [--submitted] [--upvoted] [--log LOG FILE]
-                 [--subreddit SUBREDDIT [SUBREDDIT ...]]
+usage: script.py [-h] [--directory DIRECTORY] [--NoDownload] [--verbose]
+                 [--quit] [--link link] [--saved] [--submitted] [--upvoted]
+                 [--log LOG FILE] [--subreddit SUBREDDIT [SUBREDDIT ...]]
                  [--multireddit MULTIREDDIT] [--user redditor]
                  [--search query] [--sort SORT TYPE] [--limit Limit]
-                 [--time TIME_LIMIT] [--NoDownload]
+                 [--time TIME_LIMIT]
 
 This program downloads media from reddit posts
 
 optional arguments:
   -h, --help            show this help message and exit
-  --directory DIRECTORY
+  --directory DIRECTORY, -d DIRECTORY
                         Specifies the directory where posts will be downloaded
                         to
+  --NoDownload          Just gets the posts and stores them in a file for
+                        downloading later
+  --verbose, -v         Verbose Mode
+  --quit, -q            Auto quit afer the process finishes
   --link link, -l link  Get posts from link
   --saved               Triggers saved mode
   --submitted           Gets posts of --user
@@ -38,8 +42,6 @@ optional arguments:
   --limit Limit         default: unlimited
   --time TIME_LIMIT     Either hour, day, week, month, year or all. default:
                         all
-  --NoDownload          Just gets the posts and store them in a file for
-                        downloading later
 ```
 
 # Examples

docs/COMPILE_FROM_SOURCE.md

@@ -1,16 +1,14 @@
 # Compiling from source code
 ## Requirements
 ### Python 3 Interpreter
-Latest* version of **Python 3** is needed. See if it is already installed [here](#finding-the-correct-keyword-for-python). If not, download the matching release for your platform [here](https://www.python.org/downloads/) and install it. If you are a *Windows* user, selecting **Add Python 3 to PATH** option is mandatory.   
+Latest* version of **Python 3** is needed. See if it is already installed [here](#finding-the-correct-keyword-for-python). If not, download the matching release for your platform [here](https://www.python.org/downloads/) and install it. If you are a *Windows* user, selecting **Add Python 3 to PATH** option when installing the software is mandatory.   
   
 \* *Use Python 3.6.5 if you encounter an issue*
 ## Using terminal
 ### To open it...
-- **On Windows 8/8.1/10**: Press the File tab on **Windows Explorer**, click on **Open Windows PowerShell** or **Open Windows Command Prompt** or look for *Command Prompt* or *PowerShell* in *Start Menu*.
+-  **On Windows**: Press **Shift+Right Click**, select **Open Powershell window here** or **Open Command Prompt window here**
   
-- **On Windows 7**: Press **WindowsKey+R**, type **cmd** and hit Enter or look for *Command Prompt* or *PowerShell* in *Start Menu*.
-  
-- **On Linux**: Right-click in a folder and select **Open Terminal** or press **Ctrl+Alt+T** or look for **Terminal** in the programs.
+- **On Linux**: Right-click in a folder and select **Open Terminal** or press **Ctrl+Alt+T**.
   
 - **On MacOS**: Look for an app called **Terminal**.
   
@@ -39,4 +37,4 @@ python -m pip install -r requirements.txt
   
 ---
   
-Now, you can go to [Using command-line arguments](COMMAND_LINE_ARGUMENTS.md)
+Now, you can go to [Using command-line arguments](COMMAND_LINE_ARGUMENTS.md)

docs/FAQ.md

@@ -0,0 +1,23 @@
+# FAQ
+## What do the dots resemble when getting posts?
+- Each dot means that 100 posts are scanned. 
+  
+## Getting posts is taking too long.
+- You can press Ctrl+C to interrupt it and start downloading.
+  
+## How are filenames formatted?
+- Self posts and images that are not belong to an album are formatted as **`[SUBMITTER NAME]_[POST TITLE]_[REDDIT ID]`**.
+  You can use *reddit id* to go to post's reddit page by going to link **reddit.com/[REDDIT ID]**
+  
+- An image in an imgur album is formatted as **`[ITEM NUMBER]_[IMAGE TITLE]_[IMGUR ID]`**
+  Similarly, you can use *imgur id* to go to image's imgur page by going to link **imgur.com/[IMGUR ID]**.
+
+## How do I open self post files?
+- Self posts are held at reddit as styled with markdown. So, the script downloads them as they are in order not to lose their stylings.
+  However, there is a [great Chrome extension](https://chrome.google.com/webstore/detail/markdown-viewer/ckkdlimhmcjmikdlpkmbgfkaikojcbjk) for viewing Markdown files with its styling. Install it and open the files with [Chrome](https://www.google.com/intl/tr/chrome/).  
+
+  However, they are basically text files. You can also view them with any text editor such as Notepad on Windows, gedit on Linux or Text Editor on MacOS
+
+## How can I change my credentials?
+- All of the user data is held in **config.json** file which is in a folder named "Bulk Downloader for Reddit" in your **Home** directory. You can edit 
+  them, there.

requirements.txt

@@ -1,3 +1,4 @@
+bs4
 requests
 praw
 imgurpython

script.py

@@ -10,10 +10,11 @@ import logging
 import os
 import sys
 import time
+import webbrowser
 from io import StringIO
 from pathlib import Path, PurePath
 
-from src.downloader import Direct, Gfycat, Imgur, Self, Erome
+from src.downloader import Direct, Erome, Gfycat, Imgur, Self
 from src.errors import *
 from src.parser import LinkDesigner
 from src.searcher import getPosts
@@ -22,7 +23,7 @@ from src.tools import (GLOBAL, createLogFile, jsonFile, nameCorrector,
 
 __author__ = "Ali Parlakci"
 __license__ = "GPL"
-__version__ = "1.5.1.1"
+__version__ = "1.6.4.1"
 __maintainer__ = "Ali Parlakci"
 __email__ = "parlakciali@gmail.com"
 
@@ -38,20 +39,34 @@ def getConfig(configFileName):
         if "reddit_refresh_token" in content:
             if content["reddit_refresh_token"] == "":
                 FILE.delete("reddit_refresh_token")
+
+        if not all(False if content.get(key,"") == "" else True for key in keys):
+            print(
+                "Go to this URL and fill the form: " \
+                "https://api.imgur.com/oauth2/addclient\n" \
+                "Enter the client id and client secret here:"
+            )
+            webbrowser.open("https://api.imgur.com/oauth2/addclient",new=2)
+
         for key in keys:
             try:
                 if content[key] == "":
                     raise KeyError
             except KeyError:
-                print(key,": ")
-                FILE.add({key:input()})
+                FILE.add({key:input("  "+key+": ")})
         return jsonFile(configFileName).read()
 
     else:
         FILE = jsonFile(configFileName)
         configDictionary = {}
+        print(
+            "Go to this URL and fill the form: " \
+            "https://api.imgur.com/oauth2/addclient\n" \
+            "Enter the client id and client secret here:"
+            )
+        webbrowser.open("https://api.imgur.com/oauth2/addclient",new=2)
         for key in keys:
-            configDictionary[key] = input(key + ": ")
+            configDictionary[key] = input("  "+key+": ")
         FILE.add(configDictionary)
         return FILE.read()
 
@@ -62,10 +77,26 @@ def parseArguments(arguments=[]):
                                      description="This program downloads " \
                                                  "media from reddit " \
                                                  "posts")
-    parser.add_argument("--directory",
+    parser.add_argument("--directory","-d",
                         help="Specifies the directory where posts will be " \
                         "downloaded to",
                         metavar="DIRECTORY")
+        
+    parser.add_argument("--NoDownload",
+                        help="Just gets the posts and stores them in a file" \
+                             " for downloading later",
+                        action="store_true",
+                        default=False)
+    
+    parser.add_argument("--verbose","-v",
+                        help="Verbose Mode",
+                        action="store_true",
+                        default=False)
+    
+    parser.add_argument("--quit","-q",
+                        help="Auto quit afer the process finishes",
+                        action="store_true",
+                        default=False)
 
     parser.add_argument("--link","-l",
                         help="Get posts from link",
@@ -137,13 +168,6 @@ def parseArguments(arguments=[]):
                         choices=["all","hour","day","week","month","year"],
                         metavar="TIME_LIMIT",
                         type=str)
-    
-    parser.add_argument("--NoDownload",
-                        help="Just gets the posts and store them in a file" \
-                             " for downloading later",
-                        action="store_true",
-                        default=False)
-    
 
     if arguments == []:
         return parser.parse_args()
@@ -160,9 +184,10 @@ def checkConflicts():
     else:
         user = 1
 
+    search = 1 if GLOBAL.arguments.search else 0
+
     modes = [
-        "saved","subreddit","submitted","search","log","link","upvoted",
-        "multireddit"
+        "saved","subreddit","submitted","log","link","upvoted","multireddit"
     ]
 
     values = {
@@ -175,15 +200,18 @@ def checkConflicts():
     if not sum(values[x] for x in values) == 1:
         raise ProgramModeError("Invalid program mode")
     
-    if values["search"]+values["saved"] == 2:
+    if search+values["saved"] == 2:
         raise SearchModeError("You cannot search in your saved posts")
 
-    if values["search"]+values["submitted"] == 2:
+    if search+values["submitted"] == 2:
         raise SearchModeError("You cannot search in submitted posts")
 
-    if values["search"]+values["upvoted"] == 2:
+    if search+values["upvoted"] == 2:
         raise SearchModeError("You cannot search in upvoted posts")
 
+    if search+values["log"] == 2:
+        raise SearchModeError("You cannot search in log files")
+
     if values["upvoted"]+values["submitted"] == 1 and user == 0:
         raise RedditorNameError("No redditor name given")
 
@@ -237,12 +265,15 @@ class PromptUser:
 
         if programMode == "subreddit":
 
-            subredditInput = input("subreddit (enter frontpage for frontpage): ")
+            subredditInput = input("(type frontpage for all subscribed subreddits,\n" \
+                                   " use plus to seperate multi subreddits:" \
+                                   " pics+funny+me_irl etc.)\n\n" \
+                                   "subreddit: ")
             GLOBAL.arguments.subreddit = subredditInput
 
-            while not (subredditInput == "" or subredditInput.lower() == "frontpage"):
-                subredditInput = input("subreddit: ")
-                GLOBAL.arguments.subreddit += "+" + subredditInput
+            # while not (subredditInput == "" or subredditInput.lower() == "frontpage"):
+            #     subredditInput = input("subreddit: ")
+            #     GLOBAL.arguments.subreddit += "+" + subredditInput
 
             if " " in GLOBAL.arguments.subreddit:
                 GLOBAL.arguments.subreddit = "+".join(GLOBAL.arguments.subreddit.split())
@@ -269,7 +300,7 @@ class PromptUser:
                 GLOBAL.arguments.time = "all"
 
         elif programMode == "multireddit":
-            GLOBAL.arguments.user = input("\nredditor: ")
+            GLOBAL.arguments.user = input("\nmultireddit owner: ")
             GLOBAL.arguments.multireddit = input("\nmultireddit: ")
             
             print("\nselect sort type:")
@@ -361,10 +392,7 @@ def prepareAttributes():
 
         GLOBAL.arguments.link = GLOBAL.arguments.link.strip("\"")
 
-        try:
-            ATTRIBUTES = LinkDesigner(GLOBAL.arguments.link)
-        except InvalidRedditLink:
-            raise InvalidRedditLink
+        ATTRIBUTES = LinkDesigner(GLOBAL.arguments.link)
 
         if GLOBAL.arguments.search is not None:
             ATTRIBUTES["search"] = GLOBAL.arguments.search
@@ -394,7 +422,7 @@ def prepareAttributes():
         ATTRIBUTES["submitted"] = True
 
         if GLOBAL.arguments.sort == "rising":
-            raise InvalidSortingType
+            raise InvalidSortingType("Invalid sorting type has given")
     
     ATTRIBUTES["limit"] = GLOBAL.arguments.limit
 
@@ -431,6 +459,9 @@ def isPostExists(POST):
 
     possibleExtensions = [".jpg",".png",".mp4",".gif",".webm",".md"]
 
+    """If you change the filenames, don't forget to add them here.
+    Please don't remove existing ones
+    """
     for extension in possibleExtensions:
 
         OLD_FILE_PATH = PATH / (
@@ -457,6 +488,8 @@ def isPostExists(POST):
         return False
 
 def downloadPost(SUBMISSION):
+
+    """Download directory is declared here for each file"""
     directory = GLOBAL.directory / SUBMISSION['postSubreddit']
 
     global lastRequestTime
@@ -465,10 +498,9 @@ def downloadPost(SUBMISSION):
         "imgur":Imgur,"gfycat":Gfycat,"erome":Erome,"direct":Direct,"self":Self
     }
 
+    print()
     if SUBMISSION['postType'] in downloaders:
 
-        print(SUBMISSION['postType'].upper(),end=" ")
-
         if SUBMISSION['postType'] == "imgur":
             
             while int(time.time() - lastRequestTime) <= 2:
@@ -482,13 +514,18 @@ def downloadPost(SUBMISSION):
                             + " Minutes " \
                             + str(int(IMGUR_RESET_TIME%60)) \
                             + " Seconds") 
+            
+            if credit['ClientRemaining'] < 25 or credit['UserRemaining'] < 25:
+                printCredit = {"noPrint":False}
+            else:
+                printCredit = {"noPrint":True}
 
             print(
-                "==> Client: {} - User: {} - Reset {}".format(
+                "==> Client: {} - User: {} - Reset {}\n".format(
                     credit['ClientRemaining'],
                     credit['UserRemaining'],
                     USER_RESET
-                ),end=""
+                ),end="",**printCredit
             )
 
             if not (credit['UserRemaining'] == 0 or \
@@ -509,7 +546,6 @@ def downloadPost(SUBMISSION):
 
                 raise ImgurLimitError('{} LIMIT EXCEEDED\n'.format(KEYWORD.upper()))
 
-        print()
         downloaders[SUBMISSION['postType']] (directory,SUBMISSION)
 
     else:
@@ -531,16 +567,14 @@ def download(submissions):
     FAILED_FILE = createLogFile("FAILED")
 
     for i in range(subsLenght):
-        print("\n({}/{})".format(i+1,subsLenght))
-        print(
-            "https://reddit.com/r/{subreddit}/comments/{id}".format(
-                subreddit=submissions[i]['postSubreddit'],
-                id=submissions[i]['postId']
-            )
-        )
+        print(f"\n({i+1}/{subsLenght}) – r/{submissions[i]['postSubreddit']}",
+              end="")
+        print(f" – {submissions[i]['postType'].upper()}",end="",noPrint=True)
 
         if isPostExists(submissions[i]):
-            print(submissions[i]['postType'].upper())
+            print(f"\n" \
+                  f"{submissions[i]['postSubmitter']}_"
+                  f"{nameCorrector(submissions[i]['postTitle'])}")
             print("It already exists")
             duplicates += 1
             downloadedCount -= 1
@@ -604,23 +638,33 @@ def download(submissions):
             downloadedCount -= 1
 
     if duplicates:
-        print("\n There was {} duplicates".format(duplicates))
+        print(f"\nThere {'were' if duplicates > 1 else 'was'} " \
+              f"{duplicates} duplicate{'s' if duplicates > 1 else ''}")
 
     if downloadedCount == 0:
-        print(" Nothing downloaded :(")
+        print("Nothing downloaded :(")
 
     else:
-        print(" Total of {} links downloaded!".format(downloadedCount))
+        print(f"Total of {downloadedCount} " \
+              f"link{'s' if downloadedCount > 1 else ''} downloaded!")
 
 def main():
+
+    VanillaPrint(
+        f"\nBulk Downloader for Reddit v{__version__}\n" \
+        f"Written by Ali PARLAKCI – parlakciali@gmail.com\n\n" \
+        f"https://github.com/aliparlakci/bulk-downloader-for-reddit/"
+    )
     GLOBAL.arguments = parseArguments()
 
     if GLOBAL.arguments.directory is not None:
-        GLOBAL.directory = Path(GLOBAL.arguments.directory)
+        GLOBAL.directory = Path(GLOBAL.arguments.directory.strip())
     else:
-        GLOBAL.directory = Path(input("download directory: "))
+        GLOBAL.directory = Path(input("\ndownload directory: ").strip())
 
-    print("\n"," ".join(sys.argv),"\n")
+    print("\n"," ".join(sys.argv),"\n",noPrint=True)
+    print(f"Bulk Downloader for Reddit v{__version__}\n",noPrint=True
+    )
 
     try:
         checkConflicts()
@@ -629,35 +673,21 @@ def main():
 
     if not Path(GLOBAL.configDirectory).is_dir():
         os.makedirs(GLOBAL.configDirectory)
-    GLOBAL.config = getConfig(GLOBAL.configDirectory / "config.json")
+    GLOBAL.config = getConfig("config.json") if Path("config.json").exists() \
+                    else getConfig(GLOBAL.configDirectory / "config.json")
 
     if GLOBAL.arguments.log is not None:
         logDir = Path(GLOBAL.arguments.log)
         download(postFromLog(logDir))
         sys.exit()
-    
+
     try:
         POSTS = getPosts(prepareAttributes())
-    except InsufficientPermission:
-        print("You do not have permission to do that")
-        sys.exit()
-    except NoMatchingSubmissionFound:
-        print("No matching submission was found")
-        sys.exit()
-    except NoRedditSupoort:
-        print("Reddit does not support that")
-        sys.exit()
-    except NoPrawSupport:
-        print("PRAW does not support that")
-        sys.exit()
-    except MultiredditNotFound:
-        print("Multireddit not found")
-        sys.exit()
-    except InvalidSortingType:
-        print("Invalid sorting type has given")
-        sys.exit()
-    except InvalidRedditLink:
-        print("Invalid reddit link")
+    except Exception as exc:
+        logging.error(sys.exc_info()[0].__name__,
+                      exc_info=full_exc_info(sys.exc_info()))
+        print(log_stream.getvalue(),noPrint=True)
+        print(exc)
         sys.exit()
 
     if POSTS is None:
@@ -684,7 +714,6 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         if GLOBAL.directory is None:
             GLOBAL.directory = Path(".\\")
-        print("\nQUITTING...")
         
     except Exception as exception:
         if GLOBAL.directory is None:
@@ -693,4 +722,4 @@ if __name__ == "__main__":
                       exc_info=full_exc_info(sys.exc_info()))
         print(log_stream.getvalue())
 
-    input("\nPress enter to quit\n")
+    if not GLOBAL.arguments.quit: input("\nPress enter to quit\n")

src/downloader.py

@@ -1,13 +1,15 @@
 import io
+import json
 import os
 import sys
 import urllib.request
 from html.parser import HTMLParser
+from multiprocessing import Queue
 from pathlib import Path
 from urllib.error import HTTPError
 
 import imgurpython
-from multiprocessing import Queue
+from bs4 import BeautifulSoup
 
 from src.errors import (AlbumNotDownloadedCompletely, FileAlreadyExistsError,
                         FileNameTooLong, ImgurLoginError,
@@ -23,8 +25,7 @@ def dlProgress(count, blockSize, totalSize):
 
     downloadedMbs = int(count*blockSize*(10**(-6)))
     fileSize = int(totalSize*(10**(-6)))
-    sys.stdout.write("\r{}Mb/{}Mb".format(downloadedMbs,fileSize))
-    sys.stdout.write("\b"*len("\r{}Mb/{}Mb".format(downloadedMbs,fileSize)))
+    sys.stdout.write("{}Mb/{}Mb\r".format(downloadedMbs,fileSize))
     sys.stdout.flush()
 
 def getExtension(link):
@@ -54,6 +55,23 @@ def getFile(fileDir,tempDir,imageURL,indent=0):
                 As too long file names seem not working.
     """
 
+    headers = [
+        ("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " \
+            "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 "\
+            "Safari/537.36 OPR/54.0.2952.64"),
+        ("Accept", "text/html,application/xhtml+xml,application/xml;" \
+            "q=0.9,image/webp,image/apng,*/*;q=0.8"),
+        ("Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.3"),
+        ("Accept-Encoding", "none"),
+        ("Accept-Language", "en-US,en;q=0.8"),
+        ("Connection", "keep-alive")
+    ]
+
+    opener = urllib.request.build_opener()
+    if not "imgur" in imageURL:
+        opener.addheaders = headers
+    urllib.request.install_opener(opener)
+
     if not (os.path.isfile(fileDir)):
         for i in range(3):
             try:
@@ -87,6 +105,8 @@ class Erome:
             
             extension = getExtension(IMAGES[0])
 
+            """Filenames are declared here"""
+
             title = nameCorrector(post['postTitle'])
             print(post["postSubmitter"]+"_"+title+"_"+post['postId']+extension)
 
@@ -222,8 +242,11 @@ class Imgur:
                 post['mediaURL'] = content['object'].link
 
             post['postExt'] = getExtension(post['mediaURL'])
-
+            
             title = nameCorrector(post['postTitle'])
+
+            """Filenames are declared here"""
+
             print(post["postSubmitter"]+"_"+title+"_"+post['postId']+post['postExt'])
 
             fileDir = directory / (
@@ -282,6 +305,8 @@ class Imgur:
                             + "_"
                             + images[i]['id'])
 
+                """Filenames are declared here"""
+
                 fileDir = folderDir / (fileName + images[i]['Ext'])
                 tempDir = folderDir / (fileName + ".tmp")
 
@@ -378,12 +403,17 @@ class Gfycat:
         except IndexError:
             raise NotADownloadableLinkError("Could not read the page source")
         except Exception as exception:
+            #debug
+            raise exception
             raise NotADownloadableLinkError("Could not read the page source")
 
         POST['postExt'] = getExtension(POST['mediaURL'])
-
+        
         if not os.path.exists(directory): os.makedirs(directory)
         title = nameCorrector(POST['postTitle'])
+
+        """Filenames are declared here"""
+
         print(POST["postSubmitter"]+"_"+title+"_"+POST['postId']+POST['postExt'])
 
         fileDir = directory / (
@@ -414,30 +444,25 @@ class Gfycat:
 
         url = "https://gfycat.com/" + url.split('/')[-1]
 
-        pageSource = (urllib.request.urlopen(url).read().decode().split('\n'))
+        pageSource = (urllib.request.urlopen(url).read().decode())
 
-        theLine = pageSource[lineNumber]
-        lenght = len(query)
-        link = []
+        soup = BeautifulSoup(pageSource, "html.parser")
+        attributes = {"data-react-helmet":"true","type":"application/ld+json"}
+        content = soup.find("script",attrs=attributes)
 
-        for i in range(len(theLine)):
-            if theLine[i:i+lenght] == query:
-                cursor = (i+lenght)+1
-                while not theLine[cursor] == '"':
-                    link.append(theLine[cursor])
-                    cursor += 1
-                break
-
-        if "".join(link) == "":
+        if content is None:
             raise NotADownloadableLinkError("Could not read the page source")
 
-        return "".join(link)
+        return json.loads(content.text)["video"]["contentUrl"]
 
 class Direct:
     def __init__(self,directory,POST):
         POST['postExt'] = getExtension(POST['postURL'])
         if not os.path.exists(directory): os.makedirs(directory)
         title = nameCorrector(POST['postTitle'])
+
+        """Filenames are declared here"""
+
         print(POST["postSubmitter"]+"_"+title+"_"+POST['postId']+POST['postExt'])
 
         fileDir = directory / (
@@ -460,6 +485,9 @@ class Self:
         if not os.path.exists(directory): os.makedirs(directory)
 
         title = nameCorrector(post['postTitle'])
+
+        """Filenames are declared here"""
+
         print(post["postSubmitter"]+"_"+title+"_"+post['postId']+".md")
 
         fileDir = directory / (
@@ -479,7 +507,8 @@ class Self:
     
     @staticmethod
     def writeToFile(directory,post):
-
+        
+        """Self posts are formatted here"""
         content = ("## ["
                    + post["postTitle"]
                    + "]("

src/errors.py

@@ -67,7 +67,7 @@ class NoMatchingSubmissionFound(Exception):
 class NoPrawSupport(Exception):
     pass
 
-class NoRedditSupoort(Exception):
+class NoRedditSupport(Exception):
     pass
 
 class MultiredditNotFound(Exception):

src/parser.py

@@ -29,7 +29,7 @@ def LinkParser(LINK):
     ShortLink = False
 
     if not "reddit.com" in LINK:
-        raise InvalidRedditLink
+        raise InvalidRedditLink("Invalid reddit link")
 
     SplittedLink = LINK.split("/")
 

src/searcher.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import random
 import socket
 import webbrowser
@@ -8,7 +9,7 @@ from prawcore.exceptions import NotFound, ResponseException, Forbidden
 
 from src.tools import GLOBAL, createLogFile, jsonFile, printToFile
 from src.errors import (NoMatchingSubmissionFound, NoPrawSupport,
-                        NoRedditSupoort, MultiredditNotFound,
+                        NoRedditSupport, MultiredditNotFound,
                         InvalidSortingType, RedditLoginFailed,
                         InsufficientPermission)
 
@@ -47,6 +48,7 @@ def beginPraw(config,user_agent = str(socket.gethostname())):
 
             self.client = self.recieve_connection()
             data = self.client.recv(1024).decode('utf-8')
+            str(data)
             param_tokens = data.split(' ', 2)[1].split('?', 1)[1].split('&')
             params = {
                 key: value for (key, value) in [token.split('=') \
@@ -92,6 +94,7 @@ def beginPraw(config,user_agent = str(socket.gethostname())):
             reddit = authorizedInstance[0]
             refresh_token = authorizedInstance[1]
             jsonFile(GLOBAL.configDirectory / "config.json").add({
+                "reddit_username":str(reddit.user.me()),
                 "reddit_refresh_token":refresh_token
             })
     else:
@@ -101,6 +104,7 @@ def beginPraw(config,user_agent = str(socket.gethostname())):
         reddit = authorizedInstance[0]
         refresh_token = authorizedInstance[1]
         jsonFile(GLOBAL.configDirectory / "config.json").add({
+            "reddit_username":str(reddit.user.me()),
             "reddit_refresh_token":refresh_token
         })
     return reddit
@@ -114,7 +118,7 @@ def getPosts(args):
     reddit = beginPraw(config)
 
     if args["sort"] == "best":
-        raise NoPrawSupport
+        raise NoPrawSupport("PRAW does not support that")
 
     if "subreddit" in args:
         if "search" in args:
@@ -125,8 +129,6 @@ def getPosts(args):
         if args["user"] == "me":
             args["user"] = str(reddit.user.me())
 
-    print("\nGETTING POSTS\n.\n.\n.\n")
-
     if not "search" in args:
         if args["sort"] == "top" or args["sort"] == "controversial":
             keyword_params = {
@@ -145,8 +147,8 @@ def getPosts(args):
             }
 
     if "search" in args:
-        if args["sort"] in ["hot","rising","controversial"]:
-            raise InvalidSortingType
+        if GLOBAL.arguments.sort in ["hot","rising","controversial"]:
+            raise InvalidSortingType("Invalid sorting type has given")
 
         if "subreddit" in args:
             print (
@@ -158,7 +160,7 @@ def getPosts(args):
                     sort=args["sort"],
                     subreddit=args["subreddit"],
                     time=args["time"]
-                ).upper()
+                ).upper(),noPrint=True
             )            
             return redditSearcher(
                 reddit.subreddit(args["subreddit"]).search(
@@ -170,23 +172,23 @@ def getPosts(args):
             )
 
         elif "multireddit" in args:
-            raise NoPrawSupport
+            raise NoPrawSupport("PRAW does not support that")
         
         elif "user" in args:
-            raise NoPrawSupport
+            raise NoPrawSupport("PRAW does not support that")
 
         elif "saved" in args:
-            raise NoRedditSupoort
+            raise ("Reddit does not support that")
     
     if args["sort"] == "relevance":
-        raise InvalidSortingType
+        raise InvalidSortingType("Invalid sorting type has given")
 
     if "saved" in args:
         print(
             "saved posts\nuser:{username}\nlimit={limit}\n".format(
                 username=reddit.user.me(),
                 limit=args["limit"]
-            ).upper()
+            ).upper(),noPrint=True
         )
         return redditSearcher(reddit.user.me().saved(limit=args["limit"]))
 
@@ -201,7 +203,7 @@ def getPosts(args):
                     sort=args["sort"],
                     subreddit=args["subreddit"],
                     time=args["time"]
-                ).upper()
+                ).upper(),noPrint=True
             )
             return redditSearcher(
                 getattr(reddit.front,args["sort"]) (**keyword_params)
@@ -215,7 +217,7 @@ def getPosts(args):
                     sort=args["sort"],
                     subreddit=args["subreddit"],
                     time=args["time"]
-                ).upper()
+                ).upper(),noPrint=True
             )
             return redditSearcher(
                 getattr(
@@ -233,7 +235,7 @@ def getPosts(args):
                 sort=args["sort"],
                 multireddit=args["multireddit"],
                 time=args["time"]
-            ).upper()
+            ).upper(),noPrint=True
         )
         try:
             return redditSearcher(
@@ -244,7 +246,7 @@ def getPosts(args):
                 ) (**keyword_params)
             )
         except NotFound:
-            raise MultiredditNotFound
+            raise MultiredditNotFound("Multireddit not found")
 
     elif "submitted" in args:
         print (
@@ -254,7 +256,7 @@ def getPosts(args):
                 sort=args["sort"],
                 user=args["user"],
                 time=args["time"]
-            ).upper()
+            ).upper(),noPrint=True
         )
         return redditSearcher(
             getattr(
@@ -267,17 +269,17 @@ def getPosts(args):
             "upvoted posts of {user}\nlimit: {limit}\n".format(
                 user=args["user"],
                 limit=args["limit"]
-            ).upper()
+            ).upper(),noPrint=True
         )
         try:
             return redditSearcher(
                 reddit.redditor(args["user"]).upvoted(limit=args["limit"])
             )
         except Forbidden:
-            raise InsufficientPermission
+            raise InsufficientPermission("You do not have permission to do that")
 
     elif "post" in args:
-        print("post: {post}\n".format(post=args["post"]).upper())
+        print("post: {post}\n".format(post=args["post"]).upper(),noPrint=True)
         return redditSearcher(
             reddit.submission(url=args["post"]),SINGLE_POST=True
         )
@@ -306,6 +308,8 @@ def redditSearcher(posts,SINGLE_POST=False):
 
     allPosts = {}
 
+    print("\nGETTING POSTS")
+    if GLOBAL.arguments.verbose: print("\n")
     postsFile = createLogFile("POSTS")
 
     if SINGLE_POST:
@@ -326,53 +330,65 @@ def redditSearcher(posts,SINGLE_POST=False):
         if result is not None:
             details = result
             orderCount += 1
-            printSubmission(submission,subCount,orderCount)
+            if GLOBAL.arguments.verbose:
+                printSubmission(submission,subCount,orderCount)
             subList.append(details)
 
         postsFile.add({subCount:[details]})
 
     else:
-        for submission in posts:
-            subCount += 1
+        try:
+            for submission in posts:
+                subCount += 1
 
-            try:
-                details = {'postId':submission.id,
-                           'postTitle':submission.title,
-                           'postSubmitter':str(submission.author),
-                           'postType':None,
-                           'postURL':submission.url,
-                           'postSubreddit':submission.subreddit.display_name}
-            except AttributeError:
-                continue
+                if subCount % 100 == 0 and not GLOBAL.arguments.verbose:
+                    sys.stdout.write("• ")
+                    sys.stdout.flush()
 
-            result = checkIfMatching(submission)
+                if subCount % 1000 == 0:
+                    sys.stdout.write("\n"+" "*14)
+                    sys.stdout.flush()
 
-            if result is not None:
-                details = result
-                orderCount += 1
-                printSubmission(submission,subCount,orderCount)
-                subList.append(details)
+                try:
+                    details = {'postId':submission.id,
+                            'postTitle':submission.title,
+                            'postSubmitter':str(submission.author),
+                            'postType':None,
+                            'postURL':submission.url,
+                            'postSubreddit':submission.subreddit.display_name}
+                except AttributeError:
+                    continue
 
-            allPosts[subCount] = [details]
+                result = checkIfMatching(submission)
+
+                if result is not None:
+                    details = result
+                    orderCount += 1
+                    if GLOBAL.arguments.verbose:
+                        printSubmission(submission,subCount,orderCount)
+                    subList.append(details)
+
+                allPosts[subCount] = [details]
+        except KeyboardInterrupt:
+            print("\nKeyboardInterrupt",noPrint=True)
         
         postsFile.add(allPosts)
 
-    if not len(subList) == 0:    
-        print(
-            "\nTotal of {} submissions found!\n"\
-            "{} GFYCATs, {} IMGURs, {} EROMEs, {} DIRECTs and {} SELF POSTS\n"
-            .format(
-                len(subList),
-                gfycatCount,
-                imgurCount,
-                eromeCount,
-                directCount,
-                selfCount
+    if not len(subList) == 0:
+        if GLOBAL.arguments.NoDownload or GLOBAL.arguments.verbose:
+            print(
+                f"\n\nTotal of {len(subList)} submissions found!"
             )
-        )
+            print(
+                f"{gfycatCount} GFYCATs, {imgurCount} IMGURs, " \
+                f"{eromeCount} EROMEs, {directCount} DIRECTs " \
+                f"and {selfCount} SELF POSTS",noPrint=True
+            )
+        else:
+            print()
         return subList
     else:
-        raise NoMatchingSubmissionFound
+        raise NoMatchingSubmissionFound("No matching submission was found")
 
 def checkIfMatching(submission):
     global gfycatCount

src/tools.py

@@ -90,7 +90,7 @@ def createLogFile(TITLE):
 
     return FILE
 
-def printToFile(*args, **kwargs):
+def printToFile(*args, noPrint=False,**kwargs):
     """Print to both CONSOLE and 
     CONSOLE LOG file in a folder time stampt in the name
     """
@@ -98,15 +98,21 @@ def printToFile(*args, **kwargs):
     TIME = str(time.strftime("%d-%m-%Y_%H-%M-%S",
                              time.localtime(GLOBAL.RUN_TIME)))
     folderDirectory = GLOBAL.directory / "LOG_FILES" / TIME
-    print(*args,**kwargs)
+
+    if not noPrint or \
+       GLOBAL.arguments.verbose or \
+       "file" in kwargs:
+       
+       print(*args,**kwargs)
 
     if not path.exists(folderDirectory):
         makedirs(folderDirectory)
-        
-    with io.open(
-        folderDirectory / "CONSOLE_LOG.txt","a",encoding="utf-8"
-    ) as FILE:
-        print(*args, file=FILE, **kwargs) 
+    
+    if not "file" in kwargs:
+        with io.open(
+            folderDirectory / "CONSOLE_LOG.txt","a",encoding="utf-8"
+        ) as FILE:
+            print(*args, file=FILE, **kwargs) 
 
 def nameCorrector(string):
     """Swap strange characters from given string