Merge remote-tracking branch 'origin/master'

pyinstalive/auth.py

@@ -41,7 +41,7 @@ def onlogin_callback(api, cookie_file):
     cache_settings = api.settings
     with open(cookie_file, 'w') as outfile:
         json.dump(cache_settings, outfile, default=to_json)
-        logger.info('New cookie file was made: {0!s}'.format(cookie_file))
+        logger.info('New cookie file was made: {0!s}'.format(os.path.basename(cookie_file)))
         logger.separator()
 
 
@@ -54,10 +54,10 @@ def authenticate(username, password, force_use_login_args=False):
             pil.config_login_overridden = True
             logger.binfo("Overriding configuration file login with -u and -p arguments.")
             logger.separator()
-        cookie_file = "{}.json".format(username)
+        cookie_file = os.path.join(os.path.dirname(pil.config_path), "{}.json".format(username))
         if not os.path.isfile(cookie_file):
             # settings file does not exist
-            logger.warn('Unable to find cookie file: {0!s}'.format(cookie_file))
+            logger.warn('Unable to find cookie file: {0!s}'.format(os.path.basename(cookie_file)))
             logger.info('Creating a new one.')
 
             # login new

pyinstalive/dlfuncs.py

@@ -427,7 +427,7 @@ def iterate_users(user_list):
                     '--no-lives' if not pil.dl_lives else '',
                     '--no-replays' if not pil.dl_replays else '',
                     '--no-heartbeat' if not pil.do_heartbeat else '',
-                    '--username {:s} --password {:s}'.format(pil.ig_user, pil.ig_pass) if pil.config_login_overridden else None))
+                    '--username {:s} --password {:s}'.format(pil.ig_user, pil.ig_pass) if pil.config_login_overridden else ''))
                 if start_result:
                     logger.warn("Could not start process: {:s}".format(str(start_result)))
                 else:

pyinstalive/startup.py

@@ -31,6 +31,13 @@ except ImportError:
 def validate_inputs(config, args, unknown_args):
     error_arr = []
     try:
+        if args.configpath:
+            pil.config_path = args.configpath
+            if not os.path.isfile(pil.config_path):
+                pil.config_path = os.path.join(os.getcwd(), "pyinstalive.ini")
+                logger.warn("Custom config path is invalid, falling back to default path: {:s}".format(pil.config_path))
+                logger.separator()
+                
         config.read(pil.config_path)
 
         if args.download:
@@ -77,6 +84,7 @@ def validate_inputs(config, args, unknown_args):
             logger.warn('    ' + ' '.join(unknown_args))
             logger.separator()
 
+
         pil.ig_user = config.get('pyinstalive', 'username')
         pil.ig_pass = config.get('pyinstalive', 'password')
         pil.dl_path = config.get('pyinstalive', 'download_path')
@@ -89,13 +97,6 @@ def validate_inputs(config, args, unknown_args):
         pil.config = config
         pil.proxy = config.get('pyinstalive', 'proxy')
 
-        if args.configpath:
-            pil.config_path = args.configpath
-            if not os.path.isfile(pil.config_path):
-                pil.config_path = os.path.join(os.getcwd(), "pyinstalive.ini")
-                logger.warn("Custom config path is invalid, falling back to default path: {:s}".format(pil.config_path))
-                logger.separator()
-
         if args.dlpath:
             pil.dl_path = args.dlpath