#93: reorganise Rerun, Diffusion, Schedule module (#95)

#93

Co-authored-by: bkfox <thomas bkfox net>
Reviewed-on: rc/aircox#95

aircox/admin/__init__.py

@@ -1,9 +1,11 @@
 from . import filters
 from .article import ArticleAdmin
-from .episode import DiffusionAdmin, EpisodeAdmin
+from .diffusion import DiffusionAdmin
+from .episode import EpisodeAdmin
 from .log import LogAdmin
 from .page import PageAdmin, StaticPageAdmin
-from .program import ProgramAdmin, ScheduleAdmin, StreamAdmin
+from .program import ProgramAdmin, StreamAdmin
+from .schedule import ScheduleAdmin
 from .sound import SoundAdmin, TrackAdmin
 from .station import StationAdmin
 

aircox/admin/diffusion.py

@@ -0,0 +1,48 @@
+from django.contrib import admin
+from django.utils.translation import gettext as _
+
+from aircox.models import Diffusion
+
+
+__all__ = ("DiffusionBaseAdmin", "DiffusionAdmin", "DiffusionInline")
+
+
+class DiffusionBaseAdmin:
+    fields = ("type", "start", "end", "schedule")
+    readonly_fields = ("schedule",)
+
+    def get_readonly_fields(self, request, obj=None):
+        fields = super().get_readonly_fields(request, obj)
+        if not request.user.has_perm("aircox_program.scheduling"):
+            fields = fields + ("program", "start", "end")
+        return [field for field in fields if field in self.fields]
+
+
+@admin.register(Diffusion)
+class DiffusionAdmin(DiffusionBaseAdmin, admin.ModelAdmin):
+    def start_date(self, obj):
+        return obj.local_start.strftime("%Y/%m/%d %H:%M")
+
+    start_date.short_description = _("start")
+
+    def end_date(self, obj):
+        return obj.local_end.strftime("%H:%M")
+
+    end_date.short_description = _("end")
+
+    list_display = ("episode", "start_date", "end_date", "type", "initial")
+    list_filter = ("type", "start", "program")
+    list_editable = ("type",)
+    ordering = ("-start", "id")
+
+    fields = ("type", "start", "end", "initial", "program", "schedule")
+    readonly_fields = ("schedule",)
+
+
+class DiffusionInline(DiffusionBaseAdmin, admin.TabularInline):
+    model = Diffusion
+    fk_name = "episode"
+    extra = 0
+
+    def has_add_permission(self, request, obj):
+        return request.user.has_perm("aircox_program.scheduling")

aircox/admin/episode.py

@@ -1,52 +1,11 @@
 from adminsortable2.admin import SortableAdminBase
 from django.contrib import admin
 from django.forms import ModelForm
-from django.utils.translation import gettext as _
 
-from ..models import Diffusion, Episode
+from aircox.models import Episode
 from .page import PageAdmin
 from .sound import SoundInline, TrackInline
-
-
-class DiffusionBaseAdmin:
-    fields = ("type", "start", "end", "schedule")
-    readonly_fields = ("schedule",)
-
-    def get_readonly_fields(self, request, obj=None):
-        fields = super().get_readonly_fields(request, obj)
-        if not request.user.has_perm("aircox_program.scheduling"):
-            fields = fields + ("program", "start", "end")
-        return [field for field in fields if field in self.fields]
-
-
-@admin.register(Diffusion)
-class DiffusionAdmin(DiffusionBaseAdmin, admin.ModelAdmin):
-    def start_date(self, obj):
-        return obj.local_start.strftime("%Y/%m/%d %H:%M")
-
-    start_date.short_description = _("start")
-
-    def end_date(self, obj):
-        return obj.local_end.strftime("%H:%M")
-
-    end_date.short_description = _("end")
-
-    list_display = ("episode", "start_date", "end_date", "type", "initial")
-    list_filter = ("type", "start", "program")
-    list_editable = ("type",)
-    ordering = ("-start", "id")
-
-    fields = ("type", "start", "end", "initial", "program", "schedule")
-    readonly_fields = ("schedule",)
-
-
-class DiffusionInline(DiffusionBaseAdmin, admin.TabularInline):
-    model = Diffusion
-    fk_name = "episode"
-    extra = 0
-
-    def has_add_permission(self, request, obj):
-        return request.user.has_perm("aircox_program.scheduling")
+from .diffusion import DiffusionInline
 
 
 class EpisodeAdminForm(ModelForm):

aircox/admin/program.py

@@ -1,26 +1,12 @@
 from django.contrib import admin
-from django.forms import ModelForm
 from django.utils.translation import gettext_lazy as _
 
-from ..models import Program, Schedule, Stream
+from aircox.models import Program, Schedule, Stream
 from .page import PageAdmin
+from .schedule import ScheduleInline
 
 
-# In order to simplify schedule_post_save algorithm, an existing schedule can't
-# update the following fields: "frequency", "date"
-class ScheduleInlineForm(ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if self.initial:
-            self.fields["date"].disabled = True
-            self.fields["frequency"].disabled = True
-
-
-class ScheduleInline(admin.TabularInline):
-    model = Schedule
-    form = ScheduleInlineForm
-    readonly_fields = ("timezone",)
-    extra = 1
+__all__ = ("ProgramAdmin", "StreamInline", "StreamAdmin")
 
 
 class StreamInline(admin.TabularInline):
@@ -58,36 +44,6 @@ class ProgramAdmin(PageAdmin):
         return fields
 
 
-@admin.register(Schedule)
-class ScheduleAdmin(admin.ModelAdmin):
-    def program_title(self, obj):
-        return obj.program.title
-
-    program_title.short_description = _("Program")
-
-    def freq(self, obj):
-        return obj.get_frequency_verbose()
-
-    freq.short_description = _("Day")
-
-    list_filter = ["frequency", "program"]
-    list_display = [
-        "program_title",
-        "freq",
-        "time",
-        "timezone",
-        "duration",
-        "initial",
-    ]
-    list_editable = ["time", "duration", "initial"]
-
-    def get_readonly_fields(self, request, obj=None):
-        if obj:
-            return ["program", "date", "frequency"]
-        else:
-            return []
-
-
 @admin.register(Stream)
 class StreamAdmin(admin.ModelAdmin):
     list_display = ("id", "program", "delay", "begin", "end")

aircox/admin/schedule.py

@@ -0,0 +1,55 @@
+from django.contrib import admin
+from django.forms import ModelForm
+from django.utils.translation import gettext_lazy as _
+
+from aircox.models import Schedule
+
+
+__all__ = ("ScheduleInlineForm", "ScheduleInline", "ScheduleAdmin")
+
+
+# In order to simplify schedule_post_save algorithm, an existing schedule can't
+# update the following fields: "frequency", "date"
+class ScheduleInlineForm(ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if self.initial:
+            self.fields["date"].disabled = True
+            self.fields["frequency"].disabled = True
+
+
+class ScheduleInline(admin.TabularInline):
+    model = Schedule
+    form = ScheduleInlineForm
+    readonly_fields = ("timezone",)
+    extra = 1
+
+
+@admin.register(Schedule)
+class ScheduleAdmin(admin.ModelAdmin):
+    def program_title(self, obj):
+        return obj.program.title
+
+    program_title.short_description = _("Program")
+
+    def freq(self, obj):
+        return obj.get_frequency_display()
+
+    freq.short_description = _("Day")
+
+    list_filter = ["frequency", "program"]
+    list_display = [
+        "program_title",
+        "freq",
+        "time",
+        "timezone",
+        "duration",
+        "initial",
+    ]
+    list_editable = ["time", "duration", "initial"]
+
+    def get_readonly_fields(self, request, obj=None):
+        if obj:
+            return ["program", "date", "frequency"]
+        else:
+            return []