add a settings for jingles path prefix

diff --git a/nonstop/app_settings.py b/nonstop/app_settings.py
index 5633ecfb87c83b34462c2a1251932b1972ad80db..92d755cae9f605e7db58e77b4e8c02097fa89edd 100644 (file)
--- a/nonstop/app_settings.py
+++ b/nonstop/app_settings.py
@@ -13,5 +13,10 @@ class AppSettings:
     def LOCAL_BASE_PATH(self):
         return self.get_setting('LOCAL_BASE_PATH', '/media/nonstop/')
 
+    @property
+    def JINGLES_PREFIX(self):
+        # relative to ..._BASE_PATH
+        return self.get_setting('JINGLES_PREFIX', 'SPOTS')
+
 
 app_settings = AppSettings()

diff --git a/nonstop/management/commands/create_tracks_from_nonstop.py b/nonstop/management/commands/create_tracks_from_nonstop.py
index 8f8fc3c230561ec223c2962673463915ab8f5f9e..ce77428f295970b70cf1076b15af115235572d09 100644 (file)
--- a/nonstop/management/commands/create_tracks_from_nonstop.py
+++ b/nonstop/management/commands/create_tracks_from_nonstop.py
@@ -38,7 +38,7 @@ class Command(BaseCommand):
             if self.verbose:
                 print(i, count, filepath)
             short_filepath = filepath[len(app_settings.LOCAL_BASE_PATH):]
-            if short_filepath.startswith('SPOTS'):
+            if short_filepath.startswith(app_settings.JINGLES_PREFIX):
                 continue
             if not os.path.exists(filepath):
                 if self.verbose and short_filepath.startswith('Tranches'):

diff --git a/nonstop/models.py b/nonstop/models.py
index f7f5e283b7972ac024588bdb99a3b0710315be17..1466ed99f8f04b4e2637866f7ad31eb23ec72b9b 100644 (file)
--- a/nonstop/models.py
+++ b/nonstop/models.py
@@ -198,7 +198,7 @@ class Jingle(models.Model):
     def get_local_filepath(self):
         if not self.short:
             return None
-        return os.path.join(app_settings.LOCAL_BASE_PATH, 'SPOTS', self.short)
+        return os.path.join(app_settings.LOCAL_BASE_PATH, app_settings.JINGLES_PREFIX, self.short)
 
     @property
     def title(self):

diff --git a/nonstop/views.py b/nonstop/views.py
index 3984318648df4538ce6f253014e84e0e57a5178c..5130989db3f4813a33d099db560964fe23f37cfc 100644 (file)
--- a/nonstop/views.py
+++ b/nonstop/views.py
@@ -404,4 +404,4 @@ class DelSomaDiffusionView(RedirectView):
 
 def jingle_audio_view(request, *args, **kwargs):
     jingle = Jingle.objects.get(id=kwargs['pk'])
-    return FileResponse(open(os.path.join(app_settings.LOCAL_BASE_PATH, 'SPOTS', jingle.filepath), 'rb'))
+    return FileResponse(open(os.path.join(app_settings.LOCAL_BASE_PATH, app_settings.JINGLES_PREFIX, jingle.filepath), 'rb'))