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

Merge pull request #30 from ThomasRubini/package_distro_field

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

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

@ -64,7 +64,8 @@ public CompletableFuture<Pair<Package, Set<String>>> getPackageFromAPI(String pa
resultJson.getString("pkgname"), resultJson.getString("pkgname"),
resultJson.getString("pkgver"), resultJson.getString("pkgver"),
resultJson.getString("repo"), resultJson.getString("repo"),
resultJson.getString("pkgdesc") resultJson.getString("pkgdesc"),
"arch"
), ),
dependenciesNames dependenciesNames
)); ));
@ -106,7 +107,8 @@ public CompletableFuture<Pair<Package, Set<String>>> getPackageFromAPI(String pa
searchResultJson.getString("pkgname"), searchResultJson.getString("pkgname"),
searchResultJson.getString("pkgver"), searchResultJson.getString("pkgver"),
searchResultJson.getString("repo"), searchResultJson.getString("repo"),
searchResultJson.getString("pkgdesc") searchResultJson.getString("pkgdesc"),
"arch"
)); ));
} }
futureSearchedPackages.complete(searchedPackagesList); futureSearchedPackages.complete(searchedPackagesList);

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

@ -57,7 +57,8 @@ public class FedoraDistribution extends AsyncRequestsParser implements Distribut
json.getString("basename"), json.getString("basename"),
json.getString("version"), json.getString("version"),
json.getString("repo"), json.getString("repo"),
json.getString("description") json.getString("description"),
"fedora"
), ),
dependenciesNames dependenciesNames
)); ));
@ -97,7 +98,9 @@ public class FedoraDistribution extends AsyncRequestsParser implements Distribut
searchResultJson.getString("name"), searchResultJson.getString("name"),
null, null,
null, null,
searchResultJson.getString("description"))); searchResultJson.getString("description"),
"fedora"
));
} }
futureSearchedPackages.complete(searchedPackagesList); futureSearchedPackages.complete(searchedPackagesList);
}).exceptionally(error->{ }).exceptionally(error->{

8
src/main/java/fr/packageviewer/pack/Package.java
View File

@ -15,11 +15,11 @@ public class Package extends SearchedPackage {
deps.add(pack); deps.add(pack);
} }
public Package(String name, String version, String repo, String description) { public Package(String name, String version, String repo, String description, String distribution) {
this(name, version, repo, description, new ArrayList<>()); this(name, version, repo, description, distribution, new ArrayList<>());
} }
public Package(String name, String version, String repo, String description, List<Package> deps) { public Package(String name, String version, String repo, String description, String distribution, List<Package> deps) {
super(name, version, repo, description); super(name, version, repo, description, distribution);
this.deps = deps; this.deps = deps;
} }

10
src/main/java/fr/packageviewer/pack/SearchedPackage.java
View File

@ -5,6 +5,7 @@ public class SearchedPackage {
private final String version; private final String version;
private final String repo; private final String repo;
private final String description; private final String description;
private final String distribution;
public String getName() { public String getName() {
return name; return name;
@ -22,11 +23,16 @@ public class SearchedPackage {
return description; 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.name = name;
this.version = version; this.version = version;
this.repo = repo; this.repo = repo;
this.description = desciption; this.description = description;
this.distribution = distribution;
} }
@Override @Override