Skip to content
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

Implement the repository URL #3192

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Implement the repository URL #3192

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
410adbf
Pass the repository URL to the API
Garanas Jun 2, 2024
1212cdd
Check if the URL exists before sending it
Garanas Jun 2, 2024
e197e67
Add a try-catch around interpretating `mod_info.lua`
Garanas Jun 2, 2024
26166cb
Process the mod info in the upload task
Garanas Jun 2, 2024
9a63647
Add a mod_info.lua test
Garanas Jun 2, 2024
57ff0b3
Remove repositoryURL field as it is no longer necessary
Garanas Jun 2, 2024
77b8cb4
Simplify the path resolves
Garanas Jun 2, 2024
01afae1
Mock the `extractModInfo` function of the `ModService` class
Garanas Jun 2, 2024
67e5a06
Improve code style
Garanas Jun 2, 2024
8332c86
Add a log statement
Garanas Jun 2, 2024
5def4c6
Show the repository URL in the interface
Garanas Jun 2, 2024
a405d7e
Attempt at creating UI tests
Garanas Jun 2, 2024
621d138
Update the mod version and apply the changes
Garanas Jun 2, 2024
23ab26f
Do not wait twice during the test
Garanas Jun 3, 2024
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
Prev Previous commit
Next Next commit
Improve code style
  • Loading branch information
@Garanas
Garanas committed Jun 2, 2024
commit 67e5a064873d3e38d886b9898618a819dbd993ef
11 changes: 4 additions & 7 deletions src/main/java/com/faforever/client/mod/ModUploadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,16 @@
.zip();
}

// retrieve information from the mod_info.lua to send to the API
ModVersion modVersionInfo = modService.extractModInfo(modPath);
if (modVersionInfo != null) {

}
URL repositoryURL = modVersionInfo.mod().repositoryURL();

log.debug("Uploading mod `{}` as `{}`", modPath, tmpFile);
updateTitle(i18n.get("modVault.upload.uploading"));

// retrieve information from `mod_info.lua`
ModVersion modVersionInfo = modService.extractModInfo(modPath);
URL repositoryURL = modVersionInfo.mod().repositoryURL();

HashMap<String, String> parameters = new HashMap<>();
if (repositoryURL != null) {
parameters.put("repositoryUrl", repositoryURL.toString());

Check warning on line 87 in src/main/java/com/faforever/client/mod/ModUploadTask.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/faforever/client/mod/ModUploadTask.java#L87 

Added line #L87 was not covered by tests
}

return fafApiAccessor.uploadFile("/mods/upload", tmpFile, byteListener, Map.of("metadata", parameters)).block();
Expand Down
Loading