SelfPrivacy
/
selfprivacy-rest-api
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: corrected from comment from pr

This commit is contained in:
dettlaff 2023-10-16 20:39:58 +04:00
parent eda5923cc6
commit c0f8b9026b
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
selfprivacy_api/jobs/nix_collect_garbage.py
View File

@ -1,6 +1,7 @@
import re import re
import subprocess import subprocess
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
from typing import Tuple, Iterable, IO, Any, Optional
from selfprivacy_api.utils.huey import huey from selfprivacy_api.utils.huey import huey
@ -14,7 +15,7 @@ RESULT_WAS_NOT_FOUND_ERROR = "We are sorry, garbage collection result was not fo
CLEAR_COMPLETED = "Cleaning completed." CLEAR_COMPLETED = "Cleaning completed."
def run_nix_store_print_dead() -> PIPE: def run_nix_store_print_dead() -> IO[Any]:
subprocess.run( subprocess.run(
["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"], ["nix-env", "-p", "/nix/var/nix/profiles/system", "--delete-generations old"],
check=False, check=False,
@ -24,14 +25,13 @@ def run_nix_store_print_dead() -> PIPE:
"utf-8" "utf-8"
) )
def run_nix_collect_garbage() -> Optional[IO[bytes]]:
def run_nix_collect_garbage() -> subprocess.Popen:
return subprocess.Popen( return subprocess.Popen(
["nix-store", "--gc"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT ["nix-store", "--gc"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT
).stdout ).stdout
def parse_line(line): def parse_line(line: str):
""" """
We parse the string for the presence of a final line, We parse the string for the presence of a final line,
with the final amount of space cleared. with the final amount of space cleared.
@ -58,7 +58,7 @@ def parse_line(line):
) )
def process_stream(job, stream, total_dead_packages): def process_stream(job: Job, stream: Iterable[bytes], total_dead_packages: int) -> None:
completed_packages = 0 completed_packages = 0
prev_progress = 0 prev_progress = 0
@ -89,7 +89,7 @@ def process_stream(job, stream, total_dead_packages):
) )
def get_dead_packages(output): def get_dead_packages(output) -> Tuple[int, int]:
dead = len(re.findall("/nix/store/", output)) dead = len(re.findall("/nix/store/", output))
percent = 0 percent = 0
if dead != 0: if dead != 0:

7
tests/test_graphql/test_nix_collect_garbage.py
View File

@ -18,9 +18,6 @@ from selfprivacy_api.jobs.nix_collect_garbage import (
RESULT_WAS_NOT_FOUND_ERROR, RESULT_WAS_NOT_FOUND_ERROR,
) )
pytest_plugins = ("pytest_asyncio",)
OUTPUT_PRINT_DEAD = """ OUTPUT_PRINT_DEAD = """
finding garbage collector roots... finding garbage collector roots...
determining live/dead paths... determining live/dead paths...
@ -102,7 +99,7 @@ def test_get_dead_packages_zero(job_reset):
assert get_dead_packages("") == (0, 0) assert get_dead_packages("") == (0, 0)
RUN_NIX_COLLECT_GARBAGE_QUERY = """ RUN_NIX_COLLECT_GARBAGE_MUTATION = """
mutation CollectGarbage { mutation CollectGarbage {
system { system {
nixCollectGarbage { nixCollectGarbage {
@ -133,7 +130,7 @@ def test_graphql_nix_collect_garbage(authorized_client):
response = authorized_client.post( response = authorized_client.post(
"/graphql", "/graphql",
json={ json={
"query": RUN_NIX_COLLECT_GARBAGE_QUERY, "query": RUN_NIX_COLLECT_GARBAGE_MUTATION,
}, },
) )