Bug fix and adaptation to behavior change in Spreadsheet submission

* .gitignore two specific files * Consider different behavior of Request submissions * Bug fix (parse_data_url had its parameter removed) * Add new "requirements.txt" packages, for Google APIs
MAGIC-nexus · Sep 7, 2019 · bbb5f99 · bbb5f99
1 parent f9e2262
commit bbb5f99
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ backend/ie_imports/experimental/UN Comtrade Country List.csv
 backend/ie_imports/experimental/country_alternative_names.csv
 backend/ie_imports/experimental/saved_queries.csv
 backend/ie_imports/experimental/0.csv
-magic_box/
+magic_box/
+/backend/restful_service/credentials.json
+/backend/restful_service/token.pickle
diff --git a/backend/restful_service/service_main.py b/backend/restful_service/service_main.py
@@ -1594,9 +1594,14 @@ def parse_data_url(url):
         for k in req.files:
             buffer = bytes(req.files[k].stream.getbuffer())
             content_type = req.files[k].content_type
+            it_is_url = False
             break
     else:
         buffer = bytes(io.BytesIO(req.get_data()).getbuffer())
+        content_type = req.content_type
+        it_is_url = buffer.startswith(b"data") or buffer.startswith(b"http")
+
+    if it_is_url:
         url = buffer.decode("utf-8")
         if not url.startswith("data"):
             # Try a download from the URL
@@ -1606,10 +1611,9 @@ def parse_data_url(url):
             content_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
         else:
             # It may be a DATA URL
-            try:
-                buffer, content_type = parse_data_url()
-            except:
-                content_type = req.headers["Content-Type"]
+            buffer, content_type = parse_data_url(url)
+            # except:
+            #     content_type = req.headers["Content-Type"]
 
     # Infer "generator_type" from content type
     if content_type.lower() in ["application/json", "text/csv"]:

diff --git a/frontend/index.html b/frontend/index.html
@@ -9,5 +9,5 @@
 <link rel="stylesheet" href="styles.d51b5e62e1d7166fd18e.css"></head>
 <body>
   <app-root></app-root>
-<script type="text/javascript" src="runtime.26209474bfa8dc87a77c.js"></script><script type="text/javascript" src="polyfills.bebee6a5ef0ece001bc6.js"></script><script type="text/javascript" src="scripts.66ef20419dfe730215c8.js"></script><script type="text/javascript" src="main.6e18b115bc3ab46827fa.js"></script></body>
+<script type="text/javascript" src="runtime.26209474bfa8dc87a77c.js"></script><script type="text/javascript" src="polyfills.bebee6a5ef0ece001bc6.js"></script><script type="text/javascript" src="scripts.66ef20419dfe730215c8.js"></script><script type="text/javascript" src="main.e28d78f6acaa7c5af93c.js"></script></body>
 </html>
diff --git a/frontend/main.6e18b115bc3ab46827fa.js → frontend/main.e28d78f6acaa7c5af93c.js b/frontend/main.6e18b115bc3ab46827fa.js → frontend/main.e28d78f6acaa7c5af93c.js
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,7 @@
 google-api-python-client==1.7.11
+google-auth==1.6.3
+google-auth-httplib2==0.0.3
+google-auth-oauthlib==0.4.0
 gunicorn==19.9.0
 Cython==0.29.7
 blosc==1.8.1