BioArchLinux/nvchecker
2
0
Fork 0
mirror of https://github.com/lilydjwg/nvchecker.git synced 2025-03-10 06:14:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(core): resolve symlinks on file write

Browse source 
Instead of using the passed filename as the rename target, use
Path.resolve for resolving any symlinks.

This allows to use symlinks for the nvchecker database files that point
somewhere else. Before this commit nvchecker simply replaced the symlink
with an actual file, now we resolve the targets first and only replace
the actual file that is pointed to.

Co-authored-by: Andreas 'Segaja' Schleifer <webmaster@segaja.de>
Signed-off-by: Levente Polyak <levente@leventepolyak.net>
This commit is contained in:
Levente Polyak 2023-07-25 13:04:42 +02:00
parent ea542d1fa1
commit 1986f2953a
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nvchecker/core.py
View file

@ -110,11 +110,11 @@ def process_common_arguments(args: argparse.Namespace) -> bool:
return True
return False
def safe_overwrite(fname: str, data: Union[bytes, str], *,
def safe_overwrite(file: Path, data: Union[bytes, str], *,
method: str = 'write', mode: str = 'w', encoding: Optional[str] = None) -> None:
# FIXME: directory has no read perm
# FIXME: symlinks and hard links
tmpname = fname + '.tmp'
# FIXME: hard links
tmpname = str(file) + '.tmp'
# if not using "with", write can fail without exception
with open(tmpname, mode, encoding=encoding) as f:
getattr(f, method)(data)
@ -122,7 +122,7 @@ def safe_overwrite(fname: str, data: Union[bytes, str], *,
f.flush()
os.fsync(f.fileno())
# if the above write failed (because disk is full etc), the old data should be kept
os.rename(tmpname, fname)
os.rename(tmpname, file.resolve())
def read_verfile(file: Path) -> VersData:
try:
@ -149,7 +149,7 @@ def write_verfile(file: Path, versions: VersData) -> None:
indent=2,
ensure_ascii=False,
) + '\n'
safe_overwrite(str(file), data)
safe_overwrite(file, data)
class Options(NamedTuple):
ver_files: Optional[Tuple[Path, Path]]