From 2865fe4454210999e9407f1337ac3e7fd436ff6b Mon Sep 17 00:00:00 2001 From: Josh Bird Date: Thu, 8 Mar 2018 13:23:20 -0500 Subject: [PATCH 1/4] Add hypothesis to pdf renderer --- mfr/extensions/pdf/templates/viewer.mako | 1 + 1 file changed, 1 insertion(+) diff --git a/mfr/extensions/pdf/templates/viewer.mako b/mfr/extensions/pdf/templates/viewer.mako index 1e3b3ed08..196291de8 100644 --- a/mfr/extensions/pdf/templates/viewer.mako +++ b/mfr/extensions/pdf/templates/viewer.mako @@ -37,6 +37,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/ + From a801385b0072497b77c614fcf19e74aa999d19d5 Mon Sep 17 00:00:00 2001 From: Josh Bird Date: Mon, 12 Mar 2018 13:15:36 -0400 Subject: [PATCH 2/4] Add env config to enable hypothesis --- mfr/extensions/pdf/render.py | 20 ++++++++++++++++---- mfr/extensions/pdf/settings.py | 2 ++ mfr/extensions/pdf/templates/viewer.mako | 4 +++- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/mfr/extensions/pdf/render.py b/mfr/extensions/pdf/render.py index f2b5e2842..caff4198a 100644 --- a/mfr/extensions/pdf/render.py +++ b/mfr/extensions/pdf/render.py @@ -23,7 +23,11 @@ def render(self): logger.debug('extension::{} supported-list::{}'.format(self.metadata.ext, settings.EXPORT_SUPPORTED)) if self.metadata.ext not in settings.EXPORT_SUPPORTED: logger.debug('Extension not found in supported list!') - return self.TEMPLATE.render(base=self.assets_url, url=download_url.geturl()) + return self.TEMPLATE.render( + base=self.assets_url, + url=download_url.geturl(), + enable_hypothesis = settings.ENABLE_HYPOTHESIS + ) logger.debug('Extension found in supported list!') exported_url = furl.furl(self.export_url) @@ -35,9 +39,17 @@ def render(self): exported_url.args['format'] = settings.EXPORT_TYPE self.metrics.add('needs_export', True) - return self.TEMPLATE.render(base=self.assets_url, url=exported_url.url) - - return self.TEMPLATE.render(base=self.assets_url, url=download_url.geturl()) + return self.TEMPLATE.render( + base=self.assets_url, + url=exported_url.url, + enable_hypothesis = settings.ENABLE_HYPOTHESIS + ) + + return self.TEMPLATE.render( + base=self.assets_url, + url=download_url.geturl(), + enable_hypothesis = settings.ENABLE_HYPOTHESIS + ) @property def file_required(self): diff --git a/mfr/extensions/pdf/settings.py b/mfr/extensions/pdf/settings.py index fd8a503db..0f785dc28 100644 --- a/mfr/extensions/pdf/settings.py +++ b/mfr/extensions/pdf/settings.py @@ -6,6 +6,8 @@ EXPORT_TYPE = config.get('EXPORT_TYPE', 'pdf') EXPORT_MAXIMUM_SIZE = config.get('EXPORT_MAXIMUM_SIZE', '1200x1200') +ENABLE_HYPOTHESIS = config.get('ENABLE_HYPOTHESIS', False) + # supports multiple files in the form of a space separated string EXPORT_SUPPORTED = config.get('EXPORT_SUPPORTED', '.tiff .tif').split(' ') EXPORT_MAX_PAGES = int(config.get('EXPORT_MAX_PAGES', 40)) diff --git a/mfr/extensions/pdf/templates/viewer.mako b/mfr/extensions/pdf/templates/viewer.mako index 196291de8..3c27a622f 100644 --- a/mfr/extensions/pdf/templates/viewer.mako +++ b/mfr/extensions/pdf/templates/viewer.mako @@ -37,7 +37,9 @@ http://sourceforge.net/adobe/cmap/wiki/License/ - + % if enable_hypothesis: + + % endif From ab3a15dbda5e1903536324df06461226f7b437e9 Mon Sep 17 00:00:00 2001 From: Josh Bird Date: Tue, 13 Mar 2018 11:53:12 -0400 Subject: [PATCH 3/4] Add config and styles for pdf viewer iframe --- mfr/extensions/pdf/settings.py | 2 +- mfr/extensions/pdf/templates/viewer.mako | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mfr/extensions/pdf/settings.py b/mfr/extensions/pdf/settings.py index 0f785dc28..efbab252e 100644 --- a/mfr/extensions/pdf/settings.py +++ b/mfr/extensions/pdf/settings.py @@ -6,7 +6,7 @@ EXPORT_TYPE = config.get('EXPORT_TYPE', 'pdf') EXPORT_MAXIMUM_SIZE = config.get('EXPORT_MAXIMUM_SIZE', '1200x1200') -ENABLE_HYPOTHESIS = config.get('ENABLE_HYPOTHESIS', False) +ENABLE_HYPOTHESIS = config.get_bool('ENABLE_HYPOTHESIS', False) # supports multiple files in the form of a space separated string EXPORT_SUPPORTED = config.get('EXPORT_SUPPORTED', '.tiff .tif').split(' ') diff --git a/mfr/extensions/pdf/templates/viewer.mako b/mfr/extensions/pdf/templates/viewer.mako index 3c27a622f..7378ee978 100644 --- a/mfr/extensions/pdf/templates/viewer.mako +++ b/mfr/extensions/pdf/templates/viewer.mako @@ -39,6 +39,12 @@ http://sourceforge.net/adobe/cmap/wiki/License/ % if enable_hypothesis: + % endif From 20599fe7a2eb9720d0bc3adfe17a4254aa13515b Mon Sep 17 00:00:00 2001 From: Josh Bird Date: Tue, 13 Mar 2018 13:19:54 -0400 Subject: [PATCH 4/4] Fix linting, update .gitignore --- .gitignore | 2 ++ mfr/extensions/pdf/render.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e4ac1d96..c8e990147 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,5 @@ player/static/mfr/* !.gitkeep .cache + +node_modules/ diff --git a/mfr/extensions/pdf/render.py b/mfr/extensions/pdf/render.py index caff4198a..50f796960 100644 --- a/mfr/extensions/pdf/render.py +++ b/mfr/extensions/pdf/render.py @@ -26,7 +26,7 @@ def render(self): return self.TEMPLATE.render( base=self.assets_url, url=download_url.geturl(), - enable_hypothesis = settings.ENABLE_HYPOTHESIS + enable_hypothesis=settings.ENABLE_HYPOTHESIS ) logger.debug('Extension found in supported list!') @@ -42,13 +42,13 @@ def render(self): return self.TEMPLATE.render( base=self.assets_url, url=exported_url.url, - enable_hypothesis = settings.ENABLE_HYPOTHESIS + enable_hypothesis=settings.ENABLE_HYPOTHESIS ) return self.TEMPLATE.render( base=self.assets_url, url=download_url.geturl(), - enable_hypothesis = settings.ENABLE_HYPOTHESIS + enable_hypothesis=settings.ENABLE_HYPOTHESIS ) @property