diff --git a/src/main/java/fr/packageviewer/distribution/ArchDistribution.java b/src/main/java/fr/packageviewer/distribution/ArchDistribution.java index f8aa25f..4fb7367 100644 --- a/src/main/java/fr/packageviewer/distribution/ArchDistribution.java +++ b/src/main/java/fr/packageviewer/distribution/ArchDistribution.java @@ -64,7 +64,8 @@ public CompletableFuture>> getPackageFromAPI(String pa resultJson.getString("pkgname"), resultJson.getString("pkgver"), resultJson.getString("repo"), - resultJson.getString("pkgdesc") + resultJson.getString("pkgdesc"), + "arch" ), dependenciesNames )); @@ -106,7 +107,8 @@ public CompletableFuture>> getPackageFromAPI(String pa searchResultJson.getString("pkgname"), searchResultJson.getString("pkgver"), searchResultJson.getString("repo"), - searchResultJson.getString("pkgdesc") + searchResultJson.getString("pkgdesc"), + "arch" )); } futureSearchedPackages.complete(searchedPackagesList); diff --git a/src/main/java/fr/packageviewer/distribution/FedoraDistribution.java b/src/main/java/fr/packageviewer/distribution/FedoraDistribution.java index e5894d2..f854e22 100644 --- a/src/main/java/fr/packageviewer/distribution/FedoraDistribution.java +++ b/src/main/java/fr/packageviewer/distribution/FedoraDistribution.java @@ -57,7 +57,8 @@ public class FedoraDistribution extends AsyncRequestsParser implements Distribut json.getString("basename"), json.getString("version"), json.getString("repo"), - json.getString("description") + json.getString("description"), + "fedora" ), dependenciesNames )); @@ -97,7 +98,9 @@ public class FedoraDistribution extends AsyncRequestsParser implements Distribut searchResultJson.getString("name"), null, null, - searchResultJson.getString("description"))); + searchResultJson.getString("description"), + "fedora" + )); } futureSearchedPackages.complete(searchedPackagesList); }).exceptionally(error->{ diff --git a/src/main/java/fr/packageviewer/pack/Package.java b/src/main/java/fr/packageviewer/pack/Package.java index 0371559..c05a4e5 100644 --- a/src/main/java/fr/packageviewer/pack/Package.java +++ b/src/main/java/fr/packageviewer/pack/Package.java @@ -15,11 +15,11 @@ public class Package extends SearchedPackage { deps.add(pack); } - public Package(String name, String version, String repo, String description) { - this(name, version, repo, description, new ArrayList<>()); + public Package(String name, String version, String repo, String description, String distribution) { + this(name, version, repo, description, distribution, new ArrayList<>()); } - public Package(String name, String version, String repo, String description, List deps) { - super(name, version, repo, description); + public Package(String name, String version, String repo, String description, String distribution, List deps) { + super(name, version, repo, description, distribution); this.deps = deps; } diff --git a/src/main/java/fr/packageviewer/pack/SearchedPackage.java b/src/main/java/fr/packageviewer/pack/SearchedPackage.java index 868801e..44bfebc 100644 --- a/src/main/java/fr/packageviewer/pack/SearchedPackage.java +++ b/src/main/java/fr/packageviewer/pack/SearchedPackage.java @@ -5,6 +5,7 @@ public class SearchedPackage { private final String version; private final String repo; private final String description; + private final String distribution; public String getName() { return name; @@ -22,11 +23,16 @@ public class SearchedPackage { return description; } - public SearchedPackage(String name, String version, String repo, String desciption) { + public String getDistribution() { + return distribution; + } + + public SearchedPackage(String name, String version, String repo, String description, String distribution) { this.name = name; this.version = version; this.repo = repo; - this.description = desciption; + this.description = description; + this.distribution = distribution; } @Override