- various __all__

- serializer: track search, reorder module files
- autocomplete: allow simple string value selection
- playlist editor:
    - ui & flow improve
    - init data
    - save user settings
    - autocomplete
    - fix bugs
    - discard changes

aircox/models/__init__.py

@@ -1,10 +1,11 @@
-from .article import Article
-from .page import Category, Page, StaticPage, Comment, NavItem
-from .program import Program, Stream, Schedule
-from .episode import Episode, Diffusion
-from .log import Log
-from .sound import Sound, Track
-from .station import Station, Port
+from .article import *
+from .page import *
+from .program import *
+from .episode import *
+from .log import *
+from .sound import *
+from .station import *
+from .user_settings import *
 
 from . import signals
 

aircox/models/article.py

@@ -1,8 +1,10 @@
-from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from .page import Page, PageQuerySet
-from .program import Program, ProgramChildQuerySet
+from .page import Page
+from .program import ProgramChildQuerySet
+
+
+__all__ = ('Article',)
 
 
 class Article(Page):

aircox/models/episode.py

@@ -9,12 +9,12 @@ from django.utils.functional import cached_property
 from easy_thumbnails.files import get_thumbnailer
 
 from aircox import settings, utils
-from .program import Program, ProgramChildQuerySet, \
+from .program import ProgramChildQuerySet, \
         BaseRerun, BaseRerunQuerySet, Schedule
-from .page import Page, PageQuerySet
+from .page import Page
 
 
-__all__ = ['Episode', 'Diffusion', 'DiffusionQuerySet']
+__all__ = ('Episode', 'Diffusion', 'DiffusionQuerySet')
 
 
 class Episode(Page):
@@ -31,9 +31,9 @@ class Episode(Page):
         """ Return serialized data about podcasts. """
         from ..serializers import PodcastSerializer
         podcasts = [PodcastSerializer(s).data
-                    for s in self.sound_set.public().order_by('type') ]
+                    for s in self.sound_set.public().order_by('type')]
         if self.cover:
-            options = {'size': (128,128), 'crop':'scale'}
+            options = {'size': (128, 128), 'crop': 'scale'}
             cover = get_thumbnailer(self.cover).get_thumbnail(options).url
         else:
             cover = None
@@ -84,7 +84,7 @@ class DiffusionQuerySet(BaseRerunQuerySet):
     def episode(self, episode=None, id=None):
         """ Diffusions for this episode """
         return self.filter(episode=episode) if id is None else \
-               self.filter(episode__id=id)
+            self.filter(episode__id=id)
 
     def on_air(self):
         """ On air diffusions """
@@ -104,13 +104,13 @@ class DiffusionQuerySet(BaseRerunQuerySet):
         end = tz.datetime.combine(date, datetime.time(23, 59, 59, 999))
         # start = tz.get_current_timezone().localize(start)
         # end = tz.get_current_timezone().localize(end)
-        qs = self.filter(start__range = (start, end))
+        qs = self.filter(start__range=(start, end))
         return qs.order_by('start') if order else qs
 
     def at(self, date, order=True):
         """ Return diffusions at specified date or datetime """
         return self.now(date, order) if isinstance(date, tz.datetime) else \
-               self.date(date, order)
+            self.date(date, order)
 
     def after(self, date=None):
         """
@@ -201,7 +201,7 @@ class Diffusion(BaseRerun):
 
     def __str__(self):
         str_ = '{episode} - {date}'.format(
-            self=self, episode=self.episode and self.episode.title,
+            episode=self.episode and self.episode.title,
             date=self.local_start.strftime('%Y/%m/%d %H:%M%z'),
         )
         if self.initial:
@@ -324,5 +324,3 @@ class Diffusion(BaseRerun):
             'end': self.end,
             'episode': getattr(self, 'episode', None),
         }
-
-

aircox/models/log.py

@@ -20,7 +20,7 @@ from .station import Station
 logger = logging.getLogger('aircox')
 
 
-__all__ = ['Log', 'LogQuerySet', 'LogArchiver']
+__all__ = ('Log', 'LogQuerySet', 'LogArchiver')
 
 
 class LogQuerySet(models.QuerySet):
@@ -31,7 +31,7 @@ class LogQuerySet(models.QuerySet):
     def date(self, date):
         start = tz.datetime.combine(date, datetime.time())
         end = tz.datetime.combine(date, datetime.time(23, 59, 59, 999))
-        return self.filter(date__range = (start, end))
+        return self.filter(date__range=(start, end))
         # this filter does not work with mysql
         # return self.filter(date__date=date)
 

aircox/models/page.py

@@ -1,4 +1,3 @@
-from enum import IntEnum
 import re
 
 from django.db import models
@@ -18,7 +17,8 @@ from model_utils.managers import InheritanceQuerySet
 from .station import Station
 
 
-__all__ = ['Category', 'PageQuerySet', 'Page', 'Comment', 'NavItem']
+__all__ = ('Category', 'PageQuerySet',
+           'Page', 'StaticPage', 'Comment', 'NavItem')
 
 
 headline_re = re.compile(r'(<p>)?'

aircox/models/program.py

@@ -1,6 +1,5 @@
 import calendar
 from collections import OrderedDict
-import datetime
 from enum import IntEnum
 import logging
 import os
@@ -10,7 +9,7 @@ import pytz
 from django.conf import settings as conf
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import F, Q
+from django.db.models import F
 from django.db.models.functions import Concat, Substr
 from django.utils import timezone as tz
 from django.utils.translation import gettext_lazy as _
@@ -24,8 +23,8 @@ from .station import Station
 logger = logging.getLogger('aircox')
 
 
-__all__ = ['Program', 'ProgramQuerySet', 'Stream', 'Schedule',
-           'ProgramChildQuerySet', 'BaseRerun', 'BaseRerunQuerySet']
+__all__ = ('Program', 'ProgramQuerySet', 'Stream', 'Schedule',
+           'ProgramChildQuerySet', 'BaseRerun', 'BaseRerunQuerySet')
 
 
 class ProgramQuerySet(PageQuerySet):

aircox/models/signals.py

@@ -2,7 +2,7 @@ import pytz
 
 from django.contrib.auth.models import User, Group, Permission
 from django.db import transaction
-from django.db.models import F, signals
+from django.db.models import signals
 from django.dispatch import receiver
 from django.utils import timezone as tz
 

aircox/models/sound.py

@@ -1,17 +1,14 @@
-from enum import IntEnum
 import logging
 import os
 
 from django.conf import settings as conf
 from django.db import models
-from django.db.models import Q, Value as V
-from django.db.models.functions import Concat
+from django.db.models import Q
 from django.utils import timezone as tz
 from django.utils.translation import gettext_lazy as _
 
 from taggit.managers import TaggableManager
 
-from aircox import settings
 from .program import Program
 from .episode import Episode
 
@@ -19,7 +16,7 @@ from .episode import Episode
 logger = logging.getLogger('aircox')
 
 
-__all__ = ['Sound', 'SoundQuerySet', 'Track']
+__all__ = ('Sound', 'SoundQuerySet', 'Track')
 
 
 class SoundQuerySet(models.QuerySet):

aircox/models/station.py

@@ -8,7 +8,7 @@ from filer.fields.image import FilerImageField
 from .. import settings
 
 
-__all__ = ['Station', 'StationQuerySet', 'Port']
+__all__ = ('Station', 'StationQuerySet', 'Port')
 
 
 class StationQuerySet(models.QuerySet):

aircox/models/user_settings.py

@@ -0,0 +1,16 @@
+from django.db import models
+from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+
+
+class UserSettings(models.Model):
+    """
+    Store user's settings.
+    """
+    user = models.OneToOneField(
+        User, models.CASCADE, verbose_name=_('User'),
+        related_name='aircox_settings')
+    playlist_editor_columns = models.JSONField(
+        _('Playlist Editor Columns'))
+    playlist_editor_sep = models.CharField(
+        _('Playlist Editor Separator'), max_length=16)