Even more adjustments for paths

pyinstalive/downloader.py

@@ -40,7 +40,7 @@ def start_single(instagram_api_arg, download_arg, settings_arg):
 		log_warn("Lock file could not be created. Downloads started from -df might cause problems!")
 	get_user_info(user_to_download)
 
-def start_multiple(instagram_api_arg, settings_arg, proc_arg):
+def start_multiple(instagram_api_arg, settings_arg, proc_arg, initialargs_arg):
 	try:
 		log_info_green("Checking following users for any livestreams or replays...")
 		broadcast_f_list = instagram_api_arg.reels_tray()
@@ -69,10 +69,14 @@ def start_multiple(instagram_api_arg, settings_arg, proc_arg):
 						log_warn("If this is not the case, manually delete the file '{:s}' and try again.".format(user + '.lock'))
 					else:
 						log_info_green("Launching daemon process for '{:s}'...".format(user))
-						if settings_arg.custom_config_path == 'pyinstalive.ini':
+						if not initialargs_arg.savepath and not initialargs_arg.configpath:
 							start_result = run_command("{:s} -d {:s}".format(proc_arg, user))
-						else:
+						elif initialargs_arg.savepath and initialargs_arg.configpath:
 							start_result = run_command("{:s} -d {:s} -cp '{:s}' -sp '{:s}'".format(proc_arg, user, settings_arg.custom_config_path, settings_arg.save_path))
+						elif initialargs_arg.savepath:
+							start_result = run_command("{:s} -d {:s} -sp '{:s}'".format(proc_arg, user, settings_arg.save_path))
+						elif initialargs_arg.configpath:
+							start_result = run_command("{:s} -d {:s} -cp '{:s}'".format(proc_arg, user, settings_arg.custom_config_path))
 						if start_result:
 							log_info_green("Could not start processs: {:s}".format(str(start_result)))
 						else:

pyinstalive/initialize.py

@@ -169,7 +169,7 @@ def check_config_validity(config, args=None):
 				log_warn("Invalid or missing setting detected for 'save_path', falling back to path: {:s}".format(os.getcwd()))
 				settings.save_path = os.getcwd()
 				has_thrown_errors = True
-		except:
+		except Exception as e:
 			log_warn("Invalid or missing setting detected for 'save_path', falling back to path: {:s}".format(os.getcwd()))
 			settings.save_path = os.getcwd()
 			has_thrown_errors = True
@@ -538,15 +538,15 @@ def run():
 				start_single(api, args.download, settings)
 			if not args.download and args.downloadfollowing:
 				if check_pyinstalive():
-					start_multiple(api, settings, "pyinstalive")
+					start_multiple(api, settings, "pyinstalive", args)
 				else:
 					log_warn("You probably ran PyInstaLive as a script module with the -m argument.")
 					log_warn("PyInstaLive should be properly installed when using the -df argument.")
 					log_seperator()
 					if python_version[0] == "3":
-						start_multiple(api, settings, "python3 -m pyinstalive")
+						start_multiple(api, settings, "python3 -m pyinstalive", args)
 					else:
-						start_multiple(api, settings, "python -m pyinstalive")
+						start_multiple(api, settings, "python -m pyinstalive", args)
 		except KeyboardInterrupt as ee:
 			log_warn("Pre-download checks have been aborted, exiting...")
 			log_seperator()