woggioni/jpacrepo
1
0
Fork 0
Code Actions Packages Releases Activity

fixed bug with compression format

Browse Source
This commit is contained in:
Walter Oggioni
2022-06-23 20:18:00 +08:00
parent 7b56c38acb
commit 9b94bffff0
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/woggioni/jpacrepo/service/PacmanWebService.java
View File

@@ -2,6 +2,7 @@ package net.woggioni.jpacrepo.service;
import lombok.SneakyThrows;
import lombok.val;
import net.woggioni.jpacrepo.api.model.CompressionFormat;
import net.woggioni.jpacrepo.api.model.PkgData;
import net.woggioni.jpacrepo.api.model.PkgId;
import net.woggioni.jpacrepo.api.service.PacmanServiceLocal;
@@ -107,7 +108,7 @@ public class PacmanWebService {
if (result == null) {
EntityManager em = emf.createEntityManager();
TypedQuery<Object[]> query = em.createQuery(
"SELECT pkg.id.name, pkg.id.version, pkg.id.arch, pkg.fileName, pkg.size, pkg.md5sum " +
"SELECT pkg.id.name, pkg.id.version, pkg.id.arch, pkg.id.compressionFormat, pkg.fileName, pkg.size, pkg.md5sum " +
"FROM PkgData pkg ORDER BY pkg.id.name, pkg.id.version, pkg.id.arch",
Object[].class);
cachedMap = query.getResultStream()
@@ -115,9 +116,10 @@ public class PacmanWebService {
String name = (String) pkg[0];
String version = (String) pkg[1];
String arch = (String) pkg[2];
String filename = (String) pkg[3];
long size = (long) pkg[4];
String md5sum = (String) pkg[5];
CompressionFormat compressionFormat = (CompressionFormat) pkg[3];
String filename = (String) pkg[4];
long size = (long) pkg[5];
String md5sum = (String) pkg[6];
PkgTuple tuple = new PkgTuple();
tuple.setFilename(filename);
tuple.setSize(size);
@@ -126,6 +128,7 @@ public class PacmanWebService {
id.setName(name);
id.setVersion(version);
id.setArch(arch);
id.setCompressionFormat(compressionFormat);
return Tuple2.newInstance(id, tuple);
}).collect(
CollectionUtils.toUnmodifiableTreeMap(

3
src/main/java/net/woggioni/jpacrepo/version/PkgIdComparator.java
View File

@@ -14,6 +14,7 @@ public class PkgIdComparator {
static {
comparator = Comparator.comparing(PkgId::getName)
.thenComparing(PkgId::getVersion, VersionComparator.getInstance())
.thenComparing(PkgId::getArch);
.thenComparing(PkgId::getArch)
.thenComparing(PkgId::getCompressionFormat);
}
}