Changeset 6803 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2014-02-02T23:23:27+01:00 (10 years ago)

Author:

simon04

Message:

fix #9660 - Allow to download compressed GPX tracks from osm.org/trace/ using "Download location"

This works by inspecting the filename in the Content-Disposition HTTP header.

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -11 +11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
@@ -98 +100 @@
      */
     protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException {
+        return getInputStreamRaw(urlStr, progressMonitor, reason, false);
+    }
+
+    /**
+     * Open a connection to the given url and return a reader on the input stream
+     * from that connection. In case of user cancel, return <code>null</code>.
+     * @param urlStr The exact url to connect to.
+     * @param progressMonitor progress monitoring and abort handler
+     * @param reason The reason to show on console. Can be {@code null} if no reason is given
+     * @param uncompressAccordingToContentDisposition Whether to inspect the HTTP header {@code Content-Disposition}
+     *                                                for {@code filename} and uncompress a gzip/bzip2 stream.
+     * @return An reader reading the input stream (servers answer) or <code>null</code>.
+     * @throws OsmTransferException thrown if data transfer errors occur
+     */
+    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason, boolean uncompressAccordingToContentDisposition) throws OsmTransferException {
         try {
             URL url = null;
@@ -141 +158 @@
             }
             try {
+                Main.debug(activeConnection.getHeaderFields().toString());
                 if (activeConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED)
                     throw new OsmApiException(HttpURLConnection.HTTP_UNAUTHORIZED,null,null);
@@ -169 +187 @@
                 }
 
-                return fixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
+                InputStream in = new ProgressInputStream(activeConnection, progressMonitor);
+                if (uncompressAccordingToContentDisposition) {
+                    in = uncompressAccordingToContentDisposition(in, activeConnection.getHeaderFields());
+                }
+                return fixEncoding(in, encoding);
             } catch (OsmTransferException e) {
                 throw e;
@@ -189 +211 @@
     }
 
+    private InputStream uncompressAccordingToContentDisposition(InputStream stream, Map<String, List<String>> headerFields) throws IOException {
+        if (headerFields.get("Content-Disposition").toString().contains(".gz\"")) {
+            return Compression.GZIP.getUncompressedInputStream(stream);
+        } else if (headerFields.get("Content-Disposition").toString().contains(".bz2\"")) {
+            return Compression.BZIP2.getUncompressedInputStream(stream);
+        } else {
+            return stream;
+        }
+    }
+
     /**
      * Download OSM files from somewhere