remove Station model (to much trouble for few advantages); start new player; rename Post.detail_url to Post.url, same for ListItem; move Article into website app; add website.Sound post; work on lists;...

liquidsoap/utils.py

@@ -295,12 +295,11 @@ class Controller:
         files dir.
         """
         self.id = station.slug
-        self.name = station.name
-        self.path = os.path.join(settings.AIRCOX_LIQUIDSOAP_MEDIA, station.slug)
+        self.name = station
+        self.path = os.path.join(settings.AIRCOX_LIQUIDSOAP_MEDIA,
+                                 slugify(station))
 
-        self.station = station
-        self.station.controller = self
-        self.outputs = models.Output.objects.filter(station = station)
+        self.outputs = models.Output.objects.all()
 
         self.connector = connector and Connector(self.socket_path)
 
@@ -310,8 +309,7 @@ class Controller:
             source.id : source
             for source in [
                 Source(self, program)
-                for program in programs.Program.objects.filter(station = station,
-                                                             active = True)
+                for program in programs.Program.objects.filter(active = True)
                 if program.stream_set.count()
             ]
         }
@@ -370,23 +368,3 @@ class Controller:
             file.write(data)
 
 
-class Monitor:
-    """
-    Monitor multiple controllers.
-    """
-    controllers = None
-
-    def __init__(self):
-        self.controllers = {
-            controller.id : controller
-            for controller in [
-                Controller(station, True)
-                for station in programs.Station.objects.filter(active = True)
-            ]
-        }
-
-    def update(self):
-        for controller in self.controllers.values():
-            controller.update()
-
-