diff options
| -rw-r--r-- | stapp/video/models.py | 15 | ||||
| -rw-r--r-- | stapp/video/views.py | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/stapp/video/models.py b/stapp/video/models.py index b40067b..0f79ca7 100644 --- a/stapp/video/models.py +++ b/stapp/video/models.py @@ -3,24 +3,12 @@ from django.db.models.signals import post_delete from signals import delete_files from taggit.managers import TaggableManager -from base64 import b32encode -from hashlib import sha1 -from random import random import settings import uuid import datetime import Image, os -def pkgen(): - rude = ('lol',) - bad_pk = True - while bad_pk: - pk = b32encode(sha1(str(random())).digest()).lower()[:6] - bad_pk = False - for rw in rude: - if pk.find(rw) >= 0: bad_pk = True - return pk def get_file_path(instance, filename): ext = filename.split('.')[-1] @@ -38,15 +26,12 @@ class Video(models.Model): filename = models.FileField(upload_to=get_file_path) image = models.ImageField(upload_to=get_image_path) description = models.TextField() - mykey = models.CharField(max_length=6, default=pkgen) created = models.DateTimeField(auto_now_add=True) tags = TaggableManager() def __unicode__(self): return self.name - - #Call the delete_files signal to delete physical files on delete of record post_delete.connect(delete_files, Video) diff --git a/stapp/video/views.py b/stapp/video/views.py index 54d3f54..d517c74 100644 --- a/stapp/video/views.py +++ b/stapp/video/views.py @@ -11,7 +11,7 @@ def show(request): #Get the latest video to display on the front page latest_video = Video.objects.latest('created') - return HttpResponse(latest_video.mykey) + #Get last three modified modules latest_modules = Module.objects.order_by('-modified')[0:3] all_modules = Module.objects.order_by('modified') |