Skip to content

Handle setting strings #33

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle setting strings #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d885139
Handle setting strings
atiro Sep 24, 2018
038389e
Adding thumbnail from canvas Image API option
atiro Sep 24, 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
29 changes: 20 additions & 9 deletions iiif_prezi_upgrader/prezi_upgrader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import requests
import uuid
from collections import OrderedDict
import re

try:
STR_TYPES = [str, unicode] #Py2
Expand All @@ -15,7 +16,7 @@


FLAGS = {
"crawl": {"prop": "crawl", "default": False,
"crawl": {"prop": "crawl", "default": False,
"description": "NOT YET IMPLEMENTED. Crawl to linked resources, such as AnnotationLists from a Manifest"},
"desc_2_md": {"prop": "description_is_metadata", "default": True,
"description": "If true, then the source's `description` properties will be put into a `metadata` pair.\
Expand All @@ -35,13 +36,15 @@
"attribution_label": {"prop": "attribution_label", "default": "Attribution",
"description": "The label to use for requiredStatement mapping from attribution"},
"license_label": {"prop": "license_label", "default": "Rights/License",
"description": "The label to use for non-conforming license URIs mapped into metadata"}
"description": "The label to use for non-conforming license URIs mapped into metadata"},
"canvas_as_thumbs": {"prop": "canvas_as_thumbs", "default": False,
"description": "Use canvas image for thumbnails"}
}

KEY_ORDER = ["@context", "id", "@id", "type", "@type", "motivation", "label", "profile",
KEY_ORDER = ["@context", "id", "@id", "type", "@type", "motivation", "label", "profile",
"format", "language", "value", "metadata", "requiredStatement", "thumbnail",
"homepage", "logo", "rights", "logo", "height", "width", "start",
"viewingDirection", "behavior", "navDate", "rendering", "seeAlso",
"homepage", "logo", "rights", "logo", "height", "width", "start",
"viewingDirection", "behavior", "navDate", "rendering", "seeAlso",
"partOf", "includes", "items", "structures", "annotations"]
KEY_ORDER_HASH = dict([(KEY_ORDER[x], x) for x in range(len(KEY_ORDER))])

Expand Down Expand Up @@ -326,7 +329,7 @@ def set_remote_type(self, what):
what['type'] = data['type']
elif '@type' in data:
data = self.fix_type(data)
what['type'] = data['type']
what['type'] = data['type']

def fix_object(self, what, typ):
if type(what) != dict:
Expand Down Expand Up @@ -413,9 +416,9 @@ def process_generic(self, what):
l = l['@id']
if not done and (l.find('creativecommons.org/') >-1 or l.find('rightsstatements.org/') > -1):
# match
what['rights'] = l
what['rights'] = l
done = True
else:
else:
# fix_languages below will correct these to langMaps
licstmt = {"label": self.license_label, "value": l}
md = what.get('metadata', [])
Expand All @@ -433,7 +436,7 @@ def process_generic(self, what):
what['behavior'] = what['viewingHint']
else:
# will already be a list
if type(what['viewingHint']) == list:
if type(what['viewingHint']) == list:
what['behavior'].extend(what['viewingHint'])
else:
what['behavior'].append(what['viewingHint'])
Expand Down Expand Up @@ -647,12 +650,20 @@ def process_canvas(self, what):
# XXX process otherContent here before generic grabs it

what = self.process_generic(what)
iiif_im = re.compile(r"^(http|https)://([^/]+)/(.*)/(full|square|[0-9,]+|pct:[0-9,]+)/full")

if 'images' in what:
newl = {'type': 'AnnotationPage', 'items': []}
for anno in what['images']:
newl['items'].append(anno)
what['items'] = [newl]
if self.canvas_as_thumbs:
mat = iiif_im.match(what['images'][0]['resource']['@id'])
thumb_url = "%s://%s/%s/full/80,100/0/default.jpg" % (mat.group(1), mat.group(2), mat.group(3))

thumb_id = "%s://%s/%s" % (mat.group(1), mat.group(2), mat.group(3))

what['thumbnail'] = [ {"@id" : thumb_url, "type": "Image", "service": [ { "id": thumb_id, "type": "ImageService2", "profile": "level1" } ] } ]
del what['images']
return what

Expand Down
8 changes: 4 additions & 4 deletions prezi2to3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
name=key
description=FLAGS[key]['description']
default=FLAGS[key]['default']
type=type(default)
if FLAGS[key]['default'] is not str:
type=bool
parser.add_argument('--%s' % name, default=default, type=type, help=description)
arg_type=type(default)
if not isinstance(FLAGS[key]['default'], str):
arg_type=bool
parser.add_argument('--%s' % name, default=default, type=arg_type, help=description)


args = parser.parse_args()
Expand Down