Merge pull request #3 from BenjaminHalko/update-windows

Author: BenjaminHalko

build-windows.bat

@@ -1,3 +1,3 @@
 @echo off
-pyinstaller -F -w --add-data crossplatformhelpers/Windows/Helper;Helper --icon icon/icon.ico --add-data translations/translations;translations WiiMusicEditorPlus.py
-tar -a -C dist -cf dist\WiiMusicEditorPlus-Windows.zip WiiMusicEditorPlus.exe
+pyinstaller -w --noconfirm --add-data crossplatformhelpers/Windows/Helper;Helper --icon icon/icon.ico --add-data translations/translations;translations WiiMusicEditorPlus.py
+tar -a -C dist -cf dist\WiiMusicEditorPlus-Windows.zip WiiMusicEditorPlus

crossplatformhelpers/Windows/Helper/Extra/update.bat

@@ -1,6 +1,6 @@
 @echo off
 
 timeout 1
-del %1
-move "%~dp0WiiMusicEditorPlus.exe" %1
+tar --verbose -xf "%~dp0downloaded.zip" -C "%~p1\.."
+del "%~dp0downloaded.zip"
 start "" %1

update.py

@@ -1,5 +1,4 @@
 from os import path, remove
-import pathlib
 from editor import HelperPath, LoadSetting, FullPath, currentSystem, ChooseFromOS, version, SavePath, GivePermission
 from PyQt5.QtWidgets import QDialog
 from PyQt5.QtCore import QThread, pyqtSignal, Qt
@@ -8,22 +7,19 @@
 from requests import get, ConnectionError, Timeout
 from zipfile import ZipFile
 from sys import exit as sys_exit
-from shutil import copyfile, rmtree, move
+from shutil import copyfile, rmtree
 from subprocess import call
-from warning import ShowWarning
 
 class Progress():
     def update(self, op_code, cur_count, max_count=None, message=''):
         if(op_code > 10): UpdateThread.progress.emit(cur_count/max_count*100)
-legacymode = False
 
 class Download(QThread):
     progress = pyqtSignal(int)
     done = pyqtSignal()
     version = "null"
 
     def run(self):
-        global legacymode
         file = open(SavePath()+"/downloaded.zip", "wb")
         with get("https://github.com/BenjaminHalko/WiiMusicEditorPlus/releases/download/"+self.version+"/WiiMusicEditorPlus-"+currentSystem+".zip",stream=True) as response:
             total =  int(response.headers['content-length'])
@@ -35,22 +31,20 @@ def run(self):
 
         file.close()
 
-        if(path.isfile(SavePath()+"/WiiMusicEditorPlus"+ChooseFromOS([".exe",".app",""]))): remove(SavePath()+"/WiiMusicEditorPlus"+ChooseFromOS([".exe",".app",""]))
-        elif(path.isdir(SavePath()+"/WiiMusicEditorPlus"+ChooseFromOS([".exe",".app",""]))): rmtree(SavePath()+"/WiiMusicEditorPlus"+ChooseFromOS([".exe",".app",""]))
-
-        if(currentSystem != "Mac"):
+        if(currentSystem == "Linux"):
+            if(path.isfile(SavePath()+"/WiiMusicEditorPlus")): remove(SavePath()+"/WiiMusicEditorPlus")
             zip = ZipFile(SavePath()+"/downloaded.zip")
             zip.extractall(SavePath())
-            if(len(zip.infolist()) > 5): legacymode = True
             zip.close()
-        else:
+        elif (currentSystem == "Mac"):
+            if(path.isdir(SavePath()+"/WiiMusicEditorPlus.app")): rmtree(SavePath()+"/WiiMusicEditorPlus.app")
             zip = ZipFile(SavePath()+"/downloaded.zip")
             for file in zip.infolist():
                 zip.extract(file, SavePath())
                 call(["chmod","u+x",path.join(SavePath(), file.filename)])
             zip.close()
-        
-        remove(SavePath()+"/downloaded.zip")
+
+        if(currentSystem != "Windows"): remove(SavePath()+"/downloaded.zip")
         UpdateThread.done.emit()
 
 class UpdateWindow(QDialog,Ui_Update):
@@ -94,14 +88,7 @@ def restart(self):
         copyfile(HelperPath()+"/Extra/update"+updateExt,SavePath()+"/update"+updateExt)
 
         if(currentSystem == "Windows"):
-            if(legacymode):
-                move(SavePath()+"/WiiMusicEditorPlus",pathlib.Path(FullPath).parent)
-                if(path.exists(SavePath()+"/update.bat")): remove(SavePath()+"/update.bat")
-                copyfile(HelperPath()+"/Extra/update-legacy.bat",SavePath()+"/update.bat")
-                ShowWarning(f"Program format changed to folder\nNew path of program: {pathlib.Path(FullPath).parent}/WiiMusicEditorPlus/WiiMusicEditorPlus.exe",self)
-                Popen([SavePath()+"/update.bat",FullPath])
-                Popen(path.dirname(FullPath)+"/WiiMusicEditorPlus/WiiMusicEditorPlus.exe")
-            else: Popen([SavePath()+"/update.bat",FullPath])
+            Popen([SavePath()+"/update.bat",FullPath])
         else:
             GivePermission(SavePath()+"/update.sh")
             if(currentSystem == "Linux"): GivePermission(SavePath()+'/WiiMusicEditorPlus')
@@ -117,7 +104,7 @@ def restart(self):
 def CheckForUpdate():
     try:
         tag = GetReleaseTag()
-        if(tag != version and tag != "test"): return tag
+        if(tag != version): return tag
         else: return "null"
     except (ConnectionError, Timeout):
         return "null"
@@ -137,6 +124,6 @@ def GetReleaseTag():
                     if(j["name"] == f"WiiMusicEditorPlus-{currentSystem}.zip"):
                         looking = False
                         break
-    except Exception:
+    except:
         i = 0
     return data[i]["tag_name"]