Skip to content

remap custom repos to the same format as the standard repo #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
benjaminlevine wants to merge 1 commit into from
Closed

remap custom repos to the same format as the standard repo #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion files/owut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,38 @@ function generate_repositories() {
}
}

function package_versions_from_index(index)
{
// OpenWrt package indexes can be either:
// { packages: [{ name, version, ... }, ...] }
// or a direct name->version mapping.
// Normalize both into a { pkg: version } object.
if (! index) return {};

if (type(index) == "array") {
let out = {};
for (let pkg in index) {
if (pkg?.name && pkg?.version)
out[pkg.name] = pkg.version;
}
return out;
}

if (index.packages) {
if (type(index.packages) == "array") {
let out = {};
for (let pkg in index.packages) {
if (pkg?.name && pkg?.version)
out[pkg.name] = pkg.version;
}
return out;
}
return index.packages;
}

return index;
}

function dl_package_versions_from_repositories()
{
let repositories_packages = {};
Expand All @@ -965,7 +997,8 @@ function dl_package_versions_from_repositories()
for (let index, repo in repository_list) {
let url = replace(repo, "packages.adb", "index.json");
let json = dl_json(url, "/tmp/owut-repositories-packages-"+index+".json", true);
repositories_packages = sort({ ...(repositories_packages ?? []), ...(json?.packages ?? []) });
let pkg_map = package_versions_from_index(json);
repositories_packages = sort({ ...(repositories_packages ?? []), ...(pkg_map ?? []) });
}

if (repositories_mode == "append") {
Expand Down