heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In the middle of some major changes

Browse Source
This commit is contained in:
tilly-Q 2014-04-21 19:07:28 -04:00
parent 0656de6795
commit 9f5d388ec0
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mediagoblin/gmg_commands/batchaddmedia.py
View File

@ -132,7 +132,8 @@ zip files and directories"
contents = all_metadata.read() contents = all_metadata.read()
media_metadata = parse_csv_file(contents) media_metadata = parse_csv_file(contents)
dcterms_context = { 'dcterms':'http://purl.org/dc/terms/' } metadata_context = { 'dcterms':'http://purl.org/dc/terms/',
'xsd': 'http://www.w3.org/2001/XMLSchema#'}
for media_id in media_locations.keys(): for media_id in media_locations.keys():
files_attempted += 1 files_attempted += 1
@ -141,13 +142,14 @@ zip files and directories"
sanitized_metadata = check_metadata_format(file_metadata) sanitized_metadata = check_metadata_format(file_metadata)
if sanitized_metadata == {}: continue if sanitized_metadata == {}: continue
json_ld_metadata = jsonld.compact(file_metadata, dcterms_context) json_ld_metadata = jsonld.compact(build_json_ld_metadata(file_metadata),
metadata_context)
original_location = media_locations[media_id]['media:original'] original_location = media_locations[media_id]['media:original']
url = urlparse(original_location) url = urlparse(original_location)
title = file_metadata.get('dcterms:title') title = sanitized_metadata.get('dcterms:title')
description = file_metadata.get('dcterms:description') description = sanitized_metadata.get('dcterms:description')
license = file_metadata.get('dcterms:rights') license = sanitized_metadata.get('dcterms:rights')
filename = url.path.split()[-1] filename = url.path.split()[-1]
if url.scheme == 'http': if url.scheme == 'http':
@ -218,6 +220,19 @@ def teardown(temp_files):
for temp_file in temp_files: for temp_file in temp_files:
subprocess.call(['rm','-r',temp_file]) subprocess.call(['rm','-r',temp_file])
def build_json_ld_metadata(metadata_dict):
output_dict = {}
for p in metadata_dict.keys():
if p in ["dcterms:rights", "dcterms:relation"]:
m_type = "xsd:uri"
elif p in ["dcterms:date", "dcterms:created"]:
m_type = "xsd:date"
else:
m_type = "xsd:string"
description = {"@value": metadata_dict[p],
"@type" : m_type}
output_dict[p] = description
return output_dict
def check_metadata_format(metadata_dict): def check_metadata_format(metadata_dict):
schema = { schema = {
@ -250,6 +265,7 @@ def check_metadata_format(metadata_dict):
try: try:
validate(metadata_dict, schema) validate(metadata_dict, schema)
output_dict = metadata_dict output_dict = metadata_dict
# "media:id" is only for internal use, so we delete it for the output
del output_dict['media:id'] del output_dict['media:id']
except ValidationError, exc: except ValidationError, exc:

12
mediagoblin/templates/mediagoblin/utils/metadata_table.html
View File

@ -20,14 +20,14 @@
{%- set metadata=media_entry.media_metadata %} {%- set metadata=media_entry.media_metadata %}
{%- set metadata_context=metadata['@context'] %} {%- set metadata_context=metadata['@context'] %}
{%- if metadata %} {%- if metadata %}
<table prefix="{%- for prefix in metadata_context -%} <table prefix="{% for p in metadata_context %}{% if not loop.first %}
{{ prefix }} {{ metadata_context[prefix] }} {% endif %}{{ p }} {{ metadata_context[p] }}{% endfor -%}">
{%- endfor %}"> {%- for key, value_dict in metadata.iteritems() if not key=='@context' %}
{%- for key, value in metadata.iteritems() if not key=='@context' %} {% if value_dict['@value'] -%}
{% if value -%}
<tr> <tr>
<td>{{ format_predicate(key) }}</td> <td>{{ format_predicate(key) }}</td>
<td property="{{ key }}">{{ value }}</td> <td property="{{ key }}" typeof="{{ value_dict['@type'] }}">
{{ value_dict['@value'] }}</td>
</tr> </tr>
{%- endif -%} {%- endif -%}
{%- endfor %} {%- endfor %}