From 38e867d3e3755ccc2d2272036a42efd056bfa80d Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 9 Jul 2022 18:52:51 -0700 Subject: [PATCH 1/8] Lower default skip-size values --- scripts/wk/cfg/ddrescue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wk/cfg/ddrescue.py b/scripts/wk/cfg/ddrescue.py index 15f5f46d..e621f968 100644 --- a/scripts/wk/cfg/ddrescue.py +++ b/scripts/wk/cfg/ddrescue.py @@ -39,7 +39,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, }, From df85d3049eeb083c5ffb3337b600e8a847b4fbc5 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 15:42:53 -0700 Subject: [PATCH 2/8] Disable Windows search highlights Addresses issue #190 --- scripts/wk/cfg/setup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py index 28ac5154..5e475912 100644 --- a/scripts/wk/cfg/setup.py +++ b/scripts/wk/cfg/setup.py @@ -68,6 +68,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" @@ -82,6 +86,10 @@ 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'), + ), }, } REG_OPEN_SHELL_SETTINGS = { From 72640686da2882024f84a0c212f93f5d84162a42 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 15:48:57 -0700 Subject: [PATCH 3/8] Disable "Let's make Windows even better" screens Addresses issue #191 --- scripts/wk/cfg/setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py index 5e475912..a04d7d9a 100644 --- a/scripts/wk/cfg/setup.py +++ b/scripts/wk/cfg/setup.py @@ -90,6 +90,10 @@ REG_WINDOWS_EXPLORER = { 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 = { From 5e1cc683fe9c3f657e16ed341761cdef7e363917 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 15:55:25 -0700 Subject: [PATCH 4/8] Disable Edge first run screen Addresses issue #193 --- scripts/wk/cfg/setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py index a04d7d9a..97d0bd5a 100644 --- a/scripts/wk/cfg/setup.py +++ b/scripts/wk/cfg/setup.py @@ -43,6 +43,10 @@ REG_WINDOWS_EXPLORER = { r'Software\Policies\Microsoft\Windows\DataCollection': ( ('AllowTelemetry', 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'), From 54f6b8f9aee1457b42b2b40c55fefe7ac95b8c7e Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 16:10:46 -0700 Subject: [PATCH 5/8] Allow minor errors on destination disks Addresses issue #28 --- scripts/wk/clone/ddrescue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wk/clone/ddrescue.py b/scripts/wk/clone/ddrescue.py index 07f65423..8f563b48 100644 --- a/scripts/wk/clone/ddrescue.py +++ b/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 From 6320533f86483610e968616cd0d5aa4a3a46dd8f Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 16:22:45 -0700 Subject: [PATCH 6/8] Fix syntax error --- scripts/wk/cfg/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py index 703cbeb8..54d5ca8d 100644 --- a/scripts/wk/cfg/setup.py +++ b/scripts/wk/cfg/setup.py @@ -64,6 +64,7 @@ REG_WINDOWS_EXPLORER = { ('EnableActivityFeed', 0, 'DWORD'), ('PublishUserActivities', 0, 'DWORD'), ('UploadUserActivities', 0, 'DWORD'), + ), # Disable Edge first run screen r'Software\Policies\Microsoft\MicrosoftEdge\Main': ( ('PreventFirstRunPage', 1, 'DWORD'), From 9bcb0bdb327634f8b7a5422a60a54bda37843ba1 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 16:28:03 -0700 Subject: [PATCH 7/8] Upload benchmark graphs to ticket range subfolders Partially addresses issue #22 --- scripts/wk/graph.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/wk/graph.py b/scripts/wk/graph.py index e84b57f8..acd68ce1 100644 --- a/scripts/wk/graph.py +++ b/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( From c6ff30722db0a6980a4ef2367bf9a086de1267ec Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 10 Jul 2022 16:45:08 -0700 Subject: [PATCH 8/8] Include more lines in the badblocks reports Partially addresses issue #27 --- scripts/wk/hw/surface_scan.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/wk/hw/surface_scan.py b/scripts/wk/hw/surface_scan.py index f6452bc5..f4913a8a 100644 --- a/scripts/wk/hw/surface_scan.py +++ b/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)