2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Fix misc typos

Browse source
This commit is contained in:
2Shirt 2023-08-20 16:09:47 -07:00
parent 7603b93338
commit 460fd9c952
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/wk/clone/block_pair.py
View file

@ -255,7 +255,6 @@ def add_clone_block_pairs(state) -> None:
# Add pairs from previous run # Add pairs from previous run
if settings['Partition Mapping']: if settings['Partition Mapping']:
# Resume previous run, load pairs from settings file
for part_map in settings['Partition Mapping']: for part_map in settings['Partition Mapping']:
bp_source = hw_disk.Disk( bp_source = hw_disk.Disk(
f'{state.source.path}{source_sep}{part_map[0]}', f'{state.source.path}{source_sep}{part_map[0]}',
@ -304,8 +303,8 @@ def add_clone_block_pairs(state) -> None:
source_num = re.sub(r'^.*?(\d+)$', r'\1', part.path.name) source_num = re.sub(r'^.*?(\d+)$', r'\1', part.path.name)
settings['Partition Mapping'].append([source_num, dest_num]) settings['Partition Mapping'].append([source_num, dest_num])
# Save settings # Save settings
state.save_settings(settings) state.save_settings(settings)
def add_image_block_pairs(state) -> None: def add_image_block_pairs(state) -> None:

14
scripts/wk/clone/state.py
View file

@ -48,6 +48,13 @@ CLONE_SETTINGS = {
# (5, 1) ## Clone source partition #5 to destination partition #1 # (5, 1) ## Clone source partition #5 to destination partition #1
], ],
} }
PLATFORM = std.PLATFORM
RECOMMENDED_FSTYPES = re.compile(r'^(ext[234]|ntfs|xfs)$')
if PLATFORM == 'Darwin':
RECOMMENDED_FSTYPES = re.compile(r'^(apfs|hfs.?)$')
RECOMMENDED_MAP_FSTYPES = re.compile(
r'^(apfs|cifs|ext[234]|hfs.?|ntfs|smbfs|vfat|xfs)$'
)
REGEX_REMAINING_TIME = re.compile( REGEX_REMAINING_TIME = re.compile(
r'remaining time:' r'remaining time:'
r'\s*((?P<days>\d+)d)?' r'\s*((?P<days>\d+)d)?'
@ -57,13 +64,6 @@ REGEX_REMAINING_TIME = re.compile(
r'\s*(?P<na>n/a)?', r'\s*(?P<na>n/a)?',
re.IGNORECASE re.IGNORECASE
) )
PLATFORM = std.PLATFORM
RECOMMENDED_FSTYPES = re.compile(r'^(ext[234]|ntfs|xfs)$')
if PLATFORM == 'Darwin':
RECOMMENDED_FSTYPES = re.compile(r'^(apfs|hfs.?)$')
RECOMMENDED_MAP_FSTYPES = re.compile(
r'^(apfs|cifs|ext[234]|hfs.?|ntfs|smbfs|vfat|xfs)$'
)
STATUS_COLORS = { STATUS_COLORS = {
'Passed': 'GREEN', 'Passed': 'GREEN',
'Aborted': 'YELLOW', 'Aborted': 'YELLOW',

2
scripts/wk/hw/diags.py
View file

@ -226,7 +226,7 @@ class State():
proc = exe.run_program(['smc', '-l']) proc = exe.run_program(['smc', '-l'])
data.extend(proc.stdout.splitlines()) data.extend(proc.stdout.splitlines())
except Exception: except Exception:
LOG.ERROR('Error(s) encountered while exporting SMC data') LOG.error('Error(s) encountered while exporting SMC data')
data = [line.strip() for line in data] data = [line.strip() for line in data]
with open(f'{debug_dir}/smc.data', 'a', encoding='utf-8') as _f: with open(f'{debug_dir}/smc.data', 'a', encoding='utf-8') as _f:
_f.write('\n'.join(data)) _f.write('\n'.join(data))