Merge tag '0.25.4' into develop

Author: felliott

CHANGELOG

@@ -2,6 +2,12 @@
 ChangeLog
 *********
 
+0.25.4 (2018-04-06)
+===================
+- Fix: When no exporter exists for the given extension, throw the "No supported exporter" error,
+instead of the non-specific "Please try again later" error.  This fixes a regression introduced
+in v0.25.0.
+
 0.25.3 (2018-04-03)
 ===================
 - Fix: Add a subprocess timeout to the unoconv exporter so MFR doesn't wait forever for a process

mfr/core/utils.py

@@ -112,12 +112,11 @@ def get_renderer_name(name: str) -> str:
     ep_iterator = pkg_resources.iter_entry_points(group='mfr.renderers', name=name.lower())
     ep_list = list(ep_iterator)
 
-    # Empty list indicates unsupported file type.
-    # Return a blank string and let `make_renderer()` handle it.
+    # Empty list indicates unsupported file type.  Return '' and let `make_renderer()` handle it.
     if len(ep_list) == 0:
         return ''
 
-    # If file type is supported, there must be only one element in the list.
+    # If the file type is supported, there must be only one element in the list.
     assert len(ep_list) == 1
     return ep_list[0].attrs[0]
 
@@ -135,7 +134,11 @@ def get_exporter_name(name: str) -> str:
     ep_iterator = pkg_resources.iter_entry_points(group='mfr.exporters', name=name.lower())
     ep_list = list(ep_iterator)
 
-    # `make_renderer()` is called before `make_exporter()` to ensure the file type is supported
+    # Empty list indicates unsupported export type.  Return '' and let `make_exporter()` handle it.
+    if len(ep_list) == 0:
+        return ''
+
+    # If the export type is supported, there must be only one element in the list.
     assert len(ep_list) == 1
     return ep_list[0].attrs[0]
 

mfr/server/handlers/export.py

@@ -33,9 +33,12 @@ async def prepare(self):
 
         self.cache_file_id = '{}.{}'.format(self.metadata.unique_key, self.format)
 
-        self.cache_file_path = await self.cache_provider.validate_path(
-            '/export/{}.{}'.format(self.cache_file_id, self.exporter_name)
-        )
+        if self.exporter_name:
+            cache_file_path_str = '/export/{}.{}'.format(self.cache_file_id, self.exporter_name)
+        else:
+            cache_file_path_str = '/export/{}'.format(self.cache_file_id)
+        self.cache_file_path = await self.cache_provider.validate_path(cache_file_path_str)
+
         self.source_file_path = await self.local_cache_provider.validate_path(
             '/export/{}'.format(self.source_file_id)
         )

mfr/server/handlers/render.py

@@ -27,9 +27,13 @@ async def prepare(self):
         self.renderer_name = utils.get_renderer_name(self.metadata.ext)
 
         self.cache_file_id = self.metadata.unique_key
-        self.cache_file_path = await self.cache_provider.validate_path(
-            '/render/{}.{}'.format(self.cache_file_id, self.renderer_name)
-        )
+
+        if self.renderer_name:
+            cache_file_path_str = '/export/{}.{}'.format(self.cache_file_id, self.renderer_name)
+        else:
+            cache_file_path_str = '/export/{}'.format(self.cache_file_id)
+        self.cache_file_path = await self.cache_provider.validate_path(cache_file_path_str)
+
         self.source_file_path = await self.local_cache_provider.validate_path(
             '/render/{}'.format(self.source_file_id)
         )

mfr/version.py

@@ -1 +1 @@
-__version__ = '0.25.3'
+__version__ = '0.25.4'

tests/core/test_utils.py

@@ -20,7 +20,7 @@ def test_get_renderer_name(self):
             assert mfr_utils.get_renderer_name(ep.name) == expected
 
     def test_get_renderer_name_no_entry_point(self):
-            assert mfr_utils.get_renderer_name('jpg') == ''
+        assert mfr_utils.get_renderer_name('jpg') == ''  # extensions must begin with a period
 
 
 class TestGetExporterName:
@@ -36,5 +36,4 @@ def test_get_exporter_name(self):
             assert mfr_utils.get_exporter_name(ep.name) == expected
 
     def test_get_exporter_name_no_entry_point(self):
-        with pytest.raises(AssertionError):
-            mfr_utils.get_exporter_name('jpg')
+        assert mfr_utils.get_exporter_name('jpg') == ''  # extensions must begin with a period