From d85e4e2708f65cb5ca00f7aef3e7fa3046c24d29 Mon Sep 17 00:00:00 2001 From: Corne Oosthuizen Date: Tue, 2 Oct 2018 10:03:51 +0200 Subject: [PATCH 1/3] Added a field to recorder service that can be overwritten to display a title other than the mediapackage title. --- galicaster/classui/recorderui.py | 6 ++++++ galicaster/recorder/service.py | 1 + 2 files changed, 7 insertions(+) diff --git a/galicaster/classui/recorderui.py b/galicaster/classui/recorderui.py index fee5db04..2daf789d 100644 --- a/galicaster/classui/recorderui.py +++ b/galicaster/classui/recorderui.py @@ -406,6 +406,12 @@ def update_scheduler_timeout(self, status, event_type, title): elif signalized: signalized = False + elif self.recorder.title_standin is not None: + if event_type.get_text(): + event_type.set_text("") + if status.get_text(): + status.set_text("") + title.set_text(_(self.recorder.title_standin)) if dif < datetime.timedelta(0,TIME_RED_START): if not status_label_changed: diff --git a/galicaster/recorder/service.py b/galicaster/recorder/service.py index 139fb59a..40832cda 100644 --- a/galicaster/recorder/service.py +++ b/galicaster/recorder/service.py @@ -69,6 +69,7 @@ def __init__(self, dispatcher, repo, worker, conf, logger, autorecover=False, re self.__create_drawing_areas_func = None self.__handle_recover_id = None self.autorecover = autorecover + self.title_standin = None self.logger.info("Autorecover mode: {}".format(self.autorecover)) From 5cbbcbac7a81e35cbda1c6a0c96e8fd0977c4991 Mon Sep 17 00:00:00 2001 From: Corne Oosthuizen Date: Tue, 2 Oct 2018 12:49:03 +0200 Subject: [PATCH 2/3] Moved the code block to the correct location. --- galicaster/classui/recorderui.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/galicaster/classui/recorderui.py b/galicaster/classui/recorderui.py index 2daf789d..d8f16112 100644 --- a/galicaster/classui/recorderui.py +++ b/galicaster/classui/recorderui.py @@ -406,13 +406,6 @@ def update_scheduler_timeout(self, status, event_type, title): elif signalized: signalized = False - elif self.recorder.title_standin is not None: - if event_type.get_text(): - event_type.set_text("") - if status.get_text(): - status.set_text("") - title.set_text(_(self.recorder.title_standin)) - if dif < datetime.timedelta(0,TIME_RED_START): if not status_label_changed: status.set_name('red_coloured') @@ -428,6 +421,13 @@ def update_scheduler_timeout(self, status, event_type, title): status.set_name('blinking_coloured_to') status_label_blink = not status_label_blink + elif self.recorder.title_standin is not None: + if event_type.get_text(): + event_type.set_text("") + if status.get_text(): + status.set_text("") + title.set_text(_(self.recorder.title_standin)) + else: # Not current or pending recordings if event_type.get_text(): event_type.set_text("") From 2d4b13e3c58d8d3d8b61d4ac438579ceb2b4daaf Mon Sep 17 00:00:00 2001 From: Corne Oosthuizen Date: Thu, 22 Nov 2018 11:47:55 +0200 Subject: [PATCH 3/3] Added set function as recommended by androidwiltron. --- galicaster/recorder/service.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/galicaster/recorder/service.py b/galicaster/recorder/service.py index 40832cda..9caaa436 100644 --- a/galicaster/recorder/service.py +++ b/galicaster/recorder/service.py @@ -317,6 +317,8 @@ def get_recorded_time(self): """Proxy function to get the recorder time""" return self.recorder.get_recorded_time() if self.recorder else 0 + def set_title_standin(self, title): + self.title_standin = title def _handle_error(self, origin, error_msg): self.logger.error("Handle error ({})". format(error_msg))