fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-26 19:47:32 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Fixed cache path builder in waveform gen management command

Browse Source
This commit is contained in:
Fergal Moran
2013-09-29 15:46:24 +01:00
parent a91f7f838d
commit dbe6d158d8
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spa/management/commands/waveforms.py
View File

@@ -12,17 +12,15 @@ class Command(NoArgsCommand):
def _generateWaveform(self, mix): def _generateWaveform(self, mix):
#Check for file in mix directory #Check for file in mix directory
in_file = mix.get_absolute_path()
try: try:
if os.path.isfile(in_file): in_file = mix.get_absolute_path()
create_waveform_task.delay(in_file=in_file, uid=mix.uid) if not os.path.isfile(in_file):
else: in_file = mix.get_cache_path()
fileName, extension = os.path.splitext(mix.local_file.name) if not os.path.isfile(in_file):
in_file=os.path.join(os.path.join(settings.CACHE_ROOT, "mixes"), "%s.%s" % (fileName, extension))
if os.path.isfile(in_file):
create_waveform_task.delay(in_file=in_file, uid=mix.uid)
else:
print "File %s not found" % in_file print "File %s not found" % in_file
return
create_waveform_task.delay(in_file=in_file, uid=mix.uid)
except Exception, ex: except Exception, ex:
print "Error generating waveform: %s" % ex.message print "Error generating waveform: %s" % ex.message

6
spa/models/mix.py
View File

@@ -91,6 +91,12 @@ class Mix(_BaseModel):
extension = ".mp3" extension = ".mp3"
return '%s/mixes/%s%s%s' % (settings.MEDIA_ROOT, prefix, self.uid, extension) return '%s/mixes/%s%s%s' % (settings.MEDIA_ROOT, prefix, self.uid, extension)
def get_cache_path(self, prefix=""):
fileName, extension = os.path.splitext(self.local_file.name)
if extension == "" or extension == ".":
extension = ".mp3"
return '%s/mixes/%s%s%s' % (settings.CACHE_ROOT, prefix, self.uid, extension)
def get_absolute_url(self): def get_absolute_url(self):
return '/mix/%s' % self.slug return '/mix/%s' % self.slug