X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FDiskTileCacher.java;h=fd2042a7714acfe2ca1f5b47693ce9df06b0a79f;hb=79f3ca2954d7feb6052c21b3aa974c89b2b101d6;hp=40216f8c1fe532ea1a5f49a3ae3f49c8061019b8;hpb=f1b92378a792131ac8fb33a869405851d5b2d1f7;p=GpsPrune.git

diff --git a/tim/prune/gui/map/DiskTileCacher.java b/tim/prune/gui/map/DiskTileCacher.java
index 40216f8..fd2042a 100644
--- a/tim/prune/gui/map/DiskTileCacher.java
+++ b/tim/prune/gui/map/DiskTileCacher.java
@@ -8,6 +8,10 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashSet;
+
+import tim.prune.GpsPrune;
 
 /**
  * Class to control the reading and saving of map tiles
@@ -23,6 +27,8 @@ public class DiskTileCacher implements Runnable
 	private ImageObserver _observer = null;
 	/** Time limit to cache images for */
 	private static final long CACHE_TIME_LIMIT = 20 * 24 * 60 * 60 * 1000; // 20 days in ms
+	/** Hashset of all blocked / 404 tiles to avoid requesting them again */
+	private static final HashSet<String> BLOCKED_URLS = new HashSet<String>();
 
 	/**
 	 * Private constructor
@@ -34,32 +40,33 @@ public class DiskTileCacher implements Runnable
 		_url = inUrl;
 		_file = inFile;
 		_observer = inObserver;
-		new Thread(this).start();
 	}
 
 	/**
 	 * Get the specified tile from the disk cache
 	 * @param inBasePath base path to whole disk cache
 	 * @param inTilePath relative path to requested tile
-	 * @param inCheckAge true to check age of file, false to ignore
 	 * @return tile image if available, or null if not there
 	 */
-	public static Image getTile(String inBasePath, String inTilePath, boolean inCheckAge)
+	public static MapTile getTile(String inBasePath, String inTilePath)
 	{
 		if (inBasePath == null) {return null;}
 		File tileFile = new File(inBasePath, inTilePath);
 		Image image = null;
-		if (tileFile.exists() && tileFile.canRead() && tileFile.length() > 0) {
+		if (tileFile.exists() && tileFile.canRead() && tileFile.length() > 0)
+		{
 			long fileStamp = tileFile.lastModified();
-			if (!inCheckAge || ((System.currentTimeMillis()-fileStamp) < CACHE_TIME_LIMIT))
+			boolean isExpired = ((System.currentTimeMillis()-fileStamp) > CACHE_TIME_LIMIT);
+			try
 			{
-				try {
-					image = Toolkit.getDefaultToolkit().createImage(tileFile.getAbsolutePath());
-				}
-				catch (Exception e) {}
+				image = Toolkit.getDefaultToolkit().createImage(tileFile.getAbsolutePath());
+				return new MapTile(image, isExpired);
+			}
+			catch (Exception e) {
+				System.err.println("createImage: " + e.getClass().getName() + " _ " + e.getMessage());
 			}
 		}
-		return image;
+		return null;
 	}
 
 	/**
@@ -68,30 +75,28 @@ public class DiskTileCacher implements Runnable
 	 * @param inBasePath base path to disk cache
 	 * @param inTilePath relative path to this tile
 	 * @param inObserver observer to inform when load complete
-	 * @return true if successful, false for failure
 	 */
-	public static boolean saveTile(URL inUrl, String inBasePath, String inTilePath, ImageObserver inObserver)
+	public static void saveTile(URL inUrl, String inBasePath, String inTilePath, ImageObserver inObserver)
 	{
-		// TODO: Check that these are getting blocked properly
-		if (inBasePath == null || inTilePath == null) {return false;}
+		if (inBasePath == null || inTilePath == null) {return;}
 		// save file if possible
 		File basePath = new File(inBasePath);
 		if (!basePath.exists() || !basePath.isDirectory() || !basePath.canWrite()) {
 			// Can't write to base path
-			return false;
+			return;
 		}
 		File tileFile = new File(basePath, inTilePath);
 		// Check if this file is already being loaded
-		if (isBeingLoaded(tileFile)) {return true;}
+		if (isBeingLoaded(tileFile)) {return;}
+		// Check if it has already failed
+		if (BLOCKED_URLS.contains(inUrl.toString())) {return;}
 
 		File dir = tileFile.getParentFile();
 		// Start a new thread to load the image if necessary
 		if ((dir.exists() || dir.mkdirs()) && dir.canWrite())
 		{
-			new DiskTileCacher(inUrl, tileFile, inObserver);
-			return true;
+			new Thread(new DiskTileCacher(inUrl, tileFile, inObserver)).start();
 		}
-		return false; // couldn't write the file
 	}
 
 	/**
@@ -102,7 +107,12 @@ public class DiskTileCacher implements Runnable
 	private static boolean isBeingLoaded(File inFile)
 	{
 		File tempFile = new File(inFile.getAbsolutePath() + ".temp");
-		return tempFile.exists();
+		if (!tempFile.exists()) {
+			return false;
+		}
+		// File exists, so check if it was created recently
+		final long fileAge = System.currentTimeMillis() - tempFile.lastModified();
+		return fileAge < 1000000L; // overwrite if the temp file is still there after 1000s
 	}
 
 	/**
@@ -115,8 +125,9 @@ public class DiskTileCacher implements Runnable
 		FileOutputStream out = null;
 		File tempFile = new File(_file.getAbsolutePath() + ".temp");
 		// Use a synchronized block across all threads to make sure this url is only fetched once
-		synchronized (DiskTileCacher.class) {
-			if (tempFile.exists()) {return;}
+		synchronized (DiskTileCacher.class)
+		{
+			if (tempFile.exists()) {tempFile.delete();}
 			try {
 				if (!tempFile.createNewFile()) {return;}
 			}
@@ -126,14 +137,21 @@ public class DiskTileCacher implements Runnable
 		{
 			// Open streams from URL and to file
 			out = new FileOutputStream(tempFile);
-			in = _url.openStream();
+			//System.out.println("Opening URL: " + _url.toString());
+			// Set http user agent on connection
+			URLConnection conn = _url.openConnection();
+			conn.setRequestProperty("User-Agent", "GpsPrune v" + GpsPrune.VERSION_NUMBER);
+			in = conn.getInputStream();
 			int d = 0;
 			// Loop over each byte in the stream (maybe buffering is more efficient?)
 			while ((d = in.read()) >= 0) {
 				out.write(d);
 			}
 			finished = true;
-		} catch (IOException e) {}
+		} catch (IOException e) {
+			System.err.println("ioe: " + e.getClass().getName() + " - " + e.getMessage());
+			BLOCKED_URLS.add(_url.toString());
+		}
 		finally
 		{
 			// clean up files
@@ -144,7 +162,7 @@ public class DiskTileCacher implements Runnable
 			}
 		}
 		// Move temp file to desired file location
-		if (!tempFile.renameTo(_file))
+		if (tempFile.exists() && !tempFile.renameTo(_file))
 		{
 			// File couldn't be moved - delete both to be sure
 			tempFile.delete();