From 70d495bfaf26b78093aa6e6dcd8576efce68043c Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Tue, 26 Aug 2014 18:55:23 +0100
Subject: [PATCH] Azure storage fixes

---
 .gitignore        | 1 +
 dss/settings.py   | 5 +++--
 spa/models/mix.py | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91a36aa..f8e5bc9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ build/*
 _working/*
 static/CACHE/*
 dss/localsettings.py
+dss/storagesettings.py
 dss/celery_settings.py
 dss.conf
 dss/debugsettings.py
diff --git a/dss/settings.py b/dss/settings.py
index 42b414d..a9a9ce8 100755
--- a/dss/settings.py
+++ b/dss/settings.py
@@ -10,6 +10,7 @@ from utils import here
 
 from localsettings import *
 from pipelinesettings import *
+from storagesettings import *
 from paymentsettings import *
 
 DEVELOPMENT = DEBUG
@@ -35,7 +36,7 @@ DATABASES = {
     }
 }
 import sys
-if 'test' in sys.argv or 'test_coverage' in sys.argv: #Covers regular testing and django-coverage
+if 'test' in sys.argv or 'test_coverage' in sys.argv:
     print "Testing"
     DATABASES['default']['ENGINE'] = 'django.db.backends.sqlite3'
 
@@ -138,7 +139,7 @@ INSTALLED_APPS = (
     'djrill',
     'paypal.standard.ipn',
     'django_user_agents',
-     'storages',
+    'storages',
     #'backbone_tastypie',
 )
 
diff --git a/spa/models/mix.py b/spa/models/mix.py
index 9defa76..0769316 100755
--- a/spa/models/mix.py
+++ b/spa/models/mix.py
@@ -65,6 +65,7 @@ class Mix(BaseModel):
     filetype = models.CharField(max_length=10, blank=False, default="mp3")
     download_allowed = models.BooleanField(default=False)
     duration = models.IntegerField(null=True, blank=True)
+    archive_path = models.CharField(max_length=2048, null=True, blank=True)
     slug = models.SlugField()
 
     genres = models.ManyToManyField(Genre)
@@ -163,6 +164,12 @@ class Mix(BaseModel):
 
     def get_stream_path(self):
         ret = url_path_join(localsettings.STREAM_URL, "%s.mp3" % self.uid)
+        """
+        if self.archive_path in [None, '']:
+            ret = url_path_join(localsettings.STREAM_URL, "%s.mp3" % self.uid)
+        else:
+            ret = self.archive_path
+        """
         return ret
 
     #used for podcast xml