The branch, frodo has been updated
via cdc4700e89c003d8e70d4855d8ea0ce850a82ce4 (commit)
from a407cb2b4c500f3fc8812cc5a30fd623eed1df1f (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=cdc4700e89c003d8e70d4855d8ea0ce850a82ce4
commit cdc4700e89c003d8e70d4855d8ea0ce850a82ce4
Author: sphere <[email protected]>
Date: Thu Mar 27 09:18:56 2014 +0100
[plugin.video.peoplesvoice] updated to version 0.1.8
diff --git a/plugin.video.peoplesvoice/addon.xml
b/plugin.video.peoplesvoice/addon.xml
index 6848c80..30f1b5f 100644
--- a/plugin.video.peoplesvoice/addon.xml
+++ b/plugin.video.peoplesvoice/addon.xml
@@ -3,7 +3,7 @@
id="plugin.video.peoplesvoice"
name="The People's Voice"
provider-name="celadoor"
- version="0.1.6">
+ version="0.1.8">
<requires>
<import addon="xbmc.python" version="2.1.0" />
<import addon="script.common.plugin.cache" version="1.5.1" />
diff --git a/plugin.video.peoplesvoice/changelog.txt
b/plugin.video.peoplesvoice/changelog.txt
index b2d6e37..b7f7d64 100644
--- a/plugin.video.peoplesvoice/changelog.txt
+++ b/plugin.video.peoplesvoice/changelog.txt
@@ -1,4 +1,7 @@
Plays the People's Voice live video stream. created by celadoor.
+
+Version 0.1.8 -Fixed broken video urls
+
Version 0.1.6 -Fixed schedule and added day of the week, fixed video quality
options.
Version 0.1.5 -Fixed video quality options and made error checking go to
xbmc.log()
diff --git a/plugin.video.peoplesvoice/default.py
b/plugin.video.peoplesvoice/default.py
index c6669cf..afb9303 100644
--- a/plugin.video.peoplesvoice/default.py
+++ b/plugin.video.peoplesvoice/default.py
@@ -6,26 +6,27 @@ import xbmcaddon
addon = xbmcaddon.Addon('plugin.video.peoplesvoice')
__language__ = addon.getLocalizedString
+__icon__ = addon.getAddonInfo('icon')
def CATEGORIES():
-
addDir(__language__(30010),'http://www.thepeoplesvoice.tv/watchnow/',1,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30013))
-
addDir(__language__(30016),'http://www.thepeoplesvoice.tv/whatson/',3,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30013))
-
addDir(__language__(30017),'http://www.thepeoplesvoice.tv/show/',4,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30013))
-
addLink(__language__(30010)+__language__(30018),'http://cdn.rbm.tv:1935/rightbrainmedia-live-106/_definst_/ddstream_1/playlist.m3u8','http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30013)+__language__(30012))
+
addDir(__language__(30010)+__language__(30018),'http://www.thepeoplesvoice.tv/watchnow/',1,__icon__,__language__(30013))
+
addDir(__language__(30016),'http://www.thepeoplesvoice.tv/whatson/',3,__icon__,__language__(30013))
+
addDir(__language__(30017),'http://www.thepeoplesvoice.tv/show/',4,__icon__,__language__(30013))
+
addLink(__language__(30010)+__language__(30011),'http://cdn.rbm.tv:1935/rightbrainmedia-live-106/_definst_/ddstream_3/playlist.m3u8',__icon__,__language__(30013)+__language__(30012))
def INDEX(url):
-
+
req = urllib2.Request(url)
req.add_header('User-Agent', 'Mozilla/5.0 (Windows NT 6.2; Win64; x64;
rv:16.0.1) Gecko/20121011 Firefox/16.0.1')
response = urllib2.urlopen(req)
link=response.read()
response.close()
#Scrape video source
- match=re.compile('<a href="(.+?)" target="TPV"><span style="color:
#ffffff;"><font size="3" color="black">(.+?)</span>').findall(link)
+ match=re.compile('"TPV" src="(.+?)"').findall(link)
if len(match) > 0:
- for url,name in match:
-
addDir(__language__(30010)+name,url,2,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30014)+__language__(30015)+__language__(30012))
+ for url in match:
+
addDir(__language__(30010)+__language__(30018),url,2,__icon__,__language__(30014)+__language__(30015)+__language__(30012))
else:
xbmc.log(__language__(30019), xbmc.LOGERROR )
xbmcgui.Dialog().ok(__language__(30010), __language__(30019))
@@ -51,7 +52,7 @@ def INDEX2(url):
if day > 6:
day = 0
dayset = name[4]
- addDir(week[day]+name,'',0,image,week[day]+name)
+
addDir(week[day]+name,'http://rbm.myrbm.tv/player.php?pID=145',2,image,week[day]+name)
else:
xbmc.log(__language__(30020), xbmc.LOGERROR )
xbmcgui.Dialog().ok(__language__(30010), __language__(30020))
@@ -84,9 +85,10 @@ def VIDEOLINKS(url,name):
link=response.read()
response.close()
#Scrape video source
- match=re.compile('window.location.href = "(.+?)"').findall(link)
- for url in match:
-
addLink(name+__language__(30011),url,'http://www.thepeoplesvoice.tv/sites/all/themes/tpv/images/tpv-logo-footer.gif',__language__(30013))
+ match=re.compile('href="(.+?)">(.+?)<').findall(link)#video links
+ for url,name in match:
+ name = name.replace('"', '"').replace(''',
"'").replace('&', '&').replace('’', "'") # Cleanup the title.
+
addLink(name+__language__(30018),url,__icon__,__language__(30013))
diff --git a/plugin.video.peoplesvoice/resources/language/English/strings.xml
b/plugin.video.peoplesvoice/resources/language/English/strings.xml
index 2aa5882..c450fef 100644
--- a/plugin.video.peoplesvoice/resources/language/English/strings.xml
+++ b/plugin.video.peoplesvoice/resources/language/English/strings.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="30010">The People's Voice </string>
-<string id="30011"> Live</string>
+<string id="30011">Low Quality Video Link</string>
<string id="30012">[CR]Some programmes may include swearing and adult content
after 9pm UK time...[CR]</string>
<string id="30013">[B]VIEWER EXPECTATION[/B][CR]The People's Voice has been
established to balance mainstream media bias which refuses to give voice to
people with views at odds with mainstream thinking and belief. You can expect
to hear all aspects of mainstream society questioned and debated. What viewers
choose to accept or believe is for them to decide after hearing the evidence
and opinion broadcast by The People's Voice and the information and opinion
broadcast by mainstream sources.</string>
<string id="30014">[COLOR yellow]Please Donate, and support the video content
provider![CR][/COLOR]</string>
<string id="30015">[COLOR
yellow][B]http://www.thepeoplesvoice.tv/donate/[/B][CR][CR][/COLOR]</string>
-<string id="30016">Today's Schedule[CR][CR]</string>
+<string id="30016">This Weeks Schedule[CR][CR]</string>
<string id="30017">The People's Voice Shows</string>
-<string id="30018">Direct Video Link</string>
+<string id="30018"> Mobile Video Links</string>
<string id="30019">Media url not found!</string>
<string id="30020">Schedule url not found!</string>
<string id="30021">[COLOR red] Monday [/COLOR]</string>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.peoplesvoice/addon.xml | 2 +-
plugin.video.peoplesvoice/changelog.txt | 3 ++
plugin.video.peoplesvoice/default.py | 26 ++++++++++---------
.../resources/language/English/strings.xml | 6 ++--
4 files changed, 21 insertions(+), 16 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
