ItsDrike/dotfiles
1
0
Fork 0
mirror of https://github.com/ItsDrike/dotfiles.git synced 2024-12-26 13:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a much less repetetive system for applying fixes

Browse source
This commit is contained in:
ItsDrike 2023-02-02 22:04:51 +01:00
parent 7c735df204
commit c9d593ef4f
No known key found for this signature in database
GPG key ID: B014E761034AF742
1 changed files with 47 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
sync.py
View file

@ -244,73 +244,67 @@ class FixChoice(Enum):
raise Exception("This can't happen (just here for typing.NoReturn)") raise Exception("This can't happen (just here for typing.NoReturn)")
def _overwrite_file(source: Path, target: Path):
"""Overwrite content of `target` file/directory/symlink with `source` file/directory/symlink."""
if not source.exists():
raise ValueError(f"Can't overwrite target with non-existent source ({target=}, {source=})")
# Remove the target, if it already exists
if target.exists():
if target.is_dir():
shutil.rmtree(target)
else:
target.unlink()
# Ensure parent dir exists for the target
target.parent.mkdir(parents=True, exist_ok=True)
# Copy the source to given target, preserving symlinks
if source.is_dir():
shutil.copytree(source, target, symlinks=True)
else:
shutil.copy(source, target, follow_symlinks=False)
def apply_fix(diff: FileDiff) -> None: def apply_fix(diff: FileDiff) -> None:
"""Ask the user how to fix the difference, and apply requested fix."""
match diff.status: match diff.status:
case DiffStatus.PERMISSION_ERROR: case DiffStatus.PERMISSION_ERROR:
print("Skipping fix: insufficient permissions") print("Skipping fix: insufficient permissions")
return
case DiffStatus.UNEXPECTED_DIRECTORY: case DiffStatus.UNEXPECTED_DIRECTORY:
_choice = FixChoice.pick(diff.sys_file, "directory", "file") _choice = FixChoice.pick(diff.sys_file, "directory", "file")
match _choice:
case FixChoice.SKIP:
return
case FixChoice.OVERWRITE_SYSTEM:
shutil.rmtree(diff.sys_file)
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False)
case FixChoice.OVERWRITE_DOTFILE:
diff.dot_file.unlink()
shutil.copytree(diff.sys_file, diff.dot_file, symlinks=True)
case DiffStatus.UNEXPECTED_SYMLINK: case DiffStatus.UNEXPECTED_SYMLINK:
_choice = FixChoice.pick(diff.sys_file, "symlink", "file") _choice = FixChoice.pick(diff.sys_file, "symlink", "file")
match _choice:
case FixChoice.SKIP:
return
case FixChoice.OVERWRITE_SYSTEM:
diff.sys_file.unlink()
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False)
case FixChoice.OVERWRITE_DOTFILE:
diff.dot_file.unlink()
shutil.copy(diff.sys_file, diff.dot_file, follow_symlinks=False)
case DiffStatus.EXPECTED_SYMLINK: case DiffStatus.EXPECTED_SYMLINK:
_choice = FixChoice.pick(diff.sys_file, "file", "symlink") _choice = FixChoice.pick(diff.sys_file, "file/directory", "symlink")
match _choice:
case FixChoice.SKIP:
return
case FixChoice.OVERWRITE_SYSTEM:
diff.sys_file.unlink()
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False)
case FixChoice.OVERWRITE_DOTFILE:
diff.dot_file.unlink()
shutil.copy(diff.sys_file, diff.dot_file, follow_symlinks=False)
case DiffStatus.SYMLINK_DIFFERS: case DiffStatus.SYMLINK_DIFFERS:
_choice = FixChoice.pick(diff.sys_file, "symlink", "file") _choice = FixChoice.pick(diff.sys_file, "symlink", "symlink")
match _choice:
case FixChoice.SKIP:
return
case FixChoice.OVERWRITE_SYSTEM:
diff.sys_file.unlink()
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False)
case FixChoice.OVERWRITE_DOTFILE:
diff.dot_file.unlink()
shutil.copy(diff.sys_file, diff.dot_file, follow_symlinks=False)
case DiffStatus.NOT_FOUND: case DiffStatus.NOT_FOUND:
_choice = FixChoice.pick(diff.sys_file, None, "file") _choice = FixChoice.pick(diff.sys_file, None, "file")
match _choice:
case FixChoice.SKIP:
return
case FixChoice.OVERWRITE_SYSTEM:
diff.sys_file.parent.mkdir(parents=True, exist_ok=True)
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False)
case FixChoice.OVERWRITE_DOTFILE:
diff.dot_file.unlink()
case DiffStatus.CONTENT_DIFFERS: case DiffStatus.CONTENT_DIFFERS:
_choice = FixChoice.pick(diff.sys_file, "file", "file") _choice = FixChoice.pick(diff.sys_file, "file", "file")
case status:
raise Exception(f"Diff status {status!r} didn't match on any cases. This should never happen")
match _choice: match _choice:
case FixChoice.SKIP: case FixChoice.SKIP:
return return
case FixChoice.OVERWRITE_SYSTEM: case FixChoice.OVERWRITE_SYSTEM:
shutil.copy(diff.dot_file, diff.sys_file, follow_symlinks=False) source = diff.dot_file
target = diff.sys_file
case FixChoice.OVERWRITE_DOTFILE: case FixChoice.OVERWRITE_DOTFILE:
shutil.copy(diff.sys_file, diff.dot_file, follow_symlinks=False) source = diff.sys_file
target = diff.dot_file
case choice:
raise Exception(f"Choice {choice!r} didn't match on any cases. This should never happen")
try:
_overwrite_file(source=source, target=target)
except PermissionError:
print("Fix failed: insufficient permissions")
return
def show_diffs(diffs: Iterable[FileDiff], ask_show_diff: bool, apply_fix_prompt: bool) -> None: def show_diffs(diffs: Iterable[FileDiff], ask_show_diff: bool, apply_fix_prompt: bool) -> None: