Merge pull request #22 from Glitch-is/master

Fixed Path and download URL

Author: Ronan Nello

README.md

@@ -27,16 +27,16 @@ ___
 > get your auth token here : http://flyingrub.tk/soundcloud/
 
 * This permitt scdl to access to your user profile data.
-* For now scdl use it only to use `scdl.py me [OPTIONS]` instead of `scdl.py -l [url] [OPTIONS]`
+* For now scdl use it only to use `scdl me [OPTIONS]` instead of `scdl -l [url] [OPTIONS]`
 * (soon) scdl will download an user's stream thanks to this
 
 ## Help
 ### Usage:
 ```
-  scdl.py -l <track_url> [-a | -f | -t | -p][-c][-o <offset>][--hidewarnings][--addtofile]
-  scdl.py me (-s | -a | -f | -t | -p)[-c][-o <offset>][--hidewarnings][--addtofile]
-  scdl.py -h | --help
-  scdl.py --version
+  scdl -l <track_url> [-a | -f | -t | -p][-c][-o <offset>][--hidewarnings][--addtofile]
+  scdl me (-s | -a | -f | -t | -p)[-c][-o <offset>][--hidewarnings][--addtofile]
+  scdl -h | --help
+  scdl --version
 ```
 
 ### Options:
@@ -54,6 +54,7 @@ ___
   -o [offset]        Begin with a custom offset.
   --hidewarnings     Hide Warnings. (use with precaution)
   --addtofile        Add the artist name to the filename if it isn't in the filename already
+  --path             Path to download directory, can be set in the config. If none of this is set, it uses the current working directory
 ```
 
 

scdl/scdl.py

@@ -41,6 +41,7 @@
 import mutagen
 
 token = ''
+path = ''
 offset = 0
 filename = ''
 scdl_client_id = '9dbef61eb005cb526480279a0cc868c4'
@@ -71,18 +72,22 @@ def main():
 
     if arguments["--hidewarnings"]:
         warnings.filterwarnings("ignore")
-        print("no warnings!")
+        # print("no warnings!") # Warn about no warnings...?
 
     if arguments["--path"] is not None:
         if os.path.exists(arguments["--path"]):
+            print('Downloading to '+arguments["--path"]+'...')
             os.chdir(arguments["--path"])
     else:
-        print('Invalid path...')
-        sys.exit()
+        if path is not None:
+            print('Downloading to '+path+'...')
+            os.chdir(path)
+        else:
+            print('Downloading to current directory...')
 
     print('')
     if arguments["-l"]:
-        parse_url(arguments["<track_url>"])
+        parse_url(arguments["-l"])
     elif arguments["me"]:
         if arguments["-a"]:
             download_all_user_tracks(who_am_i())
@@ -99,6 +104,7 @@ def get_config():
     read the path where to store music
     """
     global token
+    global path
     config = configparser.ConfigParser()
     config.read(os.path.join(os.path.expanduser('~'), '.config/scdl/scdl.cfg'))
     try: