Merge branch 'feature/jamovi-new-manifest' into develop

 Closes: #369

Author: felliott

mfr/extensions/jamovi/render.py

@@ -66,14 +66,20 @@ def _check_file(self, zip_file):
         """
         # Extract manifest file content
         try:
-            with zip_file.open('META-INF/MANIFEST.MF') as manifest_data:
-                manifest = manifest_data.read().decode('utf-8')
+            try:
+                # new manifest location
+                with zip_file.open('meta') as manifest_data:
+                    manifest = manifest_data.read().decode('utf-8')
+            except KeyError:
+                # old manifest location
+                with zip_file.open('META-INF/MANIFEST.MF') as manifest_data:
+                    manifest = manifest_data.read().decode('utf-8')
         except KeyError:
             raise jamovi_exceptions.JamoviFileCorruptError(
-                '{} Missing META-INF/MANIFEST.MF'.format(self.MESSAGE_FILE_CORRUPT),
+                '{} Missing manifest'.format(self.MESSAGE_FILE_CORRUPT),
                 extension=self.metadata.ext,
                 corruption_type='key_error',
-                reason='zip missing ./META-INF/MANIFEST.MF',
+                reason='zip missing manifest',
             )
 
         lines = manifest.split('\n')

tests/extensions/jamovi/files/ok-new-manifest.omv

@@ -15,8 +15,12 @@ def metadata():
                             'http://wb.osf.io/file/jamovi.omv?token=1337')
 
 @pytest.fixture
-def ok_path():
-    return os.path.join(BASE_PATH, 'ok.omv')
+def ok_new_manifest_path():
+    return os.path.join(BASE_PATH, 'ok-new-manifest.omv')
+
+@pytest.fixture
+def ok_old_manifest_path():
+    return os.path.join(BASE_PATH, 'ok-old-manifest.omv')
 
 @pytest.fixture
 def ok_with_image_path():
@@ -63,8 +67,8 @@ def extension():
     return '.omv'
 
 @pytest.fixture
-def renderer(metadata, ok_path, url, assets_url, export_url):
-    return JamoviRenderer(metadata, ok_path, url, assets_url, export_url)
+def renderer(metadata, ok_new_manifest_path, url, assets_url, export_url):
+    return JamoviRenderer(metadata, ok_new_manifest_path, url, assets_url, export_url)
 
 
 class TestCodeJamoviRenderer:
@@ -73,6 +77,11 @@ def test_render_jamovi(self, renderer):
         body = renderer.render()
         assert '<div style="word-wrap: break-word; overflow: auto;" class="mfrViewer">' in body
 
+    def test_render_jamovi_old_manifest(self, metadata, ok_old_manifest_path, url, assets_url, export_url):
+        renderer = JamoviRenderer(metadata, ok_old_manifest_path, url, assets_url, export_url)
+        body = renderer.render()
+        assert '<div style="word-wrap: break-word; overflow: auto;" class="mfrViewer">' in body
+
     def test_render_jamovi_with_image(self, metadata, ok_with_image_path, url, assets_url,
                                       export_url):
         renderer = JamoviRenderer(metadata, ok_with_image_path, url, assets_url, export_url)