Skip to content

fix: handle unencoded spaces in catalog paths and prevent NPE on miss… #163

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
alaurie wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: handle unencoded spaces in catalog paths and prevent NPE on miss… #163

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e186bba
fix: handle unencoded spaces in catalog paths and prevent NPE on miss…
alaurie Aug 28, 2026
5b50e38
fix: resolve space-encoded catalog URLs and handle -1 HTTP errors in …
alaurie Aug 28, 2026
d999cba
fix: restore original formatting and keep only space-encoding fix
alaurie Aug 28, 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
40 changes: 32 additions & 8 deletions .github/appstore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
Expand Down Expand Up @@ -123,19 +125,27 @@ public Integer call() throws Exception {
TimeUnit.MILLISECONDS.sleep(400);
var catalogContent = toJsonElement(gson, content);
if (catalogContent != null) {
catalogContent.aliases.entrySet().stream().map(entry -> toCatalogerItem(entry, content))
.forEach(aliasItems::add);
if (catalogContent.aliases != null) {
catalogContent.aliases.entrySet().stream()
.filter(entry -> entry.getValue() != null)
.map(entry -> toCatalogerItem(entry, content))
.forEach(aliasItems::add);
}

catalogContent.templates.entrySet().stream().map(entry -> templateToItem(entry, content))
.forEach(templateItems::add);
if (catalogContent.templates != null) {
catalogContent.templates.entrySet().stream()
.filter(entry -> entry.getValue() != null)
.map(entry -> templateToItem(entry, content))
.forEach(templateItems::add);
}
}
}
processed++;
index++;
retries = 5;
} catch (HttpException he) {
int code = he.getResponseCode();
if (code == 400 || code == 404 || code == 422 || code == 451 || (code == 403 && !isRateLimit(he))) {
if (code == -1 || code == 400 || code == 404 || code == 422 || code == 451 || (code == 403 && !isRateLimit(he))) {
out.println("Skipping " + location + " due to HTTP " + code + " error.");
processed++;
index++;
Expand All @@ -151,8 +161,8 @@ public Integer call() throws Exception {
+ "m before retrying (" + retries + " retries left)");
TimeUnit.MILLISECONDS.sleep(wait.toMillis());
}
} catch (IOException ioe) {
out.println("Skipping " + location + " due to IOException: " + ioe.getMessage());
} catch (IllegalArgumentException | IOException ioe) {
out.println("Skipping " + location + " due to error: " + ioe.getMessage());
processed++;
index++;
retries = 5;
Expand Down Expand Up @@ -333,8 +343,22 @@ private boolean isRateLimit(Throwable throwable) {
private Catalog toJsonElement(Gson gson, GHContent catalogContent) throws IOException {
if (catalogContent == null)
return null;
String htmlUrl = catalogContent.getHtmlUrl();
if (htmlUrl != null) {
try {
String rawUrl = htmlUrl.replace("https://github.com/", "https://raw.githubusercontent.com/")
.replace("/blob/", "/")
.replace(" ", "%20");
try (InputStream stream = URI.create(rawUrl).toURL().openStream();
InputStreamReader streamR = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
return gson.fromJson(streamR, Catalog.class);
}
} catch (Exception e) {
// Fall back to GitHub API read
}
}
Catalog json = null;
try (InputStream stream = catalogContent.read(); InputStreamReader streamR = new InputStreamReader(stream)) {
try (InputStream stream = catalogContent.read(); InputStreamReader streamR = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
try {
json = gson.fromJson(streamR, Catalog.class);

Expand Down
Loading