Merge in @doomrobo feature addition, fix small bug

hausdorff · Dec 27, 2013 · e4bcd2d · e4bcd2d
1 parent 4020d64
commit e4bcd2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/sfs b/sfs
@@ -73,7 +73,6 @@ def initialize_user():
         w.write("USERNAME=%s\n" % username.lower())
         w.write("PASSWORD=%s\n" % password)
 
-
 def init_settings_from_config_file():
     """
     Create settings dictionary mapping attribute -> value. Contains, e.g.,
@@ -112,7 +111,6 @@ def init_settings_from_config_file():
 
     return SETTINGS
 
-
 def create_dir_if_not_exists(directory):
     """
     Simple utility function creates a directory if it doesn't exist.
@@ -149,6 +147,7 @@ def main():
         arguments = docopt(__doc__, version=constants.VERSION)
         cli(arguments)
     except Exception as e:
+        print util.red("Error:"),
         print e
         exit()
 

diff --git a/snapchat_fs/snapchatfs.py b/snapchat_fs/snapchatfs.py
@@ -166,4 +166,4 @@ def upload_sfs_file(session, filename):
     print util.green('Uploading file ') + (basename)
     sfs_id = session.generate_sfs_id(basename, data)
     session.upload_image(data, sfs_id)
-    session.send_image_to(username, sfs_id)
+    session.send_image_to(session.username, sfs_id)