fix self-exec

Author: luelista

flake.nix

@@ -109,16 +109,25 @@
           ];
 
           nativeInputs = [ pkgs.qt5.wrapQtAppsHook ];
+          dontWrapGApps = true;
           dontWrapQtApps = true;
 
           src = ./.;
 
           # Arguments to be passed to `makeWrapper`, only used by buildPython*
           preFixup = ''
-          for app in "$out/bin/"*; do
-            wrapQtApp "$app"
-          done
+          makeWrapperArgs+=("''${qtWrapperArgs[@]}")
           '';
+
+          desktopItems = [
+            (pkgs.makeDesktopItem {
+              name = "pre_workbench";
+              desktopName = "PRE Workbench";
+              icon = ./pre_workbench/icons/appicon.png;
+              exec = "prewb";
+            })
+          ];
+
           meta = {
             mainProgram = "prewb";
             homepage = "https://luelista.net/pre_workbench/";

pre_workbench/mainwindow.py

@@ -40,7 +40,7 @@
 from pre_workbench import windows
 from pre_workbench.configs import getIcon, SettingsSection, SettingsField, icon_searchpaths
 from pre_workbench.datawidgets import DynamicDataWidget
-from pre_workbench.util import get_app_version, SimpleThread
+from pre_workbench.util import get_app_version, SimpleThread, get_exe_for_reloading
 from pre_workbench.windows.content.objectwindow import ObjectWindow
 from pre_workbench.windows.dialogs.manageannotationsets import ManageAnnotationSetsDialog
 # noinspection PyUnresolvedReferences
@@ -581,14 +581,7 @@ def onProjectOpenAction(self):
 
 	def openProjectInNewWindow(self, projectPath = "--choose-project"):
 		import subprocess
-		self_script = sys.argv[0]
-		# weird Windows magic
-		if self_script == sys.executable:  # PyInstaller on Windows
-			cmd_line = [self_script, projectPath]
-		elif not os.path.exists(self_script) and os.path.exists(self_script + '.exe'):  # PIP entry_points on Windows
-			cmd_line = [sys.executable, self_script + '.exe', projectPath]
-		else:  # everything else
-			cmd_line = [sys.executable, self_script, projectPath]
+		cmd_line = get_exe_for_reloading() + [projectPath]
 		logging.info('Starting new instance with cmd line: %r', cmd_line)
 		subprocess.Popen(cmd_line, stdin=subprocess.DEVNULL, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 

pre_workbench/util.py

@@ -16,6 +16,7 @@
 
 import logging
 import time
+import sys, os.path
 
 from PyQt5.QtCore import QThread, pyqtSignal
 
@@ -55,3 +56,32 @@ def run(self) -> None:
             self.resultReturned.emit(self.thread_fn())
         except:
             logging.exception("Exception in SimpleThread")
+
+
+# from here: https://github.com/samdroid-apps/werkzeug/blob/268cad0016bcbccff8a8bb9190d39fdd12dc13d2/werkzeug/_reloader.py#L59
+def get_exe_for_reloading():
+    """Returns the executable. This contains a workaround for windows
+    if the executable is incorrectly reported to not have the .exe
+    extension which can cause bugs on reloading.  This also contains
+    a workaround for linux where the file is executable (possibly with
+    a program other than python)
+    """
+    rv = [sys.executable]
+    py_script = os.path.abspath(sys.argv[0])
+
+    if os.name == 'nt' and not os.path.exists(py_script) and \
+       os.path.exists(py_script + '.exe'):
+        py_script += '.exe'
+
+    windows_workaround = (
+        os.path.splitext(rv[0])[1] == '.exe'
+        and os.path.splitext(py_script)[1] == '.exe'
+    )
+    nix_workaround = os.path.isfile(py_script) and os.access(py_script, os.X_OK)
+
+    if windows_workaround or nix_workaround:
+        rv.pop(0)
+
+    rv.append(py_script)
+    return rv
+