Force all game cache entries to be refreshed at least every week, even

if the game version hasn't been changed.
Whisprin · Oct 29, 2013 · f11e24f · f11e24f
1 parent 14dd854
commit f11e24f
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/org/ggp/base/util/game/CloudGameRepository.java b/src/org/ggp/base/util/game/CloudGameRepository.java
@@ -178,23 +178,25 @@ public void run() {
             if (bundledMetadata != null) {
                 Set<String> unchangedKeys = new HashSet<String>();
                 for (String theKey : theGameKeys) {
-                    try {                    
+                    try {
                         Game myGameVersion = loadGameFromCache(theKey);
                         if (myGameVersion == null)
                             continue;                    
-                    
+
                         String remoteGameURL = remoteRepository.getGameURL(theKey);
                         int remoteVersion = bundledMetadata.getJSONObject(theKey).getInt("version");
                         String remoteVersionedGameURL = RemoteGameRepository.addVersionToGameURL(remoteGameURL, remoteVersion);
-
-                        if (myGameVersion.getRepositoryURL().equals(remoteVersionedGameURL)) {
+
+                        // Skip updating the game cache entry if the version is the same
+                        // and the cache entry was written less than a week ago.
+                        if (myGameVersion.getRepositoryURL().equals(remoteVersionedGameURL) &&
+                        	getCacheEntryAge(theKey) < 604800000) {
                             unchangedKeys.add(theKey);
                         }
                     } catch (Exception e) {
                         continue;
                     }                        
                 }
-                theGameKeys.removeAll(unchangedKeys);
             }
 
             // Start threads to update every entry in the cache (or at least verify
@@ -261,6 +263,14 @@ private synchronized Game loadGameFromCache(String theKey) {
         if (theLine == null) return null;
         return Game.loadFromJSON(theLine);
     }
+
+    private synchronized long getCacheEntryAge(String theKey) {
+    	File theGameFile = new File(theCacheDirectory, theKey + ".zip");
+    	if (theGameFile.exists()) {
+    		return System.currentTimeMillis() - theGameFile.lastModified();
+    	}
+    	return System.currentTimeMillis();
+    }
 
     // ================================================================