Add WIP macOS support to the converter (#10)

* [Converter] minor formatting and added requirements.txt for easier setup

* [Converter] Fix path operations being hardcoded for windows

* [Converter] Add icon files for macOS .app

* [Converter] avoid an empty Tk window

* [Converter] fix multiprocessing for frozen builds — This should already have been there on windows (https://pyinstaller.org/en/stable/common-issues-and-pitfalls.html#multi-processing)
Use proper resourcesPath for macOS frozen builds

* [Converter] Updated pyinstaller build command for macOS

* [Converter] Update PyInstaller command for packaging macOS app

* [Converter] macOS fixed non frozen version not finding its config

* Revert "[Converter] minor formatting

This reverts commit 231bdc0.

Author: MrGcGamer

Converter/Sequence_Converter.py

@@ -130,8 +130,8 @@ def convert_model(self, file):
         splitted_file.pop() # We remove the last element, which is the file ending
         file_name = ''.join(splitted_file)
 
-        inputfile = self.convertSettings.inputPath + "\\"+ file
-        outputfile =  self.convertSettings.outputPath + "\\" + file_name + ".ply"
+        inputfile = os.path.join(self.convertSettings.inputPath, file)
+        outputfile = os.path.join(self.convertSettings.outputPath, file_name + ".ply")
 
         ms = ml.MeshSet()
 
@@ -420,13 +420,13 @@ def convert_image(self, file):
         file_name = splitted_file[0]
         for x in range(1, len(splitted_file) - 1):
             file_name += "." + splitted_file[x]
-        inputfile = self.convertSettings.inputPath + "\\"+ file
+        inputfile = os.path.join(self.convertSettings.inputPath, file)
 
         sizeDDS = 0
         sizeASTC = 0
 
         if(self.convertSettings.convertToDDS):
-            outputfileDDS =  self.convertSettings.outputPath + "\\" + file_name + ".dds"
+            outputfileDDS = os.path.join(self.convertSettings.outputPath, file_name + ".dds")
             cmd = self.convertSettings.resourcePath + "texconv " + "\"" + inputfile + "\"" + " -o " + "\"" + self.convertSettings.outputPath + "\"" +" -m 1 -f DXT1 -y -nologo"
             if(self.convertSettings.convertToSRGB):
                 cmd += " -srgbo" 
@@ -435,7 +435,7 @@ def convert_image(self, file):
                 return
 
         if(self.convertSettings.convertToASTC):
-            outputfileASCT =  self.convertSettings.outputPath + "\\" + file_name + ".astc"
+            outputfileASCT = os.path.join(self.convertSettings.outputPath, file_name + ".astc")
             cmd = self.convertSettings.resourcePath + "astcenc -cl " + "\"" + inputfile + "\"" + " " + "\"" + outputfileASCT + "\"" + " 6x6 -medium -silent"
             if(subprocess.run(cmd, stdout=open(os.devnull, 'wb')).returncode != 0):
                 self.processFinishedCB(True, "Error converting ASTC texture: " + inputfile)

Converter/Sequence_Converter_UI.py

@@ -1,6 +1,9 @@
 import os
 import sys
 import re
+import multiprocessing
+if getattr(sys, 'frozen', False):
+    multiprocessing.freeze_support()  # for PyInstaller support
 import configparser
 from threading import Event
 from threading import Lock
@@ -28,7 +31,9 @@ class ConverterUI:
     ### +++++++++++++++++++++++++  PACKAGE INTO SINGLE EXECUTABLE ++++++++++++++++++++++++++++++++++
     #Use this prompt in the terminal to package this script into a single executable for your system
     #You need to have PyInstaller installed in your local environment
-    # pyinstaller Sequence_Converter_UI.py --collect-all=pymeshlab --collect-all=numpy --icon=resources/logo.ico -F 
+    # pyinstaller Sequence_Converter_UI.py --collect-all=pymeshlab --collect-all=numpy --icon=resources/logo.ico -F
+    ### +++++++++++++++++++++++++  PACKAGE INTO SINGLE MACOS APP  ++++++++++++++++++++++++++++++++++
+    # pyinstaller Sequence_Converter_UI.py --icon=resources/logo.icns --windowed --strip
 
     isRunning = False
     conversionFinished = False
@@ -185,10 +190,14 @@ def InitDefaultPaths(self):
         elif __file__:
             self.applicationPath = os.path.abspath(os.path.dirname(__file__))
 
-        self.applicationPath += "\\"
+        self.applicationPath += os.sep
 
-        self.resourcesPath = self.applicationPath + "resources\\"
-        self.configPath = self.resourcesPath + "config.ini"
+        if (sys.platform == "darwin") and (getattr(sys, 'frozen', False)):
+            self.resourcesPath = os.path.abspath(self.applicationPath + "../Resources/")
+        else:
+            self.resourcesPath = os.path.join(self.applicationPath, "resources") + os.sep
+
+        self.configPath = os.path.join(self.resourcesPath, "config.ini")
         self.config = configparser.ConfigParser()
 
     def open_file_dialog(self, path):
@@ -261,7 +270,7 @@ def validate_input_files(self, input_path):
     def set_proposed_output_files(self, input_path):
 
         if(len(self.outputSequencePath) < 1 or self.outputSequencePath == self.noPathWarning):
-            self.proposedOutputPath = input_path + "\\converted"
+            self.proposedOutputPath = os.path.join(input_path, "converted")
             self.output_path_label_set("Proposed path: " + self.proposedOutputPath)
 
     def set_output_files(self, new_output_path):
@@ -513,5 +522,6 @@ def RunUI(self):
         dpg.destroy_context()
 
 if (__name__ == '__main__'):
+    Tk().withdraw() # make sure Tkinter is loaded before starting DearPyGUI -- e.g. https://github.com/python/cpython/issues/90731
     UI = ConverterUI()
     UI.RunUI()

Converter/requirements.txt

@@ -0,0 +1,4 @@
+numpy
+pymeshlab
+dearpygui
+pillow

Converter/resources/logo.icns

@@ -0,0 +1,39 @@
+{
+  "fill" : {
+    "automatic-gradient" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
+  },
+  "groups" : [
+    {
+      "blur-material" : null,
+      "layers" : [
+        {
+          "glass" : true,
+          "hidden" : false,
+          "image-name" : "logo.svg",
+          "name" : "logo",
+          "opacity" : 1,
+          "position" : {
+            "scale" : 0.54,
+            "translation-in-points" : [
+              0,
+              0
+            ]
+          }
+        }
+      ],
+      "lighting" : "individual",
+      "shadow" : {
+        "kind" : "neutral",
+        "opacity" : 0.5
+      },
+      "specular" : true,
+      "translucency" : {
+        "enabled" : true,
+        "value" : 0.5
+      }
+    }
+  ],
+  "supported-platforms" : {
+    "squares" : "shared"
+  }
+}