volumecontroller update and watcher update operation update

.gitignore

@@ -7,4 +7,7 @@ config.ini
 file_version_info.txt
 lamo-watcher.exe
 lamo-launcher.exe
-logs/
+logs/
+index.build/
+index.dist/
+index.onefile-build

README.md

@@ -18,6 +18,10 @@ Audio files from [MixKit](https://mixkit.co/)
 
 
 ### Changelog
+### 1.2.6.2
+- Update VolumeController threadsafe
+- Fix watcher update operation
+
 ### 1.2.4.1
 - Update and relaunch procedure rework
 

compile.py

@@ -1,16 +1,10 @@
-import PyInstaller.__main__
-
+import os
 from modules.config import Config
 
-import pyinstaller_versionfile
 
-pyinstaller_versionfile.create_versionfile_from_input_file(
-    output_file="file_version_info.txt",
-    input_file="metadata.yml",
-    version=Config().version
-)
+Config().version
 
-PyInstaller.__main__.run([
-    'compile.spec',
-    '--clean'
-])
+if Config().debug:
+  os.system(f'python -m nuitka --standalone --windows-icon-from-ico=assets/icons/favicon.ico --enable-plugin=pyside6 --include-data-dir=assets=assets --follow-imports --onefile --windows-file-version={Config().version} --windows-product-version={Config().version} --windows-company-name="Lost Ark Market Online" --windows-product-name="Lost Ark Market Online Launcher App" --windows-file-description="Lost Ark Market Online Launcher App" -o lamo-launcher-debug.exe index.py')
+else:
+  os.system(f'python -m nuitka --standalone --windows-icon-from-ico=assets/icons/favicon.ico --enable-plugin=pyside6 --include-data-dir=assets=assets --follow-imports --onefile --windows-disable-console --windows-file-version={Config().version} --windows-product-version={Config().version} --windows-company-name="Lost Ark Market Online" --windows-product-name="Lost Ark Market Online Launcher App" --windows-file-description="Lost Ark Market Online Launcher App" -o lamo-launcher.exe index.py')

compile_release.sh

@@ -1 +1 @@
-pyinstaller release.spec
+python -m nuitka --standalone --windows-icon-from-ico=assets/icons/favicon.ico --enable-plugin=pyside6 --include-data-dir=assets=assets --follow-imports --onefile --windows-disable-console --windows-file-version=1.2.4.1 --windows-product-version=1.2.4.1 --windows-company-name="Lost Ark Market Online" --windows-product-name="Lost Ark Market Online Launcher App" -o lamo-launcher.exe index.py

index.py

@@ -1,3 +1,4 @@
+from time import sleep
 from modules.logging import AppLogger
 from modules.messagebox import MessageBoxHandler
 import modules.single_instance
@@ -87,12 +88,13 @@ def login_success(self):
     # Watcher Version Check
     def check_config(self):
         Config().check_watcher_version()
+        print(f"Needs watcher update: {Config().watcher_needs_update}")
         if Config().watcher_needs_update == True:
             playUpdateDetected()
             self.download = LostArkMarketLauncherDownload({
                 "url": f'https://github.com/gogodr/LostArk-Market-Watcher/releases/download/{Config().watcher_version}/{Config().watcher_file}.exe',
                 "title": f'New version of the Lost Ark Market Watcher Found: v{Config().watcher_version}',
-                "file":  f'{Config().watcher_file}.exe'
+                "file":  f'{Config().watcher_file}.exe.new'
             })
             self.download.launch.connect(self.launch_watcher)
             self.download.finished_download.connect(self.watcher_downloaded)
@@ -106,13 +108,18 @@ def watcher_downloaded(self):
             self.launch_watcher()
 
     def launch_watcher(self):
+        sleep(2)
+        if os.path.exists(f"{Config().watcher_file}.exe.new") == True:
+            if os.path.exists(f"{Config().watcher_file}.exe") == True:
+                os.system(f"del /f {Config().watcher_file}.exe")
+            os.system(f"rename {Config().watcher_file}.exe.new {Config().watcher_file}.exe")
+        sleep(2)
         playSuccess()
         si = subprocess.STARTUPINFO()
         si.dwFlags |= subprocess.STARTF_USESHOWWINDOW
         subprocess.call(f"{Config().watcher_file}.exe")
         sys.exit()
 
-
 if __name__ == "__main__":
     try:
         Config()

modules/config.py

@@ -7,7 +7,7 @@
 
 
 class Config(metaclass=Singleton):
-    version = "1.2.4.1"
+    version = "1.2.6.2"
     debug = False
     id_token: str = None
     refresh_token: str = None
@@ -47,7 +47,6 @@ def load_config(self):
                     "Watcher", "play_audio") == 'True'
             else:
                 self.play_audio = True
-                changes = True
 
             if self._config.has_option("Watcher", "volume"):
                 self.volume = float(self._config.get(
@@ -120,6 +119,7 @@ def HIWORD(dword):
             curr_version = version.parse(
                 f"{HIWORD(ms)}.{LOWORD(ms)}.{HIWORD(ls)}.{LOWORD(ls)}")
             latest_version = version.parse(self.launcher_version)
+            pe.close()
 
             if latest_version > curr_version:
                 self.launcher_needs_update = True
@@ -148,6 +148,7 @@ def HIWORD(dword):
             curr_version = version.parse(
                 f"{HIWORD(ms)}.{LOWORD(ms)}.{HIWORD(ls)}.{LOWORD(ls)}")
             latest_version = version.parse(self.watcher_version)
+            pe.close()
 
             if latest_version > curr_version:
-                self.needs_update = True
+                self.watcher_needs_update = True

modules/sound.py

@@ -1,10 +1,13 @@
 import sys
 from threading import Thread
+import threading
+from time import sleep
 import simpleaudio as sa
 import os
 from pycaw.pycaw import AudioUtilities
 from modules.common.singleton import Singleton
 from modules.config import Config
+from modules.logging import AppLogger
 
 
 class PlaySoundThread(Thread):
@@ -43,25 +46,49 @@ def playDownloadComplete():
 
 
 class VolumeController(metaclass=Singleton):
+    sessions = None
     audio = None
     volume = 1.0
+    lock = threading.Lock()
 
     def __init__(self):
-        self.searchProcess()
+        self.sessions = AudioUtilities.GetAllSessions()
+        spt = Thread(target=self.searchProcess)
+        spt.start()
 
-    def searchProcess(self):
-        sessions = AudioUtilities.GetAllSessions()
-        file_name = os.path.basename(sys.executable)
+    def searchProcess(self, retries = 0):
+        if self.lock.locked() or self.audio:
+            return
+        file_name = os.path.basename(sys.argv[0])
+        self.lock.acquire()
+        try:            
+            self.sessions = AudioUtilities.GetAllSessions()
+            AppLogger().info(f"VolumeController - FileName: {file_name} - retry: {retries}")            
+            for session in self.sessions:
+                if session.Process and session.Process.name() == file_name:
+                    AppLogger().info(f"VolumeController - FileName: {file_name} - Found")
+                    self.audio = session.SimpleAudioVolume
+                    self.volume = self.audio.GetMasterVolume()
+                    self.setVolume(Config().volume/100)
+                    break
+        except Exception as ex:
+            AppLogger().exception(ex)
 
-        for session in sessions:
-            if session.Process and session.Process.name() == file_name:
-                self.audio = session.SimpleAudioVolume
-                self.volume = self.audio.GetMasterVolume()
-                self.setVolume(Config().volume/100)
-                break
+        if(self.audio is None):            
+            if retries < 3:
+                sleep(2)
+                if self.lock.locked():
+                    self.lock.release()
+                self.searchProcess(retries+1)
+            else:
+                AppLogger().error(f"VolumeController - FileName: {file_name} - Not Found")
+        if self.lock.locked():
+            self.lock.release()
 
     def setVolume(self, volume):
         if self.audio:
             self.audio.SetMasterVolume(volume, None)
         else:
-            self.searchProcess()
+            self.sessions = AudioUtilities.GetAllSessions()
+            spt = Thread(target=self.searchProcess)
+            spt.start()