Modify user-agent of CachedWebClient

Author: WikiDru

thumbly-http-client/src/main/java/org/code13k/thumbly/web/client/CachedWebClient.java

@@ -47,10 +47,10 @@ private CachedWebClient() {
     /**
      * Initialize
      */
-    synchronized public void init(String cacheDirectory, long maxSizeOfCacheDirectory, int eventLoopPoolSize) {
+    synchronized public void init(String cacheDirectory, long maxSizeOfCacheDirectory, int eventLoopPoolSize, String userAgent) {
         if (mRequestMap == null) {
             mRequestMap = new HashMap<>();
-            mWebRequest = new WebRequest(eventLoopPoolSize);
+            mWebRequest = new WebRequest(eventLoopPoolSize, userAgent);
             FileStore.getInstance().init(cacheDirectory);
             WebDataStore.getInstance().init(cacheDirectory);
             StoreManager.getInstance().init(maxSizeOfCacheDirectory);

thumbly-http-client/src/main/java/org/code13k/thumbly/web/client/WebRequest.java

@@ -31,11 +31,14 @@ public class WebRequest {
     /**
      * Constructor
      */
-    public WebRequest(int eventLoopPoolSize) {
+    public WebRequest(int eventLoopPoolSize, String userAgent) {
         mLogger.trace("WebRequest()");
 
         // Set User Agent
-        String userAgent = "Code13k-Thumbly/1.0.0";
+        if (StringUtils.isEmpty(userAgent) == true) {
+            userAgent = "Code13k-Thumbly";
+        }
+        mLogger.trace("userAgent = " + userAgent);
 
         // Set Web Client
         WebClientOptions webClientOptions = new WebClientOptions();

thumbly-main/src/main/java/org/code13k/thumbly/Main.java

@@ -85,10 +85,11 @@ public static void main(String[] args) {
         // Initialize (CachedWebClient)
         try {
             CacheInfo cacheInfo = AppConfig.getInstance().getCache();
-            String cacheDirectory = cacheInfo.getRootDirectory() +"/origin";
+            String cacheDirectory = cacheInfo.getRootDirectory() + "/origin";
             long totalSizeOfOriginImages = AppConfig.getInstance().getCache().getTotalSizeOfOriginImages();
             int eventLoopCount = Math.max(1, Env.getInstance().getProcessorCount() / 2);
-            CachedWebClient.getInstance().init(cacheDirectory, totalSizeOfOriginImages, eventLoopCount);
+            String userAgent = "Code13k-Thumbly/" + Env.getInstance().getVersionString();
+            CachedWebClient.getInstance().init(cacheDirectory, totalSizeOfOriginImages, eventLoopCount, userAgent);
             Thread.sleep(500);
         } catch (Exception e) {
             mLogger.error("Failed to initialize CachedWebClient", e);
@@ -109,7 +110,7 @@ public static void main(String[] args) {
         // Initialize (CachedImageProcessor)
         try {
             CacheInfo cacheInfo = AppConfig.getInstance().getCache();
-            String cacheDirectory = cacheInfo.getRootDirectory() +"/thumb";
+            String cacheDirectory = cacheInfo.getRootDirectory() + "/thumb";
             long totalSizeOfThumbnailImages = AppConfig.getInstance().getCache().getTotalSizeOfThumbnailImages();
             int operatorCount = Math.max(1, Env.getInstance().getProcessorCount() / 2);
             CachedImageProcessor.getInstance().init(cacheDirectory, totalSizeOfThumbnailImages, operatorCount);