yacloud/shadowmire
1
0
Fork 0
mirror of https://github.com/taoky/shadowmire.git synced 2025-07-08 09:12:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove invalid local ones when planning

Browse Source
This commit is contained in:
taoky 2024-08-04 17:14:49 +08:00
parent 9008d2cbce
commit 649d14c4fd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shadowmire.py
View File

@ -146,6 +146,8 @@ def remove_dir_with_files(directory: Path) -> None:
""" """
Remove dir in a safer (non-recursive) way, which means that the directory should have no child directories. Remove dir in a safer (non-recursive) way, which means that the directory should have no child directories.
""" """
if not directory.exists():
return
assert directory.is_dir() assert directory.is_dir()
for item in directory.iterdir(): for item in directory.iterdir():
item.unlink() item.unlink()
@ -407,6 +409,7 @@ class SyncBase:
if local_serial != remote_serial: if local_serial != remote_serial:
if local_serial == -1: if local_serial == -1:
logger.info("skip %s, as it's marked as not exist at upstream", i) logger.info("skip %s, as it's marked as not exist at upstream", i)
to_remove.append(i)
else: else:
to_update.append(i) to_update.append(i)
output = Plan(remove=to_remove, update=to_update) output = Plan(remove=to_remove, update=to_update)
@ -474,11 +477,12 @@ class SyncBase:
logger.info("Removed file %s", p_path) logger.info("Removed file %s", p_path)
except FileNotFoundError: except FileNotFoundError:
pass pass
# remove all files inside meta_dir
self.local_db.remove(package_name)
remove_dir_with_files(meta_dir)
except FileNotFoundError: except FileNotFoundError:
logger.warning("FileNotFoundError when removing %s", package_name)
pass pass
# remove all files inside meta_dir
self.local_db.remove(package_name)
remove_dir_with_files(meta_dir)
def do_update( def do_update(
self, self,