external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 02:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1251 from kevlahnota/master

Browse Source 
fix LibGDXImageFetcher not deleting .tmp files
This commit is contained in:
Anthony Calosa
2022-07-31 12:08:33 +08:00
committed by GitHub
parent 8807a0a056 194d5b00dc
commit 8961e77cbc
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-core/src/main/java/forge/ImageKeys.java
View File

@@ -155,24 +155,12 @@ public final class ImageKeys {
cachedCards.put(filename, file); cachedCards.put(filename, file);
return file; return file;
} }
// if there's a 1st art variant try with it for .fullborder images
file = findFile(dir, fullborderFile.replaceAll("[0-9]*.fullborder", "1.fullborder"));
if (file != null) {
cachedCards.put(filename, file);
return file;
}
// if there's an art variant try without it for .full images // if there's an art variant try without it for .full images
file = findFile(dir, filename.replaceAll("[0-9].full",".full")); file = findFile(dir, filename.replaceAll("[0-9].full",".full"));
if (file != null) { if (file != null) {
cachedCards.put(filename, file); cachedCards.put(filename, file);
return file; return file;
} }
// if there's a 1st art variant try with it for .full images
file = findFile(dir, filename.replaceAll("[0-9]*.full", "1.full"));
if (file != null) {
cachedCards.put(filename, file);
return file;
}
//setlookup //setlookup
if (hasSetLookup(filename)) { if (hasSetLookup(filename)) {
toFind.add(filename); toFind.add(filename);

7
forge-gui-mobile/src/forge/util/LibGDXImageFetcher.java
View File

@@ -3,6 +3,7 @@ package forge.util;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
@@ -42,9 +43,11 @@ public class LibGDXImageFetcher extends ImageFetcher {
FileHandle destFile = new FileHandle(newdespath + ".tmp"); FileHandle destFile = new FileHandle(newdespath + ".tmp");
System.out.println(newdespath); System.out.println(newdespath);
destFile.parent().mkdirs(); destFile.parent().mkdirs();
OutputStream out = new FileOutputStream(destFile.file());
// Conversion to JPEG will be handled differently depending on the platform // Conversion to JPEG will be handled differently depending on the platform
Forge.getDeviceAdapter().convertToJPEG(is, new FileOutputStream(destFile.file())); Forge.getDeviceAdapter().convertToJPEG(is, out);
is.close();
out.close(); //close outputstream before destfile.moveto so it can delete the tmp file internally
destFile.moveTo(new FileHandle(newdespath)); destFile.moveTo(new FileHandle(newdespath));
System.out.println("Saved image to " + newdespath); System.out.println("Saved image to " + newdespath);