Changeset 5bf08b0

Timestamp:

02/11/10 17:44:17 (3 years ago)

Author:

olivier <>

Branches:

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

Children:

97f48ec

Parents:

96ab603

git-author:

olivier <> (02/11/10 17:44:17)

git-committer:

olivier <> (02/11/10 17:44:17)

Message:

various fixes related to new models and Django compatibility

Location:

telemeta

Files:

• models/core.py (modified) (2 diffs)
• models/media.py (modified) (2 diffs)
• templates/telemeta_default/collection_xspf.xml (modified) (1 diff)
• templates/telemeta_default/inc/collection_list.html (modified) (1 diff)
• templates/telemeta_default/mediaitem_detail.html (modified) (1 diff)
• web/base.py (modified) (2 diffs)

telemeta/models/core.py

@@ -299 +299 @@
         super(DateTimeField, self).__init__(*args, **normalize_field(kwargs, '0000-00-00 00:00'))
 
+    def get_db_prep_value(self, value):
+        if value is None and not self.null: 
+            return '0000-00-00 00:00'
+
+        return super(DateTimeField, self).get_db_prep_value(value)
+
 class FileField(models.FileField):
     """FileField normalized with normalize_field()"""
@@ -316 +322 @@
     def __init__(self, *args, **kwargs):
         super(DateField, self).__init__(*args, **normalize_field(kwargs, '0000-00-00'))
+
+    def get_db_prep_value(self, value):
+        if value is None and not self.null: 
+            return '0000-00-00'
+
+        return super(DateField, self).get_db_prep_value(value)
 
 class RequiredFieldError(Exception):

telemeta/models/media.py

@@ -224 +224 @@
     ethnic_group          = WeakForeignKey('EthnicGroup', related_name="items", 
                                            verbose_name=_('population / social group'))
-    title                 = CharField(_('title'), required=True)
+    title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
     author                = CharField(_('author'))
@@ -275 +275 @@
 
     def save(self, force_insert=False, force_update=False):
-        if not self.code:
-            raise RequiredFieldError(self, self._meta.get_field('code'))
-        if not self.is_valid_code(self.code):
+        if self.code and not self.is_valid_code(self.code):
             raise MediaInvalidCodeError("%s is not a valid item code for collection %s" 
                                         % (self.code, self.collection.code))

telemeta/templates/telemeta_default/collection_xspf.xml

@@ -11 +11 @@
 
 {% block tracklist %}
-{% for item in collection.ordered_items %}
+{% for item in collection.items.all %}
     <track>
       <title>{{ item }}</title>
       <meta rel="type">mp3</meta>
       <location>http://{{ host }}{% url telemeta-item-export item.public_id,"mp3" %}</location>
-      <duration>{{ item.get_duration|mul:1000 }}</duration>
+      <duration>{{ item.computed_duration.as_seconds|mul:1000 }}</duration>
       <info>http://{{ host }}{% url telemeta-item-detail item.public_id %}</info>
     </track>

telemeta/templates/telemeta_default/inc/collection_list.html

@@ -27 +27 @@
     {% if collection.recorded_from_year %}
         {{ collection.recorded_from_year }}
-        {% if collection.recorded_to_year and collection.recorded_to_year != collection.recorded_from_year %}
+        {% if collection.recorded_to_year and not collection.recorded_to_year|equals:collection.recorded_from_year %}
             - {{ collection.recorded_to_year }}
         {% endif %}

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -21 +21 @@
 soundManager.debugMode = false;
 set_player_image_url('{% url telemeta-item-visualize item.public_id,visualizer_id,"WIDTH","HEIGHT" %}');
-load_player({{ item.get_duration }});
+load_player({{ item.computed_duration.as_seconds }});
 </script>
 

telemeta/web/base.py

@@ -47 +47 @@
 import telemeta
 from telemeta.models import MediaItem, Location, MediaCollection
+from telemeta.models import dublincore
 from telemeta.core import Component, ExtensionPoint
 from telemeta.export import *
@@ -154 +155 @@
 
         infile = item.file.path
-        metadata = item.to_dublincore().flatten()
+        metadata = dublincore.express_item(item).flatten()
         stream = exporter.process(item.id, infile, metadata)