Skip to content

Enable pulling releases from Forgejo-based services #10

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable pulling releases from Forgejo-based services #10

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/main/java/org/oscwii/repositorymanager/model/app/OSCMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public record OSCMeta(String name, String author, String[] authors, String categ
List<String> peripherals, String version, EnumSet<Flag> flags,
Source source, List<Treatment> treatments)
{
public record Source(String type, Format format, String url, String file,
public record Source(String type, String host, Format format, String url, String file,
String userAgent, Set<String> additionalFiles)
{
public enum Format
Expand Down
21 changes: 13 additions & 8 deletions src/main/java/org/oscwii/repositorymanager/sources/impl/GitHubSourceDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,20 @@ protected Request fetchFileInformation(InstalledApp app, Path archivePath, Path
OSCMeta.Source source = app.getMeta().source();
Request.Builder request = new Request.Builder();

if(!config.getGithubToken().isEmpty())
{
logger.info(" - Authenticating with GitHub");
request.addHeader("Authorization", "token " + config.getGithubToken());
String apiHost = source.host() + "/api/v1";
if (source.host() == null) {
apiHost = "https://api.github.com";

if(!config.getGithubToken().isEmpty())
{
logger.info(" - Authenticating with GitHub");
request.addHeader("Authorization", "token " + config.getGithubToken());
}
else
logger.info(" - No valid GitHub token found, using unauthenticated requests.");
}
else
logger.info(" - No valid GitHub token found, using unauthenticated requests.");

return request.url(LATEST_RELEASE.formatted(source.url()))
return request.url(LATEST_RELEASE.formatted(apiHost, source.url()))
.addHeader("User-Agent", config.getUserAgent())
.build();
}
Expand Down Expand Up @@ -106,5 +111,5 @@ protected void processFiles(InstalledApp app, Path archivePath, Path tmpDir, Req
}
}

private static final String LATEST_RELEASE = "https://api.github.com/repos/%s/releases/latest";
private static final String LATEST_RELEASE = "%s/repos/%s/releases/latest";
}
1 change: 1 addition & 0 deletions src/main/java/org/oscwii/repositorymanager/utils/serializers/SourceTypeAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ else if(type.equalsIgnoreCase("itchio"))
context.deserialize(additionalFilesArr, new TypeToken<>(){}.getType());

return new OSCMeta.Source(type,
obj.has("host") ? obj.get("host").getAsString() : null,
context.deserialize(obj.get("format"), OSCMeta.Source.Format.class),
url,
file,
Expand Down