diff --git a/VERSION b/VERSION index a45858a5..d473693a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.17.3-develop87 +1.17.3-develop88 diff --git a/defaults/overlays/flixpatrol.yml b/defaults/overlays/flixpatrol.yml index 274daf34..c6475b59 100644 --- a/defaults/overlays/flixpatrol.yml +++ b/defaults/overlays/flixpatrol.yml @@ -1,17 +1,31 @@ queues: - top10: - - horizontal_offset: 30 # This is the first position - horizontal_align: right - vertical_offset: 465 - vertical_align: top - - horizontal_offset: 30 # This is the second position - horizontal_align: right - vertical_offset: 670 - vertical_align: top - - horizontal_offset: 30 # This is the third position - horizontal_align: right - vertical_offset: 875 - vertical_align: top + flixpatrol_position: + right: + - horizontal_offset: 30 # This is the first position + horizontal_align: right + vertical_offset: 465 + vertical_align: top + - horizontal_offset: 30 # This is the second position + horizontal_align: right + vertical_offset: 670 + vertical_align: top + - horizontal_offset: 30 # This is the third position + horizontal_align: right + vertical_offset: 875 + vertical_align: top + left: + - horizontal_offset: 30 # This is the first position + horizontal_align: left + vertical_offset: 465 + vertical_align: top + - horizontal_offset: 30 # This is the second position + horizontal_align: left + vertical_offset: 670 + vertical_align: top + - horizontal_offset: 30 # This is the third position + horizontal_align: left + vertical_offset: 875 + vertical_align: top templates: FlixPatrol: @@ -49,7 +63,7 @@ templates: allowed_library_types: <>>> overlay: name: text(TOP<>) - queue: top10 + queue: flixpatrol_position weight: <>>> horizontal_offset: <> horizontal_align: <> diff --git a/modules/meta.py b/modules/meta.py index 867c8d73..44ccb004 100644 --- a/modules/meta.py +++ b/modules/meta.py @@ -1448,7 +1448,17 @@ class OverlayFile(DataFile): data = self.load_file(self.type, self.path, overlay=True) self.overlays = get_dict("overlays", data) self.templates = get_dict("templates", data) - self.queues = get_dict("queues", data, library.queue_names) + queues = get_dict("queues", data, library.queue_names) + self.queues = {} + for queue_name, queue in queues.items(): + if isinstance(queue, list): + self.queues[queue_name] = queue + elif queue_name in temp_vars and temp_vars[queue_name] and temp_vars[queue_name] in queue: + self.queues[queue_name] = queue[temp_vars[queue_name]] + else: + for dq, dv in queue.items(): + self.queues[queue_name] = dv + break self.external_templates(data) self.translation_files(data) if not self.overlays: