merge restore to rebuild commannd

src/ahriman/application/ahriman.py

@@ -89,7 +89,6 @@ def _parser() -> argparse.ArgumentParser:
     _set_repo_rebuild_parser(subparsers)
     _set_repo_remove_unknown_parser(subparsers)
     _set_repo_report_parser(subparsers)
-    _set_repo_restore_parser(subparsers)
     _set_repo_setup_parser(subparsers)
     _set_repo_sign_parser(subparsers)
     _set_repo_status_update_parser(subparsers)
@@ -375,6 +374,12 @@ def _set_repo_rebuild_parser(root: SubParserAction) -> argparse.ArgumentParser:
     parser.add_argument("--depends-on", help="only rebuild packages that depend on specified package", action="append")
     parser.add_argument("--dry-run", help="just perform check for packages without rebuild process itself",
                         action="store_true")
+    parser.add_argument("--from-database",
+                        help="read packages from database instead of filesystem. This feature in particular is "
+                             "required in case if you would like to restore repository from another repository "
+                             "instance. Note however that in order to restore packages you need to have original "
+                             "ahriman instance run with web service and have run repo-update at least once.",
+                        action="store_true")
     parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
     parser.set_defaults(handler=handlers.Rebuild)
     return parser
@@ -410,21 +415,6 @@ def _set_repo_report_parser(root: SubParserAction) -> argparse.ArgumentParser:
     return parser
 
 
-def _set_repo_restore_parser(root: SubParserAction) -> argparse.ArgumentParser:
-    """
-    add parser for package addition subcommand
-    :param root: subparsers for the commands
-    :return: created argument parser
-    """
-    parser = root.add_parser("repo-restore", aliases=["restore"], help="restore repository",
-                             description="restore repository from database file", formatter_class=_formatter)
-    parser.add_argument("-e", "--exit-code", help="return non-zero exit status if result is empty", action="store_true")
-    parser.add_argument("-n", "--now", help="run update function after", action="store_true")
-    parser.add_argument("--without-dependencies", help="do not add dependencies", action="store_true")
-    parser.set_defaults(handler=handlers.Add, package=None, source=PackageSource.AUR)
-    return parser
-
-
 def _set_repo_setup_parser(root: SubParserAction) -> argparse.ArgumentParser:
     """
     add parser for setup subcommand

src/ahriman/application/handlers/add.py

@@ -19,7 +19,7 @@
 #
 import argparse
 
-from typing import List, Type
+from typing import Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler
@@ -43,20 +43,10 @@ class Add(Handler):
         :param unsafe: if set no user check will be performed before path creation
         """
         application = Application(architecture, configuration, no_report, unsafe)
-        packages = Add.extract_packages(application) if args.package is None else args.package
-        application.add(packages, args.source, args.without_dependencies)
+        application.add(args.package, args.source, args.without_dependencies)
         if not args.now:
             return
 
-        packages = application.updates(packages, True, True, False, True, application.logger.info)
+        packages = application.updates(args.package, True, True, False, True, application.logger.info)
         result = application.update(packages)
         Add.check_if_empty(args.exit_code, result.is_empty)
-
-    @staticmethod
-    def extract_packages(application: Application) -> List[str]:
-        """
-        extract packages from database file
-        :param application: application instance
-        :return: list of packages which were stored in database
-        """
-        return [package.base for (package, _) in application.database.packages_get()]

src/ahriman/application/handlers/rebuild.py

@@ -19,12 +19,13 @@
 #
 import argparse
 
-from typing import Type
+from typing import List, Type
 
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters.update_printer import UpdatePrinter
+from ahriman.models.package import Package
 
 
 class Rebuild(Handler):
@@ -46,7 +47,10 @@ class Rebuild(Handler):
         depends_on = set(args.depends_on) if args.depends_on else None
 
         application = Application(architecture, configuration, no_report, unsafe)
-        updates = application.repository.packages_depends_on(depends_on)
+        if args.from_database:
+            updates = Rebuild.extract_packages(application)
+        else:
+            updates = application.repository.packages_depends_on(depends_on)
 
         Rebuild.check_if_empty(args.exit_code, not updates)
         if args.dry_run:
@@ -56,3 +60,12 @@ class Rebuild(Handler):
 
         result = application.update(updates)
         Rebuild.check_if_empty(args.exit_code, result.is_empty)
+
+    @staticmethod
+    def extract_packages(application: Application) -> List[Package]:
+        """
+        extract packages from database file
+        :param application: application instance
+        :return: list of packages which were stored in database
+        """
+        return [package for (package, _) in application.database.packages_get()]