mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-04-24 15:27:17 +00:00
add search subparser
This commit is contained in:
parent
f634f1df58
commit
6255da3368
@ -59,6 +59,7 @@ def _parser() -> argparse.ArgumentParser:
|
|||||||
_set_rebuild_parser(subparsers)
|
_set_rebuild_parser(subparsers)
|
||||||
_set_remove_parser(subparsers)
|
_set_remove_parser(subparsers)
|
||||||
_set_report_parser(subparsers)
|
_set_report_parser(subparsers)
|
||||||
|
_set_search_parser(subparsers)
|
||||||
_set_setup_parser(subparsers)
|
_set_setup_parser(subparsers)
|
||||||
_set_sign_parser(subparsers)
|
_set_sign_parser(subparsers)
|
||||||
_set_status_parser(subparsers)
|
_set_status_parser(subparsers)
|
||||||
@ -169,6 +170,18 @@ def _set_report_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
|||||||
return parser
|
return parser
|
||||||
|
|
||||||
|
|
||||||
|
def _set_search_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
||||||
|
"""
|
||||||
|
add parser for search subcommand
|
||||||
|
:param root: subparsers for the commands
|
||||||
|
:return: created argument parser
|
||||||
|
"""
|
||||||
|
parser = root.add_parser("search", help="search for package", description="search for package in AUR using API")
|
||||||
|
parser.add_argument("search", help="search terms, can be specified multiple times", nargs="+")
|
||||||
|
parser.set_defaults(handler=handlers.Search, lock=None, no_report=True, unsafe=True)
|
||||||
|
return parser
|
||||||
|
|
||||||
|
|
||||||
def _set_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
def _set_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
|
||||||
"""
|
"""
|
||||||
add parser for setup subcommand
|
add parser for setup subcommand
|
||||||
|
@ -25,6 +25,7 @@ from ahriman.application.handlers.dump import Dump
|
|||||||
from ahriman.application.handlers.rebuild import Rebuild
|
from ahriman.application.handlers.rebuild import Rebuild
|
||||||
from ahriman.application.handlers.remove import Remove
|
from ahriman.application.handlers.remove import Remove
|
||||||
from ahriman.application.handlers.report import Report
|
from ahriman.application.handlers.report import Report
|
||||||
|
from ahriman.application.handlers.search import Search
|
||||||
from ahriman.application.handlers.setup import Setup
|
from ahriman.application.handlers.setup import Setup
|
||||||
from ahriman.application.handlers.sign import Sign
|
from ahriman.application.handlers.sign import Sign
|
||||||
from ahriman.application.handlers.status import Status
|
from ahriman.application.handlers.status import Status
|
||||||
|
58
src/ahriman/application/handlers/search.py
Normal file
58
src/ahriman/application/handlers/search.py
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) 2021 ahriman team.
|
||||||
|
#
|
||||||
|
# This file is part of ahriman
|
||||||
|
# (see https://github.com/arcan1s/ahriman).
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
import argparse
|
||||||
|
import aur # type: ignore
|
||||||
|
|
||||||
|
from typing import Callable, Type
|
||||||
|
|
||||||
|
from ahriman.application.handlers.handler import Handler
|
||||||
|
from ahriman.core.configuration import Configuration
|
||||||
|
|
||||||
|
|
||||||
|
class Search(Handler):
|
||||||
|
"""
|
||||||
|
packages search handler
|
||||||
|
"""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def run(cls: Type[Handler], args: argparse.Namespace, architecture: str, configuration: Configuration) -> None:
|
||||||
|
"""
|
||||||
|
callback for command line
|
||||||
|
:param args: command line args
|
||||||
|
:param architecture: repository architecture
|
||||||
|
:param configuration: configuration instance
|
||||||
|
"""
|
||||||
|
search = " ".join(args.search)
|
||||||
|
packages = aur.search(search)
|
||||||
|
|
||||||
|
# it actually always should return string
|
||||||
|
# explicit cast to string just to avoid mypy warning for untyped library
|
||||||
|
comparator: Callable[[aur.Package], str] = lambda item: str(item.package_base)
|
||||||
|
for package in sorted(packages, key=comparator):
|
||||||
|
Search.log_fn(package)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def log_fn(package: aur.Package) -> None:
|
||||||
|
"""
|
||||||
|
log package information
|
||||||
|
:param package: package object as from AUR
|
||||||
|
"""
|
||||||
|
print(f"=> {package.package_base} {package.version}")
|
||||||
|
print(f" {package.description}")
|
@ -140,7 +140,7 @@ class Configuration(configparser.RawConfigParser):
|
|||||||
if path == self.logging_path:
|
if path == self.logging_path:
|
||||||
continue # we don't want to load logging explicitly
|
continue # we don't want to load logging explicitly
|
||||||
self.read(path)
|
self.read(path)
|
||||||
except (FileNotFoundError, configparser.NoOptionError):
|
except (FileNotFoundError, configparser.NoOptionError, configparser.NoSectionError):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def load_logging(self, logfile: bool) -> None:
|
def load_logging(self, logfile: bool) -> None:
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import argparse
|
import argparse
|
||||||
|
import aur
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
@ -7,6 +8,7 @@ from ahriman.application.ahriman import _parser
|
|||||||
from ahriman.application.application import Application
|
from ahriman.application.application import Application
|
||||||
from ahriman.application.lock import Lock
|
from ahriman.application.lock import Lock
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
|
from ahriman.models.package import Package
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
@ -20,6 +22,26 @@ def args() -> argparse.Namespace:
|
|||||||
return argparse.Namespace(lock=None, force=False, unsafe=False, no_report=True)
|
return argparse.Namespace(lock=None, force=False, unsafe=False, no_report=True)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def aur_package_ahriman(package_ahriman: Package) -> aur.Package:
|
||||||
|
return aur.Package(
|
||||||
|
num_votes=None,
|
||||||
|
description=package_ahriman.packages[package_ahriman.base].description,
|
||||||
|
url_path=package_ahriman.web_url,
|
||||||
|
last_modified=None,
|
||||||
|
name=package_ahriman.base,
|
||||||
|
out_of_date=None,
|
||||||
|
id=None,
|
||||||
|
first_submitted=None,
|
||||||
|
maintainer=None,
|
||||||
|
version=package_ahriman.version,
|
||||||
|
license=package_ahriman.packages[package_ahriman.base].licenses,
|
||||||
|
url=None,
|
||||||
|
package_base=package_ahriman.base,
|
||||||
|
package_base_id=None,
|
||||||
|
category_id=None)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def lock(args: argparse.Namespace, configuration: Configuration) -> Lock:
|
def lock(args: argparse.Namespace, configuration: Configuration) -> Lock:
|
||||||
return Lock(args, "x86_64", configuration)
|
return Lock(args, "x86_64", configuration)
|
||||||
|
50
tests/ahriman/application/handlers/test_handler_search.py
Normal file
50
tests/ahriman/application/handlers/test_handler_search.py
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
import argparse
|
||||||
|
import aur
|
||||||
|
|
||||||
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
|
from ahriman.application.handlers import Search
|
||||||
|
from ahriman.core.configuration import Configuration
|
||||||
|
|
||||||
|
|
||||||
|
def _default_args(args: argparse.Namespace) -> argparse.Namespace:
|
||||||
|
args.search = ["ahriman"]
|
||||||
|
return args
|
||||||
|
|
||||||
|
|
||||||
|
def test_run(args: argparse.Namespace, configuration: Configuration, aur_package_ahriman: aur.Package,
|
||||||
|
mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must run command
|
||||||
|
"""
|
||||||
|
args = _default_args(args)
|
||||||
|
mocker.patch("aur.search", return_value=[aur_package_ahriman])
|
||||||
|
log_mock = mocker.patch("ahriman.application.handlers.search.Search.log_fn")
|
||||||
|
|
||||||
|
Search.run(args, "x86_64", configuration)
|
||||||
|
log_mock.assert_called_once()
|
||||||
|
|
||||||
|
|
||||||
|
def test_run_multiple_search(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
must run command with multiple search arguments
|
||||||
|
"""
|
||||||
|
args = _default_args(args)
|
||||||
|
args.search = ["ahriman", "is", "cool"]
|
||||||
|
search_mock = mocker.patch("aur.search")
|
||||||
|
|
||||||
|
Search.run(args, "x86_64", configuration)
|
||||||
|
search_mock.assert_called_with(" ".join(args.search))
|
||||||
|
|
||||||
|
|
||||||
|
def test_log_fn(args: argparse.Namespace, configuration: Configuration, aur_package_ahriman: aur.Package,
|
||||||
|
mocker: MockerFixture) -> None:
|
||||||
|
"""
|
||||||
|
log function must call print built-in
|
||||||
|
"""
|
||||||
|
args = _default_args(args)
|
||||||
|
mocker.patch("aur.search", return_value=[aur_package_ahriman])
|
||||||
|
print_mock = mocker.patch("builtins.print")
|
||||||
|
|
||||||
|
Search.run(args, "x86_64", configuration)
|
||||||
|
print_mock.assert_called() # we don't really care about call details tbh
|
@ -71,6 +71,16 @@ def test_subparsers_config(parser: argparse.ArgumentParser) -> None:
|
|||||||
assert args.unsafe
|
assert args.unsafe
|
||||||
|
|
||||||
|
|
||||||
|
def test_subparsers_search(parser: argparse.ArgumentParser) -> None:
|
||||||
|
"""
|
||||||
|
search command must imply lock, no_report and unsafe
|
||||||
|
"""
|
||||||
|
args = parser.parse_args(["-a", "x86_64", "search", "ahriman"])
|
||||||
|
assert args.lock is None
|
||||||
|
assert args.no_report
|
||||||
|
assert args.unsafe
|
||||||
|
|
||||||
|
|
||||||
def test_subparsers_setup(parser: argparse.ArgumentParser) -> None:
|
def test_subparsers_setup(parser: argparse.ArgumentParser) -> None:
|
||||||
"""
|
"""
|
||||||
setup command must imply lock, no_report and unsafe
|
setup command must imply lock, no_report and unsafe
|
||||||
|
@ -113,6 +113,14 @@ def test_load_includes_no_option(configuration: Configuration) -> None:
|
|||||||
configuration.load_includes()
|
configuration.load_includes()
|
||||||
|
|
||||||
|
|
||||||
|
def test_load_includes_no_section(configuration: Configuration) -> None:
|
||||||
|
"""
|
||||||
|
must not fail if no option set
|
||||||
|
"""
|
||||||
|
configuration.remove_section("settings")
|
||||||
|
configuration.load_includes()
|
||||||
|
|
||||||
|
|
||||||
def test_load_logging_fallback(configuration: Configuration, mocker: MockerFixture) -> None:
|
def test_load_logging_fallback(configuration: Configuration, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must fallback to stderr without errors
|
must fallback to stderr without errors
|
||||||
|
Loading…
Reference in New Issue
Block a user