The branch, frodo has been updated
via debf839c0356c04027f166b7175d635fc15516fe (commit)
from e98e20da59770d4eeaed46f7fa22ab1edcd13fd8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=debf839c0356c04027f166b7175d635fc15516fe
commit debf839c0356c04027f166b7175d635fc15516fe
Author: Martijn Kaijser <[email protected]>
Date: Sun Jan 6 23:11:52 2013 +0100
[script.randomandlastitems] -2.0.2
diff --git a/script.randomandlastitems/addon.xml
b/script.randomandlastitems/addon.xml
index da01793..7daefed 100644
--- a/script.randomandlastitems/addon.xml
+++ b/script.randomandlastitems/addon.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.randomandlastitems" name="Random and Last items script"
version="2.0.1" provider-name="MikeBZH44, Martijn">
+<addon id="script.randomandlastitems" name="Random and Last items script"
version="2.0.2" provider-name="MikeBZH44, Martijn">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
<import addon="xbmc.json" version="6.0.0"/>
diff --git a/script.randomandlastitems/changelog.txt
b/script.randomandlastitems/changelog.txt
index b1cd02e..3879b74 100644
--- a/script.randomandlastitems/changelog.txt
+++ b/script.randomandlastitems/changelog.txt
@@ -1,3 +1,7 @@
+v2.0.2
+- Try to fix missing dateadded sort key
+- add missing urllib imprt
+
v2.0.1
- Updated to Frodo compatible code
diff --git a/script.randomandlastitems/randomandlastitems.py
b/script.randomandlastitems/randomandlastitems.py
index a1f548a..847d85f 100644
--- a/script.randomandlastitems/randomandlastitems.py
+++ b/script.randomandlastitems/randomandlastitems.py
@@ -1,6 +1,7 @@
import xbmc, xbmcgui, xbmcaddon
import re, sys, os, time
import random
+import urllib
from operator import itemgetter
try:
import json as simplejson
@@ -62,7 +63,7 @@ def _watchedOrResume ( _total, _watched, _unwatched, _result,
_file ):
_unwatched += 1
else:
_watched += 1
- if (UNWATCHED == 'False' and RESUME == 'False') or (UNWATCHED == 'True'
and _playcount == 0) or (RESUME == 'True' and _resume != 0):
+ if (UNWATCHED == 'False' and RESUME == 'False') or (UNWATCHED == 'True'
and _playcount == 0) or (RESUME == 'True' and _resume != 0) and
_file.get('dateadded'):
_result.append(_file)
return _total, _watched, _unwatched, _result
@@ -225,7 +226,7 @@ def _getEpisodesFromPlaylist ( ):
if _file['type'] == 'tvshow':
_tvshows += 1
# La playlist fournie retourne des series il faut retrouver
les episodes
- _json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0",
"method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %s, "properties":
["title", "playcount", "season", "episode", "showtitle", "plot", "file",
"rating", "resume", "tvshowid", "art", "streamdetails"] }, "id": 1}'
%(_file['id']))
+ _json_query = xbmc.executeJSONRPC('{"jsonrpc": "2.0",
"method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %s, "properties":
["title", "playcount", "season", "episode", "showtitle", "plot", "file",
"rating", "resume", "tvshowid", "art", "streamdetails", "dateadded"] }, "id":
1}' %(_file['id']))
_json_query = unicode(_json_query, 'utf-8', errors='ignore')
#log(_json_query)
_json_response = simplejson.loads(_json_query)
@@ -687,4 +688,4 @@ elif TYPE == 'Episode':
_getEpisodesFromPlaylist()
elif TYPE == 'Music':
_getAlbumsFromPlaylist()
-log( "Loading Playlist%s%s%s started at %s and take %s" %( METHOD, TYPE, MENU,
time.strftime( "%Y-%m-%d %H:%M:%S", time.localtime( START_TIME ) ), _timeTook(
START_TIME ) ) )
\ No newline at end of file
+log( "Loading Playlist%s%s%s started at %s and take %s" %( METHOD, TYPE, MENU,
time.strftime( "%Y-%m-%d %H:%M:%S", time.localtime( START_TIME ) ), _timeTook(
START_TIME ) ) )
-----------------------------------------------------------------------
Summary of changes:
script.randomandlastitems/addon.xml | 2 +-
script.randomandlastitems/changelog.txt | 4 ++++
script.randomandlastitems/randomandlastitems.py | 7 ++++---
3 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_123012
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
