Fixed mix add flow

core/tasks.py

@@ -3,13 +3,11 @@ from celery.task import task
 import os
 from core.utils.waveform import generate_waveform
 from dss import settings
+from spa.signals import waveform_generated
 
-"""
-    name='core.tasks.create_waveform_task'
-"""
 @task()
-def create_waveform_task(in_file, uid):
-    out_file = os.path.join(settings.MEDIA_ROOT, 'waveforms/%s.png' % uid)
+def create_waveform_task(in_file, mix_uid):
+    out_file = os.path.join(settings.MEDIA_ROOT, 'waveforms/%s.png' % mix_uid)
     print "Creating waveform \n\tIn: %s\n\tOut: %s" % (in_file, out_file)
     generate_waveform(in_file, out_file)
     if os.path.isfile(out_file):
@@ -18,5 +16,7 @@ def create_waveform_task(in_file, uid):
         new_file = in_file.replace('cache', 'mixes')
         print "Moving cache audio clip from %s to %s" % (in_file, new_file)
         shutil.move(in_file, new_file)
+        print "Uid: %s" % mix_uid
+        waveform_generated.send(sender=None, uid=mix_uid)
     else:
         print "Outfile is missing"

core/utils/file.py

@@ -1,7 +1,7 @@
 import uuid
 import os
 
-def generate_save_file_name(prefix, filename):
+def generate_save_file_name(uid, prefix, filename):
     filename, extension = os.path.splitext(filename)
-    ret = "%s%s" % ('/'.join([prefix, str(uuid.uuid1())]), extension)
+    ret = "%s%s" % ('/'.join([prefix, uid]), extension)
     return ret

core/utils/url.py

@@ -0,0 +1,4 @@
+__author__ = 'fergalm'
+def urlclean(url):
+    ret = url.replace('//', '/')
+    return ret

dss/settings.py

@@ -142,6 +142,7 @@ INSTALLED_APPS = (
     'avatar',
     'notification',
     'spa',
+    'spa.signals',
     'core',
     'allauth',
     'allauth.account',

spa/ajax.py

@@ -214,7 +214,7 @@ def upload_mix_file_handler(request):
                 for chunk in f.chunks():
                     destination.write(chunk)
             try:
-                create_waveform_task.delay(in_file=in_file, uid=uid)
+                create_waveform_task.delay(in_file=in_file, mix_uid=uid)
             except Exception, ex:
                 logger.exception("Error starting waveform generation task: %s" % ex.message)
         return HttpResponse(_get_json("Success"), mimetype='application/json')

spa/api/v1/MixResource.py

@@ -21,8 +21,7 @@ class MixResource(BackboneCompatibleResource):
         file_name = "mixes/%s.%s" % (bundle.data['upload-hash'], bundle.data['upload-extension'])
         uid = bundle.data['upload-hash']
         bundle.data['user'] = request.user.get_profile()
-        return super(MixResource, self).obj_create(bundle, request, user=request.user.get_profile(),
-            local_file=file_name, uid=uid)
+        return super(MixResource, self).obj_create(bundle, request, user=request.user.get_profile(), local_file=file_name, uid=uid)
 
     def obj_get_list(self, request=None, **kwargs):
         sort = 'latest'

spa/management/commands/waveforms.py

@@ -6,6 +6,12 @@ from spa.models.Mix import Mix
 
 class Command(NoArgsCommand):
     help = "Generate all outstanding waveforms"
+    def _generateWaveform(self, guid):
+        output_file = 'waveforms/%s.png' % guid
+        local_file =  '%s/%s' % (settings.CACHE_ROOT, guid)
+        if os.path.isfile(local_file):
+            self._check_file(local_file, output_file)
+
     def _check_file(self, local_file, output_file):
         if os.path.isfile(os.path.join(settings.MEDIA_ROOT, local_file)):
             file = os.path.join(settings.MEDIA_ROOT, output_file)
@@ -14,14 +20,9 @@ class Command(NoArgsCommand):
                 generate_waveform(local_file, file)
 
     def handle(self, *args, **options):
-        for guid in args:
-            output_file = 'waveforms/%s.png' % guid
-            local_file =  '%s/%s' % (self.CACHE_ROOT, guid)
-            if os.path.isfile(local_file):
-                self._check_file(local_file, output_file)
-
-    def handle_noargs(self, **options):
-        print "Generating waveforms for mix"
         unprocessed = Mix.objects.filter(waveform_generated=False)
         for mix in unprocessed:
-            pass
+            self._generateWaveform(mix.uid)
+
+    def handle_noargs(self, **options):
+        pass

spa/models/Mix.py

@@ -1,20 +1,22 @@
+from django.db.models.signals import post_save
+from django.dispatch import Signal, receiver
+import os
+from core.utils import url
 from datetime import datetime
 from django.db import models
 from django.db.models import Count
-from django.forms import save_instance
-import os
-from core.utils.file import generate_save_file_name
-from dss import settings, localsettings
-from spa.models.MixLike import MixLike
 from spa.models.MixPlay import MixPlay
+from dss import settings, localsettings
 from spa.models.UserProfile import UserProfile
 from spa.models._BaseModel import _BaseModel
+from core.utils.file import generate_save_file_name
 
 def mix_file_name(instance, filename):
-    return generate_save_file_name('mixes', filename)
+    return generate_save_file_name(instance.uid, 'mixes', filename)
 
 def mix_image_name(instance, filename):
-    return generate_save_file_name('mix-images', filename)
+    ret =  generate_save_file_name(instance.uid, 'mix-images', filename)
+    return ret
 
 class Mix(_BaseModel):
     class Meta:
@@ -30,7 +32,7 @@ class Mix(_BaseModel):
     is_active = models.BooleanField(default=True)
     user = models.ForeignKey(UserProfile, editable=False)
     waveform_generated = models.BooleanField(default=False)
-    uid = models.CharField(max_length=38, blank=True)
+    uid = models.CharField(max_length=38, blank=True, unique=True)
 
     def __unicode__(self):
         return self.title
@@ -40,6 +42,11 @@ class Mix(_BaseModel):
         #from image - will sort when I've figured backbone out better
         if self.mix_image.name.startswith(settings.MEDIA_URL):
             self.mix_image.name = self.mix_image.name[len(settings.MEDIA_URL):len(self.mix_image.name)]
+
+        #Check for the unlikely event that the waveform has been generated
+        if os.path.isfile(self.get_waveform_path()):
+            self.waveform_generated = True
+
         super(Mix, self).save(force_insert, force_update, using)
 
     def get_absolute_url(self):
@@ -51,23 +58,18 @@ class Mix(_BaseModel):
     def get_waveform_url(self):
         waveform_root = localsettings.WAVEFORM_URL if hasattr(localsettings, 'WAVEFORM_URL') else "%s/waveforms/" % settings.MEDIA_URL
         ret = "%s/%s.%s" % (waveform_root, self.uid, "png")
-        return ret
+        return url.urlclean(ret)
 
     def get_image_url(self):
-        images_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else "%s/mix_images/" % settings.MEDIA_URL
-        ret = "%s/%s" % (images_root, self.mix_image)
-        return ret
-        """
         try:
             if os.path.isfile(self.mix_image.path):
-                image_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else settings.MEDIA_URL
-                ret = "%s/%s" % (image_root, self.mix_image.name)
-                return ret
-        except:
-            return settings.STATIC_URL + 'img/default-track.png'
+                images_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else "%s/" % settings.MEDIA_URL
+                ret = "%s/%s" % (images_root, self.mix_image)
+                return url.urlclean(ret)
+        except Exception, ex:
+            pass
 
         return settings.STATIC_URL + 'img/default-track.png'
-        """
 
     def get_stream_path(self):
         #return 'media/%s/' % self.local_file.name

spa/signals.py

@@ -0,0 +1,20 @@
+from django.core.exceptions import ObjectDoesNotExist
+from django.db.models.signals import post_save
+from django.dispatch import receiver, Signal
+import os
+from spa.models.Mix import Mix
+
+waveform_generated = Signal()
+def waveform_generated_callback(sender, **kwargs):
+    print "Updating model with waveform"
+    try:
+        uid = kwargs['uid']
+        if uid is not None:
+            mix = Mix.objects.get(uid=uid)
+            if mix is not None:
+                mix.waveform_generated = True
+                mix.save()
+    except ObjectDoesNotExist:
+        pass
+
+waveform_generated.connect(waveform_generated_callback)