begin release

.travis.yml

@@ -0,0 +1 @@
+language: java

Building.md

@@ -1,23 +1,30 @@
 ## Building
 
-Prerequisites:
+**Prerequisites:**
 - maven 3
 - openjdk >= 8
 
-Build: 
+**Build:**
 ```bash
 ./build.sh
 ```
 
-Executables:
+**Executables:**
 ```bash
 dxvk-cache-client
 dxvk-cache-server
 ```
 
-Archlinux:
+**Debian package:**
+```
+dxvk-cache-pool-client/target/dxvk-cache-pool-client_*_all.deb
+```
+
+### Archlinux
+
+You can use the AUR: https://aur.archlinux.org/pkgbase/dxvk-cache-pool-git/
 
-See [PKGBUILD](arch/PKGBUILD)
+Otherwise see [PKGBUILD](arch/PKGBUILD)
 
 ## Implementation problems
 

README.md

@@ -107,6 +107,14 @@ You can opt to only download cache entries which are signed by verified users (`
 
 See [Verification](Verification.md).
 
-## Miscellaneous
+## FAQ
 
-For frequently asked questions, see [FAQ.md](FAQ.md). For building, see the [Building.md](Building.md). For server documentation, see the [server README](dxvk-cache-pool-server/README.md).
+For frequently asked questions, see [FAQ](FAQ.md)
+
+## Building
+
+See [Building](Building.md)
+
+## Server
+
+For server documentation, see the [server README](dxvk-cache-pool-server/README.md).

dxvk-cache-pool-client/dxvk-cache-client-debian.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec java -jar /usr/lib/dxvk-cache-pool/dxvk-cache-client.jar "$@"
+

dxvk-cache-pool-client/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ignorelist.kassandra</groupId>
 		<artifactId>dxvk-cache-pool</artifactId>
-		<version>1.0.1</version>
+		<version>1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>dxvk-cache-pool-client</artifactId>
 	<packaging>jar</packaging>
@@ -71,6 +71,56 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>jdeb</artifactId>
+				<groupId>org.vafer</groupId>
+				<version>1.7</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jdeb</goal>
+						</goals>
+						<configuration>
+							<verbose>true</verbose>
+							<snapshotExpand>true</snapshotExpand>
+							<verbose>true</verbose>
+							<controlDir>${basedir}/src/deb/control</controlDir>
+							<dataSet>
+								<data>
+									<src>${project.build.directory}/${project.build.finalName}-boot.jar</src>
+									<type>file</type>
+									<mapper>
+										<type>perm</type>
+										<prefix>/usr/lib/dxvk-cache-pool</prefix>
+										<filemode>644</filemode>
+									</mapper>
+									<dst>dxvk-cache-client.jar</dst>
+								</data>
+								<data>
+									<src>${maven.multiModuleProjectDirectory}/dxvk-cache-pool.sh</src>
+									<type>file</type>
+									<mapper>
+										<type>perm</type>
+										<prefix>/etc/profile.d</prefix>
+										<filemode>755</filemode>
+									</mapper>
+								</data>
+								<data>
+									<src>${project.basedir}/dxvk-cache-client-debian.sh</src>
+									<type>file</type>
+									<mapper>
+										<type>perm</type>
+										<prefix>/usr/bin</prefix>
+										<filemode>755</filemode>
+									</mapper>
+									<dst>dxvk-cache-client</dst>
+								</data>
+							</dataSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

dxvk-cache-pool-client/src/deb/control/control

@@ -0,0 +1,9 @@
+Package: dxvk-cache-client
+Version: [[version]]
+Section: games
+Priority: low
+Architecture: all
+Description: Allows sharing of DXVK State Cache, for smoother gameplay for everyone
+Maintainer: "rc.poison" <[email protected]>
+Homepage: https://github.com/rcpoison/dxvk-cache-pool
+Depends: java8-runtime-headless

dxvk-cache-pool-client/src/deb/control/postinst

@@ -0,0 +1,6 @@
+#!/bin/bash
+#
+# Script written by SpectralMemories on october 16 2018
+# POST INSTALL
+
+echo "Environment variables were tampered with. You should login again or restart the machine"

dxvk-cache-pool-client/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/client/CachePoolClient.java

@@ -7,6 +7,7 @@
 
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
+import com.ignorelist.kassandra.dxvk.cache.pool.common.model.PredicateStateCacheEntrySigned;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -55,7 +56,15 @@ public static void main(String[] args) throws IOException {
 				c.setScanRecursive(false);
 			}
 			if (commandLine.hasOption("min-signatures")) {
-				c.setMinimumSignatures(Integer.parseInt(commandLine.getOptionValue("min-signatures")));
+				final int minSignatures=Integer.parseInt(commandLine.getOptionValue("min-signatures"));
+				if (minSignatures<0) {
+					System.err.println("min-signatures must be positive");
+					System.exit(1);
+				}
+				if (minSignatures<PredicateStateCacheEntrySigned.DEFAULT_SIGNATURE_MINIMUM) {
+					System.err.println("You've specified min-signatures < "+PredicateStateCacheEntrySigned.DEFAULT_SIGNATURE_MINIMUM+". Please reconsider, you won't be contributing your signatures.");
+				}
+				c.setMinimumSignatures(minSignatures);
 			}
 			if (commandLine.hasOption("cache-target-dir")) {
 				c.setCacheTargetPath(Paths.get(commandLine.getOptionValue("cache-target-dir")));

dxvk-cache-pool-client/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/client/CachePoolMerger.java

@@ -370,7 +370,9 @@ private void copyToReference(final Path source, final String baseName) throws IO
 	private StateCache readReference(final int version, final String baseName) throws IOException {
 		final Path referencePath=buildReferencePath(baseName);
 		try (InputStream in=new BufferedInputStream(new GZIPInputStream(Files.newInputStream(referencePath)))) {
-			return StateCacheIO.parse(in);
+			final StateCache stateCache=StateCacheIO.parse(in);
+			stateCache.setBaseName(baseName);
+			return stateCache;
 		} catch (IOException ioe) {
 			log.log(ProgressLog.Level.SUB, baseName, "couldn't find reference cache, assuming generated locally");
 			StateCache stateCache=new StateCache();

dxvk-cache-pool-common/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ignorelist.kassandra</groupId>
 		<artifactId>dxvk-cache-pool</artifactId>
-		<version>1.0.1</version>
+		<version>1.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>dxvk-cache-pool-common</artifactId>
 	<packaging>jar</packaging>

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/Identity.java

@@ -78,7 +78,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof Identity)) {
 			return false;
 		}
 		final Identity other=(Identity) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/IdentityVerification.java

@@ -57,7 +57,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof IdentityVerification)) {
 			return false;
 		}
 		final IdentityVerification other=(IdentityVerification) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/IdentityWithVerification.java

@@ -65,7 +65,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof IdentityWithVerification)) {
 			return false;
 		}
 		final IdentityWithVerification other=(IdentityWithVerification) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/PublicKey.java

@@ -74,7 +74,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof PublicKey)) {
 			return false;
 		}
 		final PublicKey other=(PublicKey) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/PublicKeyInfo.java

@@ -62,7 +62,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof PublicKeyInfo)) {
 			return false;
 		}
 		final PublicKeyInfo other=(PublicKeyInfo) obj;
@@ -75,7 +75,7 @@ public boolean equals(Object obj) {
 	@Override
 	public String toString() {
 		return MoreObjects.toStringHelper(this)
-				.add("hash", BaseEncoding.base16().encode(hash))
+				.add("hash", null==hash ? null : BaseEncoding.base16().encode(hash))
 				.toString();
 	}
 

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/Signature.java

@@ -52,7 +52,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof Signature)) {
 			return false;
 		}
 		final Signature other=(Signature) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/SignatureCount.java

@@ -76,7 +76,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof SignatureCount)) {
 			return false;
 		}
 		final SignatureCount other=(SignatureCount) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/crypto/SignaturePublicKeyInfo.java

@@ -65,7 +65,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof SignaturePublicKeyInfo)) {
 			return false;
 		}
 		final SignaturePublicKeyInfo other=(SignaturePublicKeyInfo) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/PredicateAcceptedPublicKeys.java

@@ -61,7 +61,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof PredicateAcceptedPublicKeys)) {
 			return false;
 		}
 		final PredicateAcceptedPublicKeys other=(PredicateAcceptedPublicKeys) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/PredicateMinimumSignatures.java

@@ -57,7 +57,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof PredicateMinimumSignatures)) {
 			return false;
 		}
 		final PredicateMinimumSignatures other=(PredicateMinimumSignatures) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/PredicateStateCacheEntrySigned.java

@@ -8,6 +8,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import java.io.Serializable;
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
@@ -69,6 +70,41 @@ public boolean apply(StateCacheEntrySignees input) {
 				.apply(input);
 	}
 
+	@Override
+	public int hashCode() {
+		int hash=7;
+		hash=41*hash+Objects.hashCode(this.acceptedPublicKeys);
+		hash=41*hash+Objects.hashCode(this.minimumSignatures);
+		hash=41*hash+(this.onlyAcceptVerifiedKeys ? 1 : 0);
+		return hash;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this==obj) {
+			return true;
+		}
+		if (obj==null) {
+			return false;
+		}
+		if (!(obj instanceof PredicateStateCacheEntrySigned)) {
+			return false;
+		}
+		final PredicateStateCacheEntrySigned other=(PredicateStateCacheEntrySigned) obj;
+		if (this.onlyAcceptVerifiedKeys!=other.onlyAcceptVerifiedKeys) {
+			return false;
+		}
+		if (!Objects.equals(this.acceptedPublicKeys, other.acceptedPublicKeys)) {
+			return false;
+		}
+		if (!Objects.equals(this.minimumSignatures, other.minimumSignatures)) {
+			return false;
+		}
+		return true;
+	}
+
+
+
 	@Override
 	public String toString() {
 		return "PredicateStateCacheEntrySigned{"+"acceptedPublicKeys="+acceptedPublicKeys+", minimumSignatures="+minimumSignatures+", onlyAcceptVerifiedKeys="+onlyAcceptVerifiedKeys+'}';

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/StateCache.java

@@ -19,11 +19,13 @@
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 
 /**
  *
  * @author poison
  */
+@XmlRootElement
 public class StateCache implements StateCacheMeta, Serializable {
 
 	private static final Logger LOG=Logger.getLogger(StateCache.class.getName());
@@ -205,7 +207,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof StateCache)) {
 			return false;
 		}
 		final StateCache other=(StateCache) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/StateCacheEntry.java

@@ -97,7 +97,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof StateCacheEntry)) {
 			return false;
 		}
 		final StateCacheEntry other=(StateCacheEntry) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/StateCacheEntryInfo.java

@@ -56,7 +56,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof StateCacheEntryInfo)) {
 			return false;
 		}
 		final StateCacheEntryInfo other=(StateCacheEntryInfo) obj;

dxvk-cache-pool-common/src/main/java/com/ignorelist/kassandra/dxvk/cache/pool/common/model/StateCacheEntryInfoSignees.java

@@ -72,7 +72,7 @@ public boolean equals(Object obj) {
 		if (obj==null) {
 			return false;
 		}
-		if (getClass()!=obj.getClass()) {
+		if (!(obj instanceof StateCacheEntryInfoSignees)) {
 			return false;
 		}
 		final StateCacheEntryInfoSignees other=(StateCacheEntryInfoSignees) obj;