ThreadRoute.title as url; update scripts about old Diffusion.sounds -> Sound.Diffusion (still need tests); cleanup unused and old code

liquidsoap/management/commands/liquidsoap.py

@@ -95,15 +95,18 @@ class Monitor:
 
         # - preload next diffusion's tracks
         args = {'start__gt': prev_diff.start } if prev_diff else {}
-        next_diff = programs.Diffusion \
-                        .get(now, now = True,
-                             type = programs.Diffusion.Type.normal,
-                             sounds__isnull = False,
-                             **args) \
-                        .prefetch_related('sounds')
+        next_diff = programs.Diffusion.get(
+            now, now = True,
+            type = programs.Diffusion.Type.normal,
+            **args
+        )
         if next_diff:
-            next_diff = next_diff[0]
-            playlist += next_diff.playlist
+            for diff in next_diffs:
+                if not diff.playlist:
+                    continue
+                next_diff = diff
+                playlist += next_diff.playlist
+                break
 
         # playlist update
         if dealer.playlist != playlist:

liquidsoap/management/commands/liquidsoap_log.py

@@ -1,62 +0,0 @@
-"""
-This script is used by liquidsoap in order to log a file change. It should not
-be used for other purposes.
-"""
-import os
-from argparse import RawTextHelpFormatter
-
-from django.utils import timezone as tz
-from django.core.management.base import BaseCommand, CommandError
-
-import aircox.programs.models as programs
-
-
-class Command (BaseCommand):
-    help= __doc__
-
-    @staticmethod
-    def date(s):
-        try:
-            return tz.make_aware(tz.datetime.strptime(s, '%Y/%m/%d %H:%M:%S'))
-        except ValueError:
-            raise argparse.ArgumentTypeError('Invalid date format')
-
-
-    def add_arguments (self, parser):
-        parser.formatter_class=RawTextHelpFormatter
-        parser.add_argument(
-            '-c', '--comment', type=str,
-            help='log comment'
-        )
-        parser.add_argument(
-            '-s', '--source', type=str,
-            required=True,
-            help='source path'
-        )
-        parser.add_argument(
-            '-p', '--path', type=str,
-            required=True,
-            help='sound path to log'
-        )
-        parser.add_argument(
-            '-d', '--date', type=Command.date,
-            help='set date instead of now (using format "%Y/%m/%d %H:%M:%S")'
-        )
-
-
-    def handle (self, *args, **options):
-        comment = options.get('comment') or ''
-        path = os.path.realpath(options.get('path'))
-
-        sound = programs.Sound.objects.filter(path = path)
-        if sound:
-            sound = sound[0]
-        else:
-            sound = None
-            comment += '\nunregistered sound: {}'.format(path)
-
-        programs.Log(source = options.get('source'),
-                     comment = comment,
-                     related_object = sound).save()
-
-