SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-29 15:31:28 +00:00
Code Issues Projects Releases Wiki Activity

fix: rename functions

Browse source
This commit is contained in:
dettlaff 2024-01-17 19:26:10 +04:00
parent 372eadd306
commit bb1e1bcae0
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
selfprivacy_api/jobs/nix_collect_garbage.py
View file

@ -15,7 +15,7 @@ RESULT_WAS_NOT_FOUND_ERROR = "We are sorry, garbage collection result was not fo
CLEAR_COMPLETED = "Garbage collection completed." CLEAR_COMPLETED = "Garbage collection completed."
def run_nix_store_print_dead() -> str: def delete_old_gens_and_print_dead() -> str:
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,
@ -94,7 +94,7 @@ def get_dead_packages(output) -> Tuple[int, float]:
@huey.task() @huey.task()
def calculate_and_clear_dead_packages(job: Job): def calculate_and_clear_dead_paths(job: Job):
Jobs.update( Jobs.update(
job=job, job=job,
status=JobStatus.RUNNING, status=JobStatus.RUNNING,
@ -103,7 +103,7 @@ def calculate_and_clear_dead_packages(job: Job):
) )
dead_packages, package_equal_to_percent = get_dead_packages( dead_packages, package_equal_to_percent = get_dead_packages(
run_nix_store_print_dead() delete_old_gens_and_print_dead()
) )
if dead_packages == 0: if dead_packages == 0:
@ -132,5 +132,5 @@ def start_nix_collect_garbage() -> Job:
name="Collect garbage", name="Collect garbage",
description="Cleaning up unused packages", description="Cleaning up unused packages",
) )
calculate_and_clear_dead_packages(job=job) calculate_and_clear_dead_paths(job=job)
return job return job

2
selfprivacy_api/task_registry.py
View file

@ -2,4 +2,4 @@ from selfprivacy_api.utils.huey import huey
from selfprivacy_api.jobs.test import test_job from selfprivacy_api.jobs.test import test_job
from selfprivacy_api.backup.tasks import * from selfprivacy_api.backup.tasks import *
from selfprivacy_api.services.generic_service_mover import move_service from selfprivacy_api.services.generic_service_mover import move_service
from selfprivacy_api.jobs.nix_collect_garbage import calculate_and_clear_dead_packages from selfprivacy_api.jobs.nix_collect_garbage import calculate_and_clear_dead_paths

5
tests/test_graphql/test_nix_collect_garbage.py
View file

@ -49,11 +49,6 @@ note: currently hard linking saves 0.00 MiB
0 store paths deleted, 0.00 MiB freed 0 store paths deleted, 0.00 MiB freed
""" """
OUTPUT_RUN_NIX_STORE_PRINT_DEAD_ZERO_TRASH = """
finding garbage collector roots...
determining live/dead paths...
"""
log_event = [] log_event = []