Altered mix-image handler

2025-12-29 13:08:02 +00:00 · 2012-09-12 21:42:38 +01:00
parent f582d2b78f
commit 6434307409
532 changed files with 2 additions and 6 deletions
--- a/0
+++ b/0
--- a/0
+++ b/0
--- a/_working/create
+++ b/_working/create
--- a/_working/event.sql
+++ b/_working/event.sql
--- a/_working/label.sql
+++ b/_working/label.sql
--- a/_working/mix.sql
+++ b/_working/mix.sql
--- a/_working/recurrence.sql
+++ b/_working/recurrence.sql
--- a/_working/release.sql
+++ b/_working/release.sql
--- a/_working/release_audio.sql
+++ b/_working/release_audio.sql
--- a/_working/social.sql
+++ b/_working/social.sql
--- a/_working/venue.sql
+++ b/_working/venue.sql
--- a/apache/django_live.wsgi
+++ b/apache/django_live.wsgi
--- a/core/init.py
+++ b/core/init.py
--- a/core/analytics/init.py
+++ b/core/analytics/init.py
--- a/core/analytics/google.py
+++ b/core/analytics/google.py
--- a/core/decorators.py
+++ b/core/decorators.py
--- a/core/serialisers/init.py
+++ b/core/serialisers/init.py
--- a/core/serialisers/json.py
+++ b/core/serialisers/json.py
--- a/core/social/Facebook.py
+++ b/core/social/Facebook.py
--- a/core/social/_Social.py
+++ b/core/social/_Social.py
--- a/core/social/init.py
+++ b/core/social/init.py
--- a/core/tasks.py
+++ b/core/tasks.py
--- a/core/tests/init.py
+++ b/core/tests/init.py
--- a/core/tests/mix.py
+++ b/core/tests/mix.py
--- a/core/utils/init.py
+++ b/core/utils/init.py
--- a/core/utils/file.py
+++ b/core/utils/file.py
--- a/core/utils/html.py
+++ b/core/utils/html.py
--- a/core/utils/live.py
+++ b/core/utils/live.py
--- a/core/utils/waveform.py
+++ b/core/utils/waveform.py
--- a/core/widgets/init.py
+++ b/core/widgets/init.py
--- a/core/widgets/upload.py
+++ b/core/widgets/upload.py
--- a/dss/init.py
+++ b/dss/init.py
--- a/dss/settings.py
+++ b/dss/settings.py
--- a/dss/urls.py
+++ b/dss/urls.py
--- a/dss/wsgi.py
+++ b/dss/wsgi.py
--- a/initial_data.json
+++ b/initial_data.json
--- a/manage.py
+++ b/manage.py
--- a/requirements.txt
+++ b/requirements.txt
--- a/spa/init.py
+++ b/spa/init.py
--- a/spa/admin.py
+++ b/spa/admin.py
--- a/spa/ajax.py
+++ b/spa/ajax.py
--- a/spa/api/init.py
+++ b/spa/api/init.py
--- a/spa/api/v1/BackboneCompatibleResource.py
+++ b/spa/api/v1/BackboneCompatibleResource.py
--- a/spa/api/v1/CommentResource.py
+++ b/spa/api/v1/CommentResource.py
--- a/spa/api/v1/EventResource.py
+++ b/spa/api/v1/EventResource.py
--- a/spa/api/v1/MixResource.py
+++ b/spa/api/v1/MixResource.py
--- a/spa/api/v1/ReleaseAudioResource.py
+++ b/spa/api/v1/ReleaseAudioResource.py
--- a/spa/api/v1/ReleaseResource.py
+++ b/spa/api/v1/ReleaseResource.py
--- a/spa/api/v1/UserResource.py
+++ b/spa/api/v1/UserResource.py
--- a/spa/api/v1/init.py
+++ b/spa/api/v1/init.py
--- a/spa/audio.py
+++ b/spa/audio.py
--- a/spa/forms.py
+++ b/spa/forms.py
--- a/spa/management/init.py
+++ b/spa/management/init.py
--- a/spa/management/commands/init.py
+++ b/spa/management/commands/init.py
--- a/spa/management/commands/drop.py
+++ b/spa/management/commands/drop.py
--- a/spa/management/commands/purchaselinks.py
+++ b/spa/management/commands/purchaselinks.py
--- a/spa/management/commands/tracklists.py
+++ b/spa/management/commands/tracklists.py
--- a/spa/management/commands/waveforms.py
+++ b/spa/management/commands/waveforms.py
--- a/spa/models/Comment.py
+++ b/spa/models/Comment.py
--- a/spa/models/Event.py
+++ b/spa/models/Event.py
--- a/spa/models/Label.py
+++ b/spa/models/Label.py
--- a/spa/models/Mix.py
+++ b/spa/models/Mix.py
@@ -54,12 +54,8 @@ class Mix(_BaseModel):
        return ret

    def get_image(self):
-        image_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else "%s/mix-images/" % settings.MEDIA_URL
-        ret = "%s/%s.%s" % (image_root, self.uid, "png")
-
-        if os.path.exists(self.mix_image.file.name):
-            return ret
-
+        image_root = localsettings.IMAGE_URL if hasattr(localsettings, 'IMAGE_URL') else settings.MEDIA_URL
+        ret = "%s/%s" % (image_root, self.mix_image.name)
        return settings.STATIC_URL + 'img/default-track.png'

    def get_stream_path(self):
--- a/spa/models/MixFavourite.py
+++ b/spa/models/MixFavourite.py
--- a/spa/models/MixLike.py
+++ b/spa/models/MixLike.py
--- a/spa/models/MixPlay.py
+++ b/spa/models/MixPlay.py
--- a/spa/models/PurchaseLink.py
+++ b/spa/models/PurchaseLink.py
--- a/spa/models/Recurrence.py
+++ b/spa/models/Recurrence.py
--- a/spa/models/Release.py
+++ b/spa/models/Release.py
--- a/spa/models/Tracklist.py
+++ b/spa/models/Tracklist.py
--- a/spa/models/UserProfile.py
+++ b/spa/models/UserProfile.py
--- a/spa/models/Venue.py
+++ b/spa/models/Venue.py
--- a/spa/models/_Activity.py
+++ b/spa/models/_Activity.py
--- a/spa/models/_BaseModel.py
+++ b/spa/models/_BaseModel.py
--- a/spa/models/_Lookup.py
+++ b/spa/models/_Lookup.py
--- a/spa/models/init.py
+++ b/spa/models/init.py
--- a/spa/social.py
+++ b/spa/social.py
--- a/spa/templates.py
+++ b/spa/templates.py
--- a/spa/templatetags/init.py
+++ b/spa/templatetags/init.py
--- a/spa/templatetags/spa_extras.py
+++ b/spa/templatetags/spa_extras.py
--- a/spa/urls.py
+++ b/spa/urls.py
--- a/spa/views.py
+++ b/spa/views.py
--- a/static/bin/sm/soundmanager2.swf
+++ b/static/bin/sm/soundmanager2.swf
--- a/static/bin/sm/soundmanager2_debug.swf
+++ b/static/bin/sm/soundmanager2_debug.swf
--- a/static/bin/sm/soundmanager2_flash9.swf
+++ b/static/bin/sm/soundmanager2_flash9.swf
--- a/static/bin/sm/soundmanager2_flash9_debug.swf
+++ b/static/bin/sm/soundmanager2_flash9_debug.swf
--- a/static/bin/sm/soundmanager2_flash_xdomain.zip
+++ b/static/bin/sm/soundmanager2_flash_xdomain.zip
--- a/static/css/bootstrap/bootstrap-datepicker.css
+++ b/static/css/bootstrap/bootstrap-datepicker.css
--- a/static/css/bootstrap/bootstrap-responsive.css
+++ b/static/css/bootstrap/bootstrap-responsive.css
--- a/static/css/bootstrap/bootstrap-responsive.min.css
+++ b/static/css/bootstrap/bootstrap-responsive.min.css
--- a/static/css/bootstrap/bootstrap-timepicker.css
+++ b/static/css/bootstrap/bootstrap-timepicker.css
--- a/static/css/bootstrap/bootstrap.css
+++ b/static/css/bootstrap/bootstrap.css
--- a/static/css/bootstrap/bootstrap.min.css
+++ b/static/css/bootstrap/bootstrap.min.css
--- a/static/css/colorbox.css
+++ b/static/css/colorbox.css
--- a/static/css/com.podnoms.player.css
+++ b/static/css/com.podnoms.player.css
--- a/static/css/deepsouthsounds.css
+++ b/static/css/deepsouthsounds.css
--- a/static/css/jasny/jasny-bootstrap-responsive.css
+++ b/static/css/jasny/jasny-bootstrap-responsive.css
--- a/static/css/jasny/jasny-bootstrap-responsive.min.css
+++ b/static/css/jasny/jasny-bootstrap-responsive.min.css
--- a/static/css/jasny/jasny-bootstrap.css
+++ b/static/css/jasny/jasny-bootstrap.css
--- a/static/css/jasny/jasny-bootstrap.min.css
+++ b/static/css/jasny/jasny-bootstrap.min.css
--- a/static/css/uploadifive.css
+++ b/static/css/uploadifive.css
--- a/Show More
+++ b/Show More