Browse Source

Allow windows builds to use -df argument

notcammy 5 years ago
parent
commit
fe5cc5f46b
4 changed files with 12 additions and 3 deletions
  1. 2 1
      pyinstalive/dlfuncs.py
  2. 1 1
      pyinstalive/downloader.py
  3. 6 0
      pyinstalive/helpers.py
  4. 3 1
      pyinstalive/pil.py

+ 2 - 1
pyinstalive/dlfuncs.py

@@ -422,7 +422,8 @@ def iterate_users(user_list):
                     "If this is not the case, manually delete the file '{:s}' and try again.".format(user + '.lock'))
                     "If this is not the case, manually delete the file '{:s}' and try again.".format(user + '.lock'))
             else:
             else:
                 logger.info("Launching daemon process for '{:s}'.".format(user))
                 logger.info("Launching daemon process for '{:s}'.".format(user))
-                start_result = helpers.run_command("pyinstalive -d {:s} -cp '{:s}' -dp '{:s}' {:s} {:s} {:s} {:s}".format(
+                start_result = helpers.run_command("{:s} -d {:s} -cp '{:s}' -dp '{:s}' {:s} {:s} {:s} {:s}".format(
+                    pil.winbuild_path if pil.winbuild_path else "pyinstalive",
                     user,
                     user,
                     pil.config_path,
                     pil.config_path,
                     pil.dl_path,
                     pil.dl_path,

+ 1 - 1
pyinstalive/downloader.py

@@ -18,7 +18,7 @@ def start():
         if not pil.dl_replays:
         if not pil.dl_replays:
             logger.binfo("Replay downloading is disabled either with an argument or in the config file.")
             logger.binfo("Replay downloading is disabled either with an argument or in the config file.")
             logger.separator()
             logger.separator()
-        if not helpers.command_exists("pyinstalive"):
+        if not helpers.command_exists("pyinstalive") and not pil.winbuild_path:
             logger.error("PyInstaLive must be properly installed when using the -df argument.")
             logger.error("PyInstaLive must be properly installed when using the -df argument.")
             logger.separator()
             logger.separator()
         else:
         else:

+ 6 - 0
pyinstalive/helpers.py

@@ -303,3 +303,9 @@ def remove_temp_folder():
 
 
 def download_folder_has_lockfile():
 def download_folder_has_lockfile():
     return os.path.isfile(os.path.join(pil.dl_path, pil.dl_user + '.lock'))
     return os.path.isfile(os.path.join(pil.dl_path, pil.dl_user + '.lock'))
+
+def winbuild_path():
+    if getattr(sys, 'frozen', False):
+        return sys.executable
+    elif __file__:
+        return None

+ 3 - 1
pyinstalive/pil.py

@@ -48,6 +48,7 @@ def initialize():
     global skip_merge
     global skip_merge
     global config_login_overridden
     global config_login_overridden
     global kill_segment_thread
     global kill_segment_thread
+    global winbuild_path
     ig_api = None
     ig_api = None
     ig_user = ""
     ig_user = ""
     ig_pass = ""
     ig_pass = ""
@@ -83,4 +84,5 @@ def initialize():
     verbose = False
     verbose = False
     skip_merge = False
     skip_merge = False
     config_login_overridden = False
     config_login_overridden = False
-    kill_segment_thread = False
+    kill_segment_thread = False
+    winbuild_path = helpers.winbuild_path()