The branch, eden has been updated
via 6cdcabd580b72fc7d44e0766f199d6b8a6b06971 (commit)
via 165bc150e98a8c708a64fc43d6e42b639104e48a (commit)
from fe4f15aedb6cb6faa28d8597587ae77dee28082e (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=6cdcabd580b72fc7d44e0766f199d6b8a6b06971
commit 6cdcabd580b72fc7d44e0766f199d6b8a6b06971
Author: beenje <[email protected]>
Date: Tue May 7 22:02:14 2013 +0200
[plugin.video.4od] updated to version 2.0.11
diff --git a/plugin.video.4od/addon.xml b/plugin.video.4od/addon.xml
index d58843e..fdd2d0d 100644
--- a/plugin.video.4od/addon.xml
+++ b/plugin.video.4od/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.4od"
name="4oD"
- version="2.0.10"
+ version="2.0.11"
provider-name="mossy">
<requires>
<import addon="script.module.socksipy" version="1.0.0"/>
@@ -13,10 +13,14 @@
<provides>video</provides>
</extension>
<extension point="xbmc.addon.metadata">
- <language>en</language>
+ <language>en</language>
<platform>all</platform>
<summary>Channel 4 On Demand</summary>
<description>Channel 4 On Demand</description>
- <disclaimer>May not work outside the UK and Ireland</disclaimer>
+ <disclaimer>May not work outside the UK and Ireland</disclaimer>
+ <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+ <forum>http://forum.xbmc.org/showthread.php?tid=134118</forum>
+ <website>http://code.google.com/p/mossy-xbmc-repo/</website>
+
<source>http://code.google.com/p/plugin-video-4od/source/browse/</source>
</extension>
</addon>
diff --git a/plugin.video.4od/changelog.txt b/plugin.video.4od/changelog.txt
index 75e7f55..a9a580a 100644
--- a/plugin.video.4od/changelog.txt
+++ b/plugin.video.4od/changelog.txt
@@ -1,3 +1,6 @@
+Version 2.0.11 (01 May 2013)
+- Fix 'Error getting category web page'
+
Version 2.0.10 (28 Mar 2013)
- Option to use port 443 for RTMP streams
diff --git a/plugin.video.4od/fourOD.py b/plugin.video.4od/fourOD.py
index 118886f..6a2a753 100644
--- a/plugin.video.4od/fourOD.py
+++ b/plugin.video.4od/fourOD.py
@@ -93,7 +93,7 @@ class FourODProvider(Provider):
"http:\/\/ps3.channel4.com\/pmlsd\/tags\/animals\/4od\/title.json?platform=ps3"]
},
"$":"\n \n \n \n \n \n \n \n \n \n
\n \n ",
- "id":"tag:ps3.channel4.com,2009:\/programmes\/tags\/animals",
+
"id":"tag:ps3.channel4.com,2009:\/programmes\/categories\/animals",
"title":"Animals",
"summary":
{"@type":"html",
@@ -109,7 +109,7 @@ class FourODProvider(Provider):
continue
id = entry[u'id']
- pattern = u'/programmes/tags/(.+)'
+ pattern = u'/programmes/categories/(.+)'
match = re.search(pattern, id, re.DOTALL | re.IGNORECASE)
categoryName = match.group(1)
diff --git a/plugin.video.4od/resources/language/English/strings.po
b/plugin.video.4od/resources/language/English/strings.po
index c721d66..1496a0c 100644
--- a/plugin.video.4od/resources/language/English/strings.po
+++ b/plugin.video.4od/resources/language/English/strings.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: XBMC-Addons\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2013-03-28 15:09+0000\n"
+"POT-Creation-Date: 2013-05-01 12:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE\n"
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=165bc150e98a8c708a64fc43d6e42b639104e48a
commit 165bc150e98a8c708a64fc43d6e42b639104e48a
Author: beenje <[email protected]>
Date: Tue May 7 21:59:37 2013 +0200
[plugin.video.nolife] updated to version 1.16.6
diff --git a/plugin.video.nolife/addon.xml b/plugin.video.nolife/addon.xml
index b29fea1..5a7e117 100644
--- a/plugin.video.nolife/addon.xml
+++ b/plugin.video.nolife/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.nolife"
name="Nolife Online"
- version="1.16.5"
+ version="1.16.6"
provider-name="gormux">
<requires>
<import addon="xbmc.python" version="2.0"/>
diff --git a/plugin.video.nolife/default.py b/plugin.video.nolife/default.py
index 44d6467..df5c725 100644
--- a/plugin.video.nolife/default.py
+++ b/plugin.video.nolife/default.py
@@ -175,24 +175,49 @@ def getlastVideos():
Get the videos in the "last videos" menu option
"""
showseen = settings.getSetting( "showseen" )
- postrequest = urllib.urlencode({'emissions': 0,
+ showlast = int(settings.getSetting( "showlast" ).split('.')[0])
+ i = 0
+ emissions = []
+ finished = False
+ while finished == False:
+ postrequest = urllib.urlencode({'emissions': i,
'famille': 0,
'a': 'ge'})
- page = requestHandler.open("http://mobile.nolife-tv.com/do.php";,
postrequest)
- liste = BeautifulSoup(page.read()).findAll('li')
- for element in liste:
- extractVideoInfo(element)
+ page = requestHandler.open("http://mobile.nolife-tv.com/do.php";,
postrequest)
+ liste = BeautifulSoup(page.read()).findAll('li')
+ for element in liste:
+ if len(emissions) == showlast:
+ finished = True
+ break
- videoInfo = extractVideoInfo(element)
- if (showseen == "true" or (showseen == "false" and videoInfo.seen ==
False)):
- if isAvailableForUser(videoInfo.availability):
- addlink( videoInfo.name + " - " + videoInfo.desc,
- "plugin://plugin.video.nolife?id=" + videoInfo.vid,
- videoInfo.thumb,
- videoInfo.duration,
- videoInfo.seen )
-
+ videoInfo = extractVideoInfo(element)
+ if videoInfo != None:
+ if (showseen == "true" or (showseen == "false" and
videoInfo.seen == False)):
+ if isAvailableForUser(videoInfo.availability):
+ emissions.append([videoInfo.id,
+ videoInfo.name,
+ videoInfo.desc,
+ videoInfo.duration,
+ videoInfo.seen,
+ videoInfo.thumb])
+ i = i + 1
+
+ for emission in emissions:
+ if emission[2] == '':
+ addlink(emission[1],
+ "plugin://plugin.video.nolife?id=" + emission[0],
+ emission[5],
+ emission[3],
+ emission[4] )
+
+ else:
+ addlink(emission[1] + ' - ' + emission[2],
+ "plugin://plugin.video.nolife?id=" + emission[0],
+ emission[5],
+ emission[3],
+ emission[4] )
+
def getcategories():
"""Gets all categories and adds directories
@@ -344,6 +369,7 @@ def playvideo(requestHandler, video):
"""
settings = xbmcaddon.Addon(id='plugin.video.nolife')
quality = settings.getSetting( "quality" )
+ autorefresh = settings.getSetting("autorefresh")
if quality == "HQ" or quality == "1":
_video = video + "?quality=2"
elif quality == "LQ" or quality == "0":
@@ -366,7 +392,9 @@ def playvideo(requestHandler, video):
thumbnailImage='',
path=url )
- xbmcplugin.setResolvedUrl(0, True, listitem)
+ xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, listitem)
+ if autorefresh == "true":
+ xbmc.executebuiltin("Container.Refresh")
def get_params():
"""
@@ -403,9 +431,9 @@ def addlink(name, url, iconimage, duration, bool_seen):
liz.setInfo(
type="Video",
infoLabels={ "title": name,
- "duration" : duration,
"playcount": int(bool_seen) }
)
+ liz.addStreamInfo("video", { 'duration':duration })
liz.setProperty("IsPlayable","true")
ok = xbmcplugin.addDirectoryItem( handle=int(sys.argv[1]),
url=url,
@@ -472,10 +500,10 @@ def extractVideoInfo(element):
"""
Extract video info from html and store it in videoInfo class
"""
- info = videoInfo()
+ info = None
if re.compile('data-icon="arrow-r"').findall(str(element)):
-
- if re.compile('icones/32/on').findall(str(element)):
+ info = videoInfo()
+ if re.compile('mark_read').findall(str(element)):
info.seen = True
else:
info.seen = False
@@ -484,7 +512,7 @@ def extractVideoInfo(element):
' padding-left:55px;">.*</p>'
info.thumb =
re.compile('data-thumb=".*"').findall(str(element))[0][12:][:-1]
_date_len =
remove_html_tags(re.compile(reg_date).findall(str(element))[0])
- info.duration = _date_len.split(' - ')[1]
+ info.duration = sum(int(x) * 60 ** i for i,x in
enumerate(reversed(_date_len.split(' - ')[1].strip('s').split(":"))))
req_id = 'a href="emission-.*" '
info.id = re.compile(req_id).findall(str(element))[0][17:][:-2]
@@ -509,7 +537,7 @@ def extractVideoSearchInfo(element):
info = None
if re.compile('data-icon="arrow-r"').findall(str(element)):
info = videoInfo()
- if re.compile('icones/32/on').findall(str(element)):
+ if re.compile('mark_read').findall(str(element)):
info.seen = True
else:
info.seen = False
-----------------------------------------------------------------------
Summary of changes:
plugin.video.4od/addon.xml | 10 ++-
plugin.video.4od/changelog.txt | 3 +
plugin.video.4od/fourOD.py | 4 +-
.../resources/language/English/strings.po | 2 +-
plugin.video.nolife/addon.xml | 2 +-
plugin.video.nolife/default.py | 70 ++++++++++++++------
6 files changed, 63 insertions(+), 28 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and
their applications. This 200-page book is written by three acclaimed
leaders in the field. The early access version is available now.
Download your free book today! http://p.sf.net/sfu/neotech_d2d_may
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
