The branch, frodo has been updated
via ff5fb007c2a6c148e8abde6df7bef98c78f1e1f3 (commit)
from e7018b586d139c9ef95c8fd4e9aa4f3e36a2d2c8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/plugins;a=commit;h=ff5fb007c2a6c148e8abde6df7bef98c78f1e1f3
commit ff5fb007c2a6c148e8abde6df7bef98c78f1e1f3
Author: beenje <[email protected]>
Date: Mon Feb 4 22:24:56 2013 +0100
[plugin.video.nolife] updated to version 2.16.2
diff --git a/plugin.video.nolife/addon.xml b/plugin.video.nolife/addon.xml
index 142fb6e..be91b42 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.1"
+ version="2.16.2"
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 9455d2f..248acff 100644
--- a/plugin.video.nolife/default.py
+++ b/plugin.video.nolife/default.py
@@ -175,7 +175,9 @@ def getlastVideos():
Get the videos in the "last videos" menu option
"""
showseen = settings.getSetting( "showseen" )
+ showlast = int(settings.getSetting( "showlast" ).split('.')[0])
i = 0
+ emissions = []
finished = False
while finished == False:
postrequest = urllib.urlencode({'emissions': i,
@@ -185,7 +187,7 @@ def getlastVideos():
page = requestHandler.open("http://mobile.nolife-tv.com/do.php";,
postrequest)
liste = BeautifulSoup(page.read()).findAll('li')
for element in liste:
- if == len(emissions) == 30:
+ if len(emissions) == showlast:
finished = True
break
@@ -194,12 +196,21 @@ def getlastVideos():
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 )
-
+ emissions.append([videoInfo.id,
+ videoInfo.name,
+ videoInfo.desc,
+ videoInfo.duration,
+ videoInfo.seen,
+ videoInfo.thumb])
+ i = i + 1
+
+ for emission in emissions:
+ addlink(emission[1],
+ "plugin://plugin.video.nolife?id=" + emission[0],
+ emission[5],
+ emission[3],
+ emission[4] )
+
def getcategories():
"""Gets all categories and adds directories
@@ -374,6 +385,7 @@ def playvideo(requestHandler, video):
path=url )
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, listitem)
+ xbmc.executebuiltin("Container.Refresh")
def get_params():
"""
@@ -410,9 +422,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,
@@ -491,7 +503,7 @@ def extractVideoInfo(element):
' padding-left:10px;">.*</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]
diff --git a/plugin.video.nolife/resources/language/english/strings.xml
b/plugin.video.nolife/resources/language/english/strings.xml
index 9c4bf2b..9047ed6 100644
--- a/plugin.video.nolife/resources/language/english/strings.xml
+++ b/plugin.video.nolife/resources/language/english/strings.xml
@@ -12,6 +12,7 @@
<string id="33013">Number of videos to show</string>
<string id="33014">Quality</string>
<string id="33015">Show already seen videos</string>
+ <string id="33020">Number of shows in last shows</string>
<!-- List of shows messages -->
<string id="33016">Last shows</string>
diff --git a/plugin.video.nolife/resources/language/french/strings.xml
b/plugin.video.nolife/resources/language/french/strings.xml
index 336e299..993585d 100644
--- a/plugin.video.nolife/resources/language/french/strings.xml
+++ b/plugin.video.nolife/resources/language/french/strings.xml
@@ -12,6 +12,7 @@
<string id="33013">Nombre d'émissions à afficher</string>
<string id="33014">Qualité vidéo</string>
<string id="33015">Afficher les émissions déjà vues</string>
+ <string id="33020">Nombre d'émissions dans les récentes</string>
<!-- Messages dans la liste -->
<string id="33016">Dernières émissions</string>
diff --git a/plugin.video.nolife/resources/settings.xml
b/plugin.video.nolife/resources/settings.xml
index fe9bf69..d9cd0a6 100644
--- a/plugin.video.nolife/resources/settings.xml
+++ b/plugin.video.nolife/resources/settings.xml
@@ -12,8 +12,9 @@
<category label="33001">
<setting id="type" type="enum" label="33011" values="theme|type"
default="theme"/>
<setting id="showall" type="bool" label="33012" default="false"/>
- <setting id="show_n" subsetting="true" type="slider" label="33013"
default="30" range="10,10,100" enable="!eq(-1,true)"/>
+ <setting id="show_n" subsetting="true" type="slider" label="33013"
default="30" range="10,10,100" enable="!eq(-1,true)" option="int"/>
<setting id="showseen" type="bool" label="33015" default="true"/>
+ <setting id="showlast" subsetting="true" type="slider" label="33020"
default="30" range="10,10,100" option="int"/>
<setting id="quality" type="enum" label="33014"
values="LQ|HQ|TV|720p|1080p" default="TV"/>
</category>
-----------------------------------------------------------------------
Summary of changes:
plugin.video.nolife/addon.xml | 2 +-
plugin.video.nolife/default.py | 30 ++++++++++++++------
.../resources/language/english/strings.xml | 1 +
.../resources/language/french/strings.xml | 1 +
plugin.video.nolife/resources/settings.xml | 3 +-
5 files changed, 26 insertions(+), 11 deletions(-)
hooks/post-receive
--
Plugins
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
