Merge pull request Ghost-chu#1543 from Ghost-chu/master

Ghost-chu · web-flow · commit e7611616a009 · 2021-11-01T22:32:03.000+08:00
5.0.0.4
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>QuickShop</artifactId>
 
     <properties>
-        <pluginver>5.0.0.3</pluginver>
+        <pluginver>5.0.0.4</pluginver>
         <package>org.maxgamer.quickshop</package>
         <developer>Ghost-chu</developer>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/org/maxgamer/quickshop/api/shop/Shop.java b/src/main/java/org/maxgamer/quickshop/api/shop/Shop.java
@@ -562,6 +562,7 @@ default List<ComponentPackage> getSignText(String locale) {
     default boolean isShopSign(@NotNull Sign sign) {
         // Check for new shop sign
         String[] lines = sign.getLines();
+        // Can be claim
         if (lines[0].isEmpty() && lines[1].isEmpty() && lines[2].isEmpty() && lines[3].isEmpty()) {
             return true;
         }
diff --git a/src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/CrowdinOTA.java b/src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/CrowdinOTA.java
@@ -19,14 +19,13 @@
 
 package org.maxgamer.quickshop.localization.text.distributions.crowdin;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
-import lombok.*;
-import okhttp3.Request;
-import okhttp3.Response;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;
@@ -36,23 +35,20 @@
 import org.maxgamer.quickshop.localization.text.distributions.crowdin.bean.Manifest;
 import org.maxgamer.quickshop.util.HttpUtil;
 import org.maxgamer.quickshop.util.JsonUtil;
+import org.maxgamer.quickshop.util.MsgUtil;
 import org.maxgamer.quickshop.util.Util;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.StandardOpenOption;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
+import java.util.concurrent.locks.ReentrantLock;
 
 public class CrowdinOTA implements Distribution {
     protected static final String CROWDIN_OTA_HOST = "https://distributions.crowdin.net/daf1a8db40f132ce157c457xrm4/";
-    protected final Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
-            .expireAfterWrite(7, TimeUnit.DAYS)
-            .build();
     private final QuickShop plugin;
+    private final OTACacheControl otaCacheControl = new OTACacheControl();
 
     public CrowdinOTA(QuickShop plugin) {
         this.plugin = plugin;
@@ -68,7 +64,7 @@ public CrowdinOTA(QuickShop plugin) {
 
     @Nullable
     public Manifest getManifest() {
-        return JsonUtil.getGson().fromJson(getManifestJson(), Manifest.class);
+        return JsonUtil.regular().fromJson(getManifestJson(), Manifest.class);
     }
 
     /**
@@ -79,27 +75,7 @@ public Manifest getManifest() {
     @Nullable
     public String getManifestJson() {
         String url = CROWDIN_OTA_HOST + "manifest.json";
-        String data;
-        if (requestCachePool.getIfPresent(url) != null) {
-            return requestCachePool.getIfPresent(url);
-        }
-        try (Response response = HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute()) {
-            val body = response.body();
-            if (body == null) {
-                return null;
-            }
-            data = body.string();
-            if (response.code() != 200) {
-                plugin.getLogger().warning("Couldn't get manifest: " + response.code() + ", please report to QuickShop!");
-                return null;
-            }
-            requestCachePool.put(url, data);
-        } catch (IOException e) {
-            e.printStackTrace();
-            plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system won't work");
-            return null;
-        }
-        return data;
+        return HttpUtil.createGet(url);
     }
 
     /**
@@ -173,63 +149,93 @@ public String getFile(String fileCrowdinPath, String crowdinLocale, boolean forc
         if (!manifest.getFiles().contains(fileCrowdinPath)) {
             throw new IllegalArgumentException("The file " + fileCrowdinPath + " not exists on Crowdin");
         }
-        if (manifest.getCustomLanguages() != null && !manifest.getCustomLanguages().contains(crowdinLocale)) {
-            throw new IllegalArgumentException("The locale " + crowdinLocale + " not exists on Crowdin");
-        }
+//        if (manifest.getCustom_languages() != null && !manifest.getCustom_languages().contains(crowdinLocale)) {
+//            throw new IllegalArgumentException("The locale " + crowdinLocale + " not exists on Crowdin");
+//        }
         // Post path (replaced with locale code)
         String postProcessingPath = fileCrowdinPath.replace("%locale%", crowdinLocale);
-        // Create path hash to store the file
-        String pathHash = DigestUtils.sha1Hex(postProcessingPath);
-        // Reading metadata
-        File metadataFile = new File(Util.getCacheFolder(), "i18n.metadata");
-        YamlConfiguration cacheMetadata = YamlConfiguration.loadConfiguration(metadataFile);
-        // Reading cloud timestamp
-        long localeTimestamp = cacheMetadata.getLong(pathHash + ".timestamp");
-        // Reading locale cache
-        File cachedDataFile = new File(Util.getCacheFolder(), pathHash);
-        String data = null;
-        // Getting local cache
-        if (cachedDataFile.exists()) {
-            Util.debugLog("Reading data from local cache: " + cachedDataFile.getCanonicalPath());
-            data = Util.readToString(cachedDataFile);
-        }
-        // invalidate cache, flush it
-        // force flush required OR local cache not exists OR outdated
-        if (forceFlush || data == null || localeTimestamp != manifest.getTimestamp()) {
-            String url = CROWDIN_OTA_HOST + "content" + fileCrowdinPath.replace("%locale%", crowdinLocale);
-            //Util.debugLog("Reading data from remote server: " + url);
-            plugin.getLogger().info("Downloading translation " + crowdinLocale + " from: " + url);
-            try (Response response = HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute()) {
-                val body = response.body();
-                if (body == null) {
-                    throw new OTAException(response.code(), ""); // Returns empty string (failed to getting content)
-                }
-                data = body.string();
-                if (response.code() != 200) {
-                    throw new OTAException(response.code(), data);
+
+        // Validating the manifest
+        long manifestTimestamp = getManifest().getTimestamp();
+        if (otaCacheControl.readManifestTimestamp() == getManifest().getTimestamp() && !forceFlush) {
+            // Use cache
+            try {
+                // Check cache outdated
+                if (!otaCacheControl.isCachedObjectOutdated(postProcessingPath, manifestTimestamp)) {
+                    // Return the caches
+                    Util.debugLog("Use local cache for " + postProcessingPath);
+                    return new String(otaCacheControl.readObjectCache(postProcessingPath), StandardCharsets.UTF_8);
+                } else {
+                    Util.debugLog("Local cache outdated for " + postProcessingPath);
+                    Util.debugLog("Excepted " + otaCacheControl.readCachedObjectTimestamp(postProcessingPath) + " actual: " + manifestTimestamp);
                 }
-                // save to local cache file
-                Files.write(cachedDataFile.toPath(), data.getBytes(StandardCharsets.UTF_8));
-            } catch (IOException e) {
-                plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system may won't work");
-                e.printStackTrace();
-                return "";
+            } catch (Exception exception) {
+                MsgUtil.debugStackTrace(exception.getStackTrace());
             }
-            // update cache index
-            cacheMetadata.set(pathHash + ".timestamp", manifest.getTimestamp());
-            cacheMetadata.save(metadataFile);
-            return data;
+        } else {
+            Util.debugLog("Manifest timestamp check failed " + postProcessingPath + " excepted:" + otaCacheControl.readManifestTimestamp() + " actual: " + getManifest().getTimestamp() + " forceUpdate: " + forceFlush);
+        }
+        // Out of the cache
+        String url = CROWDIN_OTA_HOST + "content" + fileCrowdinPath.replace("%locale%", crowdinLocale);
+        plugin.getLogger().info("Updating translation " + crowdinLocale + " from: " + url);
+        String data = HttpUtil.createGet(url);
+        if (data == null) {
+            // Failed to grab data
+            throw new OTAException();
         }
+        // Successfully grab the data from the remote server
+        otaCacheControl.writeObjectCache(postProcessingPath, data.getBytes(StandardCharsets.UTF_8), manifestTimestamp);
+        otaCacheControl.writeManifestTimestamp(getManifest().getTimestamp());
         return data;
+
+//        String pathHash = DigestUtils.sha1Hex(postProcessingPath);
+//        // Reading metadata
+//        File metadataFile = new File(Util.getCacheFolder(), "i18n.metadata");
+//        YamlConfiguration cacheMetadata = YamlConfiguration.loadConfiguration(metadataFile);
+//        // Reading cloud timestamp
+//        long localeTimestamp = cacheMetadata.getLong(pathHash + ".timestamp");
+//        // Reading locale cache
+//        File cachedDataFile = new File(Util.getCacheFolder(), pathHash);
+//        String data = null;
+//        // Getting local cache
+//        if (cachedDataFile.exists()) {
+//            Util.debugLog("Reading data from local cache: " + cachedDataFile.getCanonicalPath());
+//            data = Util.readToString(cachedDataFile);
+//        }
+//        // invalidate cache, flush it
+//        // force flush required OR local cache not exists OR outdated
+//        if (forceFlush || data == null || localeTimestamp != manifest.getTimestamp()) {
+//            String url = CROWDIN_OTA_HOST + "content" + fileCrowdinPath.replace("%locale%", crowdinLocale);
+//            //Util.debugLog("Reading data from remote server: " + url);
+//            plugin.getLogger().info("Downloading translation " + crowdinLocale + " from: " + url);
+//            try (Response response = HttpUtil.create().getClient().newCall(new Request.Builder().get().url(url).build()).execute()) {
+//                val body = response.body();
+//                if (body == null) {
+//                    throw new OTAException(response.code(), ""); // Returns empty string (failed to getting content)
+//                }
+//                data = body.string();
+//                if (response.code() != 200) {
+//                    throw new OTAException(response.code(), data);
+//                }
+//                // save to local cache file
+//                Files.write(cachedDataFile.toPath(), data.getBytes(StandardCharsets.UTF_8));
+//            } catch (IOException e) {
+//                plugin.getLogger().log(Level.WARNING, "Failed to download manifest.json, multi-language system may won't work");
+//                e.printStackTrace();
+//                return "";
+//            }
+//            // update cache index
+//            cacheMetadata.set(pathHash + ".timestamp", manifest.getTimestamp());
+//            cacheMetadata.save(metadataFile);
+//            return data;
+//        }
     }
 
     @EqualsAndHashCode(callSuper = true)
     @AllArgsConstructor
     @Builder
     @Data
     public static class OTAException extends Exception {
-        private int httpCode;
-        private String content;
     }
 
     @AllArgsConstructor
@@ -240,4 +246,71 @@ public static class CrowdinGetFileRequest {
         private String crowdinLocale;
         private boolean forceFlush;
     }
+
+    public static class OTACacheControl {
+        private final File metadataFile = new File(Util.getCacheFolder(), "i18n.metadata");
+        private final YamlConfiguration metadata;
+        private final ReentrantLock LOCK = new ReentrantLock();
+
+        public OTACacheControl() {
+            this.metadata = YamlConfiguration.loadConfiguration(this.metadataFile);
+        }
+
+        private void save() {
+            LOCK.lock();
+            try {
+                this.metadata.save(this.metadataFile);
+            } catch (Exception exception) {
+                exception.printStackTrace();
+            } finally {
+                LOCK.unlock();
+            }
+        }
+
+        private String hash(String str) {
+            return DigestUtils.sha1Hex(str);
+        }
+
+        public long readManifestTimestamp() {
+            LOCK.lock();
+            long l = this.metadata.getLong("manifest.timestamp", -1);
+            LOCK.unlock();
+            return l;
+        }
+
+        public void writeManifestTimestamp(long timestamp) {
+            LOCK.lock();
+            this.metadata.set("manifest.timestamp", timestamp);
+            LOCK.unlock();
+            save();
+        }
+
+        public long readCachedObjectTimestamp(String path) {
+            String cacheKey = hash(path);
+            LOCK.lock();
+            long l = this.metadata.getLong("objects." + cacheKey + ".time", -1);
+            LOCK.unlock();
+            return l;
+        }
+
+        public boolean isCachedObjectOutdated(String path, long manifestTimestamp) {
+            return readCachedObjectTimestamp(path) != manifestTimestamp;
+        }
+
+        public byte[] readObjectCache(String path) throws IOException {
+            String cacheKey = hash(path);
+            return Files.readAllBytes(new File(Util.getCacheFolder(), cacheKey).toPath());
+        }
+
+        public void writeObjectCache(String path, byte[] data, long manifestTimestamp) throws IOException {
+            String cacheKey = hash(path);
+            Files.write(new File(Util.getCacheFolder(), cacheKey).toPath(), data);
+            LOCK.lock();
+            this.metadata.set("objects." + cacheKey + ".time", manifestTimestamp);
+            LOCK.unlock();
+            save();
+        }
+
+
+    }
 }
diff --git a/src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/bean/Manifest.java b/src/main/java/org/maxgamer/quickshop/localization/text/distributions/crowdin/bean/Manifest.java
@@ -1,23 +1,37 @@
+/*
+ * This file is a part of project QuickShop, the name is Manifest.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package org.maxgamer.quickshop.localization.text.distributions.crowdin.bean;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 
-@NoArgsConstructor
+@AllArgsConstructor
 @Data
+@NoArgsConstructor
 public class Manifest {
-
-    @JsonProperty("files")
     private List<String> files;
-    @JsonProperty("languages")
     private List<String> languages;
-    @JsonProperty("custom_languages")
-    private List<?> customLanguages;
-    @JsonProperty("timestamp")
-    private Integer timestamp;
-
+    private List<?> custom_languages;
+    private long timestamp;
 }
diff --git a/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/shop/ContainerShop.java
diff --git a/src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java b/src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java

Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,7 @@ default List<ComponentPackage> getSignText(String locale) {`
`562`	`562`	`default boolean isShopSign(@NotNull Sign sign) {`
`563`	`563`	`// Check for new shop sign`
`564`	`564`	`String[] lines = sign.getLines();`
	`565`	`+ // Can be claim`
`565`	`566`	`if (lines[0].isEmpty() && lines[1].isEmpty() && lines[2].isEmpty() && lines[3].isEmpty()) {`
`566`	`567`	`return true;`
`567`	`568`	`}`