Changeset f38625e

Timestamp:

11/03/11 18:04:29 (20 months ago)

Author:

yomguy <yomguy@…>

Branches:

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

Children:

dd46083

Parents:

d407f46

git-author:

yomguy <yomguy@…> (11/03/11 18:04:29)

git-committer:

yomguy <yomguy@…> (11/03/11 18:04:29)

Message:

add MediaItemRelatedFile? model and forms to handle media item attachements

Location:

telemeta

Files:

• admin.py (modified) (2 diffs)
• models/media.py (modified) (3 diffs)
• templates/telemeta/mediaitem_related_edit.html (added)
• templates/telemeta_default/mediaitem_detail.html (modified) (1 diff)
• templates/telemeta_default/mediaitem_related_edit.html (added)
• templatetags/telemeta_utils.py (modified) (2 diffs)
• urls.py (modified) (1 diff)
• web/base.py (modified) (4 diffs)

telemeta/admin.py

@@ -14 +14 @@
     exclude = ('copied_from_item', )
 
+class MediaItemRelatedFileAdmin(admin.ModelAdmin):
+    search_fields = ['title', 'code']
+    ordering = ['code']
+    
 class MediaPartAdmin(admin.ModelAdmin):
     search_fields = ['title', 'item__code']
@@ -49 +53 @@
 admin.site.register(MediaItem, MediaItemAdmin)
 admin.site.register(MediaPart, MediaPartAdmin)
+admin.site.register(MediaItemRelatedFile, MediaItemRelatedFileAdmin)
 
 admin.site.register(Instrument, InstrumentAdmin)

telemeta/models/media.py

@@ -43 +43 @@
 from telemeta.util.unaccent import unaccent_icmp
 import re
+import mimetypes
 from telemeta.models.location import LocationRelation, Location
 from telemeta.models.system import Revision
@@ -320 +321 @@
         else:
             title = unicode(self.collection)
-
         if self.track:
             title += ' ' + self.track
-
         return title
 
-
 class MediaItemForm(ModelForm):
     class Meta:
         model = MediaItem
+    def clean_code(self):
+        return self.cleaned_data['code'] or None
+
+
+class MediaItemRelatedFile(MediaResource):
+    "Item related attached file"
+    
+    element_type = 'media'
+    
+    item            = ForeignKey('MediaItem', related_name="related", verbose_name=_('item'))
+    code            = CharField(_('code'), unique=True, blank=True)
+    title           = CharField(_('title'))
+    date            = DateTimeField(_('date'), auto_now=True)
+    description     = TextField(_('description'))
+    author          = ForeignKey(User, related_name="related", verbose_name=_('author'))
+    mime_type       = CharField(_('mime_type'), blank=True)
+    file            = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")
+    
+    @property
+    def public_id(self):
+        if self.code:
+            return self.code
+        return self.id
+
+    def is_image(self):
+        return 'image' in self.mime_type
+        
+    def save(self, force_insert=False, force_update=False):
+        super(MediaItemRelatedFile, self).save(force_insert, force_update)
+        
+    def set_mime_type(self):
+        if self.file:
+            self.mime_type = mimetypes.guess_type(self.file.path)[0]
+    
+    def __unicode__(self):
+        if self.title and not re.match('^ *N *$', self.title):
+            title = self.title
+        else:
+            title = unicode(self.item)
+        return title
+    
+    class Meta(MetaCore):
+        db_table = 'media_item_related_file'
+
+class MediaItemRelatedFileForm(ModelForm):
+    class Meta:
+        model = MediaItemRelatedFile
     def clean_code(self):
         return self.cleaned_data['code'] or None
@@ -465 +510 @@
     class Meta(MetaCore):
         db_table = 'media_transcoding'
-
-
+        
+        
 class Search(ModelCore):
     "Keywork search"

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -273 +273 @@
 </div> <!-- with-rightcol -->
 
+<div class="infos">
+        {% block related_files %}
+        <div>
+            <h4><a href="#">{% trans "Related files" %}</a></h4>
+            {% if related_files %}
+            <div class="instruments">
+                <table class="instruments">
+                    <thead>
+                        <tr>
+                            <td>{% field_label "MediaItemRelatedFile" "file" %}</td>
+                            <td>{% field_label "MediaItemRelatedFile" "title" %}</td>
+                            <td>{% field_label "MediaItemRelatedFile" "mime type" %}</td>
+                            <td>{% field_label "MediaItemRelatedFile" "author" %}</td>
+                            <td>{% field_label "MediaItemRelatedFile" "preview" %}</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for file in related_files %}
+                        <tr>
+                            <td><a href="{% url telemeta-item-related-file item.public_id file.id %}">{% if file.file %}{{ file.file|get_filename }}{% endif %}</a></td>
+                            <td>{{ file.title }}</td>
+                            <td>{{ file.mime_type }}</td>
+                            <td>{{ file.author }}</td>
+                            <td>{% if file.is_image %}<a href="{% url telemeta-item-related-file item.public_id file.id %}"><img src="{% url telemeta-item-related-file item.public_id file.id %}" style="width: 400px;" /></a>{% else %}<a href="{% url telemeta-item-related-file item.public_id file.id %}">link</a>{% endif %}</td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                {% if user.is_authenticated and perms.telemeta.change_mediaitem %}
+                <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related"%}</a>
+                {% endif %}
+            </div>
+            {% endif %}
+        </div>
+        {% endblock related_files %}
+    </div>
+
 {% endblock %}
 

telemeta/templatetags/telemeta_utils.py

@@ -13 +13 @@
 from django import db
 import re
+import os
 import datetime
 from django.conf import settings
@@ -320 +321 @@
     else:
         return ''
+
+@register.filter
+def get_filename(file):
+    return file.path.split(os.sep)[-1]

telemeta/urls.py

@@ -114 +114 @@
         dict(template='telemeta/mediaitem_keywords_edit.html'), name="telemeta-item-keywords_edit"),
     url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', item_view.item_delete, name="telemeta-item-delete"),
-        
+    url(r'^items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<file_id>[A-Za-z0-9._-]+)$', item_view.related_file_stream, name="telemeta-item-related-file"),
+    url(r'^items/(?P<public_id>[A-Za-z0-9._-]+)/related_edit/$', item_view.related_file_edit,  dict(template='telemeta/mediaitem_related_edit.html'), name="telemeta-item-related_edit"),
     # Markers
     url(r'^markers/(?P<marker_id>[A-Za-z0-9]+)/$', item_view.item_detail, name="telemeta-item-detail-marker"),

telemeta/web/base.py

@@ -506 +506 @@
         public_access = get_public_access(item.public_access, str(item.recorded_from_date).split('-')[0], 
                                                 str(item.recorded_to_date).split('-')[0])
-                
+        
+        related_files = MediaItemRelatedFile.objects.filter(item=item)
+        for file in related_files:
+            if not file.mime_type:
+                file.set_mime_type()
+                file.save()
+        
         return render(request, template,
                     {'item': item, 'export_formats': formats,
@@ -513 +519 @@
                     'previous' : previous, 'next' : next, 'marker': marker_id, 'playlists' : playlists, 
                     'public_access': public_access, 'width': width, 'height': height, 
+                    'related_files': related_files, 
                     })
         
@@ -562 +569 @@
                     'previous' : previous, 'next' : next, 
                     })
+    
+    def related_file_stream(self, request, item_public_id, file_id):
+        item = MediaItem.objects.get(public_id=item_public_id)
+        file = MediaItemRelatedFile.objects.get(item=item, id=file_id)
+        response = HttpResponse(stream_from_file(file.file.path), mimetype=file.mime_type)
+#        response['Content-Disposition'] = 'attachment'
+        return response
+    
+    @method_decorator(permission_required('telemeta.change_mediaitem'))
+    def related_file_edit(self, request, public_id, template):
+        item = MediaItem.objects.get(public_id=public_id)
+        MediaItemRelatedFileFormSet = inlineformset_factory(MediaItem, MediaItemRelatedFile, form=MediaItemRelatedFileForm)
+        if request.method == 'POST':
+            formset = MediaItemRelatedFileFormSet(data=request.POST, files=request.FILES, instance=item)
+            if formset.is_valid():
+                formset.save()
+                return HttpResponseRedirect('/items/'+public_id)
+        else:
+            formset = MediaItemRelatedFileFormSet(instance=item)
+        
+        return render(request, template, {'item': item, 'formset': formset,})
         
     @method_decorator(permission_required('telemeta.add_mediaitem'))
@@ -711 +739 @@
         response = HttpResponse(self.cache_data.read_stream_bin(image_file), mimetype=mime_type)
         return response
-
+        
     def list_export_extensions(self):
         "Return the recognized item export file extensions, as a list"