diff options
Diffstat (limited to 'stapp')
| -rw-r--r-- | stapp/templates/video/home.html | 6 | ||||
| -rw-r--r-- | stapp/video/models.py | 29 |
2 files changed, 20 insertions, 15 deletions
diff --git a/stapp/templates/video/home.html b/stapp/templates/video/home.html index 7281fab..470403d 100644 --- a/stapp/templates/video/home.html +++ b/stapp/templates/video/home.html @@ -1,7 +1,6 @@ {% extends "base.html" %} <!DOCTYPE html> -<script src="{{ URL_BASE }}/static/video/css/jquery-1.7.2.js" type="javascript" /> {% block title %} STProject {% endblock %} @@ -31,10 +30,7 @@ function myfunction(video,image) <div span="12"> <h2>{{module.name}}</h2> {% for video in module.video_list.all %} - <!--video width="150" height="150" controls="controls"> - <source src="{{video.filename.url}}" poster="{{video.thumbnail.url}}"> - </video--> - + <a href=javascript:myfunction("{{video.filename.url}}","{{video.image.url}}") > <img src='{{video.image.url}}' name='video' id='video{{forloop.counter}}' /></a> {{video.name}} diff --git a/stapp/video/models.py b/stapp/video/models.py index 20af47c..3118c0a 100644 --- a/stapp/video/models.py +++ b/stapp/video/models.py @@ -4,15 +4,14 @@ from signals import delete_files import settings - +import uuid import datetime import Image, os def handle_thumb(image_obj, thumb_obj, width, height): # create thumbnail - if image_obj and not thumb_obj: - thumb = image_obj.path + ('-small.jpg') - #try: + thumb = str(image_obj) + ('-small.jpg') + try: t = Image.open(image_obj.path) w, h = t.size @@ -26,18 +25,28 @@ def handle_thumb(image_obj, thumb_obj, width, height): t.save(settings.MEDIA_ROOT + thumb, 'JPEG') os.chmod(settings.MEDIA_ROOT + thumb, 0666) - thumb_obj = image_obj.path + ('-small.jpg') - #except: - # pass + thumb_obj = thumb + except: + pass return thumb_obj +def get_file_path(instance, filename): + ext = filename.split('.')[-1] + filename = "%s.%s" % (uuid.uuid4(), ext) + return os.path.join('uploads/videos', filename) + +def get_image_path(instance, filename): + ext = filename.split('.')[-1] + filename = "%s.%s" % (uuid.uuid4(), ext) + return os.path.join("uploads/screenshots", filename) + class Video(models.Model): """Videos to be uploaded..""" name = models.CharField(max_length=128) - filename = models.FileField(upload_to="uploads/videos") - image = models.ImageField(upload_to="uploads/screenshots") - thumbnail = models.ImageField(upload_to='uploads/screenshots', \ + filename = models.FileField(upload_to=get_file_path) + image = models.ImageField(upload_to=get_image_path) + thumbnail = models.ImageField(upload_to=get_image_path, \ blank=True, null=True, editable=False) description = models.TextField() created = models.DateTimeField(auto_now_add=True) |