cache: split index request from download, remove hardcoded client rev

cache/src/test/java/net/runelite/cache/CacheProperties.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.cache;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class CacheProperties
+{
+	private static Properties getProperies() throws IOException
+	{
+		Properties properties = new Properties();
+		InputStream resourceAsStream = StoreLocation.class.getResourceAsStream("/cache.properties");
+		properties.load(resourceAsStream);
+		return properties;
+	}
+
+	public static int getRsVersion() throws IOException
+	{
+		return Integer.parseInt(getProperies().getProperty("rs.version"));
+	}
+
+	public static int getCacheVersion() throws IOException
+	{
+		return Integer.parseInt(getProperies().getProperty("cache.version"));
+	}
+}

cache/src/test/java/net/runelite/cache/StoreLocation.java

@@ -62,17 +62,9 @@ public class StoreLocation
 		}
 	}
 
-	private static Properties getProperies() throws IOException
-	{
-		Properties properties = new Properties();
-		InputStream resourceAsStream = StoreLocation.class.getResourceAsStream("/cache.properties");
-		properties.load(resourceAsStream);
-		return properties;
-	}
-
 	private static File setupCacheDir() throws IOException
 	{
-		File file = new File(System.getProperty("java.io.tmpdir"), "cache-" + getProperies().getProperty("cache.version"));
+		File file = new File(System.getProperty("java.io.tmpdir"), "cache-" + CacheProperties.getCacheVersion());
 
 		if (file.exists())
 		{

cache/src/test/java/net/runelite/cache/client/CacheClientTest.java

@@ -26,6 +26,7 @@ package net.runelite.cache.client;
 
 import java.io.File;
 import java.util.concurrent.CompletableFuture;
+import net.runelite.cache.CacheProperties;
 import net.runelite.cache.fs.Store;
 import org.junit.Assert;
 import org.junit.Before;
@@ -53,7 +54,7 @@ public class CacheClientTest
 		{
 			store.load();
 			
-			CacheClient c = new CacheClient(store);
+			CacheClient c = new CacheClient(store, CacheProperties.getRsVersion());
 			c.connect();
 			CompletableFuture<Integer> handshake = c.handshake();
 
@@ -78,7 +79,7 @@ public class CacheClientTest
 		{
 			store.loadTree(new File("C:\\rs\\runescape-data\\cache"));
 			
-			CacheClient c = new CacheClient(store);
+			CacheClient c = new CacheClient(store, CacheProperties.getRsVersion());
 			c.connect();
 			CompletableFuture<Integer> handshake = c.handshake();
 

cache/src/test/resources/cache.properties

@@ -1,2 +1,3 @@
+rs.version=${rs.version}
 cache.version=${cache.version}