Merge pull request #626 from panther7/625-need-restart

Handle need restart after installation for winget

wingetui/__init__.py

@@ -37,7 +37,7 @@ def __init__(self):
                 titlewidget = QHBoxLayout()
                 titlewidget.addStretch()
                 icon = QLabel()
-                icon.setPixmap(QPixmap(realpath+"/resources/icon.png").scaledToWidth(128, Qt.TransformationMode.SmoothTransformation))
+                icon.setPixmap(QPixmap(getMedia("icon", autoIconMode = False)).scaledToWidth(128, Qt.TransformationMode.SmoothTransformation))
                 text = QLabel("WingetUI")
                 text.setStyleSheet(f"font-family: \"{globals.dispfont}\";font-weight: bold; color: {'white' if isDark() else 'black'};font-size: 50pt;")
                 titlewidget.addWidget(icon)
@@ -285,7 +285,7 @@ def loadMainUI(self):
                 globals.trayIcon = QSystemTrayIcon()
                 self.trayIcon = globals.trayIcon
                 globals.app = self
-                self.trayIcon.setIcon(QIcon(realpath+"/resources/icon.png"))
+                self.trayIcon.setIcon(QIcon(getMedia("icon", autoIconMode = False)))
                 self.trayIcon.setToolTip("WingetUI")
                 self.trayIcon.setVisible(True)
 

wingetui/chocoHelpers.py

@@ -207,8 +207,10 @@ def uninstallAssistant(p: subprocess.Popen, closeAndInform: Signal, infoSignal:
     p.wait()
     cprint(output)
     outputCode = p.returncode
-    if outputCode in (1605, 1614, 1641, 3010):
+    if outputCode in (1605, 1614, 1641):
         outputCode = 0
+    elif outputCode == 3010:
+        outputCode = 3
     closeAndInform.emit(outputCode, output)
 
 

wingetui/mainWindow.py

@@ -29,7 +29,7 @@ def __init__(self):
         self.setWindowTitle("WingetUI")
         self.setMinimumSize(700, 560)
         self.setObjectName("micawin")
-        self.setWindowIcon(QIcon(realpath+"/resources/icon.png"))
+        self.setWindowIcon(QIcon(getMedia("icon", autoIconMode = False)))
         self.resize(QSize(1100, 700))
         try:
             rs = getSettingsValue("OldWindowGeometry").split(",")

wingetui/tools.py

@@ -1,4 +1,3 @@
-from ast import Attribute
 import shutil
 import winreg
 import io
@@ -7,11 +6,11 @@
 from PySide6.QtCore import *
 from PySide6.QtGui import *
 from PySide6.QtWidgets import *
-from win32mica import ApplyMica, MICAMODE
 from urllib.request import urlopen
 from versions import *
 from languages import *
 from external.blurwindow import GlobalBlur
+from pathlib import Path
 
 import globals
 
@@ -241,16 +240,18 @@ def ApplyMenuBlur(hwnd: int, window: QWidget, smallCorners: bool = False, avoidO
             #QtWin.extendFrameIntoClientArea(window, -1, -1, -1, -1)
 
 
-def getPath(s):
-    return os.path.join(os.path.join(realpath, "resources"), s).replace("\\", "/")
+def getPath(s: str) -> str:
+    return str(Path(f"{realpath}/resources/{s}").resolve()).replace("\\", "/")
 
 def getIconMode() -> str:
     return "white" if isDark() else "black"
 
-def getMedia(m: str) -> str:
-    filename = getPath(m+"_"+getIconMode()+".png")
-    if not os.path.exists(filename):
-        filename = getPath(m+".png")
+def getMedia(m: str, autoIconMode = True) -> str:
+    filename = ""
+    if autoIconMode == True:
+        filename = getPath(f"{m}_{getIconMode()}.png")
+    if not filename or not os.path.exists(filename):
+        filename = getPath(f"{m}.png")
     return filename
 
 def getint(s: str, fallback: int) -> int:

wingetui/wingetHelpers.py

@@ -135,7 +135,7 @@ def searchForUpdates(signal: Signal, finishSignal: Signal, noretry: bool = False
                     verSeparator = len(l.split("Version")[0])
                     newVerSeparator = len(l.split("Available")[0])
                     counter += 1
-    
+
     if p.returncode != 0 and not noretry:
         time.sleep(1)
         print(p.returncode)
@@ -354,10 +354,9 @@ def getInfo(signal: Signal, title: str, id: str, useId: bool) -> None:
         signal.emit(appInfo)
     except Exception as e:
         report(e)
-    
+
 def installAssistant(p: subprocess.Popen, closeAndInform: Signal, infoSignal: Signal, counterSignal: Signal) -> None:
     print(f"🟢 winget installer assistant thread started for process {p}")
-    outputCode = 0
     counter = 0
     output = ""
     while p.poll() is None:
@@ -370,14 +369,17 @@ def installAssistant(p: subprocess.Popen, closeAndInform: Signal, infoSignal: Si
             counterSignal.emit(counter)
             output += line+"\n"
     p.wait()
-    outputCode = p.returncode
-    if outputCode == 0x8A150011:
-        outputCode = 2
+    match p.returncode:
+        case 0x8A150011:
+            outputCode = 2
+        case 0x8A150109: # need restart
+            outputCode = 3
+        case other:
+            outputCode = p.returncode
     closeAndInform.emit(outputCode, output)
- 
+
 def uninstallAssistant(p: subprocess.Popen, closeAndInform: Signal, infoSignal: Signal, counterSignal: Signal) -> None:
     print(f"🟢 winget installer assistant thread started for process {p}")
-    outputCode = 0
     counter = 0
     output = ""
     while p.poll() is None: