Merge pull request #1492 from sherlock-project/help-msg

version bump and made help suite the new default timeout

README.md

@@ -55,7 +55,7 @@ usage: sherlock [-h] [--version] [--verbose] [--folderoutput FOLDEROUTPUT]
                 [--browse] [--local]
                 USERNAMES [USERNAMES ...]
 
-Sherlock: Find Usernames Across Social Networks (Version 0.14.0)
+Sherlock: Find Usernames Across Social Networks (Version 0.14.2)
 
 positional arguments:
   USERNAMES             One or more usernames to check with social networks.
@@ -66,30 +66,26 @@ optional arguments:
   --verbose, -v, -d, --debug
                         Display extra debugging information and metrics.
   --folderoutput FOLDEROUTPUT, -fo FOLDEROUTPUT
-                        If using multiple usernames, the output of the results
-                        will be saved to this folder.
+                        If using multiple usernames, the output of the results will be
+                        saved to this folder.
   --output OUTPUT, -o OUTPUT
-                        If using single username, the output of the result
-                        will be saved to this file.
-  --tor, -t             Make requests over Tor; increases runtime; requires
-                        Tor to be installed and in system path.
-  --unique-tor, -u      Make requests over Tor with new Tor circuit after each
-                        request; increases runtime; requires Tor to be
+                        If using single username, the output of the result will be saved
+                        to this file.
+  --tor, -t             Make requests over Tor; increases runtime; requires Tor to be
                         installed and in system path.
+  --unique-tor, -u      Make requests over Tor with new Tor circuit after each request;
+                        increases runtime; requires Tor to be installed and in system
+                        path.
   --csv                 Create Comma-Separated Values (CSV) File.
-  --site SITE_NAME      Limit analysis to just the listed sites. Add multiple
-                        options to specify more than one site.
+  --xlsx                Create the standard file for the modern Microsoft Excel
+                        spreadsheet (xslx).
+  --site SITE_NAME      Limit analysis to just the listed sites. Add multiple options to
+                        specify more than one site.
   --proxy PROXY_URL, -p PROXY_URL
-                        Make requests over a proxy. e.g.
-                        socks5://127.0.0.1:1080
+                        Make requests over a proxy. e.g. socks5://127.0.0.1:1080
   --json JSON_FILE, -j JSON_FILE
-                        Load data from a JSON file or an online, valid, JSON
-                        file.
-  --timeout TIMEOUT     Time (in seconds) to wait for response to requests.
-                        Default timeout is infinity. A longer timeout will be
-                        more likely to get results from slow sites. On the
-                        other hand, this may cause a long delay to gather all
-                        results.
+                        Load data from a JSON file or an online, valid, JSON file.
+  --timeout TIMEOUT     Time (in seconds) to wait for response to requests (Default: 60)
   --print-all           Output sites where the username was not found.
   --print-found         Output sites where the username was found.
   --no-color            Don't color terminal output

sherlock/sherlock.py

@@ -28,7 +28,7 @@ from sites import SitesInformation
 from colorama import init
 
 module_name = "Sherlock: Find Usernames Across Social Networks"
-__version__ = "0.14.1"
+__version__ = "0.14.2"
 
 
 class SherlockFuturesSession(FuturesSession):
@@ -533,11 +533,8 @@ def main():
                         help="Load data from a JSON file or an online, valid, JSON file.")
     parser.add_argument("--timeout",
                         action="store", metavar="TIMEOUT",
-                        dest="timeout", type=timeout_check, default=None,
-                        help="Time (in seconds) to wait for response to requests. "
-                             "Default timeout is infinity. "
-                             "A longer timeout will be more likely to get results from slow sites. "
-                             "On the other hand, this may cause a long delay to gather all results."
+                        dest="timeout", type=timeout_check, default=60,
+                        help="Time (in seconds) to wait for response to requests (Default: 60)"
                         )
     parser.add_argument("--print-all",
                         action="store_true", dest="print_all",