Skip to content

fix(wallpapers-ocs): choices() must fetch its own index #4

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

Open
perlowja wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(wallpapers-ocs): choices() must fetch its own index #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c19ef2d
fix(wallpapers-ocs): choices() must fetch its own index
perlowja Sep 21, 2026
d3e44d6
fix(wallpapers-ocs): self-fetch index, fix owner_id for import lookup
perlowja Sep 21, 2026
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
9 changes: 8 additions & 1 deletion wallpapers-ocs/wallpapers_ocs.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ namespace WallpapersOcs {
public bool supports_search { get { return false; } }
public Provider() { base("/usr/local/bin/ncz-wallpaper-ocs"); }
public async ArrayList<WallpaperProviderChoice> choices(string index, Cancellable? cancel) throws Error {
return WallpaperOcs.categories(index, id);
// The browser passes an empty index; this provider fetches its own,
// same as wallpapers-bing's choices() fetching its own markets.
return WallpaperOcs.categories(yield command({helper, "index"}, cancel, 90), id);
}
public async WallpaperProviderResult browse(string category, string query, int page,
bool refresh, Cancellable? cancel) throws Error {
Expand All @@ -45,6 +47,11 @@ namespace WallpapersOcs {
"--pages", "1", "--page-size", OCS_PAGE_SIZE}, cancel, 60, refresh);
var result = new WallpaperProviderResult();
result.items = WallpaperOcs.items(data, network, network_category);
// items() sets owner_id to the per-network name (e.g. "pling"),
// but the registered provider id is the "ocs" aggregate -- fix
// it up here so import_card()'s provider_registry.lookup(owner_id)
// finds this provider instead of failing "not active".
foreach (var item in result.items) item.owner_id = id;
var response = WallpaperOcs.document(data);
var failed = response.get_member("failed_networks");
if (failed != null && failed.get_node_type() == Json.NodeType.ARRAY && failed.get_array().get_length() > 0)
Expand Down
Loading