From 455ebbbda8bdb78849e43a420cf0da77892a13ca Mon Sep 17 00:00:00 2001 From: dream-alpha Date: Thu, 16 May 2024 19:32:43 +0200 Subject: [PATCH] 0.3.0 --- CONTROL/control | 2 +- src/Downloader2.py | 1 + src/MultiList.py | 47 ++++- src/MultiListSummary.py | 4 +- src/TVMagazineCockpit.py | 3 +- src/TvSpielfilmmain.py | 4 +- src/Version.py | 2 +- src/XMLTipps.py | 52 +++++ src/skin/Default-FHD/skin.xml | 14 +- src/skin/Default-HD/skin.xml | 14 +- src/skin/Default-WQHD/skin.xml | 14 +- src/skin/Other-WQHD/skin.xml | 14 +- src/skin/Shadow-FHD/skin.xml | 14 +- src/skin/screen_TvSpielfilmTipps.xmlinc | 15 +- src/tools.py | 19 +- src/tvspielfilmtipps.py | 244 ++++-------------------- src/tvspielfilmtvprogramm.py | 20 +- src/tvspielfilmtvprogrammfavo.py | 20 +- 18 files changed, 169 insertions(+), 334 deletions(-) create mode 100644 src/XMLTipps.py diff --git a/CONTROL/control b/CONTROL/control index 2565786..77ec4b7 100644 --- a/CONTROL/control +++ b/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 diff --git a/src/Downloader2.py b/src/Downloader2.py index a337797..ccbfce6 100644 --- a/src/Downloader2.py +++ b/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 diff --git a/src/MultiList.py b/src/MultiList.py index 2872188..683681e 100644 --- a/src/MultiList.py +++ b/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("...") diff --git a/src/MultiListSummary.py b/src/MultiListSummary.py index e214142..310cdd9 100644 --- a/src/MultiListSummary.py +++ b/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 diff --git a/src/TVMagazineCockpit.py b/src/TVMagazineCockpit.py index 7999457..be6ffca 100644 --- a/src/TVMagazineCockpit.py +++ b/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) diff --git a/src/TvSpielfilmmain.py b/src/TvSpielfilmmain.py index e8451f8..6454f51 100644 --- a/src/TvSpielfilmmain.py +++ b/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']) diff --git a/src/Version.py b/src/Version.py index 4151b84..d77bc65 100644 --- a/src/Version.py +++ b/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." diff --git a/src/XMLTipps.py b/src/XMLTipps.py new file mode 100644 index 0000000..275f3fa --- /dev/null +++ b/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: +# . + + +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 diff --git a/src/skin/Default-FHD/skin.xml b/src/skin/Default-FHD/skin.xml index d07e48f..ed02daa 100644 --- a/src/skin/Default-FHD/skin.xml +++ b/src/skin/Default-FHD/skin.xml @@ -83,18 +83,8 @@ - - - - - - - - - - - - + + diff --git a/src/skin/Default-HD/skin.xml b/src/skin/Default-HD/skin.xml index 74b9e5f..45ffc46 100644 --- a/src/skin/Default-HD/skin.xml +++ b/src/skin/Default-HD/skin.xml @@ -83,18 +83,8 @@ - - - - - - - - - - - - + + diff --git a/src/skin/Default-WQHD/skin.xml b/src/skin/Default-WQHD/skin.xml index 258466b..69a5bd4 100644 --- a/src/skin/Default-WQHD/skin.xml +++ b/src/skin/Default-WQHD/skin.xml @@ -83,18 +83,8 @@ - - - - - - - - - - - - + + diff --git a/src/skin/Other-WQHD/skin.xml b/src/skin/Other-WQHD/skin.xml index 258466b..69a5bd4 100644 --- a/src/skin/Other-WQHD/skin.xml +++ b/src/skin/Other-WQHD/skin.xml @@ -83,18 +83,8 @@ - - - - - - - - - - - - + + diff --git a/src/skin/Shadow-FHD/skin.xml b/src/skin/Shadow-FHD/skin.xml index d07e48f..ed02daa 100644 --- a/src/skin/Shadow-FHD/skin.xml +++ b/src/skin/Shadow-FHD/skin.xml @@ -83,18 +83,8 @@ - - - - - - - - - - - - + + diff --git a/src/skin/screen_TvSpielfilmTipps.xmlinc b/src/skin/screen_TvSpielfilmTipps.xmlinc index 6c5eafa..e67f222 100755 --- a/src/skin/screen_TvSpielfilmTipps.xmlinc +++ b/src/skin/screen_TvSpielfilmTipps.xmlinc @@ -11,19 +11,8 @@ - - - - - - - - - - - - - + + diff --git a/src/tools.py b/src/tools.py index c0df98e..f7f8361 100644 --- a/src/tools.py +++ b/src/tools.py @@ -81,14 +81,14 @@ def Load_My_Pixmap(path): if path == '': return None - elif path in org_pixmap_cache: + if path in org_pixmap_cache: return org_pixmap_cache[path] - elif path in _pixmap_cache: + if path in _pixmap_cache: return _pixmap_cache[path] svgpath = path[:-3] + 'svg' if svgpath and svgpath in _pixmap_cache: return _pixmap_cache[svgpath] - elif pathExists(svgpath): + if pathExists(svgpath): ptr = LoadPixmap(svgpath) if ptr: _pixmap_cache[svgpath] = ptr @@ -104,9 +104,9 @@ def Load_My_Pixmap(path): def Load_My_Pixmap_ok(path): if path == '': return None - elif path in _pixmap_cache: + if path in _pixmap_cache: return _pixmap_cache[path] - elif path and pathExists(path): + if path and pathExists(path): png = LoadPixmap(path) _pixmap_cache[path] = png return png @@ -136,7 +136,10 @@ def Piconchannelname(channelname): col_5_com = re.compile(r'.+?(.*?)<.+?>', re.S) col_em_com = re.compile(r'
.+?(.*?)', re.S) editorial_rating_com = re.compile(r'class="editorial-rating (.+?)">', re.S) -data_tracking_point_com = re.compile(r'.+?(.+?).+?(.*?)', re.S) +data_tracking_point_com = re.compile( + r'.+?(.+?).+?(.*?)', + re.S +) def tvspielfilm_parse(masresult, pagenumber=1): @@ -154,7 +157,7 @@ def clean_str(val): result = [] mytime = int(nowtime()) mindex = listmainindex - for mastx in range(len(masterval)): + for mastx, _item in enumerate(masterval): mastxval = mastxval_list[:] # channelname = '' starttime = -1 @@ -519,7 +522,7 @@ def tv_search(masresult, pagenumber=1): # rescounter = 0 mytime = int(nowtime()) mindex = listmainindex - for mastx in range(len(primetime_box_val)): + for mastx, _item in enumerate(primetime_box_val): mastxval = mastxval_list[:] tmp = sender_url_com2.search(primetime_box_val[mastx]) if tmp and len(tmp.groups()) == 2: diff --git a/src/tvspielfilmtipps.py b/src/tvspielfilmtipps.py index 2fec7a9..327b4aa 100644 --- a/src/tvspielfilmtipps.py +++ b/src/tvspielfilmtipps.py @@ -6,7 +6,7 @@ from time import strftime, localtime, time as nowtime from twisted.internet.defer import DeferredSemaphore from Screens.Screen import Screen -from enigma import eListbox, eSlider +from enigma import eSlider from Downloader2 import _headers_jpeg, headers_gzip, MygetPage, MydownloadPage, http_failed from tools import Piconchannelname, mastxval_list, listmainindex as mindex from _tvdict import _channelreference, _pixmap_cache @@ -15,20 +15,18 @@ from Components.ActionMap import ActionMap from Components.HTMLComponent import HTMLComponent from Components.GUIComponent import GUIComponent -from Components.TemplatedMultiContentComponent import TemplatedMultiContentComponent -from Components.Element import Element from Components.Label import Label from Components.Sources.StaticText import StaticText from .EasyMenu import EasyMenu from .TvSpielfilmView import TvSpielfilmView from .TvSpielfilmchannel import TvSpielfilmchannel +from .MultiList import MultiList from .MultiListSummary import MultiListSummary from .MYSimpleSummary import MYSimpleSummary from .tvspielfilmsetup import TvSpielfilmstartSetup, TvSpielfilmmainSetup from .__init__ import _ -from .SkinUtils import getSkinPath -from .FileUtils import readFile from .Debug import logger +from .XMLTipps import XMLTipps class Slider(HTMLComponent, GUIComponent): @@ -47,118 +45,6 @@ def postWidgetCreate(self, instance): instance.setBorderWidth(0) -class MultiList(HTMLComponent, Element, TemplatedMultiContentComponent, object): - - COMPONENT_ID = 'TvSpielfilmTipps' - default_template = readFile(getSkinPath("screenpart_tipps_template.tpl")) - - def __init__(self, alist=None): - logger.info("...") - if alist is None: - alist = [] - self.skinAttributes = [] - TemplatedMultiContentComponent.__init__(self) - self.onSelectionChanged = [] - self.list = alist - 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.list - - current = property(getCurrent) - - GUI_WIDGET = eListbox - - def postWidgetCreate(self, instance): - logger.info("...") - self.visible = 0 - instance.setContent(self.l) - - def preWidgetRemove(self, instance): - logger.info("...") - instance.setContent(None) - - def connectSelChanged(self, fnc): - logger.info("...") - if fnc not in self.onSelectionChanged: - self.onSelectionChanged.append(fnc) - - def disconnectSelChanged(self, fnc): - logger.info("...") - if fnc in self.onSelectionChanged: - self.onSelectionChanged.remove(fnc) - - def selectionChanged(self): - logger.info("...") - for x in self.onSelectionChanged: - x() - - def moveToIndex(self, index): - logger.info("...") - self.instance.moveSelectionTo(index) - - def getCurrentIndex(self): - logger.info("...") - return self.instance.getCurrentIndex() - - currentIndex = property(getCurrentIndex, moveToIndex) - - def up(self): - logger.info("...") - if self.instance is not None: - self.instance.moveSelection(self.instance.moveUp) - - def down(self): - logger.info("...") - if self.instance is not None: - self.instance.moveSelection(self.instance.moveDown) - - 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): - logger.info("...") - self.l.entryRemoved(idx) - - def setSelectionEnable(self, selectionEnabled=True): - logger.info("...") - self.instance.setSelectionEnable(selectionEnabled) - - def __len__(self): - logger.info("...") - return len(self.list) - - class TvSpielfilmTipps(Screen): def __init__(self, session): logger.info("...") @@ -168,7 +54,7 @@ def __init__(self, session): ["TVS_Actions", "NumberActions"], { "ok": self.key_ok, - "cancel": self.close, + "cancel": self.key_cancel, "up": self.up, "down": self.down, "left": self.left, @@ -190,7 +76,7 @@ def __init__(self, session): ) self.listindex = 0 for value in listvalues: - self[value] = MultiList([]) + self[value] = MultiList(None, "TvSpielfilmTipps", "screenpart_tipps_template.tpl") self[value].l.setBuildFunc(self.buildEntry) self[value].hide() self[value + 'text'] = Label() @@ -201,7 +87,7 @@ def __init__(self, session): self.mytimecount = 1 mytime = int(nowtime()) self.timestr = strftime("< %A %d %B >", localtime(mytime)) - self["searchdate"] = Label(strftime("< %A %d %b .%y >", localtime(mytime))) + self["searchdate"] = Label(strftime("< %A %d. %b %y >", localtime(mytime))) mytime = mytime - 86400 self.timelist = [] @@ -252,7 +138,7 @@ def update_liste(self): def download_page(self): logger.info("...") self['scrollbar'].hide() - url = 'https://www.tvspielfilm.de/tv-tipps # /?' + self.date_string + url = 'https://www.tvspielfilm.de/tv-programm/rss/tipps.xml' del self.download.waiting[:] logger.debug("url: %s", url) self.download.run(MygetPage, url=url, headers=headers_gzip).addCallback(self.result_back).addErrback(http_failed) @@ -269,9 +155,10 @@ def result_back(self, result): del result notres = listtippsempty[:] notres[listtippsindex['dict']] = {} - notres[listtippsindex['title']] = _('None') + ' ' + _('Entries') + ' ' + _('found') + notres[listtippsindex['title']] = _('No entries found') for value in listvalues: val = res['liste'].get(value, [tuple(notres)]) + logger.debug("value: %s, val: %s", value, val) self[value].setList(val) self.update_Title() @@ -458,6 +345,9 @@ def DlgCallback(nex_screen=None): logger.info("...") self.session.openWithCallback(DlgCallback, EasyMenu) + def key_cancel(self): + self.close("programm") + def __onClose__(self): logger.info("...") del self.download.waiting[:] @@ -487,103 +377,33 @@ def __onClose__(self): listtippsempty[listtippsindex['channelpix']] = None listtippsempty[listtippsindex['dict']] = {} -listvalues = ['spielfilm', 'serie', 'report', 'unterhaltung', 'kinder', 'sport'] - +listvalues = ['today'] -def tv_tipp(masresult): - def clean(res): - logger.info("...") - return res.replace('', '') - - logger.info("masresult: %s", masresult) - master = re.compile(r'
.+?
', re.S).search(masresult) - if not master: - logger.error("no master") - return None - logger.debug("master: %s", master) - masterval = re.compile('
.+?.+?', re.S).findall(master.group()) - del master - starttime = re.compile(r'(.+?)', re.S) - startdate = re.compile(r'
(.+?)
', re.S) - classname = re.compile(r'id=".+?opener">(.+?)', re.S) - subclassname = re.compile(r'
  • .+?
    • ', re.S) - - strongtitle = re.compile(r'
    (.+?)(.+?)', re.S) - strongtitle2 = re.compile(r'(.+?)', re.S) - sendungurl = re.compile(r'(.+?)', re.S) - rating = re.compile(r', (.+?)', re.S) - new = re.compile(r'(.+?)', re.S) - tipp = re.compile(r'(.+?)', re.S) - imgsrc = re.compile(r'.+?', re.S) - index = listtippsindex +def tv_tipp(xmlstring): + logger.info("...") + tipps = XMLTipps().parseXML(xmlstring) + logger.debug("tipps: %s", tipps) result = {'liste': {}} count = 0 - for mastx, _item in enumerate(masterval): - logger.debug("_item: %s", _item) - classnameres = re.search(classname, masterval[mastx]) - dictname = classnameres.group(1).lower() - if dictname not in listvalues: - continue + index = listtippsindex + for listvalue in listvalues: + logger.debug("listvalue: %s", listvalue) + dictname = listvalue result['liste'][dictname] = [] - mastxres = subclassname.findall(masterval[mastx], re.S) - for xtmp, _item in enumerate(mastxres): + for xtmp, tipp in enumerate(tipps): + logger.debug("tipp: %s", tipp) count += 1 mastxval = listtippsempty[:] mastxval[listtippsindex['dict']] = {} - tmp = re.search(starttime, mastxres[xtmp]) - if tmp: - mastxval[index['time']] = tmp.group(1) - else: - tmp = re.search(startdate, mastxres[xtmp]) - if tmp: - mastxval[index['time']] = tmp.group(1) - tmp = re.search(strongtitle, mastxres[xtmp]) - if tmp: - mastxval[index['sendungurl']] = tmp.group(1) - mastxval[index['title']] = clean(tmp.group(2)) - mastxval[index['titled']] = clean(tmp.group(3)) - else: - tmp = re.search(strongtitle2, mastxres[xtmp]) - if tmp: - mastxval[index['title']] = clean(tmp.group(1)) - tmp = re.search(spantitle, mastxres[xtmp]) - if tmp: - mastxval[index['titled']] = clean(tmp.group(1)) - tmp = re.search(sendungurl, mastxres[xtmp]) - if tmp: - mastxval[index['sendungurl']] = tmp.group(1) - tmp = re.search(channelurl, mastxres[xtmp]) - if tmp: - mastxval[index['channelurl']] = tmp.group(1) - mastxval[index['channel']] = tmp.group(2).strip() - channelname = tmp.group(1).rsplit(', ')[1][:-5] - mastxval[index['id']] = channelname - mastxval[index['channelpix']] = Piconchannelname(channelname) - tmp = re.search(starttime, mastxres[xtmp]) - if tmp: - mastxval[index['time']] = tmp.group(1) - tmp = re.search(new, mastxres[xtmp]) - if tmp: - mastxval[index['neu']] = tmp.group(1) - tmp = re.search(tipp, mastxres[xtmp]) - if tmp: - mastxval[index['tipp']] = tmp.group(1) - tmp = re.search(datasrc, mastxres[xtmp]) - if tmp: - mastxval[index['sendungpngurl']] = tmp.group(1) # .replace('.jpg', '.png') - else: - tmp = re.search(imgsrc, mastxres[xtmp]) - if tmp: - mastxval[index['sendungpngurl']] = tmp.group(1) - - tmp = re.search(rating, mastxres[xtmp]) - if tmp: - mastxval[index['rating']] = tmp.group(1).strip() - + mastxval[listtippsindex['title']] = tipp.get("title", "n/a") + mastxval[listtippsindex['time']] = tipp.get("time", "n/a") + mastxval[listtippsindex['channel']] = tipp.get("channel", "n/a") + mastxval[listtippsindex['titled']] = tipp.get("description", "n/a") + mastxval[listtippsindex['sendungurl']] = tipp.get("link", "n/a") + mastxval[listtippsindex['sendungpngurl']] = tipp.get("url", "n/a") + mastxval[listtippsindex['channelpix']] = Piconchannelname(mastxval[listtippsindex['channel']]) + tmp = {} tmp['file'] = '/tmp/' + dictname + str(xtmp) + mastxval[index['sendungpngurl']][-4:] tmp['url'] = mastxval[index['sendungpngurl']] @@ -592,5 +412,5 @@ def clean(res): mastxval[index['sendungpngurl']] = '' mastxval[index['dict']] = tmp result['liste'][dictname].append(tuple(mastxval)) - logger.debug("result: %s", result) + logger.debug("result: %s", result) return result diff --git a/src/tvspielfilmtvprogramm.py b/src/tvspielfilmtvprogramm.py index 0378597..e57b7c4 100644 --- a/src/tvspielfilmtvprogramm.py +++ b/src/tvspielfilmtvprogramm.py @@ -94,8 +94,8 @@ def __init__(self, session, programmtyp='tv-sender'): { "ok": self.key_ok, "cancel": self.close, - "up": self.up, - "down": self.down, + "up": self.moveUp, + "down": self.moveDown, "left": self.left, "right": self.right, "next": self.key_next, @@ -130,7 +130,7 @@ def __init__(self, session, programmtyp='tv-sender'): for listint in range(len(self.listvalue)): self.mlist.append([]) listeval = "liste%d" % listint - self[listeval] = MultiList() + self[listeval] = MultiList(None, "TvSpielfilmTvProgramm", "screenpart_programm_template.tpl") channval = "channel%d" % listint self[channval] = Label() channpix = "channelpix%d" % listint @@ -145,12 +145,12 @@ def __init__(self, session, programmtyp='tv-sender'): 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)) self.date_string = strftime("&date=%Y-%m-%d") 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["key_red"] = StaticText("TV Spielfilm Main") @@ -287,7 +287,7 @@ def set_values(self, val=None): self[channpix].instance.setPixmap(gPixmapPtr()) self.mlist[listint] = ['', '', '', None, 0] self[listeval].l.setList([['', '', notres, None, '', '', '']]) - self[propix].instance.setPixmap(gPixmapPtr()) + self[propix].instance.setPixmap(gPixmapPtr()) self[self.listvalue[self.listindex]].setSelectionEnable(True) self.update_Title() self.update_liste() @@ -347,14 +347,14 @@ def right(self): self[self.listvalue[self.listindex]].setSelectionEnable(True) self.update_liste() - def up(self): + def moveUp(self): logger.info("...") - self[self.listvalue[self.listindex]].up() + self[self.listvalue[self.listindex]].moveUp() self.update_liste() - def down(self): + def moveDown(self): logger.info("...") - self[self.listvalue[self.listindex]].down() + self[self.listvalue[self.listindex]].moveDown() self.update_liste() def showMenu(self): diff --git a/src/tvspielfilmtvprogrammfavo.py b/src/tvspielfilmtvprogrammfavo.py index 6ff798b..78fc1bf 100644 --- a/src/tvspielfilmtvprogrammfavo.py +++ b/src/tvspielfilmtvprogrammfavo.py @@ -102,8 +102,8 @@ def __init__(self, session): "ok": self.key_ok, "cancel": self.close, # "info": self.close, - "up": self.up, - "down": self.down, + "up": self.moveUp, + "down": self.moveDown, "left": self.left, "right": self.right, "next": self.key_next, @@ -143,7 +143,7 @@ def __init__(self, session): for index in range(self.listleng): listeval = "liste{0}".format(index) - self[listeval] = MultiList() + self[listeval] = MultiList(None, "TvSpielfilmTvProgramm", "screenpart_programm_template.tpl") channval = "channel{0}".format(index) self[channval] = Label() channpix = "channelpix{0}".format(index) @@ -158,13 +158,12 @@ def __init__(self, session): self.mytimecount = 1 mytime = int(nowtime()) - # self.timestr = strftime("< %A %d %B >", localtime(mytime)) - self["searchdate"].text = strftime("< %A %d %b .%y >", localtime(mytime)) + self["searchdate"].text = strftime("< %A %d. %b %y >", localtime(mytime)) self.date_string = strftime("&date=%Y-%m-%d") 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["key_red"] = StaticText("TV Spielfilm Main") @@ -174,14 +173,9 @@ def __init__(self, session): self.download = MyDeferredSemaphore(tokens=1) self.download2 = MyDeferredSemaphore(tokens=6) - # self.onExecEnd.append(self.__onClose__) self.onClose.append(self.__onClose__) - # self.onExecEnd.append(self.__onExecEnd__) - # self.onLayoutFinish.append(self.key_blue) - # self.onExecBegin.append(self._onExecBegin_) self.firststart() - # self.key_blue() def firststart(self): logger.info("...") @@ -528,13 +522,13 @@ def right(self): self[self.listvalue[self.listindex]].setSelectionEnable(True) self.update_liste() - def up(self): + def moveUp(self): logger.info("...") # self["liste3"].selectNext() self[self.listvalue[self.listindex]].up() self.update_liste() - def down(self): + def moveDown(self): logger.info("...") # self["liste3"].selectNext() self[self.listvalue[self.listindex]].down()