The branch, eden has been updated
via 36157dbfaadb5283c179c82be4d1ce7c6ed3db2b (commit)
via 0c6f3cd0a715fe0c8bdc4b00a249fa911cdffd7b (commit)
from 6ebbe3ef50e9672d63a16b65c90e0c82ce4caa2a (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=36157dbfaadb5283c179c82be4d1ce7c6ed3db2b
commit 36157dbfaadb5283c179c82be4d1ce7c6ed3db2b
Author: beenje <[email protected]>
Date: Wed Aug 28 22:23:41 2013 +0200
[plugin.video.tageswebschau] updated to version 1.0.5
diff --git a/plugin.video.tageswebschau/addon.xml
b/plugin.video.tageswebschau/addon.xml
index 7ee38b5..6e24db2 100644
--- a/plugin.video.tageswebschau/addon.xml
+++ b/plugin.video.tageswebschau/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.tageswebschau" name="TagesWEBschau" version="1.0.3"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.tageswebschau" name="WochenWEBschau" version="1.0.5"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
@@ -13,7 +13,7 @@
<language>de</language>
<description lang="de">Die neuesten Web-Nachrichten</description>
<description lang="en">Latest Web-News</description>
- <website></website>
+ <website>http://wochenwebschau.de</website>
<source>https://github.com/AddonScriptorDE/plugin.video.tageswebschau</source>
<forum>http://forum.xbmc.org/showthread.php?tid=132563</forum>
<email>AddonScriptorDE at yahoo dot de</email>
diff --git a/plugin.video.tageswebschau/changelog.txt
b/plugin.video.tageswebschau/changelog.txt
index 07b59ba..c08b60d 100644
--- a/plugin.video.tageswebschau/changelog.txt
+++ b/plugin.video.tageswebschau/changelog.txt
@@ -4,5 +4,9 @@
- Added latest shows
1.0.2
- Fixed site changes
-1.0.3
+1.0.3 / 2.0.3
+- Fixed site changes
+1.0.4 / 2.0.4
+- Changed content/name to WochenWEBschau
+1.0.5 / 2.0.5
- Fixed site changes
diff --git a/plugin.video.tageswebschau/default.py
b/plugin.video.tageswebschau/default.py
index bf8b665..ce44435 100644
--- a/plugin.video.tageswebschau/default.py
+++ b/plugin.video.tageswebschau/default.py
@@ -9,44 +9,55 @@ import xbmcaddon
import xbmcplugin
pluginhandle = int(sys.argv[1])
+xbox = xbmc.getCondVisibility("System.Platform.xbox")
def index():
- content =
getUrl("http://www.radiobremen.de/extranet/tws/json/tws_toc.json?_=1367168129910";)
- spl = content.split('{\n "titel" : ')
+ content = getUrl("http://wochenwebschau.tumblr.com/";)
+ spl = content.split('<div class="post-panel"')
for i in range(1, len(spl), 1):
entry = spl[i]
- match = re.compile('"(.+?)"', re.DOTALL).findall(entry)
+ match = re.compile('<div class="copy">(.+?)</div>',
re.DOTALL).findall(entry)
title = match[0]
+ match = re.compile('<strong>(.+?)</strong>', re.DOTALL).findall(title)
+ if match:
+ title = match[0]
+ title = title.replace("<p>", "").replace("</p>", "").replace("<span>",
"").replace("</span>", "")
+ if ">" in title:
+ title = title[title.find(">")+1:]
+ if ">" in title:
+ title = title[title.find(">")+1:]
+ if title[len(title)-1:]==":":
+ title = title[:-1]
title = cleanTitle(title)
- match = re.compile('"img" : "(.+?)"', re.DOTALL).findall(entry)
- thumb = match[0]
- title = cleanTitle(title)
- match = re.compile('"jsonurl" : "(.+?)"', re.DOTALL).findall(entry)
- url = "http://www.radiobremen.de"+match[0]
- addLink(title, url, 'playVideo', thumb)
+ match = re.compile('src="http://www.youtube.com/embed/(.+?)\\?',
re.DOTALL).findall(entry)
+ id = match[0]
+ thumb = "http://img.youtube.com/vi/"+id+"/0.jpg";
+ addLink(title, id, 'playVideo', thumb)
xbmcplugin.endOfDirectory(pluginhandle)
-def playVideo(url):
- content = getUrl(url)
- match1 = re.compile('"url" : "http://(.+?)_L.mp4"',
re.DOTALL).findall(content)
- match2 = re.compile('"url":"http://(.+?)_L.mp4"',
re.DOTALL).findall(content)
- if match1:
- url = "http://"+match1[0]+"_L.mp4";
- elif match2:
- url = "http://"+match2[0]+"_L.mp4";
- listitem = xbmcgui.ListItem(path=url)
+def playVideo(id):
+ listitem = xbmcgui.ListItem(path=getYoutubePluginUrl(id))
xbmcplugin.setResolvedUrl(pluginhandle, True, listitem)
+def getYoutubePluginUrl(id):
+ if xbox:
+ return
"plugin://video/YouTube/?path=/root/video&action=play_video&videoid=" + id
+ else:
+ return
"plugin://plugin.video.youtube/?path=/root/video&action=play_video&videoid=" +
id
+
+
def cleanTitle(title):
- return title.replace("<", "<").replace(">", ">").replace("&",
"&").replace("'", "\\").replace(""", "\"").strip()
+ title = title = title.replace("'", "'").replace("–",
"-").replace("“", "-").replace("”", "-").replace("’",
"'").replace("…", "â¦")
+ title = title.replace("<", "<").replace(">", ">").replace("&",
"&").replace("'", "\\").replace(""", "\"").strip()
+ return title
def getUrl(url):
req = urllib2.Request(url)
- req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:19.0)
Gecko/20100101 Firefox/19.0')
+ req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; rv:23.0)
Gecko/20100101 Firefox/23.0')
response = urllib2.urlopen(req)
link = response.read()
response.close()
diff --git a/plugin.video.tageswebschau/icon.png
b/plugin.video.tageswebschau/icon.png
index 98fbce9..bfe424b 100644
Binary files a/plugin.video.tageswebschau/icon.png and
b/plugin.video.tageswebschau/icon.png differ
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=0c6f3cd0a715fe0c8bdc4b00a249fa911cdffd7b
commit 0c6f3cd0a715fe0c8bdc4b00a249fa911cdffd7b
Author: beenje <[email protected]>
Date: Wed Aug 28 22:23:39 2013 +0200
[plugin.video.filmstarts_de] updated to version 1.1.1
diff --git a/plugin.video.filmstarts_de/addon.xml
b/plugin.video.filmstarts_de/addon.xml
index dad4238..3f5505a 100644
--- a/plugin.video.filmstarts_de/addon.xml
+++ b/plugin.video.filmstarts_de/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.filmstarts_de" name="FilmStarts.de" version="1.1.0"
provider-name="AddonScriptorDE">
+<addon id="plugin.video.filmstarts_de" name="FilmStarts.de" version="1.1.1"
provider-name="AddonScriptorDE">
<requires>
<import addon="xbmc.python" version="2.0"/>
</requires>
diff --git a/plugin.video.filmstarts_de/changelog.txt
b/plugin.video.filmstarts_de/changelog.txt
index ec05af6..bfab065 100644
--- a/plugin.video.filmstarts_de/changelog.txt
+++ b/plugin.video.filmstarts_de/changelog.txt
@@ -27,3 +27,5 @@
1.1.0 / 2.1.0
- Fixed site changes
- Some small improvements
+1.1.1 / 2.1.1
+- Fixed video playback for some trailers
diff --git a/plugin.video.filmstarts_de/default.py
b/plugin.video.filmstarts_de/default.py
index 114981c..780ce2a 100644
--- a/plugin.video.filmstarts_de/default.py
+++ b/plugin.video.filmstarts_de/default.py
@@ -9,12 +9,12 @@ import xbmcgui
import re
import sys
+addon = xbmcaddon.Addon()
socket.setdefaulttimeout(30)
pluginhandle = int(sys.argv[1])
-xbox = xbmc.getCondVisibility("System.Platform.xbox")
-addonId = 'plugin.video.filmstarts_de'
-addon = xbmcaddon.Addon(id=addonId)
+addonId = addon.getAddonInfo('id')
translation = addon.getLocalizedString
+xbox = xbmc.getCondVisibility("System.Platform.xbox")
showAllTrailers = addon.getSetting("showAllTrailers") == "true"
forceViewMode = addon.getSetting("forceViewMode") == "true"
useCoverAsFanart = addon.getSetting("useCoverAsFanart") == "true"
@@ -70,14 +70,14 @@ def listVideos(urlFull):
if currentPage == 1:
match = re.compile('<a href=".+?">\n<img src="(.+?)" alt=""
/>\n</a>\n</div>\n<div style=".+?">\n<h2 class=".+?" style=".+?"><b>.+?</b>
(.+?)</h2><br />\n<span style=".+?" class="purehtml fs11">\n.+?<a class="btn"
href="(.+?)"', re.DOTALL).findall(content)
for thumb, title, url in match:
- addDir(title, baseUrl + url, "playVideo",
get_better_thumb(thumb))
+ addLink(title, baseUrl + url, "playVideo",
get_better_thumb(thumb))
match = re.compile('<img src=\'(.+?)\' alt=".+?" title=".+?"
/>\n</span>\n</div>\n<div class="contenzone">\n<div class="titlebar">\n<a
href=\'(.+?)\' class="link">\n<span class=\'bold\'><b>.+?</b> (.+?)</span>',
re.DOTALL).findall(content)
for thumb, url, title in match:
- addDir(title, baseUrl + url, "playVideo", get_better_thumb(thumb))
+ addLink(title, baseUrl + url, "playVideo", get_better_thumb(thumb))
elif mode == "listVideosInterview":
match = re.compile('<img src=\'(.+?)\'.+?</span>\n</div>\n<div
class="contenzone">\n<div class="titlebar">\n<a.+?href=\'(.+?)\'>\n<span
class=\'bold\'>\n(.+?)\n</span>(.+?)\n</a>', re.DOTALL).findall(content)
for thumb, url, title1, title2 in match:
- addDir(title1+title2, baseUrl + url, "playVideo",
get_better_thumb(thumb))
+ addLink(title1+title2, baseUrl + url, "playVideo",
get_better_thumb(thumb))
elif mode == "listVideosTV":
spl = content.split('<div class="datablock vpadding10b">')
for i in range(1, len(spl), 1):
@@ -92,7 +92,7 @@ def listVideos(urlFull):
else:
match = re.compile("<a href='(.+?)'>\n(.+?)<br />",
re.DOTALL).findall(entry)
title = match[0][1]
- addDir(title, baseUrl + url, "playVideo", get_better_thumb(thumb))
+ addLink(title, baseUrl + url, "playVideo", get_better_thumb(thumb))
if currentPage < maxPage:
urlNew = ""
if mode == "listVideosTrailer":
@@ -165,14 +165,14 @@ def playVideo(url):
content = getUrl(url)
match = re.compile('"html5PathHD":"(.*?)"', re.DOTALL).findall(content)
finalUrl=""
- if match[0]:
+ if match[0] and match[0].startswith("http://";):
finalUrl=match[0]
else:
match = re.compile('"refmedia":(.+?),', re.DOTALL).findall(content)
media = match[0]
- match = re.compile('"cMovie":(.+?),', re.DOTALL).findall(content)
+ match = re.compile('"relatedEntityId":(.+?),',
re.DOTALL).findall(content)
ref = match[0]
- match = re.compile('"entityType":"(.+?)"', re.DOTALL).findall(content)
+ match = re.compile('"relatedEntityType":"(.+?)"',
re.DOTALL).findall(content)
typeRef = match[0]
content = getUrl(baseUrl +
'/ws/AcVisiondataV4.ashx?media='+media+'&ref='+ref+'&typeref='+typeRef)
finalUrl = ""
-----------------------------------------------------------------------
Summary of changes:
plugin.video.filmstarts_de/addon.xml | 2 +-
plugin.video.filmstarts_de/changelog.txt | 2 +
plugin.video.filmstarts_de/default.py | 20 ++++++------
plugin.video.tageswebschau/addon.xml | 4 +-
plugin.video.tageswebschau/changelog.txt | 6 +++-
plugin.video.tageswebschau/default.py | 51 ++++++++++++++++++------------
plugin.video.tageswebschau/icon.png | Bin 20332 -> 24511 bytes
7 files changed, 51 insertions(+), 34 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://img.youtube.com/vi/"+id+"/0.jpg"](https://img.youtube.com/vi/"+id+"/0.jpg"){kind=link}