AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JarDiffPatcher needs to support .old files.

Browse Source 
When patching, Getdown will move foo.jar to foo.jar.old and then patch that
file to create a new foo.jar. That results in foo.jar.old being passed into
JarDiffPatcher as the source file, which it then inspects to determine whether
it is a zip file or a jar file based on its file extension. Since that file
extension has already changed to .xxx.old, we need to handle that.

Closes #230.
This commit is contained in:
Michael Bayne
2022-01-05 07:25:56 -08:00
parent 1cd3a5c9c3
commit bb4b9e3390
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
+5 -2
View File
@@ -282,8 +282,11 @@ public class JarDiffPatcher implements JarDiffCodes
throws IOException throws IOException
{ {
FileOutputStream out = new FileOutputStream(target); FileOutputStream out = new FileOutputStream(target);
if (source.getName().endsWith(".jar")) return new JarOutputStream(out); String sourceName = source.getName();
else if (source.getName().endsWith(".zip")) return new ZipOutputStream(out); if (sourceName.endsWith(".jar") ||
sourceName.endsWith(".jar.old")) return new JarOutputStream(out);
else if (sourceName.endsWith(".zip") ||
sourceName.endsWith(".zip.old")) return new ZipOutputStream(out);
else throw new AssertionError("Unsupported source file '" + source + "'. Not a .jar or .zip?"); else throw new AssertionError("Unsupported source file '" + source + "'. Not a .jar or .zip?");
} }