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

Reword some explanations

Browse Source
This commit is contained in:
Joscha 2021-05-23 18:35:32 +02:00
parent d97d6bf147
commit 445dffc987
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PFERD/output_dir.py
View File

@ -197,7 +197,7 @@ class OutputDirectory:
if remote_newer: if remote_newer:
log.explain("Remote file seems to be newer") log.explain("Remote file seems to be newer")
else: else:
log.explain("Local file seems to be newer") log.explain("Remote file doesn't seem to be newer")
if redownload == Redownload.NEVER_SMART: if redownload == Redownload.NEVER_SMART:
if remote_newer is None: if remote_newer is None:
@ -344,12 +344,12 @@ class OutputDirectory:
# Detect and solve local-dir-remote-file conflict # Detect and solve local-dir-remote-file conflict
if local_path.is_dir(): if local_path.is_dir():
log.explain("Conflict: There's a dir in place of the local file") log.explain("Conflict: There's a directory in place of the local file")
if await self._conflict_ldrf(on_conflict, path): if await self._conflict_ldrf(on_conflict, path):
log.explain("Result: Delete the dir") log.explain("Result: Delete the obstructing directory")
shutil.rmtree(local_path) shutil.rmtree(local_path)
else: else:
log.explain("Result: Keep the dir") log.explain("Result: Keep the obstructing directory")
return None return None
# Detect and solve local-file-remote-dir conflict # Detect and solve local-file-remote-dir conflict
@ -399,20 +399,19 @@ class OutputDirectory:
if filecmp.cmp(info.local_path, info.tmp_path): if filecmp.cmp(info.local_path, info.tmp_path):
log.explain("Contents identical with existing file") log.explain("Contents identical with existing file")
log.explain("Updating metadata on existing file instead") log.explain("Updating metadata of existing file")
self._update_metadata(info) self._update_metadata(info)
return return
log.explain("Conflict: The local and remote versions differ") log.explain("Conflict: The local and remote versions differ")
if await self._conflict_lfrf(info.on_conflict, info.path): if await self._conflict_lfrf(info.on_conflict, info.path):
log.explain("Result: Keeping the remote version") log.explain("Result: Replacing local with remote version")
else: else:
log.explain("Result: Keeping the local version") log.explain("Result: Keeping local version")
return return
log.explain("Replacing local file with temporary file")
info.tmp_path.replace(info.local_path) info.tmp_path.replace(info.local_path)
log.explain("Updating metadata on local file") log.explain("Updating file metadata")
self._update_metadata(info) self._update_metadata(info)
if changed: if changed: