DocRock3r/custom-install
1
0
Fork 0
mirror of https://github.com/ihaveamac/custom-install.git synced 2025-12-08 05:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci-gui: make comtypes an optional module

Browse Source
This commit is contained in:
Ian Burgwin
2020-07-22 16:16:10 -07:00
parent bea3c3c082
commit cd86713d17
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ci-gui.py
View File

@@ -25,13 +25,17 @@ if TYPE_CHECKING:
from typing import List from typing import List
is_windows = platform == 'win32' is_windows = platform == 'win32'
taskbar = None
if is_windows: if is_windows:
try:
import comtypes.client as cc import comtypes.client as cc
tbl = cc.GetModule('TaskbarLib.tlb') tbl = cc.GetModule('TaskbarLib.tlb')
taskbar = cc.CreateObject('{56FDF344-FD6D-11D0-958A-006097C9A090}', interface=tbl.ITaskbarList3) taskbar = cc.CreateObject('{56FDF344-FD6D-11D0-958A-006097C9A090}', interface=tbl.ITaskbarList3)
taskbar.HrInit() taskbar.HrInit()
except ModuleNotFoundError:
pass
file_parent = dirname(__file__) file_parent = dirname(__file__)
@@ -106,7 +110,7 @@ class CustomInstallGUI(ttk.Frame):
self.rowconfigure(2, weight=1) self.rowconfigure(2, weight=1)
self.columnconfigure(0, weight=1) self.columnconfigure(0, weight=1)
if is_windows: if taskbar:
# this is so progress can be shown in the taskbar # this is so progress can be shown in the taskbar
def setup_tab(): def setup_tab():
self.hwnd = int(parent.wm_frame(), 16) self.hwnd = int(parent.wm_frame(), 16)
@@ -267,6 +271,10 @@ class CustomInstallGUI(ttk.Frame):
self.log('custom-install by ihaveamac', status=False) self.log('custom-install by ihaveamac', status=False)
self.log('https://github.com/ihaveamac/custom-install', status=False) self.log('https://github.com/ihaveamac/custom-install', status=False)
if is_windows and not taskbar:
self.log('Note: comtypes module not found.')
self.log('Note: Progress will not be shown in the Windows taskbar.')
self.log('Ready.') self.log('Ready.')
self.disable_during_install = (add_cias, add_dirs, remove_selected, start, *self.file_picker_textboxes.values()) self.disable_during_install = (add_cias, add_dirs, remove_selected, start, *self.file_picker_textboxes.values())
@@ -364,11 +372,11 @@ class CustomInstallGUI(ttk.Frame):
def ci_update_percentage(total_percent, total_read, size): def ci_update_percentage(total_percent, total_read, size):
self.progressbar.config(value=total_percent + finished_percent) self.progressbar.config(value=total_percent + finished_percent)
if is_windows: if taskbar:
taskbar.SetProgressValue(self.hwnd, int(total_percent + finished_percent), max_percentage) taskbar.SetProgressValue(self.hwnd, int(total_percent + finished_percent), max_percentage)
def ci_on_error(exc): def ci_on_error(exc):
if is_windows: if taskbar:
taskbar.SetProgressState(self.hwnd, tbl.TBPF_ERROR) taskbar.SetProgressState(self.hwnd, tbl.TBPF_ERROR)
for line in format_exception(*exc): for line in format_exception(*exc):
for line2 in line.split('\n')[:-1]: for line2 in line.split('\n')[:-1]:
@@ -379,7 +387,7 @@ class CustomInstallGUI(ttk.Frame):
def ci_on_cia_start(idx): def ci_on_cia_start(idx):
nonlocal finished_percent nonlocal finished_percent
finished_percent = idx * 100 finished_percent = idx * 100
if is_windows: if taskbar:
taskbar.SetProgressValue(self.hwnd, finished_percent, max_percentage) taskbar.SetProgressValue(self.hwnd, finished_percent, max_percentage)
installer.event.on_log_msg += ci_on_log_msg installer.event.on_log_msg += ci_on_log_msg
@@ -387,7 +395,7 @@ class CustomInstallGUI(ttk.Frame):
installer.event.on_error += ci_on_error installer.event.on_error += ci_on_error
installer.event.on_cia_start += ci_on_cia_start installer.event.on_cia_start += ci_on_cia_start
if is_windows: if taskbar:
taskbar.SetProgressState(self.hwnd, tbl.TBPF_NORMAL) taskbar.SetProgressState(self.hwnd, tbl.TBPF_NORMAL)
def install(): def install():
@@ -402,7 +410,7 @@ class CustomInstallGUI(ttk.Frame):
self.open_console() self.open_console()
except: except:
installer.event.on_error(exc_info()) installer.event.on_error(exc_info())
finally:
self.enable_buttons() self.enable_buttons()
Thread(target=install).start() Thread(target=install).start()