Changeset 66bbeee

Timestamp:

06/24/11 11:47:35 (2 years ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

a4d12ba

Parents:

305c6d0

git-author:

yomguy <yomguy@…> (06/24/11 11:47:35)

git-committer:

yomguy <yomguy@…> (06/24/11 11:47:35)

Message:

fix item public_access

Location:

telemeta

Files:

• models/dublincore.py (modified) (4 diffs)
• web/base.py (modified) (1 diff)

telemeta/models/dublincore.py

@@ -34 +34 @@
 
 from telemeta.models.core import Duration
-from telemeta.models.media import MediaItem, MediaCollection
+from telemeta.models.media import MediaItem, MediaCollection, MediaItemAnalysis
 from django.contrib.sites.models import Site
 from django.conf import settings
@@ -178 +178 @@
         Element('format',           duration, 'extent'),
         Element('format',           collection.physical_format, 'medium'),
-        #FIXME: audio mime types are missing,
         parts
     )
@@ -207 +206 @@
         if item.track:
             title += u' - ' + item.track
+    
+    try:
+        analysis = MediaItemAnalysis(item=item, analyzer_id='mime_type')
+        mime_type = analysis.value
+    except:
+        mime_type = 'unknown'
 
     resource = Resource(
@@ -226 +231 @@
         Element('rights',           item.collection.legal_rights, 'license'),
         Element('rights',           media_access_rights(item.collection), 'accessRights'),
-    
         Element('format',           max(item.approx_duration, item.computed_duration()), 'extent'),
         Element('format',           item.collection.physical_format, 'medium'),
-        #FIXME: audio mime types are missing,
+        Element('format',           mime_type, 'MIME type'),
         Element('relation',         media_identifier(item.collection), 'isPartOf', item.collection)
     )

telemeta/web/base.py

@@ -459 +459 @@
             item = MediaItem.objects.get(public_id=public_id)
         
-        item_public_access = item.public_access == 'none' or item.collection.public_access == 'none'
+        item_public_access = item.public_access != 'none' or item.collection.public_access != 'none'
         if not item_public_access and not (request.user.is_staff or request.user.is_superuser):
             mess = ugettext('Access not allowed')