Skip to content

[][SVCS-645] Add hypothesis to pdf renderer #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NyanHelsing wants to merge 4 commits into from
Closed

[][SVCS-645] Add hypothesis to pdf renderer #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2865fe4
Add hypothesis to pdf renderer
NyanHelsing Mar 8, 2018
a801385
Add env config to enable hypothesis
NyanHelsing Mar 12, 2018
ab3a15d
Add config and styles for pdf viewer iframe
NyanHelsing Mar 13, 2018
20599fe
Fix linting, update .gitignore
NyanHelsing Mar 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,5 @@ player/static/mfr/*
!.gitkeep

.cache

node_modules/
20 changes: 16 additions & 4 deletions mfr/extensions/pdf/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions mfr/extensions/pdf/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
EXPORT_TYPE = config.get('EXPORT_TYPE', 'pdf')
EXPORT_MAXIMUM_SIZE = config.get('EXPORT_MAXIMUM_SIZE', '1200x1200')

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(' ')
EXPORT_MAX_PAGES = int(config.get('EXPORT_MAX_PAGES', 40))
9 changes: 9 additions & 0 deletions mfr/extensions/pdf/templates/viewer.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ http://sourceforge.net/adobe/cmap/wiki/License/

<script src="debugger.js"></script>
<script src="viewer.js"></script>
% if enable_hypothesis:
<script src="https://hypothes.is/embed.js"></script>
<style>
#toolbarViewer {
position: relative;
margin-right: 36px;
}
</style>
% endif
</head>

<body tabindex="1" class="loadingInProgress">
Expand Down