Release 2.0.0rc9

In case if package has local cache it will fail to load because no
remote source set. Particially this case can be observed during tree
load

docs/advanced-usage.rst

@@ -8,7 +8,7 @@ Depending on the goal the package can be used in different ways. Nevertheless, i
    from pathlib import Path
 
    from ahriman.core.configuration import Configuration
-   from ahriman.core.database.sqlite import SQLite
+   from ahriman.core.database import SQLite
 
    architecture = "x86_64"
    configuration = Configuration.from_path(Path("/etc/ahriman.ini"), architecture, quiet=False)

package/archlinux/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgname='ahriman'
-pkgver=2.0.0rc7
+pkgver=2.0.0rc9
 pkgrel=1
 pkgdesc="ArcH Linux ReposItory MANager"
 arch=('any')

src/ahriman/application/application/application_packages.py

@@ -86,7 +86,7 @@ class ApplicationPackages(ApplicationProperties):
         self.database.remote_update(package)
 
         with tmpdir() as local_path:
-            Sources.load(local_path, package.remote, self.database.patches_get(package.base))
+            Sources.load(local_path, package, self.database.patches_get(package.base), self.repository.paths)
             self._process_dependencies(local_path, known_packages, without_dependencies)
 
     def _add_directory(self, source: str, *_: Any) -> None:

src/ahriman/application/application/application_properties.py

@@ -20,7 +20,7 @@
 import logging
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository
 
 

src/ahriman/application/application/application_repository.py

@@ -24,7 +24,7 @@ from typing import Callable, Iterable, List
 
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.core.build_tools.sources import Sources
-from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters import UpdatePrinter
 from ahriman.core.tree import Tree
 from ahriman.models.package import Package
 from ahriman.models.result import Result
@@ -169,7 +169,7 @@ class ApplicationRepository(ApplicationProperties):
         process_update(packages, build_result)
 
         # process manual packages
-        tree = Tree.load(updates, self.database)
+        tree = Tree.load(updates, self.repository.paths, self.database)
         for num, level in enumerate(tree.levels()):
             self.logger.info("processing level #%i %s", num, [package.base for package in level])
             build_result = self.repository.process_build(level)

src/ahriman/application/handlers/add.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/backup.py

@@ -24,9 +24,9 @@ from pathlib import Path
 from tarfile import TarFile
 from typing import Set, Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 
 
 class Backup(Handler):

src/ahriman/application/handlers/clean.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/dump.py

@@ -21,9 +21,9 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.configuration_printer import ConfigurationPrinter
+from ahriman.core.formatters import ConfigurationPrinter
 
 
 class Dump(Handler):

src/ahriman/application/handlers/help.py

@@ -21,7 +21,7 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/key_import.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/patch.py

@@ -23,10 +23,10 @@ from pathlib import Path
 from typing import List, Optional, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.action import Action
 from ahriman.models.package import Package
 

src/ahriman/application/handlers/rebuild.py

@@ -22,9 +22,9 @@ import argparse
 from typing import List, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters import UpdatePrinter
 from ahriman.models.package import Package
 
 

src/ahriman/application/handlers/remove.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/remove_unknown.py

@@ -22,9 +22,9 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 
 
 class RemoveUnknown(Handler):

src/ahriman/application/handlers/report.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.result import Result
 

src/ahriman/application/handlers/restore.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 from tarfile import TarFile
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/search.py

@@ -23,12 +23,11 @@ from dataclasses import fields
 from typing import Callable, Iterable, List, Tuple, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
-from ahriman.core.alpm.remote.aur import AUR
-from ahriman.core.alpm.remote.official import Official
+from ahriman.application.handlers import Handler
+from ahriman.core.alpm.remote import AUR, Official
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import InvalidOption
-from ahriman.core.formatters.aur_printer import AurPrinter
+from ahriman.core.formatters import AurPrinter
 from ahriman.models.aur_package import AURPackage
 
 

src/ahriman/application/handlers/setup.py

@@ -23,7 +23,7 @@ from pathlib import Path
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.repository_paths import RepositoryPaths
 

src/ahriman/application/handlers/sign.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/status.py

@@ -22,10 +22,9 @@ import argparse
 from typing import Callable, Iterable, Tuple, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.package_printer import PackagePrinter
-from ahriman.core.formatters.status_printer import StatusPrinter
+from ahriman.core.formatters import PackagePrinter, StatusPrinter
 from ahriman.models.build_status import BuildStatus
 from ahriman.models.package import Package
 

src/ahriman/application/handlers/status_update.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.models.action import Action
 

src/ahriman/application/handlers/sync.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/unsafe_commands.py

@@ -22,9 +22,9 @@ import shlex
 
 from typing import List, Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 
 
 class UnsafeCommands(Handler):

src/ahriman/application/handlers/update.py

@@ -22,7 +22,7 @@ import argparse
 from typing import Callable, Type
 
 from ahriman.application.application import Application
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 
 

src/ahriman/application/handlers/users.py

@@ -23,10 +23,10 @@ import getpass
 from pathlib import Path
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
-from ahriman.core.formatters.user_printer import UserPrinter
+from ahriman.core.database import SQLite
+from ahriman.core.formatters import UserPrinter
 from ahriman.models.action import Action
 from ahriman.models.user import User
 

src/ahriman/application/handlers/web.py

@@ -21,7 +21,7 @@ import argparse
 
 from typing import Type
 
-from ahriman.application.handlers.handler import Handler
+from ahriman.application.handlers import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.spawn import Spawn
 

src/ahriman/core/alpm/remote/__init__.py

@@ -17,3 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.alpm.remote.remote import Remote
+
+from ahriman.core.alpm.remote.aur import AUR
+from ahriman.core.alpm.remote.official import Official
+from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb

src/ahriman/core/alpm/remote/aur.py

@@ -22,7 +22,7 @@ import requests
 from typing import Any, Dict, List, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import Remote
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import exception_response_text
 from ahriman.models.aur_package import AURPackage

src/ahriman/core/alpm/remote/official.py

@@ -22,7 +22,7 @@ import requests
 from typing import Any, Dict, List, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import Remote
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import exception_response_text
 from ahriman.models.aur_package import AURPackage

src/ahriman/core/alpm/remote/official_syncdb.py

@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.official import Official
+from ahriman.core.alpm.remote import Official
 from ahriman.models.aur_package import AURPackage
 
 

src/ahriman/core/alpm/remote/remote.py

@@ -38,8 +38,7 @@ class Remote:
         These classes are designed to be used without instancing. In order to achieve it several class methods are
         provided: ``info``, ``multisearch`` and ``search``. Thus, the basic flow is the following::
 
-            >>> from ahriman.core.alpm.remote.aur import AUR
-            >>> from ahriman.core.alpm.remote.official import Official
+            >>> from ahriman.core.alpm.remote import AUR, Official
             >>>
             >>> package = AUR.info("ahriman", pacman=pacman)
             >>> search_result = Official.multisearch("pacman", "manager", pacman=pacman)

src/ahriman/core/auth/__init__.py

@@ -17,3 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.auth.auth import Auth
+
+from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth.oauth import OAuth

src/ahriman/core/auth/auth.py

@@ -24,7 +24,7 @@ import logging
 from typing import Optional, Type
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.models.auth_settings import AuthSettings
 from ahriman.models.user_access import UserAccess
 
@@ -82,10 +82,10 @@ class Auth:
         """
         provider = AuthSettings.from_option(configuration.get("auth", "target", fallback="disabled"))
         if provider == AuthSettings.Configuration:
-            from ahriman.core.auth.mapping import Mapping
+            from ahriman.core.auth import Mapping
             return Mapping(configuration, database)
         if provider == AuthSettings.OAuth:
-            from ahriman.core.auth.oauth import OAuth
+            from ahriman.core.auth import OAuth
             return OAuth(configuration, database)
         return cls(configuration)
 

src/ahriman/core/auth/mapping.py

@@ -19,10 +19,9 @@
 #
 from typing import Optional
 
-from ahriman.core.auth.auth import Auth
-
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.models.auth_settings import AuthSettings
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess

src/ahriman/core/auth/oauth.py

@@ -21,9 +21,9 @@ import aioauth_client
 
 from typing import Optional, Type
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import InvalidOption
 from ahriman.models.auth_settings import AuthSettings
 

src/ahriman/core/build_tools/sources.py

@@ -24,7 +24,9 @@ from pathlib import Path
 from typing import List, Optional
 
 from ahriman.core.util import check_output, walk
+from ahriman.models.package import Package
 from ahriman.models.remote_source import RemoteSource
+from ahriman.models.repository_paths import RepositoryPaths
 
 
 class Sources:
@@ -43,7 +45,7 @@ class Sources:
     _check_output = check_output
 
     @staticmethod
-    def add(sources_dir: Path, *pattern: str) -> None:
+    def _add(sources_dir: Path, *pattern: str) -> None:
         """
         track found files via git
 
@@ -64,7 +66,7 @@ class Sources:
                               exception=None, cwd=sources_dir, logger=Sources.logger)
 
     @staticmethod
-    def diff(sources_dir: Path) -> str:
+    def _diff(sources_dir: Path) -> str:
         """
         generate diff from the current version and write it to the output file
 
@@ -76,6 +78,21 @@ class Sources:
         """
         return Sources._check_output("git", "diff", exception=None, cwd=sources_dir, logger=Sources.logger)
 
+    @staticmethod
+    def _move(pkgbuild_dir: Path, sources_dir: Path) -> None:
+        """
+        move content from pkgbuild_dir to sources_dir
+
+        Args:
+            pkgbuild_dir(Path): path to directory with pkgbuild from which need to move
+            sources_dir(Path): path to target directory
+        """
+        if pkgbuild_dir == sources_dir:
+            return  # directories are the same, no need to move
+        for src in walk(pkgbuild_dir):
+            dst = sources_dir / src.relative_to(pkgbuild_dir)
+            shutil.move(src, dst)
+
     @staticmethod
     def fetch(sources_dir: Path, remote: Optional[RemoteSource]) -> None:
         """
@@ -103,7 +120,8 @@ class Sources:
                                   remote.git_url, str(sources_dir),
                                   exception=None, cwd=sources_dir, logger=Sources.logger)
         else:
-            Sources.logger.warning("%s is not initialized, but no remote provided", sources_dir)
+            # it will cause an exception later
+            Sources.logger.error("%s is not initialized, but no remote provided", sources_dir)
 
         # and now force reset to our branch
         Sources._check_output("git", "checkout", "--force", branch,
@@ -114,7 +132,7 @@ class Sources:
         # move content if required
         # we are using full path to source directory in order to make append possible
         pkgbuild_dir = remote.pkgbuild_dir if remote is not None else sources_dir.resolve()
-        Sources.move((sources_dir / pkgbuild_dir).resolve(), sources_dir)
+        Sources._move((sources_dir / pkgbuild_dir).resolve(), sources_dir)
 
     @staticmethod
     def has_remotes(sources_dir: Path) -> bool:
@@ -142,36 +160,26 @@ class Sources:
                               exception=None, cwd=sources_dir, logger=Sources.logger)
 
     @staticmethod
-    def load(sources_dir: Path, remote: Optional[RemoteSource], patch: Optional[str]) -> None:
+    def load(sources_dir: Path, package: Package, patch: Optional[str], paths: RepositoryPaths) -> None:
         """
         fetch sources from remote and apply patches
 
         Args:
             sources_dir(Path): local path to fetch
-            remote(Optional[RemoteSource]): remote target (from where to fetch)
+            package(Package): package definitions
             patch(Optional[str]): optional patch to be applied
+            paths(RepositoryPaths): repository paths instance
         """
-        Sources.fetch(sources_dir, remote)
+        if (cache_dir := paths.cache_for(package.base)).is_dir() and cache_dir != sources_dir:
+            # no need to clone whole repository, just copy from cache first
+            shutil.copytree(cache_dir, sources_dir, dirs_exist_ok=True)
+        Sources.fetch(sources_dir, package.remote)
+
         if patch is None:
             Sources.logger.info("no patches found")
             return
         Sources.patch_apply(sources_dir, patch)
 
-    @staticmethod
-    def move(pkgbuild_dir: Path, sources_dir: Path) -> None:
-        """
-        move content from pkgbuild_dir to sources_dir
-
-        Args:
-            pkgbuild_dir(Path): path to directory with pkgbuild from which need to move
-            sources_dir(Path): path to target directory
-        """
-        if pkgbuild_dir == sources_dir:
-            return  # directories are the same, no need to move
-        for src in walk(pkgbuild_dir):
-            dst = sources_dir / src.relative_to(pkgbuild_dir)
-            shutil.move(src, dst)
-
     @staticmethod
     def patch_apply(sources_dir: Path, patch: str) -> None:
         """
@@ -198,6 +206,6 @@ class Sources:
         Returns:
             str: patch as plain text
         """
-        Sources.add(sources_dir, *pattern)
-        diff = Sources.diff(sources_dir)
+        Sources._add(sources_dir, *pattern)
+        diff = Sources._diff(sources_dir)
         return f"{diff}\n"  # otherwise, patch will be broken

src/ahriman/core/build_tools/task.py

@@ -18,14 +18,13 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 import logging
-import shutil
 
 from pathlib import Path
 from typing import List
 
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import BuildFailed
 from ahriman.core.util import check_output
 from ahriman.models.package import Package
@@ -66,12 +65,12 @@ class Task:
         self.makepkg_flags = configuration.getlist("build", "makepkg_flags", fallback=[])
         self.makechrootpkg_flags = configuration.getlist("build", "makechrootpkg_flags", fallback=[])
 
-    def build(self, sources_path: Path) -> List[Path]:
+    def build(self, sources_dir: Path) -> List[Path]:
         """
         run package build
 
         Args:
-            sources_path(Path): path to where sources are
+            sources_dir(Path): path to where sources are
 
         Returns:
             List[Path]: paths of produced packages
@@ -85,26 +84,23 @@ class Task:
         Task._check_output(
             *command,
             exception=BuildFailed(self.package.base),
-            cwd=sources_path,
+            cwd=sources_dir,
             logger=self.build_logger,
             user=self.uid)
 
         # well it is not actually correct, but we can deal with it
         packages = Task._check_output("makepkg", "--packagelist",
                                       exception=BuildFailed(self.package.base),
-                                      cwd=sources_path,
+                                      cwd=sources_dir,
                                       logger=self.build_logger).splitlines()
         return [Path(package) for package in packages]
 
-    def init(self, path: Path, database: SQLite) -> None:
+    def init(self, sources_dir: Path, database: SQLite) -> None:
         """
         fetch package from git
 
         Args:
-            path(Path): local path to fetch
+            sources_dir(Path): local path to fetch
             database(SQLite): database instance
         """
-        if self.paths.cache_for(self.package.base).is_dir():
-            # no need to clone whole repository, just copy from cache first
-            shutil.copytree(self.paths.cache_for(self.package.base), path, dirs_exist_ok=True)
-        Sources.load(path, self.package.remote, database.patches_get(self.package.base))
+        Sources.load(sources_dir, self.package, database.patches_get(self.package.base), self.paths)

src/ahriman/core/database/__init__.py

@@ -17,3 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.database.sqlite import SQLite

src/ahriman/core/database/data/__init__.py

@@ -27,8 +27,7 @@ from ahriman.core.database.data.users import migrate_users_data
 from ahriman.models.migration_result import MigrationResult
 
 
-def migrate_data(
-        result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
+def migrate_data(result: MigrationResult, connection: Connection, configuration: Configuration) -> None:
     """
     perform data migration
 

src/ahriman/core/formatters/__init__.py

@@ -1,19 +1,29 @@
 #
-# Copyright (c) 2021-2022 ahriman team.
+# copyright (c) 2021-2022 ahriman team.
 #
-# This file is part of ahriman
+# 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
+# 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.
+# 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/>.
+# you should have received a copy of the gnu general public license
+# along with this program. if not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.formatters.printer import Printer
+from ahriman.core.formatters.string_printer import StringPrinter
+
+from ahriman.core.formatters.aur_printer import AurPrinter
+from ahriman.core.formatters.build_printer import BuildPrinter
+from ahriman.core.formatters.configuration_printer import ConfigurationPrinter
+from ahriman.core.formatters.package_printer import PackagePrinter
+from ahriman.core.formatters.status_printer import StatusPrinter
+from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.core.formatters.user_printer import UserPrinter

src/ahriman/core/formatters/aur_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.core.util import pretty_datetime
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.property import Property

src/ahriman/core/formatters/build_printer.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.package import Package
 
 

src/ahriman/core/formatters/configuration_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import Dict, List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.property import Property
 
 

src/ahriman/core/formatters/package_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.build_status import BuildStatus
 from ahriman.models.package import Package
 from ahriman.models.property import Property

src/ahriman/core/formatters/status_printer.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.build_status import BuildStatus
 
 

src/ahriman/core/formatters/string_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import Optional
 
-from ahriman.core.formatters.printer import Printer
+from ahriman.core.formatters import Printer
 
 
 class StringPrinter(Printer):

src/ahriman/core/formatters/update_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List, Optional
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.package import Package
 from ahriman.models.property import Property
 

src/ahriman/core/formatters/user_printer.py

@@ -19,7 +19,7 @@
 #
 from typing import List
 
-from ahriman.core.formatters.string_printer import StringPrinter
+from ahriman.core.formatters import StringPrinter
 from ahriman.models.property import Property
 from ahriman.models.user import User
 

src/ahriman/core/report/__init__.py

@@ -17,3 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.report.report import Report
+from ahriman.core.report.jinja_template import JinjaTemplate
+
+from ahriman.core.report.console import Console
+from ahriman.core.report.email import Email
+from ahriman.core.report.html import HTML
+from ahriman.core.report.telegram import Telegram

src/ahriman/core/report/console.py

@@ -20,8 +20,8 @@
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters.build_printer import BuildPrinter
-from ahriman.core.report.report import Report
+from ahriman.core.formatters import BuildPrinter
+from ahriman.core.report import Report
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 

src/ahriman/core/report/email.py

@@ -25,8 +25,7 @@ from email.mime.text import MIMEText
 from typing import Dict, Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.core.util import pretty_datetime
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/report/html.py

@@ -20,8 +20,7 @@
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 

src/ahriman/core/report/report.py

@@ -87,16 +87,16 @@ class Report:
         section, provider_name = configuration.gettype(target, architecture)
         provider = ReportSettings.from_option(provider_name)
         if provider == ReportSettings.HTML:
-            from ahriman.core.report.html import HTML
+            from ahriman.core.report import HTML
             return HTML(architecture, configuration, section)
         if provider == ReportSettings.Email:
-            from ahriman.core.report.email import Email
+            from ahriman.core.report import Email
             return Email(architecture, configuration, section)
         if provider == ReportSettings.Console:
-            from ahriman.core.report.console import Console
+            from ahriman.core.report import Console
             return Console(architecture, configuration, section)
         if provider == ReportSettings.Telegram:
-            from ahriman.core.report.telegram import Telegram
+            from ahriman.core.report import Telegram
             return Telegram(architecture, configuration, section)
         return cls(architecture, configuration)  # should never happen
 

src/ahriman/core/report/telegram.py

@@ -23,8 +23,7 @@ import requests
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.report.jinja_template import JinjaTemplate
-from ahriman.core.report.report import Report
+from ahriman.core.report import JinjaTemplate, Report
 from ahriman.core.util import exception_response_text
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/repository/executor.py

@@ -23,9 +23,9 @@ from pathlib import Path
 from typing import Iterable, List, Optional, Set
 
 from ahriman.core.build_tools.task import Task
-from ahriman.core.report.report import Report
+from ahriman.core.report import Report
 from ahriman.core.repository.cleaner import Cleaner
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import tmpdir
 from ahriman.models.package import Package
 from ahriman.models.result import Result

src/ahriman/core/repository/repository.py

@@ -35,7 +35,7 @@ class Repository(Executor, UpdateHandler):
         sync local repository to remote, generate report, etc::
 
             >>> from ahriman.core.configuration import Configuration
-            >>> from ahriman.core.database.sqlite import SQLite
+            >>> from ahriman.core.database import SQLite
             >>>
             >>> configuration = Configuration()
             >>> database = SQLite.load(configuration)

src/ahriman/core/repository/repository_properties.py

@@ -22,7 +22,7 @@ import logging
 from ahriman.core.alpm.pacman import Pacman
 from ahriman.core.alpm.repo import Repo
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import UnsafeRun
 from ahriman.core.sign.gpg import GPG
 from ahriman.core.status.client import Client

src/ahriman/core/status/watcher.py

@@ -22,7 +22,7 @@ import logging
 from typing import Dict, List, Optional, Tuple
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import UnknownPackage
 from ahriman.core.repository import Repository
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum

src/ahriman/core/tree.py

@@ -22,9 +22,10 @@ from __future__ import annotations
 from typing import Iterable, List, Set, Type
 
 from ahriman.core.build_tools.sources import Sources
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.util import tmpdir
 from ahriman.models.package import Package
+from ahriman.models.repository_paths import RepositoryPaths
 
 
 class Leaf:
@@ -58,19 +59,20 @@ class Leaf:
         return self.package.packages.keys()
 
     @classmethod
-    def load(cls: Type[Leaf], package: Package, database: SQLite) -> Leaf:
+    def load(cls: Type[Leaf], package: Package, paths: RepositoryPaths, database: SQLite) -> Leaf:
         """
         load leaf from package with dependencies
 
         Args:
             package(Package): package properties
+            paths(RepositoryPaths): repository paths instance
             database(SQLite): database instance
 
         Returns:
             Leaf: loaded class
         """
         with tmpdir() as clone_dir:
-            Sources.load(clone_dir, package.remote, database.patches_get(package.base))
+            Sources.load(clone_dir, package, database.patches_get(package.base), paths)
             dependencies = Package.dependencies(clone_dir)
         return cls(package, dependencies)
 
@@ -102,7 +104,7 @@ class Tree:
         method::
 
             >>> from ahriman.core.configuration import Configuration
-            >>> from ahriman.core.database.sqlite import SQLite
+            >>> from ahriman.core.database import SQLite
             >>> from ahriman.core.repository import Repository
             >>>
             >>> configuration = Configuration()
@@ -110,7 +112,7 @@ class Tree:
             >>> repository = Repository("x86_64", configuration, database, no_report=False, unsafe=False)
             >>> packages = repository.packages()
             >>>
-            >>> tree = Tree.load(packages, database)
+            >>> tree = Tree.load(packages, configuration.repository_paths, database)
             >>> for tree_level in tree.levels():
             >>>     for package in tree_level:
             >>>         print(package.base)
@@ -138,18 +140,19 @@ class Tree:
         self.leaves = leaves
 
     @classmethod
-    def load(cls: Type[Tree], packages: Iterable[Package], database: SQLite) -> Tree:
+    def load(cls: Type[Tree], packages: Iterable[Package], paths: RepositoryPaths, database: SQLite) -> Tree:
         """
         load tree from packages
 
         Args:
             packages(Iterable[Package]): packages list
+            paths(RepositoryPaths): repository paths instance
             database(SQLite): database instance
 
         Returns:
             Tree: loaded class
         """
-        return cls([Leaf.load(package, database) for package in packages])
+        return cls([Leaf.load(package, paths, database) for package in packages])
 
     def levels(self) -> List[List[Package]]:
         """

src/ahriman/core/upload/__init__.py

@@ -17,3 +17,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
+from ahriman.core.upload.upload import Upload
+from ahriman.core.upload.http_upload import HttpUpload
+
+from ahriman.core.upload.github import Github
+from ahriman.core.upload.rsync import Rsync
+from ahriman.core.upload.s3 import S3

src/ahriman/core/upload/github.py

@@ -24,7 +24,7 @@ from pathlib import Path
 from typing import Any, Dict, Iterable, Optional
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.http_upload import HttpUpload
+from ahriman.core.upload import HttpUpload
 from ahriman.core.util import walk
 from ahriman.models.package import Package
 

src/ahriman/core/upload/http_upload.py

@@ -24,7 +24,7 @@ from pathlib import Path
 from typing import Any, Dict
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import exception_response_text
 
 

src/ahriman/core/upload/rsync.py

@@ -21,7 +21,7 @@ from pathlib import Path
 from typing import Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import check_output
 from ahriman.models.package import Package
 

src/ahriman/core/upload/s3.py

@@ -25,7 +25,7 @@ from pathlib import Path
 from typing import Any, Dict, Iterable
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.upload.upload import Upload
+from ahriman.core.upload import Upload
 from ahriman.core.util import walk
 from ahriman.models.package import Package
 

src/ahriman/core/upload/upload.py

@@ -86,13 +86,13 @@ class Upload:
         section, provider_name = configuration.gettype(target, architecture)
         provider = UploadSettings.from_option(provider_name)
         if provider == UploadSettings.Rsync:
-            from ahriman.core.upload.rsync import Rsync
+            from ahriman.core.upload import Rsync
             return Rsync(architecture, configuration, section)
         if provider == UploadSettings.S3:
-            from ahriman.core.upload.s3 import S3
+            from ahriman.core.upload import S3
             return S3(architecture, configuration, section)
         if provider == UploadSettings.Github:
-            from ahriman.core.upload.github import Github
+            from ahriman.core.upload import Github
             return Github(architecture, configuration, section)
         return cls(architecture, configuration)  # should never happen
 

src/ahriman/models/package.py

@@ -29,9 +29,7 @@ from srcinfo.parse import parse_srcinfo  # type: ignore
 from typing import Any, Dict, Iterable, List, Optional, Set, Type
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.aur import AUR
-from ahriman.core.alpm.remote.official import Official
-from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb
+from ahriman.core.alpm.remote import AUR, Official, OfficialSyncdb
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.core.util import check_output, full_version
 from ahriman.models.package_description import PackageDescription
@@ -284,7 +282,7 @@ class Package:
         from ahriman.core.build_tools.sources import Sources
 
         logger = logging.getLogger("build_details")
-        Sources.load(paths.cache_for(self.base), self.remote, None)
+        Sources.load(paths.cache_for(self.base), self, None, paths)
 
         try:
             # update pkgver first

src/ahriman/models/remote_source.py

@@ -95,7 +95,7 @@ class RemoteSource:
             Optional[RemoteSource]: generated remote source if any, None otherwise
         """
         if source == PackageSource.AUR:
-            from ahriman.core.alpm.remote.aur import AUR
+            from ahriman.core.alpm.remote import AUR
             return RemoteSource(
                 git_url=AUR.remote_git_url(package_base, repository),
                 web_url=AUR.remote_web_url(package_base),
@@ -104,7 +104,7 @@ class RemoteSource:
                 source=source,
             )
         if source == PackageSource.Repository:
-            from ahriman.core.alpm.remote.official import Official
+            from ahriman.core.alpm.remote import Official
             return RemoteSource(
                 git_url=Official.remote_git_url(package_base, repository),
                 web_url=Official.remote_web_url(package_base),

src/ahriman/version.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.0.0rc7"
+__version__ = "2.0.0rc9"

src/ahriman/web/middlewares/auth_handler.py

@@ -30,7 +30,7 @@ from aiohttp_session.cookie_storage import EncryptedCookieStorage
 from cryptography import fernet
 from typing import Optional
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.models.user_access import UserAccess
 from ahriman.models.user_identity import UserIdentity
 from ahriman.web.middlewares import HandlerType, MiddlewareType

src/ahriman/web/views/base.py

@@ -22,9 +22,9 @@ from __future__ import annotations
 from aiohttp.web import Request, View
 from typing import Any, Dict, List, Optional, Type
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.spawn import Spawn
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.user_access import UserAccess

src/ahriman/web/views/service/search.py

@@ -20,7 +20,7 @@
 from aiohttp.web import HTTPNotFound, Response, json_response
 from typing import Callable, List
 
-from ahriman.core.alpm.remote.aur import AUR
+from ahriman.core.alpm.remote import AUR
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.user_access import UserAccess
 from ahriman.web.views.base import BaseView

src/ahriman/web/views/user/login.py

@@ -48,7 +48,7 @@ class LoginView(BaseView):
             HTTPMethodNotAllowed: in case if method is used, but OAuth is disabled
             HTTPUnauthorized: if case of authorization error
         """
-        from ahriman.core.auth.oauth import OAuth
+        from ahriman.core.auth import OAuth
 
         oauth_provider = self.validator
         if not isinstance(oauth_provider, OAuth):  # there is actually property, but mypy does not like it anyway

src/ahriman/web/web.py

@@ -23,9 +23,9 @@ import logging
 
 from aiohttp import web
 
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import InitializeException
 from ahriman.core.spawn import Spawn
 from ahriman.core.status.watcher import Watcher

tests/ahriman/application/application/conftest.py

@@ -6,7 +6,7 @@ from ahriman.application.application.application_packages import ApplicationPack
 from ahriman.application.application.application_properties import ApplicationProperties
 from ahriman.application.application.application_repository import ApplicationRepository
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 
 
 @pytest.fixture
@@ -23,7 +23,7 @@ def application_packages(configuration: Configuration, database: SQLite, mocker:
         ApplicationPackages: application test instance
     """
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
     return ApplicationPackages("x86_64", configuration, no_report=True, unsafe=False)
 
 
@@ -42,7 +42,7 @@ def application_properties(configuration: Configuration, database: SQLite,
         ApplicationProperties: application test instance
     """
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
     return ApplicationProperties("x86_64", configuration, no_report=True, unsafe=False)
 
 
@@ -61,5 +61,5 @@ def application_repository(configuration: Configuration, database: SQLite,
         ApplicationRepository: application test instance
     """
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
     return ApplicationRepository("x86_64", configuration, no_report=True, unsafe=False)

tests/ahriman/application/application/test_application_packages.py

@@ -48,14 +48,15 @@ def test_add_aur(application_packages: ApplicationPackages, package_ahriman: Pac
     load_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.load")
     dependencies_mock = mocker.patch(
         "ahriman.application.application.application_packages.ApplicationPackages._process_dependencies")
-    build_queue_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.build_queue_insert")
-    update_remote_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.remote_update")
+    build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_insert")
+    update_remote_mock = mocker.patch("ahriman.core.database.SQLite.remote_update")
 
     application_packages._add_aur(package_ahriman.base, set(), False)
     load_mock.assert_called_once_with(
         pytest.helpers.anyvar(int),
-        package_ahriman.remote,
-        pytest.helpers.anyvar(int))
+        package_ahriman,
+        pytest.helpers.anyvar(int),
+        application_packages.repository.paths)
     dependencies_mock.assert_called_once_with(pytest.helpers.anyvar(int), set(), False)
     build_queue_mock.assert_called_once_with(package_ahriman)
     update_remote_mock.assert_called_once_with(package_ahriman)
@@ -87,7 +88,7 @@ def test_add_local(application_packages: ApplicationPackages, package_ahriman: P
     copytree_mock = mocker.patch("shutil.copytree")
     dependencies_mock = mocker.patch(
         "ahriman.application.application.application_packages.ApplicationPackages._process_dependencies")
-    build_queue_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.build_queue_insert")
+    build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_insert")
 
     application_packages._add_local(package_ahriman.base, set(), False)
     copytree_mock.assert_called_once_with(
@@ -120,8 +121,8 @@ def test_add_repository(application_packages: ApplicationPackages, package_ahrim
     must add package from official repository
     """
     mocker.patch("ahriman.models.package.Package.from_official", return_value=package_ahriman)
-    build_queue_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.build_queue_insert")
-    update_remote_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.remote_update")
+    build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_insert")
+    update_remote_mock = mocker.patch("ahriman.core.database.SQLite.remote_update")
 
     application_packages._add_repository(package_ahriman.base)
     build_queue_mock.assert_called_once_with(package_ahriman)

tests/ahriman/application/application/test_application_repository.py

@@ -195,7 +195,6 @@ def test_update_empty(application_repository: ApplicationRepository, package_ahr
     """
     must skip updating repository if no packages supplied
     """
-    paths = [package.filepath for package in package_ahriman.packages.values()]
     tree = Tree([Leaf(package_ahriman, set())])
 
     mocker.patch("ahriman.core.tree.Tree.load", return_value=tree)

tests/ahriman/application/conftest.py

@@ -7,7 +7,7 @@ from ahriman.application.ahriman import _parser
 from ahriman.application.application import Application
 from ahriman.application.lock import Lock
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 
 
 @pytest.fixture
@@ -24,7 +24,7 @@ def application(configuration: Configuration, database: SQLite, mocker: MockerFi
         Application: application test instance
     """
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
     return Application("x86_64", configuration, no_report=True, unsafe=False)
 
 

tests/ahriman/application/handlers/test_handler_add.py

@@ -52,7 +52,7 @@ def test_run_with_updates(args: argparse.Namespace, configuration: Configuration
     mocker.patch("ahriman.application.application.Application.add")
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     application_mock = mocker.patch("ahriman.application.application.Application.update", return_value=result)
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
     updates_mock = mocker.patch("ahriman.application.application.Application.updates", return_value=[package_ahriman])
 
     Add.run(args, "x86_64", configuration, True, False)
@@ -72,7 +72,7 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.application.application.Application.update", return_value=Result())
     mocker.patch("ahriman.application.application.Application.updates")
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Add.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)

tests/ahriman/application/handlers/test_handler_backup.py

@@ -46,7 +46,7 @@ def test_get_paths(configuration: Configuration, mocker: MockerFixture) -> None:
     mocker.patch.object(RepositoryPaths, "root_owner", (42, 42))
     getpwuid_mock = mocker.patch("pwd.getpwuid", return_value=MagicMock())
     # well database does not exist so we override it
-    database_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.database_path", return_value=configuration.path)
+    database_mock = mocker.patch("ahriman.core.database.SQLite.database_path", return_value=configuration.path)
 
     paths = Backup.get_paths(configuration)
     getpwuid_mock.assert_called_once_with(42)

tests/ahriman/application/handlers/test_handler_dump.py

@@ -11,7 +11,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     must run command
     """
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
     application_mock = mocker.patch("ahriman.core.configuration.Configuration.dump",
                                     return_value=configuration.dump())
 

tests/ahriman/application/handlers/test_handler_patch.py

@@ -35,7 +35,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     args = _default_args(args)
     args.action = Action.Update
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    application_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_create")
+    application_mock = mocker.patch("ahriman.application.handlers.Patch.patch_set_create")
 
     Patch.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with(pytest.helpers.anyvar(int), Path(args.package), args.track)
@@ -48,7 +48,7 @@ def test_run_list(args: argparse.Namespace, configuration: Configuration, mocker
     args = _default_args(args)
     args.action = Action.List
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    application_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_list")
+    application_mock = mocker.patch("ahriman.application.handlers.Patch.patch_set_list")
 
     Patch.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with(pytest.helpers.anyvar(int), args.package, False)
@@ -61,7 +61,7 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, mock
     args = _default_args(args)
     args.action = Action.Remove
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    application_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_remove")
+    application_mock = mocker.patch("ahriman.application.handlers.Patch.patch_set_remove")
 
     Patch.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with(pytest.helpers.anyvar(int), args.package)
@@ -71,9 +71,9 @@ def test_patch_set_list(application: Application, mocker: MockerFixture) -> None
     """
     must list available patches for the command
     """
-    get_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.patches_list", return_value={"ahriman": "patch"})
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    get_mock = mocker.patch("ahriman.core.database.SQLite.patches_list", return_value={"ahriman": "patch"})
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Patch.patch_set_list(application, "ahriman", False)
     get_mock.assert_called_once_with("ahriman")
@@ -85,8 +85,8 @@ def test_patch_set_list_empty_exception(application: Application, mocker: Mocker
     """
     must raise ExitCode exception on empty patch list
     """
-    mocker.patch("ahriman.core.database.sqlite.SQLite.patches_list", return_value={})
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    mocker.patch("ahriman.core.database.SQLite.patches_list", return_value={})
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Patch.patch_set_list(application, "ahriman", True)
     check_mock.assert_called_once_with(True, True)
@@ -99,7 +99,7 @@ def test_patch_set_create(application: Application, package_ahriman: Package, mo
     mocker.patch("pathlib.Path.mkdir")
     mocker.patch("ahriman.models.package.Package.from_build", return_value=package_ahriman)
     mocker.patch("ahriman.core.build_tools.sources.Sources.patch_create", return_value="patch")
-    create_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.patches_insert")
+    create_mock = mocker.patch("ahriman.core.database.SQLite.patches_insert")
 
     Patch.patch_set_create(application, Path("path"), ["*.patch"])
     create_mock.assert_called_once_with(package_ahriman.base, "patch")
@@ -109,6 +109,6 @@ def test_patch_set_remove(application: Application, package_ahriman: Package, mo
     """
     must remove patch set for the package
     """
-    remove_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.patches_remove")
+    remove_mock = mocker.patch("ahriman.core.database.SQLite.patches_remove")
     Patch.patch_set_remove(application, package_ahriman.base)
     remove_mock.assert_called_once_with(package_ahriman.base)

tests/ahriman/application/handlers/test_handler_rebuild.py

@@ -40,7 +40,7 @@ def test_run(args: argparse.Namespace, package_ahriman: Package,
     application_packages_mock = mocker.patch("ahriman.core.repository.repository.Repository.packages_depends_on",
                                              return_value=[package_ahriman])
     application_mock = mocker.patch("ahriman.application.application.Application.update", return_value=result)
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Rebuild.run(args, "x86_64", configuration, True, False)
     application_packages_mock.assert_called_once_with(None)
@@ -73,7 +73,7 @@ def test_run_dry_run(args: argparse.Namespace, configuration: Configuration,
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.core.repository.repository.Repository.packages_depends_on", return_value=[package_ahriman])
     application_mock = mocker.patch("ahriman.application.application.Application.update")
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Rebuild.run(args, "x86_64", configuration, True, False)
     application_mock.assert_not_called()
@@ -117,7 +117,7 @@ def test_run_update_empty_exception(args: argparse.Namespace, configuration: Con
     args.dry_run = True
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.core.repository.repository.Repository.packages_depends_on", return_value=[])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Rebuild.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)
@@ -133,7 +133,7 @@ def test_run_build_empty_exception(args: argparse.Namespace, configuration: Conf
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.core.repository.repository.Repository.packages_depends_on", return_value=[package_ahriman])
     mocker.patch("ahriman.application.application.Application.update", return_value=Result())
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Rebuild.run(args, "x86_64", configuration, True, False)
     check_mock.assert_has_calls([mock.call(True, False), mock.call(True, True)])
@@ -143,6 +143,6 @@ def test_extract_packages(application: Application, mocker: MockerFixture) -> No
     """
     must extract packages from database
     """
-    packages_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.packages_get")
+    packages_mock = mocker.patch("ahriman.core.database.SQLite.packages_get")
     Rebuild.extract_packages(application)
     packages_mock.assert_called_once_with()

tests/ahriman/application/handlers/test_handler_remove_unknown.py

@@ -49,7 +49,7 @@ def test_run_dry_run(args: argparse.Namespace, configuration: Configuration, pac
     application_mock = mocker.patch("ahriman.application.application.Application.unknown",
                                     return_value=[package_ahriman])
     remove_mock = mocker.patch("ahriman.application.application.Application.remove")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     RemoveUnknown.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with()
@@ -69,7 +69,7 @@ def test_run_dry_run_verbose(args: argparse.Namespace, configuration: Configurat
     application_mock = mocker.patch("ahriman.application.application.Application.unknown",
                                     return_value=[package_ahriman])
     remove_mock = mocker.patch("ahriman.application.application.Application.remove")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     RemoveUnknown.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with()

tests/ahriman/application/handlers/test_handler_search.py

@@ -35,11 +35,11 @@ def test_run(args: argparse.Namespace, configuration: Configuration, aur_package
     """
     args = _default_args(args)
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    aur_search_mock = mocker.patch("ahriman.core.alpm.remote.aur.AUR.multisearch", return_value=[aur_package_ahriman])
-    official_search_mock = mocker.patch("ahriman.core.alpm.remote.official.Official.multisearch",
+    aur_search_mock = mocker.patch("ahriman.core.alpm.remote.AUR.multisearch", return_value=[aur_package_ahriman])
+    official_search_mock = mocker.patch("ahriman.core.alpm.remote.Official.multisearch",
                                         return_value=[aur_package_ahriman])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     Search.run(args, "x86_64", configuration, True, False)
     aur_search_mock.assert_called_once_with("ahriman", pacman=pytest.helpers.anyvar(int))
@@ -54,11 +54,11 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     """
     args = _default_args(args)
     args.exit_code = True
-    mocker.patch("ahriman.core.alpm.remote.aur.AUR.multisearch", return_value=[])
-    mocker.patch("ahriman.core.alpm.remote.official.Official.multisearch", return_value=[])
-    mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    mocker.patch("ahriman.core.alpm.remote.AUR.multisearch", return_value=[])
+    mocker.patch("ahriman.core.alpm.remote.Official.multisearch", return_value=[])
+    mocker.patch("ahriman.core.formatters.Printer.print")
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Search.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)
@@ -70,10 +70,10 @@ def test_run_sort(args: argparse.Namespace, configuration: Configuration, aur_pa
     must run command with sorting
     """
     args = _default_args(args)
-    mocker.patch("ahriman.core.alpm.remote.aur.AUR.multisearch", return_value=[aur_package_ahriman])
-    mocker.patch("ahriman.core.alpm.remote.official.Official.multisearch", return_value=[])
+    mocker.patch("ahriman.core.alpm.remote.AUR.multisearch", return_value=[aur_package_ahriman])
+    mocker.patch("ahriman.core.alpm.remote.Official.multisearch", return_value=[])
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    sort_mock = mocker.patch("ahriman.application.handlers.search.Search.sort")
+    sort_mock = mocker.patch("ahriman.application.handlers.Search.sort")
 
     Search.run(args, "x86_64", configuration, True, False)
     sort_mock.assert_has_calls([
@@ -89,10 +89,10 @@ def test_run_sort_by(args: argparse.Namespace, configuration: Configuration, aur
     """
     args = _default_args(args)
     args.sort_by = "field"
-    mocker.patch("ahriman.core.alpm.remote.aur.AUR.multisearch", return_value=[aur_package_ahriman])
-    mocker.patch("ahriman.core.alpm.remote.official.Official.multisearch", return_value=[])
+    mocker.patch("ahriman.core.alpm.remote.AUR.multisearch", return_value=[aur_package_ahriman])
+    mocker.patch("ahriman.core.alpm.remote.Official.multisearch", return_value=[])
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    sort_mock = mocker.patch("ahriman.application.handlers.search.Search.sort")
+    sort_mock = mocker.patch("ahriman.application.handlers.Search.sort")
 
     Search.run(args, "x86_64", configuration, True, False)
     sort_mock.assert_has_calls([

tests/ahriman/application/handlers/test_handler_setup.py

@@ -39,11 +39,11 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     """
     args = _default_args(args)
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    ahriman_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_ahriman")
-    devtools_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_devtools")
-    makepkg_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_makepkg")
-    sudo_configuration_mock = mocker.patch("ahriman.application.handlers.setup.Setup.configuration_create_sudo")
-    executable_mock = mocker.patch("ahriman.application.handlers.setup.Setup.executable_create")
+    ahriman_configuration_mock = mocker.patch("ahriman.application.handlers.Setup.configuration_create_ahriman")
+    devtools_configuration_mock = mocker.patch("ahriman.application.handlers.Setup.configuration_create_devtools")
+    makepkg_configuration_mock = mocker.patch("ahriman.application.handlers.Setup.configuration_create_makepkg")
+    sudo_configuration_mock = mocker.patch("ahriman.application.handlers.Setup.configuration_create_sudo")
+    executable_mock = mocker.patch("ahriman.application.handlers.Setup.executable_create")
     init_mock = mocker.patch("ahriman.core.alpm.repo.Repo.init")
     paths = RepositoryPaths(configuration.getpath("repository", "root"), "x86_64")
 

tests/ahriman/application/handlers/test_handler_status.py

@@ -38,8 +38,8 @@ def test_run(args: argparse.Namespace, configuration: Configuration, package_ahr
     packages_mock = mocker.patch("ahriman.core.status.client.Client.get",
                                  return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success)),
                                                (package_python_schedule, BuildStatus(BuildStatusEnum.Failed))])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     Status.run(args, "x86_64", configuration, True, False)
     application_mock.assert_called_once_with()
@@ -57,7 +57,7 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.core.status.client.Client.get_self")
     mocker.patch("ahriman.core.status.client.Client.get", return_value=[])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Status.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)
@@ -73,7 +73,7 @@ def test_run_verbose(args: argparse.Namespace, configuration: Configuration, pac
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.core.status.client.Client.get",
                  return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success))])
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     Status.run(args, "x86_64", configuration, True, False)
     print_mock.assert_has_calls([mock.call(True) for _ in range(2)])
@@ -105,7 +105,7 @@ def test_run_by_status(args: argparse.Namespace, configuration: Configuration, p
                  return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success)),
                                (package_python_schedule, BuildStatus(BuildStatusEnum.Failed))])
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     Status.run(args, "x86_64", configuration, True, False)
     print_mock.assert_has_calls([mock.call(False) for _ in range(2)])

tests/ahriman/application/handlers/test_handler_unsafe_commands.py

@@ -30,7 +30,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     args = _default_args(args)
     commands_mock = mocker.patch("ahriman.application.handlers.UnsafeCommands.get_unsafe_commands",
                                  return_value=["command"])
-    print_mock = mocker.patch("ahriman.core.formatters.printer.Printer.print")
+    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
 
     UnsafeCommands.run(args, "x86_64", configuration, True, False)
     commands_mock.assert_called_once_with(pytest.helpers.anyvar(int))
@@ -56,7 +56,7 @@ def test_check_unsafe(mocker: MockerFixture) -> None:
     """
     must check if command is unsafe
     """
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
     UnsafeCommands.check_unsafe("repo-clean", ["repo-clean"], _parser())
     check_mock.assert_called_once_with(True, True)
 
@@ -65,7 +65,7 @@ def test_check_unsafe_safe(mocker: MockerFixture) -> None:
     """
     must check if command is safe
     """
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
     UnsafeCommands.check_unsafe("package-status", ["repo-clean"], _parser())
     check_mock.assert_called_once_with(True, False)
 

tests/ahriman/application/handlers/test_handler_update.py

@@ -41,7 +41,7 @@ def test_run(args: argparse.Namespace, package_ahriman: Package,
     result.add_success(package_ahriman)
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     application_mock = mocker.patch("ahriman.application.application.Application.update", return_value=result)
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
     updates_mock = mocker.patch("ahriman.application.application.Application.updates", return_value=[package_ahriman])
 
     Update.run(args, "x86_64", configuration, True, False)
@@ -60,7 +60,7 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     args.dry_run = True
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.application.application.Application.updates", return_value=[])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Update.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)
@@ -76,7 +76,7 @@ def test_run_update_empty_exception(args: argparse.Namespace, package_ahriman: P
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     mocker.patch("ahriman.application.application.Application.update", return_value=Result())
     mocker.patch("ahriman.application.application.Application.updates", return_value=[package_ahriman])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Update.run(args, "x86_64", configuration, True, False)
     check_mock.assert_has_calls([mock.call(True, False), mock.call(True, True)])
@@ -90,7 +90,7 @@ def test_run_dry_run(args: argparse.Namespace, configuration: Configuration, moc
     args.dry_run = True
     mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     application_mock = mocker.patch("ahriman.application.application.Application.update")
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
     updates_mock = mocker.patch("ahriman.application.application.Application.updates")
 
     Update.run(args, "x86_64", configuration, True, False)

tests/ahriman/application/handlers/test_handler_users.py

@@ -6,7 +6,7 @@ from pytest_mock import MockerFixture
 
 from ahriman.application.handlers import Users
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.exceptions import InitializeException
 from ahriman.models.action import Action
 from ahriman.models.user import User
@@ -39,13 +39,13 @@ def test_run(args: argparse.Namespace, configuration: Configuration, database: S
     """
     args = _default_args(args)
     user = User(args.username, args.password, args.role)
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
     mocker.patch("ahriman.models.user.User.hash_password", return_value=user)
     get_auth_configuration_mock = mocker.patch("ahriman.application.handlers.Users.configuration_get")
     create_configuration_mock = mocker.patch("ahriman.application.handlers.Users.configuration_create")
     create_user_mock = mocker.patch("ahriman.application.handlers.Users.user_create", return_value=user)
     get_salt_mock = mocker.patch("ahriman.application.handlers.Users.get_salt", return_value="salt")
-    update_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.user_update")
+    update_mock = mocker.patch("ahriman.core.database.SQLite.user_update")
 
     Users.run(args, "x86_64", configuration, True, False)
     get_auth_configuration_mock.assert_called_once_with(configuration.include)
@@ -63,9 +63,9 @@ def test_run_list(args: argparse.Namespace, configuration: Configuration, databa
     """
     args = _default_args(args)
     args.action = Action.List
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
-    list_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.user_list", return_value=[user])
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
+    list_mock = mocker.patch("ahriman.core.database.SQLite.user_list", return_value=[user])
 
     Users.run(args, "x86_64", configuration, True, False)
     list_mock.assert_called_once_with("user", args.role)
@@ -80,9 +80,9 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     args = _default_args(args)
     args.action = Action.List
     args.exit_code = True
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_list", return_value=[])
-    check_mock = mocker.patch("ahriman.application.handlers.handler.Handler.check_if_empty")
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
+    mocker.patch("ahriman.core.database.SQLite.user_list", return_value=[])
+    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Users.run(args, "x86_64", configuration, True, False)
     check_mock.assert_called_once_with(True, True)
@@ -95,8 +95,8 @@ def test_run_remove(args: argparse.Namespace, configuration: Configuration, data
     """
     args = _default_args(args)
     args.action = Action.Remove
-    mocker.patch("ahriman.core.database.sqlite.SQLite.load", return_value=database)
-    remove_mock = mocker.patch("ahriman.core.database.sqlite.SQLite.user_remove")
+    mocker.patch("ahriman.core.database.SQLite.load", return_value=database)
+    remove_mock = mocker.patch("ahriman.core.database.SQLite.user_remove")
 
     Users.run(args, "x86_64", configuration, True, False)
     remove_mock.assert_called_once_with(args.username)

tests/ahriman/conftest.py

@@ -7,9 +7,9 @@ from typing import Any, Dict, Type, TypeVar
 from unittest.mock import MagicMock
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.auth.auth import Auth
+from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.core.spawn import Spawn
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.aur_package import AURPackage

tests/ahriman/core/alpm/remote/conftest.py

@@ -1,9 +1,6 @@
 import pytest
 
-from ahriman.core.alpm.remote.aur import AUR
-from ahriman.core.alpm.remote.official import Official
-from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import AUR, Official, OfficialSyncdb, Remote
 
 
 @pytest.fixture

tests/ahriman/core/alpm/remote/test_aur.py

@@ -7,7 +7,7 @@ from pytest_mock import MockerFixture
 from unittest.mock import MagicMock
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.aur import AUR
+from ahriman.core.alpm.remote import AUR
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.models.aur_package import AURPackage
 
@@ -131,7 +131,7 @@ def test_package_info(aur: AUR, aur_package_ahriman: AURPackage, pacman: Pacman,
     """
     must make request for info
     """
-    request_mock = mocker.patch("ahriman.core.alpm.remote.aur.AUR.make_request", return_value=[aur_package_ahriman])
+    request_mock = mocker.patch("ahriman.core.alpm.remote.AUR.make_request", return_value=[aur_package_ahriman])
     assert aur.package_info(aur_package_ahriman.name, pacman=pacman) == aur_package_ahriman
     request_mock.assert_called_once_with("info", aur_package_ahriman.name)
 
@@ -140,6 +140,6 @@ def test_package_search(aur: AUR, aur_package_ahriman: AURPackage, pacman: Pacma
     """
     must make request for search
     """
-    request_mock = mocker.patch("ahriman.core.alpm.remote.aur.AUR.make_request", return_value=[aur_package_ahriman])
+    request_mock = mocker.patch("ahriman.core.alpm.remote.AUR.make_request", return_value=[aur_package_ahriman])
     assert aur.package_search(aur_package_ahriman.name, pacman=pacman) == [aur_package_ahriman]
     request_mock.assert_called_once_with("search", aur_package_ahriman.name, by="name-desc")

tests/ahriman/core/alpm/remote/test_official.py

@@ -7,7 +7,7 @@ from pytest_mock import MockerFixture
 from unittest.mock import MagicMock
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.official import Official
+from ahriman.core.alpm.remote import Official
 from ahriman.core.exceptions import InvalidPackageInfo
 from ahriman.models.aur_package import AURPackage
 
@@ -111,7 +111,7 @@ def test_package_info(official: Official, aur_package_akonadi: AURPackage, pacma
     """
     must make request for info
     """
-    request_mock = mocker.patch("ahriman.core.alpm.remote.official.Official.make_request",
+    request_mock = mocker.patch("ahriman.core.alpm.remote.Official.make_request",
                                 return_value=[aur_package_akonadi])
     assert official.package_info(aur_package_akonadi.name, pacman=pacman) == aur_package_akonadi
     request_mock.assert_called_once_with(aur_package_akonadi.name, by="name")
@@ -122,7 +122,7 @@ def test_package_search(official: Official, aur_package_akonadi: AURPackage, pac
     """
     must make request for search
     """
-    request_mock = mocker.patch("ahriman.core.alpm.remote.official.Official.make_request",
+    request_mock = mocker.patch("ahriman.core.alpm.remote.Official.make_request",
                                 return_value=[aur_package_akonadi])
     assert official.package_search(aur_package_akonadi.name, pacman=pacman) == [aur_package_akonadi]
     request_mock.assert_called_once_with(aur_package_akonadi.name, by="q")

tests/ahriman/core/alpm/remote/test_official_syncdb.py

@@ -1,7 +1,7 @@
 from pytest_mock import MockerFixture
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.official_syncdb import OfficialSyncdb
+from ahriman.core.alpm.remote import OfficialSyncdb
 from ahriman.models.aur_package import AURPackage
 
 

tests/ahriman/core/alpm/remote/test_remote.py

@@ -4,7 +4,7 @@ from pytest_mock import MockerFixture
 from unittest import mock
 
 from ahriman.core.alpm.pacman import Pacman
-from ahriman.core.alpm.remote.remote import Remote
+from ahriman.core.alpm.remote import Remote
 from ahriman.models.aur_package import AURPackage
 
 
@@ -12,7 +12,7 @@ def test_info(pacman: Pacman, mocker: MockerFixture) -> None:
     """
     must call info method
     """
-    info_mock = mocker.patch("ahriman.core.alpm.remote.remote.Remote.package_info")
+    info_mock = mocker.patch("ahriman.core.alpm.remote.Remote.package_info")
     Remote.info("ahriman", pacman=pacman)
     info_mock.assert_called_once_with("ahriman", pacman=pacman)
 
@@ -22,7 +22,7 @@ def test_multisearch(aur_package_ahriman: AURPackage, pacman: Pacman, mocker: Mo
     must search in AUR with multiple words
     """
     terms = ["ahriman", "is", "cool"]
-    search_mock = mocker.patch("ahriman.core.alpm.remote.remote.Remote.search", return_value=[aur_package_ahriman])
+    search_mock = mocker.patch("ahriman.core.alpm.remote.Remote.search", return_value=[aur_package_ahriman])
 
     assert Remote.multisearch(*terms, pacman=pacman) == [aur_package_ahriman]
     search_mock.assert_has_calls([mock.call("ahriman", pacman=pacman), mock.call("cool", pacman=pacman)])
@@ -33,7 +33,7 @@ def test_multisearch_empty(pacman: Pacman, mocker: MockerFixture) -> None:
     must return empty list if no long terms supplied
     """
     terms = ["it", "is"]
-    search_mock = mocker.patch("ahriman.core.alpm.remote.remote.Remote.search")
+    search_mock = mocker.patch("ahriman.core.alpm.remote.Remote.search")
 
     assert Remote.multisearch(*terms, pacman=pacman) == []
     search_mock.assert_not_called()
@@ -43,7 +43,7 @@ def test_multisearch_single(aur_package_ahriman: AURPackage, pacman: Pacman, moc
     """
     must search in AUR with one word
     """
-    search_mock = mocker.patch("ahriman.core.alpm.remote.remote.Remote.search", return_value=[aur_package_ahriman])
+    search_mock = mocker.patch("ahriman.core.alpm.remote.Remote.search", return_value=[aur_package_ahriman])
     assert Remote.multisearch("ahriman", pacman=pacman) == [aur_package_ahriman]
     search_mock.assert_called_once_with("ahriman", pacman=pacman)
 
@@ -68,7 +68,7 @@ def test_search(pacman: Pacman, mocker: MockerFixture) -> None:
     """
     must call search method
     """
-    search_mock = mocker.patch("ahriman.core.alpm.remote.remote.Remote.package_search")
+    search_mock = mocker.patch("ahriman.core.alpm.remote.Remote.package_search")
     Remote.search("ahriman", pacman=pacman)
     search_mock.assert_called_once_with("ahriman", pacman=pacman)
 

tests/ahriman/core/auth/conftest.py

@@ -1,9 +1,8 @@
 import pytest
 
-from ahriman.core.auth.mapping import Mapping
-from ahriman.core.auth.oauth import OAuth
+from ahriman.core.auth import Mapping, OAuth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 
 
 @pytest.fixture

tests/ahriman/core/auth/test_auth.py

@@ -1,8 +1,6 @@
-from ahriman.core.auth.auth import Auth
-from ahriman.core.auth.mapping import Mapping
-from ahriman.core.auth.oauth import OAuth
+from ahriman.core.auth import Auth, Mapping, OAuth
 from ahriman.core.configuration import Configuration
-from ahriman.core.database.sqlite import SQLite
+from ahriman.core.database import SQLite
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess
 

tests/ahriman/core/auth/test_mapping.py

@@ -1,6 +1,6 @@
 from pytest_mock import MockerFixture
 
-from ahriman.core.auth.mapping import Mapping
+from ahriman.core.auth import Mapping
 from ahriman.models.user import User
 from ahriman.models.user_access import UserAccess
 
@@ -11,7 +11,7 @@ async def test_check_credentials(mapping: Mapping, user: User, mocker: MockerFix
     """
     current_password = user.password
     user = user.hash_password(mapping.salt)
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=user)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
     assert await mapping.check_credentials(user.username, current_password)
     # here password is hashed so it is invalid
     assert not await mapping.check_credentials(user.username, user.password)
@@ -37,7 +37,7 @@ def test_get_user(mapping: Mapping, user: User, mocker: MockerFixture) -> None:
     """
     must return user from storage by username
     """
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=user)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
     assert mapping.get_user(user.username) == user
 
 
@@ -45,7 +45,7 @@ def test_get_user_normalized(mapping: Mapping, user: User, mocker: MockerFixture
     """
     must return user from storage by username case-insensitive
     """
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=user)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
     assert mapping.get_user(user.username.upper()) == user
 
 
@@ -60,7 +60,7 @@ async def test_known_username(mapping: Mapping, user: User, mocker: MockerFixtur
     """
     must allow only known users
     """
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=user)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
     assert await mapping.known_username(user.username)
 
 
@@ -69,7 +69,7 @@ async def test_known_username_unknown(mapping: Mapping, user: User, mocker: Mock
     must not allow only known users
     """
     assert not await mapping.known_username(None)
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=None)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=None)
     assert not await mapping.known_username(user.password)
 
 
@@ -77,6 +77,6 @@ async def test_verify_access(mapping: Mapping, user: User, mocker: MockerFixture
     """
     must verify user access
     """
-    mocker.patch("ahriman.core.database.sqlite.SQLite.user_get", return_value=user)
+    mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
     assert await mapping.verify_access(user.username, user.access, None)
     assert not await mapping.verify_access(user.username, UserAccess.Write, None)