add 'distribution' field to packages

This commit is contained in:
Thomas Rubini 2022-12-14 14:43:38 +01:00
parent 6b641ca10f
commit a1ab530fa7
No known key found for this signature in database
GPG Key ID: C7D287C8C1CAC373
4 changed files with 20 additions and 9 deletions

View File

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

View File

@ -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->{

View File

@ -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<Package> deps) {
super(name, version, repo, description);
public Package(String name, String version, String repo, String description, String distribution, List<Package> deps) {
super(name, version, repo, description, distribution);
this.deps = deps;
}

View File

@ -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 description) {
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 = description;
this.distribution = distribution;
}
@Override