The branch, frodo has been updated via d6e3628df8f0f97d5ac85738decde96c385f413d (commit) from c86258fa9ddea6a9fab7ea89e0186499433d5cf3 (commit)
- Log ----------------------------------------------------------------- http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=d6e3628df8f0f97d5ac85738decde96c385f413d commit d6e3628df8f0f97d5ac85738decde96c385f413d Author: kibje <k...@xbmc.org> Date: Mon Jul 1 12:54:54 2013 +0200 [plugin.video.orftvthek] updated to version 0.1.3 diff --git a/plugin.video.orftvthek/addon.xml b/plugin.video.orftvthek/addon.xml index c7b3602..17707a3 100755 --- a/plugin.video.orftvthek/addon.xml +++ b/plugin.video.orftvthek/addon.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.1.2" provider-name="sofaking"> +<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.1.3" provider-name="sofaking"> <requires> <import addon="xbmc.python" version="2.1.0"/> <import addon="script.module.beautifulsoup"/> + <import addon="script.common.plugin.cache" version="0.9.1"/> </requires> <extension point="xbmc.python.pluginsource" library="default.py"> <provides>video</provides> diff --git a/plugin.video.orftvthek/changelog.txt b/plugin.video.orftvthek/changelog.txt index db5cda7..bab7b63 100755 --- a/plugin.video.orftvthek/changelog.txt +++ b/plugin.video.orftvthek/changelog.txt @@ -1,3 +1,8 @@ +0.1.3 +- added Search function +- fixed the low resolution preview image problem +- added History for Search function + 0.1.2 - fixed bad view mode on aeon nox - added force view option diff --git a/plugin.video.orftvthek/default.py b/plugin.video.orftvthek/default.py index 461701e..2ef3622 100755 --- a/plugin.video.orftvthek/default.py +++ b/plugin.video.orftvthek/default.py @@ -8,11 +8,16 @@ import urlparse import os.path from xml.dom import Node; from xml.dom import minidom; +try: + import StorageServer +except: + import storageserverdummy as StorageServer +cache = StorageServer.StorageServer("plugin.video.orftvthek", 999999) -version = "0.1.2" +version = "0.1.3" plugin = "ORF-TVthek-" + version author = "sofaking" - + socket.setdefaulttimeout(30) @@ -71,6 +76,15 @@ def createListItem(name,banner,summary,runtime,backdrop,videourl,playable,folder backdrop = defaultbackdrop if banner == '': banner = defaultbanner + if "/image1/" in banner: + if ".jpeg" in banner: + banner = banner.replace("/image1/","/image/") + newbanner = banner.split("/image/") + filename = newbanner[1] + + filename = filename.split(".jpeg") + number = int(filename[0])-2 + banner = newbanner[0]+"/image/"+str(number)+".jpeg" liz=xbmcgui.ListItem(cleanText(name), iconImage=banner, thumbnailImage=banner) liz.setInfo( type="Video", infoLabels={ "Title": cleanText(name) } ) liz.setInfo( type="Video", infoLabels={ "Plot": cleanText(summary) } ) @@ -222,7 +236,11 @@ def getLinks(url,quality): flashVars = flashVarReg.findall(html) for flashVar in flashVars: xml = xmlVarRef.search(flashVar).group() - image = "%s/%s" % (base_url,imgVarRef.search(html).group()) + try: + image = "%s/%s" % (base_url,imgVarRef.search(html).group()) + except: + image = "" + pass flashDom = minidom.parseString(urllib.unquote(xml)) asxurl = "" asxUrls = flashDom.getElementsByTagName("AsxUrl") @@ -275,6 +293,7 @@ def getMainMenu(): addDirectory("Neu",defaultbanner,defaultbackdrop,"","getNeu") addDirectory("Meist gesehen",defaultbanner,defaultbackdrop,"","getMostViewed") addDirectory("Sendung verpasst?",defaultbanner,defaultbackdrop,"","getArchiv") + addDirectory("Suchen",defaultbanner,defaultbackdrop,"","searchPhrase") xbmcplugin.setContent(pluginhandle,'episodes') xbmcplugin.endOfDirectory(pluginhandle) if forceView: @@ -710,7 +729,104 @@ def getCategories(): xbmcplugin.endOfDirectory(pluginhandle) if forceView: xbmc.executebuiltin(defaultViewMode) + + +def search(): + addDirectory("Suchen ...",defaultbanner,defaultbackdrop,"","searchNew") + cache.table_name = "searchhistory" + some_dict = cache.get("searches").split("|") + for str in reversed(some_dict): + addDirectory(str,defaultbanner,defaultbackdrop,str.replace(" ","+"),"searchNew") + xbmcplugin.setContent(pluginhandle,'episodes') + xbmcplugin.endOfDirectory(pluginhandle) + if forceView: + xbmc.executebuiltin(defaultViewMode) + xbmcplugin.setPluginFanart(int(sys.argv[1]), defaultbackdrop, color2='0xFFFF3300') + +def searchTV(): + keyboard = xbmc.Keyboard('') + keyboard.doModal() + if (keyboard.isConfirmed()): + cache.table_name = "searchhistory" + keyboard_in = keyboard.getText() + some_dict = cache.get("searches") + "|"+keyboard_in + cache.set("searches",some_dict); + searchurl = "%s/search?q=%s"%(base_url,keyboard_in.replace(" ","+")) + getSearchedShows(searchurl) + else: + addDirectory("Keine Ergebnisse",defaultlogo,defaultbackdrop,"","") + xbmcplugin.setContent(pluginhandle,'episodes') + xbmcplugin.endOfDirectory(pluginhandle) + if forceView: + xbmc.executebuiltin(defaultViewMode) + +def searchTVHistory(link): + keyboard = xbmc.Keyboard(link) + keyboard.doModal() + if (keyboard.isConfirmed()): + cache.table_name = "searchhistory" + keyboard_in = keyboard.getText() + if keyboard_in != link: + some_dict = cache.get("searches") + "|"+keyboard_in + cache.set("searches",some_dict); + searchurl = "%s/search?q=%s"%(base_url,keyboard_in.replace(" ","+")) + getSearchedShows(searchurl) + else: + addDirectory("Keine Ergebnisse",defaultlogo,defaultbackdrop,"","") + xbmcplugin.setContent(pluginhandle,'episodes') + xbmcplugin.endOfDirectory(pluginhandle) + if forceView: + xbmc.executebuiltin(defaultViewMode) + +def getSearchedShows(url): + progressbar = xbmcgui.DialogProgress() + progressbar.create('Ladevorgang' ) + progressbar.update(0) + print(url) + url = urllib.unquote(url) + html = opener.open(url) + html = html.read() + suppn = BeautifulSoup(html) + ul = suppn.find('ul',{'class':'search'}); + try: + blocks = ul.findAll('li') + i = 1 + feedcount = len(blocks) + for block in blocks: + if progressbar.iscanceled() : + xbmcplugin.endOfDirectory(pluginhandle) + progressbar.close() + break + i = i+1 + percent = i*100/feedcount + progressbar.update(percent) + try: + img = block.find('img') + anchor = block.find('a') + title = block.findAll('p')[0].text.encode('UTF-8') + image = img['src'] + desc = block.findAll('p')[1].text.encode('UTF-8') + + link = "%s%s" % (base_url,anchor['href']) + type = anchor.find('span') + if type != None: + type = type.text + else: + type = "" + + parameters = {"link" : link,"title" : title,"banner" : image,"backdrop" : defaultbackdrop, "mode" : "openSeries"} + u = sys.argv[0] + '?' + urllib.urlencode(parameters) + createListItem(cleanText(title),image,cleanText(desc),cleanText(title),backdrop,u,'false',True) + #addDirectory(title.encode('UTF-8'),image,defaultbackdrop,link,'listEpisode') + except Exception as e: + print(e) + pass + except: + addDirectory("Keine Ergebnisse",defaultlogo,defaultbackdrop,"","") + blocks = 0 + + #Getting Parameters params=parameters_string_to_dict(sys.argv[2]) mode=params.get('mode') @@ -751,5 +867,14 @@ elif mode == 'getArchiv': getArchiv(schedule_url) elif mode == 'openArchiv': openArchiv(link) +elif mode == 'searchPhrase': + search() +elif mode == 'searchNew': + if not link == None: + print "LINK:"+link + searchTVHistory(urllib.unquote(link)); + else: + searchTV() + else: getMainMenu() ----------------------------------------------------------------------- Summary of changes: plugin.video.orftvthek/addon.xml | 3 +- plugin.video.orftvthek/changelog.txt | 5 + plugin.video.orftvthek/default.py | 131 +++++++++++++++++++- .../resources/media/backdrops/Bundesrat.jpg | Bin 560076 -> 0 bytes .../resources/media/backdrops/Burgenland.heute.jpg | Bin 16404 -> 0 bytes .../resources/media/backdrops/CopStories.jpg | Bin 34523 -> 0 bytes .../resources/media/backdrops/EU-Gipfel.jpg | Bin 560076 -> 0 bytes .../resources/media/backdrops/Hohes.Haus.jpg | Bin 243850 -> 0 bytes .../resources/media/backdrops/Krnten.heute.jpg | Bin 15858 -> 0 bytes .../resources/media/backdrops/Nationalrat.jpg | Bin 560076 -> 0 bytes .../media/backdrops/Niedersterreich.heute.jpg | Bin 25068 -> 0 bytes .../media/backdrops/Obersterreich.heute.jpg | Bin 16877 -> 0 bytes .../resources/media/backdrops/Salzburg.heute.jpg | Bin 16432 -> 0 bytes .../media/backdrops/Schlosshotel.Orth.jpg | Bin 175047 -> 0 bytes .../resources/media/backdrops/Soko.Donau.jpg | Bin 462693 -> 0 bytes .../resources/media/backdrops/Sport-Bild.jpg | Bin 105197 -> 0 bytes .../resources/media/backdrops/Sport.Aktuell.jpg | Bin 103973 -> 0 bytes .../resources/media/backdrops/Sport.ZIB.20.jpg | Bin 921504 -> 0 bytes .../resources/media/backdrops/Sport.am.Sonntag.jpg | Bin 502119 -> 0 bytes .../resources/media/backdrops/Spt-ZIB.jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/Steiermark.heute.jpg | Bin 17248 -> 0 bytes .../resources/media/backdrops/Tatort.(AD).jpg | Bin 316873 -> 0 bytes .../resources/media/backdrops/Tatort.jpg | Bin 316873 -> 0 bytes .../resources/media/backdrops/Tirol.heute.jpg | Bin 15580 -> 0 bytes .../backdrops/Vier.Frauen.und.ein.Todesfall.jpg | Bin 569970 -> 0 bytes .../resources/media/backdrops/Vorarlberg.heute.jpg | Bin 16260 -> 0 bytes .../resources/media/backdrops/Wetter.ZIB.(GS).jpg | Bin 254620 -> 0 bytes .../resources/media/backdrops/Wetter.ZIB.20.jpg | Bin 720876 -> 0 bytes .../resources/media/backdrops/Wetter.ZIB.jpg | Bin 254620 -> 0 bytes .../resources/media/backdrops/Wetterschau.jpg | Bin 254620 -> 0 bytes .../resources/media/backdrops/Wien.heute.jpg | Bin 21940 -> 0 bytes .../resources/media/backdrops/ZIB.11.jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/ZIB.13.jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/ZIB.17.jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/ZIB.2.jpg | Bin 326195 -> 0 bytes .../resources/media/backdrops/ZIB.20.jpg | Bin 920306 -> 0 bytes .../resources/media/backdrops/ZIB.24.jpg | Bin 919558 -> 0 bytes .../resources/media/backdrops/ZIB.9.jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/ZIB.Flash.jpg | Bin 921239 -> 0 bytes .../resources/media/backdrops/ZIB.Magazin.jpg | Bin 920680 -> 0 bytes .../resources/media/backdrops/ZIB.SPEZIAL.jpg | Bin 264220 -> 0 bytes .../resources/media/backdrops/ZIB.Spezial.jpg | Bin 264220 -> 0 bytes .../media/backdrops/Zeit.im.Bild.(GS).jpg | Bin 260323 -> 0 bytes .../resources/media/backdrops/Zeit.im.Bild.jpg | Bin 260323 -> 0 bytes .../resources/media/logos/Burgenland.heute.jpg | Bin 16433 -> 0 bytes .../resources/media/logos/CopStories.jpg | Bin 25602 -> 0 bytes .../resources/media/logos/Krnten.heute.jpg | Bin 19262 -> 0 bytes .../media/logos/Niedersterreich.heute.jpg | Bin 19545 -> 0 bytes .../resources/media/logos/Obersterreich.heute.jpg | Bin 19439 -> 0 bytes .../resources/media/logos/Salzburg.heute.jpg | Bin 18220 -> 0 bytes .../resources/media/logos/Schlosshotel.Orth.jpg | Bin 36883 -> 0 bytes .../resources/media/logos/Sport.Aktuell.jpg | Bin 28503 -> 0 bytes .../resources/media/logos/Sport.ZIB.20.jpg | Bin 30242 -> 0 bytes .../resources/media/logos/Spt-ZIB.jpg | Bin 13696 -> 0 bytes .../resources/media/logos/Steiermark.heute.jpg | Bin 18061 -> 0 bytes .../resources/media/logos/Tatort.jpg | 11 -- .../resources/media/logos/Tirol.heute.jpg | Bin 18948 -> 0 bytes .../resources/media/logos/Vorarlberg.heute.jpg | Bin 19537 -> 0 bytes .../resources/media/logos/Wetter.ZIB.(GS).jpg | Bin 6677 -> 0 bytes .../resources/media/logos/Wetter.ZIB.20.jpg | Bin 24813 -> 0 bytes .../resources/media/logos/Wetter.ZIB.jpg | Bin 6677 -> 0 bytes .../resources/media/logos/Wetterschau.jpg | Bin 6677 -> 0 bytes .../resources/media/logos/Wien.heute.jpg | Bin 20872 -> 0 bytes .../resources/media/logos/ZIB.13.jpg | Bin 13696 -> 0 bytes .../resources/media/logos/ZIB.17.jpg | Bin 13696 -> 0 bytes .../resources/media/logos/ZIB.2.jpg | Bin 17179 -> 0 bytes .../resources/media/logos/ZIB.20.jpg | Bin 31411 -> 0 bytes .../resources/media/logos/ZIB.24.jpg | Bin 31097 -> 0 bytes .../resources/media/logos/ZIB.9.jpg | Bin 13696 -> 0 bytes .../resources/media/logos/ZIB.Flash.jpg | Bin 30209 -> 0 bytes .../resources/media/logos/ZIB.Magazin.jpg | Bin 30580 -> 0 bytes .../resources/media/logos/Zeit.im.Bild.(GS).jpg | Bin 13696 -> 0 bytes .../resources/media/logos/Zeit.im.Bild.jpg | Bin 13696 -> 0 bytes 73 files changed, 135 insertions(+), 15 deletions(-) delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Bundesrat.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Burgenland.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/CopStories.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/EU-Gipfel.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Hohes.Haus.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Krnten.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Nationalrat.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Niedersterreich.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Obersterreich.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Salzburg.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Schlosshotel.Orth.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Soko.Donau.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Sport-Bild.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Sport.Aktuell.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Sport.ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Sport.am.Sonntag.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Spt-ZIB.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Steiermark.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Tatort.(AD).jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Tatort.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Tirol.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Vier.Frauen.und.ein.Todesfall.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Vorarlberg.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Wetter.ZIB.(GS).jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Wetter.ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Wetter.ZIB.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Wetterschau.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Wien.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.11.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.13.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.17.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.2.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.24.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.9.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.Flash.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.Magazin.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.SPEZIAL.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/ZIB.Spezial.jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Zeit.im.Bild.(GS).jpg delete mode 100644 plugin.video.orftvthek/resources/media/backdrops/Zeit.im.Bild.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Burgenland.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/CopStories.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Krnten.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Niedersterreich.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Obersterreich.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Salzburg.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Schlosshotel.Orth.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Sport.Aktuell.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Sport.ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Spt-ZIB.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Steiermark.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Tatort.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Tirol.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Vorarlberg.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Wetter.ZIB.(GS).jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Wetter.ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Wetter.ZIB.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Wetterschau.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Wien.heute.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.13.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.17.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.2.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.20.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.24.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.9.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.Flash.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/ZIB.Magazin.jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Zeit.im.Bild.(GS).jpg delete mode 100644 plugin.video.orftvthek/resources/media/logos/Zeit.im.Bild.jpg hooks/post-receive -- Plugins ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Xbmc-addons mailing list Xbmc-addons@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xbmc-addons