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

Remember files correctly for cleanin up

Browse Source
This commit is contained in:
Joscha 2018-11-28 08:59:07 +00:00
parent dad33b8c7f
commit bdc0e8ad03
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PFERD/organizer.py
View File

@ -50,12 +50,15 @@ class Organizer:
# check if sync_dir/to_path is inside sync_dir? # check if sync_dir/to_path is inside sync_dir?
to_path = pathlib.Path(self._sync_dir, to_path) to_path = pathlib.Path(self._sync_dir, to_path)
# remember path for later reference
self._added_files.add(to_path.resolve())
if to_path.exists(): if to_path.exists():
if filecmp.cmp(from_path, to_path, shallow=False): if filecmp.cmp(from_path, to_path, shallow=False):
logger.info(f"Ignored {to_path}") logger.info(f"Ignored {to_path}")
# remember path for later reference
self._added_files.add(to_path.resolve())
logger.debug(f"Added file {to_path.resolve()}")
# No further action needed, especially not overwriting symlinks... # No further action needed, especially not overwriting symlinks...
return return
else: else:
@ -64,16 +67,24 @@ class Organizer:
logger.info(f"New file at {to_path}") logger.info(f"New file at {to_path}")
# copy the file from from_path to sync_dir/to_path # copy the file from from_path to sync_dir/to_path
# If the file being replaced was a symlink, the link itself is overwritten,
# not the file the link points to.
to_path.parent.mkdir(parents=True, exist_ok=True) to_path.parent.mkdir(parents=True, exist_ok=True)
from_path.replace(to_path) from_path.replace(to_path)
logger.debug(f"Moved {from_path} to {to_path}") logger.debug(f"Moved {from_path} to {to_path}")
# remember path for later reference, after the new file was written
# This is necessary here because otherwise, resolve() would resolve the symlink too.
self._added_files.add(to_path.resolve())
logger.debug(f"Added file {to_path.resolve()}")
def clean_sync_dir(self): def clean_sync_dir(self):
self._clean_dir(self._sync_dir, remove_parent=False) self._clean_dir(self._sync_dir, remove_parent=False)
logger.debug(f"Cleaned sync dir: {self._sync_dir}") logger.debug(f"Cleaned sync dir: {self._sync_dir}")
def _clean_dir(self, path, remove_parent=True): def _clean_dir(self, path, remove_parent=True):
for child in sorted(path.iterdir()): for child in sorted(path.iterdir()):
logger.debug(f"Looking at {child.resolve()}")
if child.is_dir(): if child.is_dir():
self._clean_dir(child, remove_parent=True) self._clean_dir(child, remove_parent=True)
elif child.resolve() not in self._added_files: elif child.resolve() not in self._added_files: