0.3.0

CONTROL/control

@@ -1,5 +1,5 @@
 Description: TVMagazineCockpit
 Maintainer: dream-alpha
 Package: enigma2-plugin-extensions-tvmagazinecockpit
-Version: 0.2.0
+Version: 0.3.0
 Architecture: all

src/Downloader2.py

@@ -456,6 +456,7 @@ def http_failed(failure_instance=None, *_args, **kwargs):
 		error_message = str(failure_instance)
 	text = _(kwargs.get('title', 'Error')) + '\n'
 	text += _("Error during download.") + '\n\n' + error_message + '\n'
+	logger.error("error_message: %s", error_message)
 	# if error_message == "" and failure_instance is not None:
 	# 	error_message = failure_instance.getErrorMessage()
 	# text += error_message  CancelledError

src/MultiList.py

@@ -1,5 +1,6 @@
 from Components.HTMLComponent import HTMLComponent
 from Components.TemplatedMultiContentComponent import TemplatedMultiContentComponent
+from Components.GUIComponent import GUIComponent
 from enigma import eListbox
 from .SkinUtils import getSkinPath
 from .FileUtils import readFile
@@ -8,17 +9,32 @@
 
 class MultiList(HTMLComponent, TemplatedMultiContentComponent, object):
 
-	COMPONENT_ID = 'TvSpielfilmTvProgramm'
-	default_template = readFile(getSkinPath("screenpart_programm_template.tpl"))
+	COMPONENT_ID = ''
+	default_template = ''
 
-	def __init__(self, alist=None):
+	def __init__(self, alist=None, component_id="", default_template_name=""):
 		logger.info("...")
-		if alist is None:
-			alist = []
+		self.skinAttributes = []
+		MultiList.default_template = readFile(getSkinPath(default_template_name))
+		MultiList.COMPONENT_ID = component_id
 		TemplatedMultiContentComponent.__init__(self)
-		self.list = alist
+		self.list = alist if alist else []
+		self.pagenumber = 0
 		self.deprecationInfo = True
 
+	def applySkin(self, desktop, parent):
+		logger.info("...")
+		if self.skinAttributes is not None:
+			attribs = []
+			for (attrib, value) in self.skinAttributes:
+				if attrib == "PageNumber":
+					self.pagenumber = int(value)
+				else:
+					attribs.append((attrib, value))
+			self.skinAttributes = attribs
+			GUIComponent.applySkin(self, desktop, parent)
+			self.applyTemplate(additional_locals={})
+
 	def getCurrent(self):
 		logger.info("...")
 		return self.l.getCurrentSelection()
@@ -41,8 +57,9 @@ def getCurrentIndex(self):
 		logger.info("...")
 		return self.instance.getCurrentIndex()
 
-	currentIndex = property(getCurrentIndex, moveToIndex)
-	currentSelection = property(getCurrent)
+	current_index = property(getCurrentIndex, moveToIndex)
+	current_selection = property(getCurrent)
+	current = property(getCurrent)
 
 	def up(self):
 		logger.info("...")
@@ -58,13 +75,23 @@ def moveDown(self):
 		logger.info("...")
 		self.instance.moveSelection(self.instance.moveDown)
 
+	def moveLeft(self):
+		logger.info("...")
+		if self.instance is not None:
+			self.instance.moveSelection(self.instance.moveLeft)
+
+	def moveRight(self):
+		logger.info("...")
+		if self.instance is not None:
+			self.instance.moveSelection(self.instance.moveRight)
+
 	def invalidate(self):
 		logger.info("...")
 		self.l.invalidate()
 
-	def entryRemoved(self, idx):
+	def entryRemoved(self, index):
 		logger.info("...")
-		self.l.entryRemoved(idx)
+		self.l.entryRemoved(index)
 
 	def setSelectionEnable(self, selectionEnabled=True):
 		logger.info("...")

src/MultiListSummary.py

@@ -9,11 +9,9 @@
 class MultiListSummary(GUIComponent, Element, object):
 	def __init__(self, alist=None):
 		logger.info("...")
-		if alist is None:
-			alist = []
 		GUIComponent.__init__(self)
 		Element.__init__(self)
-		self.list = alist
+		self.list = alist if alist else []
 		self.onSelectionChanged = []
 		self.lb = eListboxPythonStringContent()
 		self.deprecationInfo = True

src/TVMagazineCockpit.py

@@ -43,7 +43,8 @@ def showScreen(self, screen, *args):
 		self.screen = screen
 		self.session.openWithCallback(self.showScreenCallback, screen, *args)
 
-	def showScreenCallback(self, return_screen="", *args):
+	def showScreenCallback(self, *args):
+		return_screen = args[0] if len(args) > 0 else ""
 		logger.info("return_screen: %s", return_screen)
 		if self.screen == TvSpielfilmsearch:
 			self.showScreen(self.last_screen)

src/TvSpielfilmmain.py

@@ -71,11 +71,11 @@ def __init__(self, session):
 		self.change = {'fovo': False, 'default': False, 'config': False}
 		self.mytimecount = 1
 		mytime = int(nowtime())
-		self["searchdate"].text = strftime("< %A %d %b .%y >", localtime(mytime))
+		self["searchdate"].text = strftime("< %A %d. %b %y >", localtime(mytime))
 		mytime = mytime - 86400
 		self.timelist = []
 		for _tre in range(0, 15):
-			self.timelist.append([strftime("%A %d %b .%y", localtime(mytime)), strftime("&date=%Y-%m-%d", localtime(mytime))])
+			self.timelist.append([strftime("%A %d. %b %y", localtime(mytime)), strftime("&date=%Y-%m-%d", localtime(mytime))])
 			mytime = mytime + 86400
 		self.timelist.append(['Diese Woche', '&date=thisWeek'])
 		self.timelist.append(['Nächste Woche', '&date=nextWeek'])

src/Version.py

@@ -21,6 +21,6 @@
 
 PLUGIN = "TVMagazineCockpit"
 ID = "TVC"
-VERSION = "0.2.0"
+VERSION = "0.3.0"
 COPYRIGHT = "2018-2024 by dream-alpha"
 LICENSE = "This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version."

src/XMLTipps.py

@@ -0,0 +1,52 @@
+#!/usr/bin/python
+# encoding: utf-8
+#
+# Copyright (C) 2018-2024 by dream-alpha
+#
+# In case of reuse of this source code please do not remove this copyright.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# For more information on the GNU General Public License see:
+# <http://www.gnu.org/licenses/>.
+
+
+import xml.etree.ElementTree as ET
+
+
+class XMLTipps():
+	def __init__(self):
+		pass
+
+	def parseXML(self, xml_string):
+		# print("parseXML")
+		tipps = []
+		tree = ET.ElementTree(ET.fromstring(xml_string))
+		for node in tree.iter():
+			if node.tag == "item":
+				# print("##### %s" % node.tag)
+				item = {}
+				for elem in node:
+					if elem.tag in ["title"]:
+						words = str(elem.text).split(" | ")
+						item["time"] = words[0]
+						item["channel"] = words[1]
+						item["title"] = words[2]
+					if elem.tag in ["description", "link"]:
+						# print(node.tag, elem.tag)
+						# print(str(elem.text))
+						item[elem.tag] = str(elem.text)
+					for key in elem.attrib:
+						# print("--- ", key, elem.attrib[key])
+						if key in ["url"]:
+							item[key] = str(elem.attrib[key])
+				tipps.append(item)
+		return tipps

src/skin/Default-FHD/skin.xml

@@ -83,18 +83,8 @@
 		<widget backgroundColor="#a08500" font="Regular;25" halign="center" position="610,2" render="Label" size="300,60" source="key_yellow" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;25" halign="center" position="910,2" render="Label" size="300,60" source="key_blue" transparent="1" valign="center" zPosition="1"/>
 		<widget font="Regular;28" halign="left" name="searchdate" position="1330,10" size="350,30" transparent="1" valign="center"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="250" mode="horizontal" name="spielfilm" position="25,125" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="250" mode="horizontal" name="serie" position="25,390" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="250" mode="horizontal" name="report" position="25,655" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="250" mode="horizontal" name="unterhaltung" position="25,125" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="250" mode="horizontal" name="kinder" position="25,390" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="250" mode="horizontal" name="sport" position="25,655" scrollbarMode="showOnDemand" size="1750,200"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="spielfilmtext" position="0,70" size="1785,50" text="Spielfilme" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="serietext" position="0,335" size="1785,50" text="Serien" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="reporttext" position="0,600" size="1785,50" text="Reportagen" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="unterhaltungtext" position="0,70" size="1785,50" text="Unterhaltung" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="kindertext" position="0,335" size="1785,50" text="Kinder" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="sporttext" position="0,600" size="1785,50" text="Sport" valign="center" zPosition="1"/>
+		<widget PageNumber="0" enableWrapAround="1" itemWidth="250" mode="horizontal" name="today" position="25,125" scrollbarMode="showOnDemand" size="1750,200"/>
+		<widget backgroundColor="#037bfc" font="Regular;25" halign="center" name="todaytext" position="0,70" size="1785,50" text="Heute" valign="center" zPosition="1"/>
 		<widget name="scrollbar" position="1780,70" size="8,785" zPosition="3"/>
 	</screen>
 	<screen name="TvSpielfilmTvProgramm" position="center,110" size="1800,930" title="TvSpielfilm">

src/skin/Default-HD/skin.xml

@@ -83,18 +83,8 @@
 		<widget backgroundColor="#a08500" font="Regular;17" halign="center" position="407,1" render="Label" size="200,40" source="key_yellow" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;17" halign="center" position="607,1" render="Label" size="200,40" source="key_blue" transparent="1" valign="center" zPosition="1"/>
 		<widget font="Regular;19" halign="left" name="searchdate" position="887,7" size="233,20" transparent="1" valign="center"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="167" mode="horizontal" name="spielfilm" position="17,83" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="167" mode="horizontal" name="serie" position="17,260" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="167" mode="horizontal" name="report" position="17,437" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="167" mode="horizontal" name="unterhaltung" position="17,83" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="167" mode="horizontal" name="kinder" position="17,260" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="167" mode="horizontal" name="sport" position="17,437" scrollbarMode="showOnDemand" size="1167,133"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="spielfilmtext" position="0,47" size="1190,33" text="Spielfilme" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="serietext" position="0,223" size="1190,33" text="Serien" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="reporttext" position="0,400" size="1190,33" text="Reportagen" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="unterhaltungtext" position="0,47" size="1190,33" text="Unterhaltung" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="kindertext" position="0,223" size="1190,33" text="Kinder" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="sporttext" position="0,400" size="1190,33" text="Sport" valign="center" zPosition="1"/>
+		<widget PageNumber="0" enableWrapAround="1" itemWidth="167" mode="horizontal" name="today" position="17,83" scrollbarMode="showOnDemand" size="1167,133"/>
+		<widget backgroundColor="#037bfc" font="Regular;17" halign="center" name="todaytext" position="0,47" size="1190,33" text="Heute" valign="center" zPosition="1"/>
 		<widget name="scrollbar" position="1187,47" size="5,523" zPosition="3"/>
 	</screen>
 	<screen name="TvSpielfilmTvProgramm" position="center,73" size="1200,620" title="TvSpielfilm">

src/skin/Default-WQHD/skin.xml

@@ -83,18 +83,8 @@
 		<widget backgroundColor="#a08500" font="Regular;33" halign="center" position="813,3" render="Label" size="400,80" source="key_yellow" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;33" halign="center" position="1213,3" render="Label" size="400,80" source="key_blue" transparent="1" valign="center" zPosition="1"/>
 		<widget font="Regular;37" halign="left" name="searchdate" position="1773,13" size="467,40" transparent="1" valign="center"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="spielfilm" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="serie" position="33,520" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="report" position="33,873" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="unterhaltung" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="kinder" position="33,520" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="sport" position="33,873" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="spielfilmtext" position="0,93" size="2380,67" text="Spielfilme" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="serietext" position="0,447" size="2380,67" text="Serien" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="reporttext" position="0,800" size="2380,67" text="Reportagen" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="unterhaltungtext" position="0,93" size="2380,67" text="Unterhaltung" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="kindertext" position="0,447" size="2380,67" text="Kinder" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="sporttext" position="0,800" size="2380,67" text="Sport" valign="center" zPosition="1"/>
+		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="today" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
+		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="todaytext" position="0,93" size="2380,67" text="Heute" valign="center" zPosition="1"/>
 		<widget name="scrollbar" position="2373,93" size="11,1047" zPosition="3"/>
 	</screen>
 	<screen name="TvSpielfilmTvProgramm" position="center,147" size="2400,1240" title="TvSpielfilm">

src/skin/Other-WQHD/skin.xml

@@ -83,18 +83,8 @@
 		<widget backgroundColor="#a08500" font="Regular;33" halign="center" position="813,3" render="Label" size="400,80" source="key_yellow" transparent="1" valign="center" zPosition="1"/>
 		<widget backgroundColor="#18188b" font="Regular;33" halign="center" position="1213,3" render="Label" size="400,80" source="key_blue" transparent="1" valign="center" zPosition="1"/>
 		<widget font="Regular;37" halign="left" name="searchdate" position="1773,13" size="467,40" transparent="1" valign="center"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="spielfilm" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="serie" position="33,520" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="report" position="33,873" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="unterhaltung" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="kinder" position="33,520" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget PageNumber="2" enableWrapAround="1" itemWidth="333" mode="horizontal" name="sport" position="33,873" scrollbarMode="showOnDemand" size="2333,267"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="spielfilmtext" position="0,93" size="2380,67" text="Spielfilme" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="serietext" position="0,447" size="2380,67" text="Serien" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="reporttext" position="0,800" size="2380,67" text="Reportagen" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="unterhaltungtext" position="0,93" size="2380,67" text="Unterhaltung" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="kindertext" position="0,447" size="2380,67" text="Kinder" valign="center" zPosition="1"/>
-		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="sporttext" position="0,800" size="2380,67" text="Sport" valign="center" zPosition="1"/>
+		<widget PageNumber="0" enableWrapAround="1" itemWidth="333" mode="horizontal" name="today" position="33,167" scrollbarMode="showOnDemand" size="2333,267"/>
+		<widget backgroundColor="#037bfc" font="Regular;33" halign="center" name="todaytext" position="0,93" size="2380,67" text="Heute" valign="center" zPosition="1"/>
 		<widget name="scrollbar" position="2373,93" size="11,1047" zPosition="3"/>
 	</screen>
 	<screen name="TvSpielfilmTvProgramm" position="center,147" size="2400,1240" title="TvSpielfilm">