DjalimSimaila/PackageViewer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12 from ThomasRubini/arch_fixup

Browse Source
This commit is contained in:
Thomas Rubini 2022-12-12 22:48:21 +01:00 committed by GitHub
commit bc5b41122c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/fr/packageviewer/distribution/ArchDistribution.java
View File

@ -107,8 +107,9 @@ public class ArchDistribution implements Distribution {
// unknown package, probably an abstract dependency // unknown package, probably an abstract dependency
logger.fine("Completing callback INVALID for package %s (depth=%s)".formatted(packageName, depth)); logger.fine("Completing callback INVALID for package %s (depth=%s)".formatted(packageName, depth));
futurePackage.complete(null); futurePackage.complete(null);
return;
} }
JSONObject resultJson = json.getJSONArray("results").getJSONObject(0); JSONObject resultJson = resultsArrayJson.getJSONObject(0);
// get infos except dependencies // get infos except dependencies
name = resultJson.getString("pkgname"); name = resultJson.getString("pkgname");
@ -120,7 +121,8 @@ public class ArchDistribution implements Distribution {
if(depth==0) { if(depth==0) {
logger.fine("Completing callback NODEP for package %s (depth=%s)".formatted(packageName, depth)); logger.fine("Completing callback NODEP for package %s (depth=%s)".formatted(packageName, depth));
futurePackage.complete(new Package(name, version, repo, description, Collections.emptyList())); futurePackage.complete(new Package(name, version, repo, description, Collections.emptyList()));
} else { return;
}
// iterate for every package in the list // iterate for every package in the list
List<CompletableFuture<Package>> futureDeps = new ArrayList<>(); List<CompletableFuture<Package>> futureDeps = new ArrayList<>();
for (Object depPackageNameObj : resultJson.getJSONArray("depends")) { for (Object depPackageNameObj : resultJson.getJSONArray("depends")) {
@ -140,7 +142,6 @@ public class ArchDistribution implements Distribution {
// TODO this doesn't seem clean // TODO this doesn't seem clean
logger.fine("Completing callback DEPS for package %s (depth=%s)".formatted(packageName, depth)); logger.fine("Completing callback DEPS for package %s (depth=%s)".formatted(packageName, depth));
futurePackage.complete(new Package(name, version, repo, description, deps)); futurePackage.complete(new Package(name, version, repo, description, deps));
}
}).exceptionally((e2->{ }).exceptionally((e2->{
logger.warning("Error while fetching package %s (depth=%s) from the API : \n%s".formatted(packageName, depth, e2)); logger.warning("Error while fetching package %s (depth=%s) from the API : \n%s".formatted(packageName, depth, e2));
e2.printStackTrace(); e2.printStackTrace();