refactor(pikatypes: InstallInfo): initialize values based on pkg info

Author: actionless

.gitignore

@@ -12,4 +12,5 @@ MANIFEST
 pikaur.1
 aur_db.dump*
 pikaur_static/pikaur/**
+pikaur_rust/pikaur/**
 docker_ci/

pikaur/install_info_fetcher.py

@@ -285,12 +285,8 @@ def _get_pkg_install_infos(results: "list[PacmanPrint]") -> list[RepoInstallInfo
                 pkg = all_repo_pkgs[pkg_print.full_name]
                 local_pkg = all_local_pkgs.get(pkg.name)
                 install_info = RepoInstallInfo(
-                    name=pkg.name,
-                    current_version=local_pkg.version if local_pkg else "",
-                    new_version=pkg.version,
-                    description=pkg.desc,
-                    repository=pkg.db.name,
                     package=pkg,
+                    current_version=local_pkg.version if local_pkg else "",
                 )
 
                 groups = install_info.package.groups
@@ -389,12 +385,8 @@ def get_upgradeable_repo_pkgs_info(self) -> list[RepoInstallInfo]:
         ):
             local_pkg = all_local_pkgs.get(pkg.name)
             install_info = RepoInstallInfo(
-                name=pkg.name,
-                current_version=local_pkg.version if local_pkg else "",
-                new_version=pkg.version,
-                description=pkg.desc,
-                repository=pkg.db.name,
                 package=pkg,
+                current_version=local_pkg.version if local_pkg else "",
             )
             pkg_install_infos.append(install_info)
         return pkg_install_infos
@@ -525,12 +517,8 @@ def get_aur_pkgs_info(  # pylint: disable=too-many-branches
                 continue
             local_pkg = local_pkgs.get(pkg_name)
             aur_updates_install_info_by_name[pkg_name] = AURInstallInfo(
-                name=pkg_name,
-                current_version=local_pkg.version if local_pkg else " ",
-                new_version=aur_pkg.version,
-                description=aur_pkg.desc,
-                maintainer=aur_pkg.maintainer,
                 package=aur_pkg,
+                current_version=local_pkg.version if local_pkg else " ",
             )
         for pkg_name in list(aur_updates_install_info_by_name.keys())[:]:
             if pkg_name not in aur_updates_install_info_by_name:
@@ -571,12 +559,13 @@ def get_info_from_pkgbuilds(self) -> None:
                     raise RuntimeError(translate(f"{pkg_name} already added to the list"))
                 local_pkg = local_pkgs.get(pkg_name)
                 info = AURInstallInfo(
+                    # @TODO: use data from srcinfo here?
+                    package=aur_pkg,
                     name=pkg_name,
                     current_version=local_pkg.version if local_pkg else " ",
                     new_version=aur_pkg.version,
                     description=aur_pkg.desc,
                     maintainer="local user",
-                    package=aur_pkg,
                     pkgbuild_path=path,
                 )
                 logger.debug("  3 {} {} {}", info, info.package, info.package.packagebase)
@@ -640,12 +629,8 @@ def get_aur_deps_info(self) -> None:
                 continue
             local_pkg = local_pkgs.get(pkg_name)
             self.aur_deps_install_info.append(AURInstallInfo(
-                name=aur_pkg.name,
-                current_version=local_pkg.version if local_pkg else " ",
-                new_version=aur_pkg.version,
-                description=aur_pkg.desc,
-                maintainer=aur_pkg.maintainer,
                 package=aur_pkg,
+                current_version=local_pkg.version if local_pkg else " ",
             ))
             added_pkg_names.append(aur_pkg.name)
 

pikaur/pikatypes.py

@@ -63,12 +63,12 @@ class PackageSource(enum.Enum):
     LOCAL = enum.auto()
 
 
-@dataclass(eq=False)
+@dataclass(eq=False, kw_only=True)
 class InstallInfo(ComparableType):
-    name: str
     package: "pyalpm.Package | AURPackageInfo"
-    new_version: str
-    current_version: str
+    name: str = ""
+    new_version: str = ""
+    current_version: str = ""
 
     description: str | None = None
     maintainer: str | None = None
@@ -103,6 +103,42 @@ def __repr__(self) -> str:
             f"{self.current_version} -> {self.new_version}>"
         )
 
+    def __post_init__(self) -> None:
+        pkg_type = (
+            "aur"
+            if isinstance(self.package, AURPackageInfo)
+            else (
+                "local"
+                if self.package.db.name == "local"
+                else "repo"
+            )
+        )
+        if not self.name:
+            self.name = self.package.name
+        if not self.description:
+            self.description = self.package.desc
+        if pkg_type == "local":
+            if not self.current_version:
+                self.current_version = self.package.version
+            if self.repository is None:
+                self.repository = cast("pyalpm.Package", self.package).db.name
+            if self.required_by_installed is None:
+                self.required_by_installed = \
+                    cast("pyalpm.Package", self.package).compute_requiredby()
+            if self.optional_for_installed is None:
+                self.optional_for_installed = \
+                    cast("pyalpm.Package", self.package).compute_optionalfor()
+            if self.installed_as_dependency is None:
+                self.installed_as_dependency = \
+                    cast(bool, cast("pyalpm.Package", self.package).reason)
+        else:
+            if not self.new_version:
+                self.new_version = self.package.version
+            if pkg_type == "aur" and not self.maintainer:
+                self.maintainer = cast(AURPackageInfo, self.package).maintainer
+            if pkg_type == "repo" and not self.repository:
+                self.repository = cast("pyalpm.Package", self.package).db.name
+
 
 @dataclass(eq=False)
 class RepoInstallInfo(InstallInfo):

pikaur/updates.py

@@ -84,12 +84,8 @@ def find_repo_upgradeable() -> list[RepoInstallInfo]:
         local_pkg = all_local_pkgs[repo_pkg.name]
         repo_packages_updates.append(
             RepoInstallInfo(
-                name=local_pkg.name,
-                new_version=repo_pkg.version,
-                current_version=local_pkg.version,
-                description=repo_pkg.desc,
-                repository=repo_pkg.db.name,
                 package=repo_pkg,
+                current_version=local_pkg.version,
             ),
         )
     return repo_packages_updates
@@ -113,13 +109,10 @@ def find_aur_devel_updates(
         pkg_age_days = (now - pkg_install_datetime).days
         if pkg_age_days >= package_ttl_days:
             aur_updates.append(AURInstallInfo(
-                name=pkg_name,
+                package=aur_pkg,
                 current_version=local_pkg.version,
                 new_version=VERSION_DEVEL,
-                description=aur_pkg.desc,
                 devel_pkg_age_days=pkg_age_days,
-                maintainer=aur_pkg.maintainer,
-                package=aur_pkg,
             ))
     return aur_updates
 
@@ -143,12 +136,8 @@ def find_aur_updates() -> tuple[list[AURInstallInfo], list[str]]:
         compare_aur_pkg = compare_versions(current_version, aur_version)
         if compare_aur_pkg < 0:
             pkg_install_info = AURInstallInfo(
-                name=pkg_name,
-                new_version=aur_version,
-                current_version=current_version,
-                description=aur_pkg.desc,
-                maintainer=aur_pkg.maintainer,
                 package=aur_pkg,
+                current_version=current_version,
             )
             if args.ignore_outofdate and aur_pkg.outofdate:
                 print_ignoring_outofdate_upgrade(pkg_install_info)

pikaur_meta_helpers/dep_tree.py

@@ -1,56 +1,14 @@
 import sys
-from dataclasses import dataclass
-from typing import NamedTuple, cast
+from typing import NamedTuple
 
 import pyalpm
 
 from pikaur.pacman import PackageDB
 from pikaur.pikaprint import ColorsHighlight, color_line, format_paragraph, get_term_width
-from pikaur.pikatypes import AURPackageInfo
-from pikaur.pikatypes import InstallInfo as InstallInfoOld
+from pikaur.pikatypes import InstallInfo
 from pikaur.print_department import pretty_format_upgradeable
 
 
-@dataclass(eq=False, kw_only=True)
-class InstallInfo(InstallInfoOld):
-    # @TODO: move it to the main module?
-    name: str = ""
-    new_version: str = ""
-    current_version: str = ""
-
-    def __post_init__(self) -> None:
-        pkg_type = (
-            "aur"
-            if isinstance(self.package, AURPackageInfo)
-            else (
-                "local"
-                if self.package.db.name == "local"
-                else "repo"
-            )
-        )
-        if pkg_type == "local":
-            if not self.current_version:
-                self.current_version = self.package.version
-            if self.required_by_installed is None:
-                self.required_by_installed = \
-                    cast("pyalpm.Package", self.package).compute_requiredby()
-            if self.optional_for_installed is None:
-                self.optional_for_installed = \
-                    cast("pyalpm.Package", self.package).compute_optionalfor()
-            if self.installed_as_dependency is None:
-                self.installed_as_dependency = \
-                    cast(bool, cast("pyalpm.Package", self.package).reason)
-        if not self.name:
-            self.name = self.package.name
-        if (
-            (not self.new_version)
-            and (pkg_type in {"aur", "repo"})
-        ):
-            self.new_version = self.package.version
-        if not self.description:
-            self.description = self.package.desc
-
-
 class StackItem(NamedTuple):
     item_type: str  # 'pkg' or 'title'
     content: str  # Package name or title text

pikaur_test/test_unit_pikatypes.py

@@ -115,17 +115,15 @@ class InstallInfoTest(PikaurTestCase):
     def setUpClass(cls):
         repo_pkg = PackageDB.get_repo_list()[0]
         cls.repo_install_info = InstallInfo(
-            name=repo_pkg.name,
+            package=repo_pkg,
             current_version=repo_pkg.version,
             new_version="420",
-            package=repo_pkg,
         )
         aur_pkg = find_aur_packages(["pikaur"])[0][0]
         cls.aur_install_info = InstallInfo(
-            name=aur_pkg.name,
+            package=aur_pkg,
             current_version=aur_pkg.version,
             new_version="420",
-            package=aur_pkg,
         )
 
     def test_basic(self):