Updated some CDN urls

This commit is contained in:
Fergal Moran
2015-07-30 22:06:43 +01:00
parent 71fa592f4b
commit c636c4afa2
5 changed files with 42 additions and 12 deletions

View File

@@ -0,0 +1,22 @@
import os
from django.core.management.base import NoArgsCommand
from core.utils import cdn
from spa.models import Mix
class Command(NoArgsCommand):
def handle_noargs(self, **options):
try:
print 'Enumerating items'
items = cdn.enumerate_objects('mixes')
for item in items:
# Check if we have a corresponding mix
uid, type = os.path.splitext(item)
try:
Mix.objects.get(uid=uid)
except Mix.DoesNotExist:
# no mix found - delete the blob
cdn.delete_object('mixes', item)
print "Deleting blob: {0}".format(uid)
except Exception, ex:
print "Debug exception: %s" % ex.message

View File

@@ -10,7 +10,7 @@ from dss import localsettings, settings
class BaseModel(models.Model):
logger = logging.getLogger(__name__)
logger = logging.getLogger('dss')
object_created = models.DateTimeField(auto_now_add=True, default=datetime.now())
object_updated = models.DateTimeField(auto_now=True, default=datetime.now(), db_index=True)

View File

@@ -166,15 +166,10 @@ class Mix(BaseModel):
def get_image_url(self, size='200x200', default=''):
try:
if self.mix_image.name and self.mix_image.storage.exists(self.mix_image.name):
ret = get_thumbnail(self.mix_image, size, crop='center')
return "%s/%s" % (settings.MEDIA_URL, ret.name)
else:
return self.user.get_sized_avatar_image(170, 170)
return "{0}{1}".format(settings.MIXIMAGE_URL, os.path.basename(self.mix_image.name))
except Exception, ex:
pass
return super(Mix, self).get_image_url(self.mix_image, settings.DEFAULT_TRACK_IMAGE)
self.logger.exception(ex)
return super(Mix, self).get_image_url(self.mix_image, settings.DEFAULT_TRACK_IMAGE)
def get_stream_url(self):
if self.archive_path in [None, '']: