janware/jw-pkg
Watch
1
Code Pull requests Activity Actions

App.get_project_refs(): Fix multi-section results #117

Merged
Jan Lindemann merged 1 commit from jan/fix/20260922-app-get-project-refs-fix-multi-section-results into master 2026-09-22 05:07:54 +02:00 AGit
Conversation 0 Commits 1 Files changed 1 +29 -26
1 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/python/jw/pkg/App.py
View file

@ -203,7 +203,7 @@ class App(Base):
buf: list[str], buf: list[str],
visited: set[str], visited: set[str],
spec: str, spec: str,
section: str, sections: list[str],
key: str, key: str,
add_self: bool, add_self: bool,
scope: Scope, scope: Scope,
@ -230,29 +230,33 @@ class App(Base):
f'Unmet dependency on {mod}: the -{needed_subpackage} package ' f'Unmet dependency on {mod}: the -{needed_subpackage} package '
f'of project {name} is not installed' f'of project {name} is not installed'
) )
vals = self.get_value(name, section, key) vals_list: list[str] = []
log( for section in sections:
DEBUG, vals = self.get_value(name, section, key)
( log(
f'name={name}, section={section}, key={key}, deps={vals}, ' DEBUG,
f'scope={scope.name}, visited={visited}' (
), f'name={name}, section={section}, key={key}, deps={vals}, '
) f'scope={scope.name}, visited={visited}'
vals_list = vals.split(',') if vals else [] ),
)
if not vals:
continue
for val in vals.split(','):
val = val.strip()
if (len(val)) and (val not in vals_list):
vals_list.append(val)
match scope: match scope:
case Scope.Self: case Scope.Self:
buf += vals_list buf += vals_list
case Scope.One | Scope.Subtree: case Scope.One | Scope.Subtree:
subscope = scope.Self if scope == Scope.One else scope subscope = scope.Self if scope == Scope.One else scope
for val in vals_list: for val in vals_list:
val = val.strip()
if not (len(val)):
continue
self.__get_project_refs( self.__get_project_refs(
buf, buf,
visited, visited,
val, val,
section, sections,
key, key,
add_self = True, add_self = True,
scope = subscope, scope = subscope,
@ -559,18 +563,17 @@ class App(Base):
if isinstance(keys, str): if isinstance(keys, str):
keys = [keys] keys = [keys]
ret: list[str] = [] ret: list[str] = []
for section in sections: for key in keys:
for key in keys: visited: set[str] = set()
visited: set[str] = set() for name in projects:
for name in projects: rr: list[str] = []
rr: list[str] = [] self.__get_project_refs(
self.__get_project_refs( rr, visited, name, sections, key, add_self, scope, names_only
rr, visited, name, section, key, add_self, scope, names_only )
) # TODO: this looks like a performance hogger
# TODO: this looks like a performance hogger for m in rr:
for m in rr: if m not in ret:
if m not in ret: ret.append(m)
ret.append(m)
return ret return ret
def get_libname(self, spec: str) -> str | None: def get_libname(self, spec: str) -> str | None: