Util variable names

Change download_url for `mfr` case

Author: AddisonSchiller

waterbutler/providers/googledrive/provider.py

@@ -234,16 +234,18 @@ async def download(self,  # type: ignore
 
         metadata = await self.metadata(path, revision=revision)
 
-        if 'mfr' in kwargs and kwargs['mfr'] and kwargs['mfr'].lower() == 'true':
-            download_url = metadata.raw.get('downloadUrl') or drive_utils.get_alt_export_link(metadata.raw),  # type: ignore
+        if kwargs.get('mfr', None) and kwargs['mfr'].lower() == 'true':
+            download_url = drive_utils.get_alt_export_link(metadata.raw)  # type: ignore
             export_name = metadata.alt_export_name
         else:
-            download_url = metadata.raw.get('downloadUrl') or drive_utils.get_export_link(metadata.raw),  # type: ignore
+
+            # TODO figure out metadata.raw.get('downloadUrl')
+            download_url = metadata.raw.get('downloadUrl') or drive_utils.get_export_link(metadata.raw)  # type: ignore
             export_name = metadata.export_name  # type: ignore
 
         download_resp = await self.make_request(
             'GET',
-            *download_url,
+            download_url,
             range=range,
             expects=(200, 206),
             throws=exceptions.DownloadError,

waterbutler/providers/googledrive/utils.py

@@ -39,44 +39,39 @@ def is_docs_file(metadata):
 
 
 def get_mimetype_from_ext(ext):
-    for format in DOCS_FORMATS:
-        if format['ext'] == ext:
-            return format['mime_type']
+    for format_type in DOCS_FORMATS:
+        if format_type['ext'] == ext:
+            return format_type['mime_type']
 
 
 def get_format(metadata):
-    for format in DOCS_FORMATS:
-        if format['mime_type'] == metadata['mimeType']:
-            return format
+    for format_type in DOCS_FORMATS:
+        if format_type['mime_type'] == metadata['mimeType']:
+            return format_type
     return DOCS_DEFAULT_FORMAT
 
 
 def get_extension(metadata):
-    format = get_format(metadata)
-    return format['ext']
+    format_type = get_format(metadata)
+    return format_type['ext']
 
 
 def get_download_extension(metadata):
-    format = get_format(metadata)
-    return format['download_ext']
+    format_type = get_format(metadata)
+    return format_type['download_ext']
 
 
 def get_alt_download_extension(metadata):
-    format = get_format(metadata)
-    try:
-        return format['alt_download_ext']
-    except:
-        return format['download_ext']
+    format_type = get_format(metadata)
+    return format_type.get('alt_download_ext', None) or format_type['download_ext']
 
 
 def get_alt_export_link(metadata):
-    format = get_format(metadata)
-    try:
-        return metadata['exportLinks'][format['alt_type']]
-    except:
-        return metadata['exportLinks'][format['type']]
+    format_type = get_format(metadata)
+    export_links = metadata['exportLinks']
+    return export_links.get(format_type['alt_type'], None) or export_links[format_type['type']]
 
 
 def get_export_link(metadata):
-    format = get_format(metadata)
-    return metadata['exportLinks'][format['type']]
+    format_type = get_format(metadata)
+    return metadata['exportLinks'][format_type['type']]