Ticket #11193: expires-version1-v3.patch

src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java

@@ -48 +48 @@
 
     private static final Charset TAGS_CHARSET = Charset.forName("UTF-8");
 
-    public static final long FILE_AGE_ONE_DAY = 1000 * 60 * 60 * 24;
-    public static final long FILE_AGE_ONE_WEEK = FILE_AGE_ONE_DAY * 7;
+    private static final long DEFAULT_EXPIRES_TIME = 1000 * 60 * 60 * 24 * 7;
+
 
     protected String cacheDirBase;
 
     protected final Map<TileSource, File> sourceCacheDirMap;
 
     protected long maxCacheFileAge = Long.MAX_VALUE;  // max. age not limited
-    protected long recheckAfter = FILE_AGE_ONE_WEEK;
 
     public static File getDefaultCacheDir() throws SecurityException {
         String tempDir = null;
@@ -66 +65 @@
         } catch (SecurityException e) {
             log.log(Level.WARNING,
                     "Failed to access system property ''java.io.tmpdir'' for security reasons. Exception was: "
-                    + e.toString());
+                            + e.toString());
             throw e; // rethrow
         }
         try {
@@ -134 +133 @@
         File tileFile = null;
         Long fileMtime = null;
         Long now = null; // current time in milliseconds (keep consistent value for the whole run)
+        boolean cachePresent = false;
 
         public FileLoadJob(Tile tile) {
             this.tile = tile;
@@ -156 +156 @@
             now = System.currentTimeMillis();
             tileCacheDir = getSourceCacheDir(tile.getSource());
 
-            if (loadTileFromFile(recheckAfter)) {
+            cachePresent = loadTagsFromFile();
+
+            if (cachePresent && isTileFileValid() && loadTileFromFile()) {
                 log.log(Level.FINE, "TMS - found in tile cache: {0}", tile);
                 tile.setLoaded(true);
                 listener.tileLoadingFinished(tile, true);
                 return;
             }
+
             TileJob job = new TileJob() {
 
                 @Override
                 public void run() {
-                    if (loadOrUpdateTile()) {
+                    if (loadOrUpdateTile()  && loadTileFromFile()) {
                         tile.setLoaded(true);
                         listener.tileLoadingFinished(tile, true);
                     } else {
                         // failed to download - use old cache file if available
-                        if (loadTileFromFile(maxCacheFileAge)) {
+                        if (cachePresent && loadTileFromFile()) {
                             tile.setLoaded(true);
                             tile.error = false;
                             listener.tileLoadingFinished(tile, true);
@@ -242 +245 @@
                     default:
                         break;
                     }
-                    if (loadTileFromFile(maxCacheFileAge)) {
-                        tileFile.setLastModified(now);
-                        return true;
-                    }
+                    tileFile.setLastModified(now);
+                    return true;
                 }
 
                 loadTileMetadata(tile, urlConn);
@@ -285 +286 @@
             return false;
         }
 
-        protected boolean loadTileFromFile(long maxAge) {
+        protected boolean isTileFileValid() {
+            Long expires = null;
             try {
-                tileFile = getTileFile();
-                if (!tileFile.exists())
-                    return false;
-                loadTagsFromFile();
+                expires = Long.parseLong(tile.getValue("expires"));
+            } catch (NumberFormatException e) {}
 
+            if(expires != null && !expires.equals(0L)) {
+                // check by expire date set by server
+                if (now > expires) {
+                    log.fine("TMS - Tile has expired -> not valid");
+                    return false;
+                }
+            } else {
+                // check by file modification date
                 fileMtime = tileFile.lastModified();
-                if (now - fileMtime > maxAge)
+                if (now - fileMtime > DEFAULT_EXPIRES_TIME) {
+                    log.fine("TMS - Tile has expired, maximum file age reached");
                     return false;
-
-                if ("no-tile".equals(tile.getValue("tile-info"))) {
-                    tile.setError("No tile at this zoom level");
-                    if (tileFile.exists()) {
-                        tileFile.delete();
-                    }
-                    tileFile = null;
-                } else {
-                    try (FileInputStream fin = new FileInputStream(tileFile)) {
-                        if (fin.available() == 0)
-                            throw new IOException("File empty");
-                        tile.loadImage(fin);
-                    }
                 }
-                return true;
+            }
+            if ("no-tile".equals(tile.getValue("tile-info"))) {
+                // do not remove file - keep the information, that there is no tile, for further requests
+                log.fine("TMS - Tile valid, but no file, as no tiles at this level");
+                tile.setError("No tile at this zoom level");
+                tileFile = null;
+            }
 
+            return true;
+        }
+
+        protected boolean loadTileFromFile() {
+            try (FileInputStream fin = new FileInputStream(tileFile)) {
+                if (fin.available() == 0)
+                    throw new IOException("File empty");
+                tile.loadImage(fin);
+                return true;
             } catch (Exception e) {
                 log.log(Level.WARNING, "TMS - Error while loading image from tile cache: {0}; {1}", new Object[]{e.getMessage(), tile});
                 tileFile.delete();
+                File tileMetaData = getTagsFile();
+                if (tileMetaData.exists())
+                    tileMetaData.delete();
                 tileFile = null;
                 fileMtime = null;
             }
@@ -405 +419 @@
             File file = getTileFile();
             file.getParentFile().mkdirs();
             try (
-                FileOutputStream f = new FileOutputStream(file)
-            ) {
+                    FileOutputStream f = new FileOutputStream(file)
+                    ) {
                 f.write(rawData);
             } catch (Exception e) {
                 log.log(Level.SEVERE, "Failed to save tile content: {0}", e.getLocalizedMessage());
@@ -429 +443 @@
             }
         }
 
-        protected void loadTagsFromFile() {
+        protected boolean loadTagsFromFile() {
+            tileFile = getTileFile();
+            if (!tileFile.exists())
+                return false;
             File tagsFile = getTagsFile();
             try (BufferedReader f = new BufferedReader(new InputStreamReader(new FileInputStream(tagsFile), TAGS_CHARSET))) {
                 for (String line = f.readLine(); line != null; line = f.readLine()) {
@@ -444 +461 @@
             } catch (Exception e) {
                 System.err.println("Failed to load tile tags: " + e.getLocalizedMessage());
             }
+            return true;
         }
     }
 

src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -108 +108 @@
         if (str != null) {
             tile.putValue("tile-info", str);
         }
+
+        Long lng = urlConn.getExpiration();
+        if (lng.equals(0L)) {
+            try {
+                str = urlConn.getHeaderField("Cache-Control");
+                if (str != null) {
+                    for (String token: str.split(",")) {
+                        if (token.startsWith("max-age=")) {
+                            lng = Long.parseLong(token.substring(8))*1000 +
+                                    System.currentTimeMillis();
+                        }
+                    }
+                }
+            } catch (NumberFormatException e) {} //ignore malformed Cache-Control headers
+        }
+        if (!lng.equals(0)) {
+            tile.putValue("expires", lng.toString());
+        }
     }
 
     protected void prepareHttpUrlConnection(HttpURLConnection urlConn) {