ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cache: use newer index data parser for cache client

Browse Source
This commit is contained in:
Adam
2017-09-03 21:54:59 -04:00
parent bf4436178d
commit 9e00655326
1 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
cache/src/main/java/net/runelite/cache/client/CacheClient.java vendored
View File

@@ -51,6 +51,8 @@ import net.runelite.cache.client.requests.HelloHandshake;
import net.runelite.cache.fs.Archive; import net.runelite.cache.fs.Archive;
import net.runelite.cache.fs.Index; import net.runelite.cache.fs.Index;
import net.runelite.cache.fs.Store; import net.runelite.cache.fs.Store;
import net.runelite.cache.index.ArchiveData;
import net.runelite.cache.index.IndexData;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -239,45 +241,50 @@ public class CacheClient implements AutoCloseable
continue; continue;
} }
Index oldIndex = null; IndexData indexData = new IndexData();
if (index != null) indexData.load(indexFileResult.getContents());
if (index == null)
{ {
store.removeIndex(index); index = store.addIndex(i);
}
oldIndex = index; else
{
// update index crc
index.setCrc(crc);
} }
index = store.addIndex(i);
index.readIndexData(indexFileResult.getContents());
index.setCrc(crc);
logger.info("Index {} has {} archives", i, index.getArchives().size()); logger.info("Index {} has {} archives", i, index.getArchives().size());
for (Archive archive : index.getArchives()) for (ArchiveData ad : indexData.getArchives())
{ {
Archive oldArchive = oldIndex != null ? oldIndex.getArchive(archive.getArchiveId()) : null; Archive existing = index.getArchive(ad.getId());
if (oldArchive == null || oldArchive.getRevision() != archive.getRevision()) if (existing == null || existing.getRevision() != ad.getRevision())
{ {
if (oldArchive == null) if (existing == null)
{ {
logger.info("Archive {}/{} in index {} is out of date, downloading", archive.getArchiveId(), index.getArchives().size(), index.getId()); logger.info("Archive {}/{} in index {} is out of date, downloading",
ad.getId(), indexData.getArchives().length, index.getId());
} }
else if (archive.getRevision() < oldArchive.getRevision()) else if (ad.getRevision() < existing.getRevision())
{ {
logger.warn("Archive {}/{} in index {} revision is going BACKWARDS! (our revision {}, their revision {})", logger.warn("Archive {}/{} in index {} revision is going BACKWARDS! (our revision {}, their revision {})",
archive.getArchiveId(), index.getArchives().size(), index.getId(), ad.getId(), indexData.getArchives().length, index.getId(),
oldArchive.getRevision(), archive.getRevision()); existing.getRevision(), ad.getRevision());
} }
else else
{ {
logger.info("Archive {}/{} in index {} is out of date ({} != {}), downloading", logger.info("Archive {}/{} in index {} is out of date ({} != {}), downloading",
archive.getArchiveId(), index.getArchives().size(), index.getId(), ad.getId(), indexData.getArchives().length, index.getId(),
oldArchive.getRevision(), archive.getRevision()); existing.getRevision(), ad.getRevision());
} }
CompletableFuture<FileResult> future = requestFile(index.getId(), archive.getArchiveId(), false); final Archive archive = existing == null
? index.addArchive(ad.getId())
: existing;
CompletableFuture<FileResult> future = requestFile(index.getId(), ad.getId(), false);
future.handle((fr, ex) -> future.handle((fr, ex) ->
{ {
archive.setData(fr.getCompressedData()); archive.setData(fr.getCompressedData());
@@ -286,20 +293,8 @@ public class CacheClient implements AutoCloseable
} }
else else
{ {
logger.info("Active {}/{} in index {} is up to date", archive.getArchiveId(), index.getArchives().size(), index.getId()); logger.info("Active {}/{} in index {} is up to date",
ad.getId(), indexData.getArchives().length, index.getId());
// copy existing contents, this is sort of hackish.
byte[] contents = oldArchive.getData();
if (contents != null)
{
archive.setData(contents);
}
else
{
contents = oldArchive.saveContents();
archive.loadContents(contents);
archive.setCompression(oldArchive.getCompression());
}
} }
} }
} }