mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-04-24 23:37:18 +00:00
add support of repository restoration
This commit is contained in:
parent
e200ac9776
commit
2536b8dc1f
@ -89,6 +89,7 @@ def _parser() -> argparse.ArgumentParser:
|
|||||||
_set_repo_rebuild_parser(subparsers)
|
_set_repo_rebuild_parser(subparsers)
|
||||||
_set_repo_remove_unknown_parser(subparsers)
|
_set_repo_remove_unknown_parser(subparsers)
|
||||||
_set_repo_report_parser(subparsers)
|
_set_repo_report_parser(subparsers)
|
||||||
|
_set_repo_restore_parser(subparsers)
|
||||||
_set_repo_setup_parser(subparsers)
|
_set_repo_setup_parser(subparsers)
|
||||||
_set_repo_sign_parser(subparsers)
|
_set_repo_sign_parser(subparsers)
|
||||||
_set_repo_status_update_parser(subparsers)
|
_set_repo_status_update_parser(subparsers)
|
||||||
@ -409,6 +410,21 @@ def _set_repo_report_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
|||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
|
def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
||||||
|
"""
|
||||||
|
add parser for package addition subcommand
|
||||||
|
:param root: subparsers for the commands
|
||||||
|
:return: created argument parser
|
||||||
|
"""
|
||||||
|
parser = root.add_parser("repo-restore", aliases=["restore"], help="restore repository",
|
||||||
|
description="restore repository from database file", formatter_class=_formatter)
|
||||||
|
parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
|
||||||
|
parser.add_argument("-n", "--now", help="run update function after", action="store_true")
|
||||||
|
parser.add_argument("--without-dependencies", help="do not add dependencies", action="store_true")
|
||||||
|
parser.set_defaults(handler=handlers.Add, package=None, source=PackageSource.AUR)
|
||||||
|
return parser
|
||||||
|
|
||||||
|
|
||||||
def _set_repo_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
def _set_repo_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
||||||
"""
|
"""
|
||||||
add parser for setup subcommand
|
add parser for setup subcommand
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#
|
#
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
from typing import Type
|
from typing import List, Type
|
||||||
|
|
||||||
from ahriman.application.application import Application
|
from ahriman.application.application import Application
|
||||||
from ahriman.application.handlers.handler import Handler
|
from ahriman.application.handlers.handler import Handler
|
||||||
@ -43,10 +43,20 @@ class Add(Handler):
|
|||||||
:param unsafe: if set no user check will be performed before path creation
|
:param unsafe: if set no user check will be performed before path creation
|
||||||
"""
|
"""
|
||||||
application = Application(architecture, configuration, no_report, unsafe)
|
application = Application(architecture, configuration, no_report, unsafe)
|
||||||
application.add(args.package, args.source, args.without_dependencies)
|
packages = Add.extract_packages(application) if args.package is None else args.package
|
||||||
|
application.add(packages, args.source, args.without_dependencies)
|
||||||
if not args.now:
|
if not args.now:
|
||||||
return
|
return
|
||||||
|
|
||||||
packages = application.updates(args.package, True, True, False, True, application.logger.info)
|
packages = application.updates(packages, True, True, False, True, application.logger.info)
|
||||||
result = application.update(packages)
|
result = application.update(packages)
|
||||||
Add.check_if_empty(args.exit_code, result.is_empty)
|
Add.check_if_empty(args.exit_code, result.is_empty)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def extract_packages(application: Application) -> List[str]:
|
||||||
|
"""
|
||||||
|
extract packages from database file
|
||||||
|
:param application: application instance
|
||||||
|
:return: list of packages which were stored in database
|
||||||
|
"""
|
||||||
|
return [package.base for (package, _) in application.database.packages_get()]
|
||||||
|
@ -3,6 +3,7 @@ import pytest
|
|||||||
|
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
|
from ahriman.application.application import Application
|
||||||
from ahriman.application.handlers import Add
|
from ahriman.application.handlers import Add
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.models.package import Package
|
from ahriman.models.package import Package
|
||||||
@ -36,6 +37,20 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
|
|||||||
application_mock.assert_called_once_with(args.package, args.source, args.without_dependencies)
|
application_mock.assert_called_once_with(args.package, args.source, args.without_dependencies)
|
||||||
|
|
||||||
|
|
||||||
|
def test_run_extract_packages(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must run command
|
||||||
|
"""
|
||||||
|
args = _default_args(args)
|
||||||
|
args.package = None
|
||||||
|
mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
|
||||||
|
mocker.patch("ahriman.application.application.Application.add")
|
||||||
|
extract_mock = mocker.patch("ahriman.application.handlers.Add.extract_packages", return_value=[])
|
||||||
|
|
||||||
|
Add.run(args, "x86_64", configuration, True, False)
|
||||||
|
extract_mock.assert_called_once_with(pytest.helpers.anyvar(int))
|
||||||
|
|
||||||
|
|
||||||
def test_run_with_updates(args: argparse.Namespace, configuration: Configuration,
|
def test_run_with_updates(args: argparse.Namespace, configuration: Configuration,
|
||||||
package_ahriman: Package, mocker: MockerFixture) -> None:
|
package_ahriman: Package, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
@ -72,3 +87,12 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
|
|||||||
|
|
||||||
Add.run(args, "x86_64", configuration, True, False)
|
Add.run(args, "x86_64", configuration, True, False)
|
||||||
check_mock.assert_called_once_with(True, True)
|
check_mock.assert_called_once_with(True, True)
|
||||||
|
|
||||||
|
|
||||||
|
def test_extract_packages(application: Application, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must extract packages from database
|
||||||
|
"""
|
||||||
|
packages_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.packages_get")
|
||||||
|
Add.extract_packages(application)
|
||||||
|
packages_mock.assert_called_once_with()
|
||||||
|
@ -6,6 +6,7 @@ from pytest_mock import MockerFixture
|
|||||||
from ahriman.application.handlers import Handler
|
from ahriman.application.handlers import Handler
|
||||||
from ahriman.models.action import Action
|
from ahriman.models.action import Action
|
||||||
from ahriman.models.build_status import BuildStatusEnum
|
from ahriman.models.build_status import BuildStatusEnum
|
||||||
|
from ahriman.models.package_source import PackageSource
|
||||||
from ahriman.models.sign_settings import SignSettings
|
from ahriman.models.sign_settings import SignSettings
|
||||||
from ahriman.models.user_access import UserAccess
|
from ahriman.models.user_access import UserAccess
|
||||||
|
|
||||||
@ -339,6 +340,25 @@ def test_subparsers_repo_report_architecture(parser: argparse.ArgumentParser) ->
|
|||||||
assert args.architecture == ["x86_64"]
|
assert args.architecture == ["x86_64"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_subparsers_repo_restore(parser: argparse.ArgumentParser) -> None:
|
||||||
|
"""
|
||||||
|
repo-restore command must imply package and source
|
||||||
|
"""
|
||||||
|
args = parser.parse_args(["repo-restore"])
|
||||||
|
assert args.package is None
|
||||||
|
assert args.source == PackageSource.AUR
|
||||||
|
|
||||||
|
|
||||||
|
def test_subparsers_repo_restore_architecture(parser: argparse.ArgumentParser) -> None:
|
||||||
|
"""
|
||||||
|
repo-restore command must correctly parse architecture list
|
||||||
|
"""
|
||||||
|
args = parser.parse_args(["repo-restore"])
|
||||||
|
assert args.architecture is None
|
||||||
|
args = parser.parse_args(["-a", "x86_64", "repo-restore"])
|
||||||
|
assert args.architecture == ["x86_64"]
|
||||||
|
|
||||||
|
|
||||||
def test_subparsers_repo_setup(parser: argparse.ArgumentParser) -> None:
|
def test_subparsers_repo_setup(parser: argparse.ArgumentParser) -> None:
|
||||||
"""
|
"""
|
||||||
repo-setup command must imply lock, no-report, quiet and unsafe
|
repo-setup command must imply lock, no-report, quiet and unsafe
|
||||||
|
Loading…
Reference in New Issue
Block a user