Merge remote-tracking branch 'upstream/dev' into dev

scripts/wk/cfg/tools.py

@@ -14,6 +14,8 @@ SOURCES = {
   'AIDA64': 'https://download.aida64.com/aida64engineer633.zip',
   'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-win-32bit-build1.zip',
   'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
+  'AVRemover32': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt32_enu.exe',
+  'AVRemover64': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt64_enu.exe',
   'BleachBit': 'https://download.bleachbit.org/BleachBit-4.2.0-portable.zip',
   'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
   'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
@@ -23,8 +25,6 @@ SOURCES = {
   'EmsisoftCmd32': 'https://dl.emsisoft.com/EmsisoftCommandlineScanner32.exe',
   'EmsisoftCmd64': 'https://dl.emsisoft.com/EmsisoftCommandlineScanner64.exe',
   'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
-  'ESET AVRemover32': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt32_enu.exe',
-  'ESET AVRemover64': 'https://download.eset.com/com/eset/tools/installers/av_remover/latest/avremover_nt64_enu.exe',
   'ESET NOD32 AV': 'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt64.exe',
   'ESET Online Scanner': 'https://download.eset.com/com/eset/tools/online_scanner/latest/esetonlinescanner_enu.exe',
   'Everything32': 'https://www.voidtools.com/Everything-1.4.1.1005.x86.en-US.zip',

scripts/wk/repairs/win.py

@@ -266,6 +266,13 @@ def init(menus):
   """Initialize Auto Repairs."""
   session_started = is_session_started()
 
+  # Run AVRemover
+  if not session_started:
+    TRY_PRINT.run(
+      'Run AVRemover...', run_tool, 'AVRemover', 'AVRemover',
+      download=True, msg_good='DONE',
+      )
+
   # Start or resume a repair session
   if session_started:
     load_settings(menus)

scripts/wk/std.py

@@ -18,7 +18,12 @@ import time
 import traceback
 
 from collections import OrderedDict
-from functools import cache
+
+try:
+  from functools import cache
+except ImportError:
+  # Assuming Python is < 3.9
+  from functools import lru_cache as cache
 
 import requests