diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java index 514aac1a..6f8a20b6 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/ThreadDownloadImageETag.java @@ -2,6 +2,8 @@ package com.voxelmodpack.hdskins; import com.google.common.base.Charsets; import com.google.common.io.Files; +import com.voxelmodpack.hdskins.skins.NetClient; + import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.SimpleTexture; import net.minecraft.client.renderer.texture.TextureUtil; @@ -12,10 +14,7 @@ import org.apache.http.Header; import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; +import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -34,48 +33,48 @@ public class ThreadDownloadImageETag extends SimpleTexture { @Nonnull private final File cacheFile; + private final File eTagFile; private final String imageUrl; + @Nullable private final IImageBuffer imageBuffer; @Nullable private BufferedImage bufferedImage; + @Nullable private Thread imageThread; private boolean textureUploaded; public ThreadDownloadImageETag(@Nonnull File cacheFileIn, String imageUrlIn, ResourceLocation defLocation, @Nullable IImageBuffer imageBufferIn) { super(defLocation); - this.cacheFile = cacheFileIn; - this.eTagFile = new File(cacheFile.getParentFile(), cacheFile.getName() + ".etag"); - this.imageUrl = imageUrlIn; - this.imageBuffer = imageBufferIn; - } - - private void checkTextureUploaded() { - if (!this.textureUploaded) { - if (this.bufferedImage != null) { - if (this.textureLocation != null) { - this.deleteGlTexture(); - } - - TextureUtil.uploadTextureImage(super.getGlTextureId(), this.bufferedImage); - this.textureUploaded = true; - } - } + cacheFile = cacheFileIn; + eTagFile = new File(cacheFile.getParentFile(), cacheFile.getName() + ".etag"); + imageUrl = imageUrlIn; + imageBuffer = imageBufferIn; } public int getGlTextureId() { - this.checkTextureUploaded(); + if (!textureUploaded) { + if (bufferedImage != null) { + if (textureLocation != null) { + deleteGlTexture(); + } + + TextureUtil.uploadTextureImage(super.getGlTextureId(), bufferedImage); + textureUploaded = true; + } + } + return super.getGlTextureId(); } private void setBufferedImage(@Nonnull BufferedImage bufferedImageIn) { - this.bufferedImage = bufferedImageIn; + bufferedImage = bufferedImageIn; - if (this.imageBuffer != null) { - this.imageBuffer.skinAvailable(); + if (imageBuffer != null) { + imageBuffer.skinAvailable(); } } @@ -85,24 +84,22 @@ public class ThreadDownloadImageETag extends SimpleTexture { } public void loadTexture(IResourceManager resourceManager) throws IOException { - if (this.bufferedImage == null && this.textureLocation != null) { + if (bufferedImage == null && textureLocation != null) { super.loadTexture(resourceManager); } - if (this.imageThread == null) { - this.imageThread = new Thread(this::loadTexture, "Texture Downloader #" + THREAD_ID.incrementAndGet()); - this.imageThread.setDaemon(true); - this.imageThread.start(); + if (imageThread == null) { + imageThread = new Thread(this::loadTexture, "Texture Downloader #" + THREAD_ID.incrementAndGet()); + imageThread.setDaemon(true); + imageThread.start(); } } private void loadTexture() { - HttpResponse response = null; - try { - HttpClient client = HttpClientBuilder.create().build(); - response = client.execute(new HttpGet(imageUrl)); - int status = response.getStatusLine().getStatusCode(); - if (status == HttpStatus.SC_NOT_FOUND) { + try (NetClient client = new NetClient("GET", imageUrl)) { + CloseableHttpResponse response = client.getResponse(); + + if (client.getResponseCode() == HttpStatus.SC_NOT_FOUND) { // delete the cache files in case we can't connect in the future clearCache(); } else if (checkETag(response)) { @@ -132,9 +129,6 @@ public class ThreadDownloadImageETag extends SimpleTexture { } } LOGGER.error("Couldn't load skin {} ", imageUrl, e); - } finally { - if (response != null) - EntityUtils.consumeQuietly(response.getEntity()); } } @@ -149,8 +143,8 @@ public class ThreadDownloadImageETag extends SimpleTexture { } private void clearCache() { - FileUtils.deleteQuietly(this.cacheFile); - FileUtils.deleteQuietly(this.eTagFile); + FileUtils.deleteQuietly(cacheFile); + FileUtils.deleteQuietly(eTagFile); } private boolean checkETag(HttpResponse response) { @@ -158,14 +152,15 @@ public class ThreadDownloadImageETag extends SimpleTexture { if (cacheFile.isFile()) { String localETag = Files.readFirstLine(eTagFile, Charsets.UTF_8); Header remoteETag = response.getFirstHeader(HttpHeaders.ETAG); + // true if no remote etag or does match return remoteETag == null || localETag.equals(remoteETag.getValue()); } - return false; } catch (IOException e) { - // it failed, so re-fetch. - return false; + } + + return false; // it failed, so re-fetch. } private void loadTextureFromServer(HttpResponse response) { diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java index eb0183d5..b8fd762e 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/BethlehemSkinServer.java @@ -5,6 +5,7 @@ import java.net.URI; import java.util.Locale; import java.util.Map; import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.http.HttpStatus; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; @@ -32,14 +33,13 @@ public class BethlehemSkinServer extends AbstractSkinServer { @Override protected MinecraftTexturesPayload getProfileData(GameProfile profile) { try (NetClient client = new NetClient("GET", getPath(profile))) { - if (!client.send()) { - return null; + if (client.getResponseCode() == HttpStatus.SC_OK) { + return gson.fromJson(client.getResponseText(), MinecraftTexturesPayload.class); } - - return gson.fromJson(client.getResponseText(), MinecraftTexturesPayload.class); } catch (IOException e) { - return null; + } + return null; } @Override @@ -53,11 +53,11 @@ public class BethlehemSkinServer extends AbstractSkinServer { client.putFile(type.toString().toLowerCase(Locale.US), "image/png", image); } - if (!client.send()) { - throw new IOException(client.getResponseText()); + if (client.getResponseCode() == HttpStatus.SC_OK) { + return new SkinUploadResponse(client.getResponseText()); } - return new SkinUploadResponse(client.getResponseText()); + throw new IOException(client.getResponseText()); } } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java index 9c84e9e3..f98e1675 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/LegacySkinServer.java @@ -13,6 +13,7 @@ import com.mojang.util.UUIDTypeAdapter; import net.minecraft.util.Session; import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.http.HttpStatus; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -66,7 +67,7 @@ public class LegacySkinServer extends AbstractSkinServer { String url = getPath(address, type, profile); try (NetClient client = new NetClient("GET", url)) { - if (!client.send()) { + if (client.getResponseCode() != HttpStatus.SC_OK) { throw new IOException("Bad response code: " + client.getResponseCode()); } diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java b/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java index e3b5437f..a982f647 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/skins/NetClient.java @@ -8,7 +8,6 @@ import java.io.InputStreamReader; import java.net.URI; import java.util.Map; -import org.apache.commons.io.IOUtils; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; @@ -18,13 +17,14 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.apache.http.util.EntityUtils; /** * Ew. Why so many builders? >.< */ public class NetClient implements Closeable { - private CloseableHttpClient client; + private static CloseableHttpClient client = null; private RequestBuilder rqBuilder; @@ -36,18 +36,34 @@ public class NetClient implements Closeable { start(method, uri); } + /** + * Starts a new network request. + * + * @param method The HTTP method verb. GET/PUT/POST/DELETE/OPTIONS + * @param uri Http link to query + * + * @return Itself for chaining + */ public NetClient start(String method, String uri) { rqBuilder = RequestBuilder.create(method).setUri(uri); headers = null; if (response != null) { - IOUtils.closeQuietly(response); + EntityUtils.consumeQuietly(response.getEntity()); response = null; } return this; } + /** + * Adds a file to the request. Typically used with PUT/POST for uploading. + * @param key Key identifier to index the file in the request. + * @param contentType Type of file being sent. Usually the mime-type. + * @param file The file or a link to the file. + * + * @return itself for chaining + */ public NetClient putFile(String key, String contentType, URI file) { File f = new File(file); HttpEntity entity = MultipartEntityBuilder.create().addBinaryBody(key, f, ContentType.create(contentType), f.getName()).build(); @@ -57,13 +73,22 @@ public class NetClient implements Closeable { return this; } + /** + * Sets the headers to be included with this request. + * @param headers Headers to send + * + * @return itself for chaining + */ public NetClient putHeaders(Map headers) { this.headers = headers; return this; } - public boolean send() { + /** + * Commits and sends the request. + */ + private void send() throws IOException { HttpUriRequest request = rqBuilder.build(); if (headers != null) { @@ -76,31 +101,36 @@ public class NetClient implements Closeable { client = HttpClients.createSystem(); } - try { - response = client.execute(request); - - return getResponseCode() == HttpStatus.SC_OK; - } catch (IOException e) { } - - return false; + response = client.execute(request); } - public int getResponseCode() { + /** + * Gets or obtains the http response body. + */ + public CloseableHttpResponse getResponse() throws IOException { if (response == null) { send(); } - return response.getStatusLine().getStatusCode(); + return response; } - public String getResponseText() { - if (response == null) { - if (!send()) { - return ""; - } + /** + * Gets or obtains a response status code. + */ + public int getResponseCode() throws IOException { + return getResponse().getStatusLine().getStatusCode(); + } + + /** + * Consumes and returns the entire response body. + */ + public String getResponseText() throws IOException { + if (getResponse().getEntity() == null) { + return ""; } - try (BufferedReader reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent()))) { + try (BufferedReader reader = new BufferedReader(new InputStreamReader(getResponse().getEntity().getContent()))) { StringBuilder builder = new StringBuilder(); int ch; @@ -109,23 +139,17 @@ public class NetClient implements Closeable { } return builder.toString(); - } catch (IOException e) { - } - - return ""; } @Override public void close() throws IOException { - if (response != null) { - IOUtils.closeQuietly(response); + try { + if (response != null) { + response.close(); + } + } finally { response = null; } - - if (client != null) { - IOUtils.closeQuietly(client); - client = null; - } } }