Replace IOBit with UninstallView

scripts/auto_repairs.py

@@ -69,7 +69,7 @@ BASE_MENUS = {
       ),
     'Manual Steps': (
       MenuEntry('AdwCleaner',               'auto_adwcleaner'),
-      MenuEntry('IO Bit Uninstaller',       'auto_iobit_uninstaller'),
+      MenuEntry('UninstallView',            'auto_uninstallview'),
       MenuEntry('Enable Windows Updates',   'auto_windows_updates_enable'),
       ),
     },

scripts/wk/cfg/sources.py

@@ -42,7 +42,6 @@ SOURCES = {
   'BlueScreenView32':   'http://www.nirsoft.net/utils/bluescreenview.zip',
   'BlueScreenView64':   'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
   'ERUNT':              'http://www.aumha.org/downloads/erunt.zip',
-  'IOBit Uninstaller':  'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
   'Everything32':       'https://www.voidtools.com/Everything-1.4.1.1020.x86.zip',
   'Everything64':       'https://www.voidtools.com/Everything-1.4.1.1020.x64.zip',
   'FastCopy':           'https://ftp.vector.co.jp/75/32/2323/FastCopy4.2.0_installer.exe',
@@ -57,6 +56,8 @@ SOURCES = {
   'OpenShell':          'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.170/OpenShellSetup_4_4_170.exe',
   'PuTTY':              'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
   'SDIO Torrent':       'https://www.glenn.delahoy.com/downloads/sdio/SDIO_Update.torrent',
+  'UninstallView32':    'https://www.nirsoft.net/utils/uninstallview.zip',
+  'UninstallView64':    'https://www.nirsoft.net/utils/uninstallview-x64.zip',
   'WizTree':            'https://diskanalyzer.com/files/wiztree_4_10_portable.zip',
   'XMPlay':             'https://support.xmplay.com/files/20/xmplay385.zip?v=47090',
   'XMPlay 7z':          'https://support.xmplay.com/files/16/xmp-7z.zip?v=800962',

scripts/wk/kit/build_win.py

@@ -230,16 +230,6 @@ def download_hwinfo():
   delete_from_temp('HWiNFO.zip')
 
 
-def download_iobit_uninstaller():
-  """Download IOBit Uninstaller."""
-  installer = CBIN_DIR.joinpath('IObitUninstallerPortable.exe')
-  download_file(installer, SOURCES['IOBit Uninstaller'])
-  popen_program([installer])
-  sleep(1)
-  wait_for_procs('IObitUninstallerPortable.exe')
-  delete_item(installer)
-
-
 def download_macs_fan_control():
   """Download Macs Fan Control."""
   out_path = INSTALLERS_DIR.joinpath('Macs Fan Control.exe')
@@ -358,6 +348,19 @@ def download_snappy_driver_installer_origin():
   delete_from_temp('fake.7z')
 
 
+def download_uninstallview():
+  """Download UninstallView."""
+  archive_32 = download_to_temp('uninstallview32.zip', SOURCES['UninstallView32'])
+  archive_64 = download_to_temp('uninstallview64.zip', SOURCES['UninstallView64'])
+  out_path = BIN_DIR.joinpath('UninstallView')
+  extract_archive(archive_64, out_path, 'UninstallView.exe')
+  rename_item(
+    out_path.joinpath('UninstallView.exe'),
+    out_path.joinpath('UninstallView64.exe'),
+    )
+  extract_archive(archive_32, out_path)
+  delete_from_temp('uninstallview32.zip')
+  delete_from_temp('uninstallview64.zip')
 
 
 def download_wiztree():
@@ -475,7 +478,6 @@ def build_kit():
   try_print.run('FastCopy...',                download_fastcopy)
   try_print.run('FurMark...',                 download_furmark)
   try_print.run('HWiNFO...',                  download_hwinfo)
-  try_print.run('IOBit Uninstaller...',       download_iobit_uninstaller)
   try_print.run('LibreOffice...',             download_libreoffice)
   try_print.run('Macs Fan Control...',        download_macs_fan_control)
   try_print.run('Neutron...',                 download_neutron)
@@ -483,6 +485,7 @@ def build_kit():
   try_print.run('OpenShell...',               download_openshell)
   try_print.run('PuTTY...',                   download_putty)
   try_print.run('Snappy Driver Installer...', download_snappy_driver_installer_origin)
+  try_print.run('UninstallView...',           download_uninstallview)
   try_print.run('WizTree...',                 download_wiztree)
   try_print.run('XMPlay...',                  download_xmplay)
   try_print.run('XMPlay Music...',            download_xmplay_music)

scripts/wk/repairs/win.py

@@ -663,14 +663,6 @@ def auto_hitmanpro(group, name):
   save_settings(group, name, result=result)
 
 
-def auto_iobit_uninstaller(group, name):
-  """Run IO Bit Uninstaller scan."""
-  result = TRY_PRINT.run(
-    'IO Bit Uninstaller...', run_iobit_uninstaller, msg_good='DONE',
-    )
-  save_settings(group, name, result=result)
-
-
 def auto_kvrt(group, name):
   """Run KVRT scan."""
   result = TRY_PRINT.run('KVRT...', run_kvrt, msg_good='DONE')
@@ -774,6 +766,14 @@ def auto_system_restore_set_size(group, name):
   save_settings(group, name, result=result)
 
 
+def auto_uninstallview(group, name):
+  """Run UninstallView."""
+  result = TRY_PRINT.run(
+    'UninstallView...', run_uninstallview, msg_good='DONE',
+    )
+  save_settings(group, name, result=result)
+
+
 def auto_windows_updates_disable(group, name):
   """Disable Windows Updates."""
   result = TRY_PRINT.run('Disable Windows Updates...', disable_windows_updates)
@@ -963,11 +963,6 @@ def run_hitmanpro():
   run_tool('HitmanPro', 'HitmanPro', *cmd_args, download=True)
 
 
-def run_iobit_uninstaller():
-  """Run IO Bit Uninstaller."""
-  run_tool('IObitUninstallerPortable', 'IObitUninstallerPortable', cbin=True)
-
-
 def run_kvrt():
   """Run KVRT scan."""
   log_path = format_log_path(log_name='KVRT', timestamp=True, tool=True)
@@ -1079,6 +1074,11 @@ def run_tdsskiller():
   run_tool('TDSSKiller', 'TDSSKiller', *cmd_args, download=True)
 
 
+def run_uninstallview():
+  """Run UninstallView."""
+  run_tool('UninstallView', 'UninstallView')
+
+
 # OS Built-in Functions
 def create_custom_power_plan(enable_sleep=True, keep_display_on=False):
   """Create new power plan and set as active."""