Jelajahi Sumber

Create config file only if it does not exist

Patrick Wang 5 tahun lalu
induk
melakukan
059b990ff2
1 mengubah file dengan 10 tambahan dan 10 penghapusan
  1. 10 10
      pyinstalive/startup.py

+ 10 - 10
pyinstalive/startup.py

@@ -32,11 +32,16 @@ def validate_inputs(config, args, unknown_args):
     error_arr = []
     error_arr = []
     try:
     try:
         if args.configpath:
         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 os.path.isfile(args.configpath):
+                pil.config_path = args.configpath
+            else:
+                if os.path.isfile(pil.config_path):
+                    logger.warn("Custom config path is invalid, falling back to default path: {:s}".format(pil.config_path))
+                    logger.separator()
+                else:  # Create new config if it doesn't exist
+                    logger.banner()
+                    helpers.new_config()
+                    return False
         pil.config_path = os.path.realpath(pil.config_path)
         pil.config_path = os.path.realpath(pil.config_path)
         config.read(pil.config_path)
         config.read(pil.config_path)
 
 
@@ -311,11 +316,6 @@ def run():
 
 
     args, unknown_args = parser.parse_known_args()  # Parse arguments
     args, unknown_args = parser.parse_known_args()  # Parse arguments
 
 
-    if not os.path.exists(pil.config_path):  # Create new config if it doesn't exist
-        logger.banner()
-        helpers.new_config()
-        return
-
     if validate_inputs(config, args, unknown_args):
     if validate_inputs(config, args, unknown_args):
         if not args.username and not args.password:
         if not args.username and not args.password:
             pil.ig_api = auth.authenticate(username=pil.ig_user, password=pil.ig_pass)
             pil.ig_api = auth.authenticate(username=pil.ig_user, password=pil.ig_pass)