mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2023-12-21 10:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Treat file overwrite and marked file overwrite differently

Browse Source
This commit is contained in:
I-Al-Istannen 2020-12-05 14:03:43 +01:00
parent 2d64409542
commit 4ce385b262
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
PFERD/organizer.py
View File

@ -24,34 +24,44 @@ class ConflictType(Enum):
""" """
The type of the conflict. A file might not exist anymore and will be deleted The type of the conflict. A file might not exist anymore and will be deleted
or it might be overwritten with a newer version. or it might be overwritten with a newer version.
FILE_OVERWRITTEN: An existing file will be updated
MARKED_FILE_OVERWRITTEN: A file is written for the second+ time in this run
FILE_DELETED: The file was deleted
""" """
FILE_OVERWRITTEN = "overwritten" FILE_OVERWRITTEN = "overwritten"
MARKED_FILE_OVERWRITTEN = "marked_file_overwritten"
FILE_DELETED = "deleted" FILE_DELETED = "deleted"
class FileConflictResolution(Enum): class FileConflictResolution(Enum):
""" """
The reaction when confronted with a file conflict: The reaction when confronted with a file conflict:
DESTROY_EXISTING: Delete/overwrite the current file
KEEP_EXISTING: Keep the current file
DEFAULT: Do whatever the PFERD authors thought is sensible
PROMPT: Interactively ask the user
""" """
DESTROY_EXISTING = "destroy" DESTROY_EXISTING = "destroy"
"""Delete/overwrite the current file"""
KEEP_EXISTING = "keep" KEEP_EXISTING = "keep"
"""Keep the current file"""
DEFAULT = "default" DEFAULT = "default"
"""Do whatever the PFERD authors thought is sensible"""
PROMPT = "prompt" PROMPT = "prompt"
"""Interactively ask the user"""
FileConflictResolver = Callable[[PurePath, ConflictType], FileConflictResolution] FileConflictResolver = Callable[[PurePath, ConflictType], FileConflictResolution]
def resolve_prompt_user(_path: PurePath, _conflict: ConflictType) -> FileConflictResolution: def resolve_prompt_user(_path: PurePath, conflict: ConflictType) -> FileConflictResolution:
"""Resolves conflicts by always asking the user.""" """
Resolves conflicts by asking the user if a file was written twice or will be deleted.
"""
if conflict == ConflictType.FILE_OVERWRITTEN:
return FileConflictResolution.DESTROY_EXISTING
return FileConflictResolution.PROMPT return FileConflictResolution.PROMPT
@ -105,7 +115,7 @@ class Organizer(Location):
if self._is_marked(dst): if self._is_marked(dst):
PRETTY.warning(f"File {str(dst_absolute)!r} was already written!") PRETTY.warning(f"File {str(dst_absolute)!r} was already written!")
conflict = ConflictType.FILE_OVERWRITTEN conflict = ConflictType.MARKED_FILE_OVERWRITTEN
if self._resolve_conflict(f"Overwrite file?", dst_absolute, conflict, default=False): if self._resolve_conflict(f"Overwrite file?", dst_absolute, conflict, default=False):
PRETTY.ignored_file(dst_absolute, "file was written previously") PRETTY.ignored_file(dst_absolute, "file was written previously")
return None return None
@ -128,6 +138,11 @@ class Organizer(Location):
self.mark(dst) self.mark(dst)
return dst_absolute return dst_absolute
prompt = f"Overwrite file {dst_absolute}?"
conflict = ConflictType.FILE_OVERWRITTEN
if not self._resolve_conflict(prompt, dst_absolute, conflict, default=True):
return None
self.download_summary.add_modified_file(dst_absolute) self.download_summary.add_modified_file(dst_absolute)
PRETTY.modified_file(dst_absolute) PRETTY.modified_file(dst_absolute)
else: else:

2
sync_url.py
View File

@ -30,6 +30,8 @@ def _resolve_no_delete(_path: PurePath, conflict: ConflictType) -> FileConflictR
# Update files # Update files
if conflict == ConflictType.FILE_OVERWRITTEN: if conflict == ConflictType.FILE_OVERWRITTEN:
return FileConflictResolution.DESTROY_EXISTING return FileConflictResolution.DESTROY_EXISTING
if conflict == ConflictType.MARKED_FILE_OVERWRITTEN:
return FileConflictResolution.DESTROY_EXISTING
# But do not delete them # But do not delete them
return FileConflictResolution.KEEP_EXISTING return FileConflictResolution.KEEP_EXISTING