wipwip-2022-04-04

2 files changed, 36 insertions, 22 deletions

diff --git a/parabola_repolint/logging.py b/parabola_repolint/logging.py
index f5fbc7c..864a58f 100644
--- a/parabola_repolint/logging.py
+++ b/parabola_repolint/logging.py
@@ -25,18 +25,28 @@ def LogLoadDone(repo, components, components_class):
     for error_msg in component.error_msgs:
       ERROR(error_msg)
 
-def LogAssembly(repo, components, component_name):
+def LogAssembly(components, component_name):
   if sys.stdout.isatty():
     LogClearLine(None)
-    log_fmt = '[%s]: assembling PackageSet components: %i <--(%s)'
-    sys.stdout.write(log_fmt % (repo._name, len(components), component_name))
+    if components:
+      component = type(list(list(list(components.values())[0].values())[0].values())[0])
+      components_class = type(component).__name__
+      log_fmt = 'assembling PackageSet %s components: %i <--(%s)'
+      sys.stdout.write(log_fmt % (components_class, len(components), component_name))
+    else:
+      log_fmt = 'assembling PackageSet %s components: %i'
+      sys.stdout.write(log_fmt % (component_name, len(components)))
     sys.stdout.flush()
 
-def LogAssemblyDone(repo, components):
-  components_class = type(components[0]).__name__ if components else ''
-  log_fmt = '[%s]: assembled PackageSet %s components: %i'
+def LogAssemblyDone(components):
+  if components:
+    component = type(list(list(list(components.values())[0].values())[0].values())[0])
+    components_class = type(component).__name__
+  else:
+    components_class = ''
+  log_fmt = 'assembled PackageSet %s components: %i'
 
-  Info(log_fmt % (repo._name, components_class, len(components)))
+  Info(log_fmt % (components_class, len(components)))
 
 def LogKeyring(_, keyring):
   if sys.stdout.isatty():
diff --git a/parabola_repolint/packageset.py b/parabola_repolint/packageset.py
index ab149a3..b01d6a0 100644
--- a/parabola_repolint/packageset.py
+++ b/parabola_repolint/packageset.py
@@ -3,8 +3,11 @@
 import os
 import sh
 
+from parabola_repolint.cache import Cache
+from parabola_repolint.cache_helpers import CacheHelpers
 from parabola_repolint.logging import Info, LogAssembly, LogAssemblyDone
 #from parabola_repolint.repo_components import PkgBuild, PkgEntry, PkgFile, PkgId
+from parabola_repolint.pkgid import PkgId
 from parabola_repolint.repo_components import PkgBuild, PkgEntry, PkgFile
 #from parabola_repolint.repo import Repo, RepoCache
 #from parabola_repolint.repo import Repo
@@ -270,25 +273,25 @@ class PackageSet():
             LogAssembly([], 'PkgBuild')
             for repo in all_repos:
                 for pkgbuild in repo.pkgbuilds:
-                    LogAssembly(PackageSet.PkgBuilds, pkgbuild.pkgbase)
+                    LogAssembly(Cache.PkgBuilds, pkgbuild.pkgbase)
                     for _repo in all_repos:
                         for pkg_id in pkgbuild.pkg_ids:
                             _AssociatePkgBulid(pkgbuild, _repo, pkg_id)
-            LogAssemblyDone(PackageSet.PkgBuilds, 'PkgBuild')
-            LogAssembly([], 'PkgEntries')
+            LogAssemblyDone(Cache.PkgBuilds)
+            LogAssembly([], 'PkgEntry')
             for repo in all_repos:
                 for pkgentry in repo.pkgentries:
-                    LogAssembly(PackageSet.PkgEntries, PkgidName(pkg_id))
+                    LogAssembly(Cache.PkgEntries, PkgidName(pkg_id))
                     for _repo in all_repos:
                         _AssociatePkgEntry(pkgentry, _repo)
-            LogAssemblyDone(PackageSet.PkgEntries, '')
-            LogAssembly([], 'PkgFiles')
+            LogAssemblyDone(Cache.PkgEntries)
+            LogAssembly([], 'PkgFile')
             for repo in all_repos:
                 for pkgfile in repo.pkgfiles:
-                    LogAssembly(PackageSet.PkgFiles, PkgidName(pkg_id))
+                    LogAssembly(Cache.PkgFiles, PkgidName(pkg_id))
                     for _repo in all_repos:
                         _AssociatePkgFile(pkgfile, _repo)
-            LogAssemblyDone(PackageSet.PkgFiles, '')
+            LogAssemblyDone(Cache.PkgFiles)
 
             """ WIP: _AssociatePkgBulid, _AssociatePkgEntry, _AssociatePkgFile generically
                 for arch in component.arches:
@@ -353,7 +356,7 @@ class PackageSet():
             ''' Determine and set unique error status, indicating missing package-set components,
                 for each collected PkgBuild, PkgEntry, and PkgFile, in all repos.
             '''
-            LogStatus(PackageSet.PkgSets)
+            LogStatus(Cache.PkgSets)
 
             for repo in all_repos:
                 assert (repo.pkgbuilds  and repo.pkgbuilds_cache ) or \
@@ -363,15 +366,15 @@ class PackageSet():
             for component in all_components:
                 VerifyPackageSet(component)
 
-                LogStatus(PackageSet.PkgSets)
+                LogStatus(Cache.PkgSets)
 
-            LogStatusDone(PackageSet.PkgSets)
+            LogStatusDone(Cache.PkgSets)
 
         def VerifyPackageSet(component):
             pkgfiles = component.pkgfiles
             path = component.path
             arch = component.arch
-            pkg_id = PackageSet.ComponentPkgId(component)
+            pkg_id = PkgId.ComponentPkgId(component)
 
             assert type(component) in ['PkgBuild', 'PkgEntry', 'PkgFile']
 
@@ -418,7 +421,7 @@ class PackageSet():
             Info('PackageSet status:%s pkg_id: %s path: %s' % (bin(PackageSet.Status()), pkg_id, path))
 
 
-        assert False # WIP
+        #assert False # WIP
         if Cache.PkgSets: return
 
         #PackageSet.Repos = repocache.all_repos # CacheRepo() handles this now
@@ -451,8 +454,9 @@ class PackageSet():
 
 
             # BEGIN DEBUG
+            DEBUG_WATCH_FILES = []
             #DEBUG_WATCH_FILES = [ '/mnt/repo/community/os/armv7h/4ti2-1.6.9-2-armv7h.pkg.tar.xz' ]
-            DEBUG_WATCH_FILES = [ '/mnt/repo/community/os/i686/pdftk-3.2.2-1.0-any.pkg.tar.zst' ]
+            #DEBUG_WATCH_FILES = [ '/mnt/repo/community/os/i686/pdftk-3.2.2-1.0-any.pkg.tar.zst' ]
             #if pkgpath in DEBUG_WATCH_FILES: # DEBUG:
                 #Info("prev_status=%s next_status=%s" % (bin(prev_status), bin(prev_status & ~status)))
             if pkg_id in DEBUG_WATCH_FILES:
@@ -460,7 +464,7 @@ class PackageSet():
             # END DEBUG
 
 
-            packageset = FindOrCreatePackageset(arch, pkg_id)
+            packageset = CacheHelpers.FindOrCreatePackageset(arch, pkg_id)
             packageset._status = (packageset.status | status)