Merge branch 'dev' of ssh://1201.ddns.net:2222/1201/WizardKit into dev

scripts/wk/cfg/ddrescue.py

@@ -40,7 +40,7 @@ DDRESCUE_SETTINGS = {
     '--reopen-on-error':  {'Selected': False,                               },
     '--retry-passes':     {'Selected': True,  'Value': '0',                 },
     '--reverse':          {'Selected': False,                               },
-    '--skip-size':        {'Selected': True,  'Value': '0.001,0.05',        },  # Percentages of source size
+    '--skip-size':        {'Selected': True,  'Value': '0.001,0.02',        },  # Percentages of source size
     '--test-mode':        {'Selected': False, 'Value': 'test.map',          },
     '--timeout':          {'Selected': True,  'Value': '30m',               },
     '-vvvv':              {'Selected': True,                'Hidden': True, },

scripts/wk/cfg/setup.py

@@ -65,6 +65,10 @@ REG_WINDOWS_EXPLORER = {
       ('PublishUserActivities', 0, 'DWORD'),
       ('UploadUserActivities', 0, 'DWORD'),
       ),
+    # Disable Edge first run screen
+    r'Software\Policies\Microsoft\MicrosoftEdge\Main': (
+      ('PreventFirstRunPage', 1, 'DWORD'),
+      ),
     # Disable Wi-Fi Sense
     r'Software\Microsoft\PolicyManager\default\WiFi\AllowWiFiHotSpotReporting': (
       ('Value', 0, 'DWORD'),
@@ -90,6 +94,10 @@ REG_WINDOWS_EXPLORER = {
     r'Software\Microsoft\Windows\CurrentVersion\Feeds': (
       ('ShellFeedsTaskbarOpenOnHover', 0, 'DWORD'),
       ),
+    # Disable search highlights
+    r'Software\Microsoft\Windows\CurrentVersion\Feeds\DSB': (
+      ('ShowDynamicContent', 0, 'DWORD'),
+      ),
     # File Explorer
     r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': (
       # Change default Explorer view to "Computer"
@@ -104,6 +112,14 @@ REG_WINDOWS_EXPLORER = {
     r'Software\Microsoft\Windows\CurrentVersion\Search': (
       ('SearchboxTaskbarMode', 1, 'DWORD'),
       ),
+    # Disable search highlights from opening on hover
+    r'Software\Microsoft\Windows\CurrentVersion\SearchSettings': (
+      ('IsDynamicSearchBoxEnabled', 0, 'DWORD'),
+      ),
+    # Disable "Let's make Windows even better" screens
+    r'Software\Microsoft\Windows\CurrentVersion\UserProfileEngagement': (
+      ('ScoobeSystemSettingEnabled', 0, 'DWORD'),
+      ),
     },
   }
 REG_OPEN_SHELL_SETTINGS = {

scripts/wk/clone/ddrescue.py

@@ -1032,7 +1032,7 @@ class State():
         )
 
     # Check for minor errors
-    if not check_attributes(self.destination, only_blocking=False):
+    if not check_attributes(self.destination, only_blocking=True):
       std.print_warning(
         f'Attribute error(s) detected for: {self.destination.path}',
         )
@@ -1602,7 +1602,7 @@ def check_destination_health(destination):
     result = 'Critical error(s) detected for: {destination.path}'
 
   # Check for minor errors
-  if not check_attributes(destination, only_blocking=False):
+  if not check_attributes(destination, only_blocking=True):
     result = f'Attribute error(s) detected for: {destination.path}'
 
   # Done

scripts/wk/graph.py

@@ -200,6 +200,7 @@ def upload_to_imgur(image_path):
 def upload_to_nextcloud(image_path, ticket_number, dev_name):
   """Upload image to Nextcloud server and return folder url as str."""
   image_data = None
+  ticket_range = f'{ticket_number[:3]}00-{ticket_number[:3]}99'
 
   # Bail early
   if not image_path:
@@ -212,7 +213,7 @@ def upload_to_nextcloud(image_path, ticket_number, dev_name):
   # PUT image
   url = (
     f'{BENCHMARK_SERVER["Url"]}/'
-    f'{ticket_number}_iobenchmark'
+    f'{ticket_range}/{ticket_number}_iobenchmark'
     f'_{dev_name}_{time.strftime("%Y-%m-%d_%H%M_%z")}.png'
     )
   requests.put(

scripts/wk/hw/surface_scan.py

@@ -29,8 +29,10 @@ def check_surface_scan_results(test_obj, log_path) -> None:
   """Check results and set test status."""
   with open(log_path, 'r', encoding='utf-8') as _f:
     for line in _f.readlines():
+      # TODO: Test further to restrict report to just the results
       line = strip_colors(line.strip())
-      if not line or BADBLOCKS_SKIP_REGEX.match(line):
+      #if not line or BADBLOCKS_SKIP_REGEX.match(line):
+      if not line:
         # Skip
         continue
       match = BADBLOCKS_REGEX.search(line)