Installer improvements before version 1.5.0

WingetUI.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "WingetUI"
-#define MyAppVersion "1.4.2"
+#define MyAppVersion "1.5.0"
 #define MyAppPublisher "Martí Climent"
 #define MyAppURL "https://github.com/martinet101/WingetUI"
 #define MyAppExeName "WingetUI.exe"
@@ -26,11 +26,13 @@ CloseApplications=no
 PrivilegesRequired=lowest
 OutputBaseFilename=WingetUI Installer
 OutputDir=.
-SetupIconFile=Y:\WinGetUI-Store\wingetui\resources\icon.ico
+SetupIconFile=wingetui\resources\icon.ico
+UninstallDisplayIcon={app}\WingetUI.exe
 Compression=lzma
 SolidCompression=yes
 WizardStyle=classic      
-WizardImageFile=Y:\WingetUI-Store\INSTALLER.BMP
+WizardImageFile=INSTALLER.BMP
+WizardSmallImageFile=wingetui\resources\icon.bmp
 DisableWelcomePage=no
 UsePreviousTasks=yes
 ChangesEnvironment=yes
@@ -61,6 +63,12 @@ Name: "Spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 Name: "Turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
 Name: "Ukrainian"; MessagesFile: "compiler:Languages\Ukrainian.isl"
 
+[InstallDelete]
+Type: filesandordirs; Name: "{autopf}\WingetUI\*"; BeforeInstall: TaskKill('WingetUI.exe');
+
+[UninstallDelete]  
+Type: filesandordirs; Name: "{autopf}\WingetUI\*"
+
 [Code]
 procedure InitializeWizard;
 begin

wingetui-version-file

@@ -32,8 +32,8 @@ StringFileInfo(
     [
       StringStruct(u'CompanyName', u'Martí Climent'),
       StringStruct(u'FileDescription', u'WingetUI'),
-      StringStruct(u'FileVersion', u'1.4.0'),
-      StringStruct(u'ProductVersion', u'1.4.0'),
+      StringStruct(u'FileVersion', u'1.5.0'),
+      StringStruct(u'ProductVersion', u'1.5.0'),
       StringStruct(u'InternalName', u'WingetUI'),
       StringStruct(u'LegalCopyright', u'Martí Climent'),
       StringStruct(u'OriginalFilename', u'wingetui.exe'),

wingetui/Win.spec

@@ -10,12 +10,12 @@ import importlib, os
 
 a = Analysis(['__init__.py'],
              pathex=['Y:\WingetUI-Store\wingetui_bin'],
-             binaries=[('blurwindow.pyc', '.'), ('globals.pyc', '.'), ('mainWindow.pyc', '.'), ('scoopHelpers.pyc', '.'), ('storeEngine.pyc', '.'), ('tools.pyc', '.'), ('wingetHelpers.pyc', '.'), ("uiSections.pyc", ".")],
-             datas=[('resources/', 'resources/'), ("winget-cli/", "winget-cli/"), ("sudo/", "sudo/")],
+             binaries=[('blurwindow.pyc', '.'), ('globals.pyc', '.'), ('mainWindow.pyc', '.'), ('scoopHelpers.pyc', '.'), ('storeEngine.pyc', '.'), ('tools.pyc', '.'), ('wingetHelpers.pyc', '.'), ("uiSections.pyc", "."), ("customWidgets.pyc", "."), ("languages.pyc", ".")],
+             datas=[('resources/', 'resources/'), ("winget-cli/", "winget-cli/"), ("sudo/", "sudo/"), ("lang/", "lang/")],
              hiddenimports=['pkg_resources.py2_warn', "win32gui"],
              hookspath=[],
              runtime_hooks=[],
-             excludes=['eel', 'tkinter', "PyQt5"],
+             excludes=['eel', 'tkinter', "PyQt5", "PySide2", "pygame", "numpy", "matplotlib"],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,
              cipher=block_cipher,

wingetui/tools.py

@@ -46,10 +46,17 @@ def cprint(*args) -> None:
 
 def report(exception) -> None: # Exception reporter
     import traceback
-    for line in traceback.format_exception(*sys.exc_info()):
-        print("🔴 "+line)
-        cprint("🔴 "+line)
-    print(f"🔴 Note this traceback was caught by reporter and has been added to the log ({exception})")
+    tb = traceback.format_exception(*sys.exc_info())
+    try:
+        for line in tb:
+            print("🔴 "+line)
+            cprint("🔴 "+line)
+        print(f"🔴 Note this traceback was caught by reporter and has been added to the log ({exception})")
+    except UnicodeEncodeError:
+        for line in tb:
+            print("ERROR "+line)
+            cprint("ERROR "+line)
+        print(f"ERROR Note this traceback was caught by reporter and has been added to the log ({exception})")
 
 def _(s): # Translate function
     global lang

wingetui/versions.py

@@ -1,2 +1,2 @@
-version = 1.49
-versionName = "1.5.0-beta"
+version = 1.5
+versionName = "1.5.0"