me/snap-pac
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use pathlib

Browse source
This commit is contained in:
Wes Barnett 2021-02-27 21:10:22 -05:00
parent edd388092f
commit eeb376a54c
No known key found for this signature in database
GPG key ID: 1070BCC98C18BD66
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/snap_pac.py
View file

@ -22,6 +22,7 @@ import logging
from pathlib import Path from pathlib import Path
import os import os
import sys import sys
import tempfile
logging.basicConfig(format="%(message)s", level=logging.INFO) logging.basicConfig(format="%(message)s", level=logging.INFO)
@ -54,11 +55,10 @@ class SnapperCmd:
def get_snapper_configs(conf_file): def get_snapper_configs(conf_file):
"""Get the snapper configurations.""" """Get the snapper configurations."""
with open(conf_file, "r") as f: for line in conf_file.read_text().split("\n"):
for line in f: if line.startswith("SNAPPER_CONFIGS"):
if line.startswith("SNAPPER_CONFIGS"): line = line.rstrip("\n").rstrip("\"").split("=")
line = line.rstrip("\n").rstrip("\"").split("=") return line[1].lstrip("\"").split()
return line[1].lstrip("\"").split()
def setup_config_parser(ini_file, parent_cmd, packages): def setup_config_parser(ini_file, parent_cmd, packages):
@ -117,7 +117,7 @@ def main(snap_pac_ini, snapper_conf_file, args):
config.add_section(snapper_config) config.add_section(snapper_config)
if config.getboolean(snapper_config, "snapshot"): if config.getboolean(snapper_config, "snapshot"):
prefile = "/tmp" / Path(f"snap-pac-pre_{snapper_config}") prefile = tempfile.gettempdir() / Path(f"snap-pac-pre_{snapper_config}")
cleanup_algorithm = config.get(snapper_config, "cleanup_algorithm") cleanup_algorithm = config.get(snapper_config, "cleanup_algorithm")
description = get_description(args.type, config, snapper_config) description = get_description(args.type, config, snapper_config)
@ -135,8 +135,8 @@ def main(snap_pac_ini, snapper_conf_file, args):
if __name__ == "__main__": if __name__ == "__main__":
snap_pac_ini = "/etc/snap-pac.ini" snap_pac_ini = Path("/etc/snap-pac.ini")
snapper_conf_file = "/etc/conf.d/snapper" snapper_conf_file = Path("/etc/conf.d/snapper")
parser = ArgumentParser(description="Script for taking pre/post snapper snapshots. Used with pacman hooks.") parser = ArgumentParser(description="Script for taking pre/post snapper snapshots. Used with pacman hooks.")
parser.add_argument(dest="type", choices=["pre", "post"]) parser.add_argument(dest="type", choices=["pre", "post"])

2
tests/test_script.py
View file

@ -69,7 +69,7 @@ def test_get_snapper_configs():
f.write("# List of snapper configurations.\n") f.write("# List of snapper configurations.\n")
f.write("SNAPPER_CONFIGS=\"home root foo bar\"\n") f.write("SNAPPER_CONFIGS=\"home root foo bar\"\n")
name = f.name name = f.name
assert get_snapper_configs(name) == ["home", "root", "foo", "bar"] assert get_snapper_configs(Path(name)) == ["home", "root", "foo", "bar"]
def test_skip_snap_pac(): def test_skip_snap_pac():