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

Don't check overlay hash for overlays that didn't exist before (#2136)

Browse Source
This commit is contained in:
Lucwousin
2019-12-16 21:06:17 +01:00
committed by Kyle
parent 9c7d4fae81
commit 8341dc9fa3
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java
View File

@@ -50,26 +50,30 @@ public abstract class RSAbstractArchiveMixin implements RSAbstractArchive
final Logger log = client.getLogger(); final Logger log = client.getLogger();
final String path = String.format("/runelite/%s/%s", archiveId, groupId); final String path = String.format("/runelite/%s/%s", archiveId, groupId);
String overlayHash, originalHash; // rsData will be null if this script didn't exist at first
if (rsData != null)
{
String overlayHash, originalHash;
try (final InputStream hashIn = getClass().getResourceAsStream(path + ".hash")) try (final InputStream hashIn = getClass().getResourceAsStream(path + ".hash"))
{ {
overlayHash = CharStreams.toString(new InputStreamReader(hashIn)); overlayHash = CharStreams.toString(new InputStreamReader(hashIn));
originalHash = Hashing.sha256().hashBytes(rsData).toString(); originalHash = Hashing.sha256().hashBytes(rsData).toString();
} }
catch (IOException e) catch (IOException e)
{ {
log.warn("Missing overlay hash for {}/{}", archiveId, groupId); log.warn("Missing overlay hash for {}/{}", archiveId, groupId);
return rsData; return rsData;
} }
// Check if hash is correct first, so we don't have to load the overlay file if it doesn't match // Check if hash is correct first, so we don't have to load the overlay file if it doesn't match
if (!overlayHash.equalsIgnoreCase(originalHash)) if (!overlayHash.equalsIgnoreCase(originalHash))
{ {
log.warn("Mismatch in overlaid cache archive hash for {}/{}: {} != {}", log.warn("Mismatch in overlaid cache archive hash for {}/{}: {} != {}",
archiveId, groupId, overlayHash, originalHash); archiveId, groupId, overlayHash, originalHash);
overlayOutdated = true; overlayOutdated = true;
return rsData; return rsData;
}
} }
try (final InputStream ovlIn = getClass().getResourceAsStream(path)) try (final InputStream ovlIn = getClass().getResourceAsStream(path))