stamina: add settings/hack to merge tracks from multiple zones

diff --git a/nonstop/app_settings.py b/nonstop/app_settings.py
index 2ea71cf829500d507d32e2ba2527bc7ef17bcd68..641f1aad00310df8afcb2df78d340ce35c65147f 100644 (file)
--- a/nonstop/app_settings.py
+++ b/nonstop/app_settings.py
@@ -50,5 +50,12 @@ class AppSettings:
     def SERVER_BIND_PORT(self):
         return self.get_setting('SERVER_BIND_PORT', 8888)
 
     def SERVER_BIND_PORT(self):
         return self.get_setting('SERVER_BIND_PORT', 8888)
 

+    @property
+    def EXTRA_ZONES(self):
+        # zone slug to list of zone slugs,
+        # ex: {"le-mange-disque": ['hop-bop-and-co', 'up-beat-tempo']}
+        # to get tracks from additional zones.
+        return self.get_setting('EXTRA_ZONES', {})
+

 
 app_settings = AppSettings()
 
 app_settings = AppSettings()

diff --git a/nonstop/management/commands/stamina.py b/nonstop/management/commands/stamina.py
index a740db278b55614e4f527e7924a716a934e9b883..768e455d39ff6c02c494c1c17cc07d2a920c2532 100644 (file)
--- a/nonstop/management/commands/stamina.py
+++ b/nonstop/management/commands/stamina.py
@@ -108,9 +108,13 @@ class Command(BaseCommand):
                 current_datetime = start_datetime + sum(
                         [x.duration for x in playlist], datetime.timedelta(seconds=0))
 
                 current_datetime = start_datetime + sum(
                         [x.duration for x in playlist], datetime.timedelta(seconds=0))
 

+            zone_ids = [zone.id]
+            extra_zones = app_settings.EXTRA_ZONES.get(zone.slug)
+            if extra_zones:
+                zone_ids.extend([x.id for x in Nonstop.objects.filter(slug__in=extra_zones)])

             remaining_time = (end_datetime - current_datetime)
             track = Track.objects.filter(
             remaining_time = (end_datetime - current_datetime)
             track = Track.objects.filter(

-                    nonstop_zones=zone,
+                    nonstop_zones__in=zone_ids,

                     duration__isnull=False).exclude(
                             id__in=recent_tracks_id + [x.id for x in playlist if isinstance(x, Track)]
                     ).order_by('?').first()
                     duration__isnull=False).exclude(
                             id__in=recent_tracks_id + [x.id for x in playlist if isinstance(x, Track)]
                     ).order_by('?').first()