Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions 1

Fix update URL for AWS S3

Browse source
This commit is contained in:
Mike Primm 2022-02-22 00:57:11 -06:00
parent 7658c4a14b
commit cdf773a764
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
DynmapCore/src/main/java/org/dynmap/storage/aws_s3/AWSS3MapStorage.java
View file

@ -8,6 +8,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.dynmap.DynmapCore; import org.dynmap.DynmapCore;
@ -98,9 +99,15 @@ public class AWSS3MapStorage extends MapStorage {
byte[] buf = obj.getBytes(); byte[] buf = obj.getBytes();
tr.image = new BufferInputStream(buf); tr.image = new BufferInputStream(buf);
tr.format = ImageEncoding.fromContentType(rsp.getContentType()); tr.format = ImageEncoding.fromContentType(rsp.getContentType());
tr.hashCode = rsp.geteTag().hashCode(); Map<String, String> meta = rsp.getMetadata();
tr.lastModified = rsp.getLastModified().toEpochMilli(); String v = meta.get("x-dynmap-hash");
if (v != null) {
tr.hashCode = Long.parseLong(v, 16);
}
v = meta.get("x-dynmap-ts");
if (v != null) {
tr.lastModified = Long.parseLong(v);
}
return tr; return tr;
} }
} catch (NoSuchKeyException nskx) { } catch (NoSuchKeyException nskx) {
@ -123,7 +130,8 @@ public class AWSS3MapStorage extends MapStorage {
s3.deleteObject(req); s3.deleteObject(req);
} }
else { else {
PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(map.getImageFormat().getEncoding().getContentType()).build(); PutObjectRequest req = PutObjectRequest.builder().bucketName(bucketname).key(baseKey).contentType(map.getImageFormat().getEncoding().getContentType())
.addMetadata("x-dynmap-hash", Long.toHexString(hash)).addMetadata("x-dynmap-ts", Long.toString(timestamp)).build();
s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len)); s3.putObject(req, RequestBody.fromBytes(encImage.buf, encImage.len));
} }
done = true; done = true;
@ -163,7 +171,7 @@ public class AWSS3MapStorage extends MapStorage {
@Override @Override
public String getURI() { public String getURI() {
return baseKey; return uri;
} }
@Override @Override
@ -605,7 +613,7 @@ public class AWSS3MapStorage extends MapStorage {
* @return URI * @return URI
*/ */
public String getConfigurationJSONURI(boolean login_enabled) { public String getConfigurationJSONURI(boolean login_enabled) {
return "standalone/dynmap_config.json"; return "standalone/dynmap_config.json?_={timestamp}";
} }
/** /**
* URI to use for loading update JSON files (for external web server only) * URI to use for loading update JSON files (for external web server only)
@ -613,7 +621,7 @@ public class AWSS3MapStorage extends MapStorage {
* @return URI * @return URI
*/ */
public String getUpdateJSONURI(boolean login_enabled) { public String getUpdateJSONURI(boolean login_enabled) {
return "standalone/dynmap_{world}.json"; return "standalone/dynmap_{world}.json?_={timestamp}";
} }
@Override @Override