From ce3091c2ada20745efae195831005c4854a8646c Mon Sep 17 00:00:00 2001
From: flyingrub <flyinggrub@gmail.com>
Date: Mon, 19 Jan 2015 20:23:46 +0100
Subject: [PATCH] Fix: Small fixes

---
 README.md    |  4 ++--
 scdl/scdl.py | 23 +++++++++++++++--------
 setup.py     |  3 ++-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 31d233d..3350ad9 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ ___
 ## Help
 ### Usage:
 ```
-  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 -l <track_url> [-a | -f | -t | -p][-c][-o <offset>][--hidewarnings][--debug | --error][--path <path>][--addtofile][--onlymp3]
+  scdl me (-s | -a | -f | -t | -p)[-c][-o <offset>][--hidewarnings][--debug | --error][--path <path>][--addtofile][--onlymp3]
   scdl -h | --help
   scdl --version
 ```
diff --git a/scdl/scdl.py b/scdl/scdl.py
index a5bfae5..f147b89 100755
--- a/scdl/scdl.py
+++ b/scdl/scdl.py
@@ -4,10 +4,8 @@
 Usage:
     scdl -l <track_url> [-a | -f | -t | -p][-c][-o <offset>]\
 [--hidewarnings][--debug | --error][--path <path>][--addtofile][--onlymp3]
-
     scdl me (-s | -a | -f | -t | -p)[-c][-o <offset>]\
 [--hidewarnings][--debug | --error][--path <path>][--addtofile][--onlymp3]
-
     scdl -h | --help
     scdl --version
 
@@ -27,10 +25,14 @@ Options:
     --path [path]      Use a custom path for this time
     --hidewarnings     Hide Warnings. (use with precaution)
     --addtofile        Add the artist name to the filename if it isn't in the filename already
+    --onlymp3          Download only the mp3 file even if the track is Downloadable
+    --error            Only print debug information (Error/Warning)
+    --debug            Print every information and
 """
-import __init__
 from docopt import docopt
+from termcolor import colored
 import configparser
+from scdl import __version__
 
 import warnings
 import os
@@ -58,8 +60,13 @@ client = soundcloud.Client(client_id=scdl_client_id)
 
 def log(str, strverbosity=1):  # strverbosity (0 = Error ; 1 = Info ; 2 = Debug)
     global log_verbosity
-    if log_verbosity >= strverbosity:  # Error
-        print(str)
+    if log_verbosity >= strverbosity:
+        if strverbosity == 0:
+            print(colored(str, 'red'))
+        elif strverbosity == 1:
+            print(colored(str, 'white'))
+        elif strverbosity == 2:
+            print(colored(str, 'yellow'))
 
 
 def main():
@@ -75,7 +82,7 @@ def main():
     get_config()
 
     # Parse argument
-    arguments = docopt(__doc__, version=__init__.__version__)
+    arguments = docopt(__doc__, version=__version__)
 
     if arguments["--debug"]:
         log_verbosity = 2
@@ -201,7 +208,7 @@ def who_am_i():
     except:
         log('Invalid token...', strverbosity=0)
         sys.exit(0)
-    log('Hello', current_user.username, '!', strverbosity=1)
+    log('Hello' + current_user.username + '!', strverbosity=1)
     log('', strverbosity=1)
     return current_user
 
@@ -339,7 +346,7 @@ def download_track(track):
         log('', strverbosity=1)
         return
     title = track.title
-    title = title.encode('utf-8', 'ignore')
+    title = title.encode('utf-8', 'ignore').decode('utf-8')
     log("Downloading " + title, strverbosity=1)
 
     #filename
diff --git a/setup.py b/setup.py
index 4aa7b48..3674d05 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,8 @@ setup(
         'docopt',
         'soundcloud',
         'wget',
-        'mutagen'
+        'mutagen',
+        'termcolor'
     ],
     data_files=[
         (os.path.join(os.path.expanduser('~'), '.config/scdl'), ['config/scdl.cfg'])