Merge pull request #175 from bird-house/fix-174

Only switch to dods mimetype if supported
bird-house · Mar 11, 2020 · 41f490d · 41f490d
2 parents f6f68a0 + cd17486
commit 41f490d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Change History
 **************
 
-0.6.8 (2020-03-10)
+0.6.9 (2020-03-10)
 ==================
 
 Changes:

diff --git a/birdy/utils.py b/birdy/utils.py
@@ -123,7 +123,8 @@ def _encode(content, mimetype, encoding):
 
 
 def guess_type(url, supported):
-    """Guess the mime type of the file link. If the mimetype is not recognized, default to the first supported value.
+    """Guess the mime type of the file link.
+    If the mimetype is not recognized, default to the first supported value.
 
 
     Parameters
@@ -148,11 +149,11 @@ def guess_type(url, supported):
     # -------------
 
     # netCDF
-    if mime == "application/x-netcdf" and "dodsC" in url:
+    if mime == "application/x-netcdf" and "dodsC" in url and "application/x-ogc-dods" in supported:
         mime = "application/x-ogc-dods"
 
+    # ZIP
     zips = ["application/zip", "application/x-zipped-shp"]
-
     if mime not in supported:
         if mime in zips and set(zips).intersection(supported):
             mime = set(zips).intersection(supported).pop()