From d18aeaa9a966c7240d03b9da79caba910399d6b9 Mon Sep 17 00:00:00 2001
From: bkfox <thomas bkfox net>
Date: Fri, 29 May 2020 17:37:04 +0200
Subject: [PATCH] work on archiver / episode item: is now

---
 aircox/models/log.py                                       | 1 +
 aircox/templates/aircox/widgets/episode_item.html          | 5 ++++-
 aircox/views/admin.py                                      | 2 +-
 aircox/views/log.py                                        | 2 +-
 aircox_streamer/templates/aircox_streamer/source_item.html | 2 +-
 aircox_streamer/templates/aircox_streamer/streamer.html    | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/aircox/models/log.py b/aircox/models/log.py
index bd99a07..7f4f5a0 100644
--- a/aircox/models/log.py
+++ b/aircox/models/log.py
@@ -155,6 +155,7 @@ class Log(models.Model):
     @classmethod
     def merge_diffusions(cls, logs, diffs, count=None):
         # TODO: limit count
+        # FIXME: log may be iterable (in stats view)
         logs = list(logs.order_by('-date'))
         diffs = deque(diffs.on_air().before().order_by('-start'))
         object_list = []
diff --git a/aircox/templates/aircox/widgets/episode_item.html b/aircox/templates/aircox/widgets/episode_item.html
index 971007c..7f6e8d8 100644
--- a/aircox/templates/aircox/widgets/episode_item.html
+++ b/aircox/templates/aircox/widgets/episode_item.html
@@ -12,7 +12,10 @@ Context variables:
 
 {% block title %}
 {% if not object.is_published and object.program.is_published %}
-<a href="{{ object.program.get_absolute_url }}">{{ object.title }}</a>
+<a href="{{ object.program.get_absolute_url }}">
+    {{ object.title }}
+    {% if object.is_now %}<span class="has-text-danger fa fa-play-circle"></span>{% endif %}
+</a>
 {% else %}
 {{ block.super }}
 {% endif %}
diff --git a/aircox/views/admin.py b/aircox/views/admin.py
index c54183b..f17fbe7 100644
--- a/aircox/views/admin.py
+++ b/aircox/views/admin.py
@@ -33,6 +33,6 @@ class StatisticsView(BaseAdminView, LogListView, ListView):
     date = None
 
     def get_object_list(self, logs, *_):
-        return super().get_object_list(logs, True)
+        super().get_object_list(logs, True)
 
 
diff --git a/aircox/views/log.py b/aircox/views/log.py
index 629d217..564e0cb 100644
--- a/aircox/views/log.py
+++ b/aircox/views/log.py
@@ -43,7 +43,7 @@ class LogListMixin(GetDateMixin):
 
     def get_object_list(self, logs, full=False):
         """
-        Return diffusions merged to the provided logs queryset. If
+        Return diffusions merged to the provided logs iterable. If
         `full`, sort items by date without merging.
         """
         diffs = self.get_diffusions_queryset()
diff --git a/aircox_streamer/templates/aircox_streamer/source_item.html b/aircox_streamer/templates/aircox_streamer/source_item.html
index 754243c..d93a669 100644
--- a/aircox_streamer/templates/aircox_streamer/source_item.html
+++ b/aircox_streamer/templates/aircox_streamer/source_item.html
@@ -10,7 +10,7 @@
             </span>
             [[ source.id ]]
 
-            <small v-if="source.isPaused || source.isPlaying">(-[[ source.remainingString ]])</small>
+            <small v-if="source.isPaused || source.isPlaying">([[ source.remainingString ]])</small>
 
             <a v-if="source.data.program !== undefined"
                :href="'{% url 'admin:aircox_program_change' "$$" %}'.replace('$$', source.data.program)"
diff --git a/aircox_streamer/templates/aircox_streamer/streamer.html b/aircox_streamer/templates/aircox_streamer/streamer.html
index 5f7789d..be7c223 100644
--- a/aircox_streamer/templates/aircox_streamer/streamer.html
+++ b/aircox_streamer/templates/aircox_streamer/streamer.html
@@ -21,7 +21,7 @@
         </div>
         <div class="navbar-end">
             <div class="select navbar-item">
-                <select ref="selectStreamer" @change.native="selectStreamer" class="control"
+                <select ref="selectStreamer" onchange="selectStreamer" class="control"
                         title="{% trans "Select a station" %}"
                         aria-label="{% trans "Select a station" %}">
                     <option v-for="streamer of streamers" :value="streamer.id">[[ streamer.data.name ]]</option>