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

Fixed media serving

Browse Source
This commit is contained in:
Fergal Moran
2015-07-31 22:53:15 +01:00
parent 0b7d65e716
commit fa9c6ba3d7
8 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spa/models/mix.py
View File

@@ -166,11 +166,13 @@ class Mix(BaseModel):
def get_image_url(self, size='200x200', default=''):
try:
filename = os.path.basename(self.mix_image.name)
if cdn.file_exists('{0}{1}'.format(localsettings.MIXIMAGE_URL, filename)):
return "{0}{1}".format(settings.MIXIMAGE_URL, filename)
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 url.urlclean("%s/%s" % (settings.MEDIA_URL, ret.name))
else:
return self.user.get_sized_avatar_image(170, 170)
except Exception, ex:
self.logger.exception(ex)
pass
return super(Mix, self).get_image_url(self.mix_image, settings.DEFAULT_TRACK_IMAGE)