The branch, frodo has been updated
via 57f758b14dec8275f9e2b747b806559413aa4fe4 (commit)
via 9161d9b4bed242a5026c948d2aa5a17ac962425f (commit)
from 3c5227edd5fde1d69f75d3d4f5b085e8835f7224 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=57f758b14dec8275f9e2b747b806559413aa4fe4
commit 57f758b14dec8275f9e2b747b806559413aa4fe4
Author: beenje <[email protected]>
Date: Tue May 7 22:02:17 2013 +0200
[plugin.video.4od] updated to version 3.0.11
diff --git a/plugin.video.4od/addon.xml b/plugin.video.4od/addon.xml
index 36f560d..63c8cb0 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="3.0.10"
+ version="3.0.11"
provider-name="mossy">
<requires>
<import addon="script.module.socksipy" version="2.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 d564e98..0f2def8 100644
--- a/plugin.video.4od/changelog.txt
+++ b/plugin.video.4od/changelog.txt
@@ -1,3 +1,6 @@
+Version 3.0.11 (01 May 2013)
+- Fix 'Error getting category web page'
+
Version 3.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 5142311..1bb5291 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 13:18+0000\n"
+"POT-Creation-Date: 2013-05-01 12:03+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=9161d9b4bed242a5026c948d2aa5a17ac962425f
commit 9161d9b4bed242a5026c948d2aa5a17ac962425f
Author: beenje <[email protected]>
Date: Tue May 7 21:59:33 2013 +0200
[plugin.video.nolife] updated to version 2.16.6
diff --git a/plugin.video.nolife/addon.xml b/plugin.video.nolife/addon.xml
index a77199b..4bebd69 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="2.16.5"
+ version="2.16.6"
provider-name="gormux">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/plugin.video.nolife/default.py b/plugin.video.nolife/default.py
index 48c5f12..df5c725 100644
--- a/plugin.video.nolife/default.py
+++ b/plugin.video.nolife/default.py
@@ -190,19 +190,18 @@ def getlastVideos():
if len(emissions) == showlast:
finished = True
break
-
- extractVideoInfo(element)
videoInfo = extractVideoInfo(element)
- if (showseen == "true" or (showseen == "false" and videoInfo.seen
== False)):
- if isAvailableForUser(videoInfo.availability):
+ 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
+ i = i + 1
for emission in emissions:
if emission[2] == '':
@@ -501,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
@@ -538,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 | 17 ++++++++---------
6 files changed, 22 insertions(+), 16 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
