The branch, frodo has been updated
via 5439ba41789fd0814e61af3f3f01d73e4d9e79e8 (commit)
from 21a4ef4d83331de5be906f0f7689b67d96eb6144 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=5439ba41789fd0814e61af3f3f01d73e4d9e79e8
commit 5439ba41789fd0814e61af3f3f01d73e4d9e79e8
Author: Martijn Kaijser <[email protected]>
Date: Fri May 23 14:26:48 2014 +0200
[script.lazytv] 0.9.8
diff --git a/script.lazytv/addon.xml b/script.lazytv/addon.xml
index 3686d72..61c132d 100644
--- a/script.lazytv/addon.xml
+++ b/script.lazytv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<addon id="script.lazytv"
name="LazyTV"
- version="0.9.7"
+ version="0.9.8"
provider-name="KodeKarnage">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -9,7 +9,7 @@
<extension point="xbmc.python.script"
library="default.py">
- <provides>video</provides>
+ <provides>executable video</provides>
</extension>
<extension point="xbmc.service" library="service.py"
start="login"></extension>
diff --git a/script.lazytv/default.py b/script.lazytv/default.py
index 24782b3..20779a5 100644
--- a/script.lazytv/default.py
+++ b/script.lazytv/default.py
@@ -62,7 +62,7 @@ language = xbmc.getInfoLabel('System.Language')
primary_function = __setting__('primary_function')
populate_by_d = __setting__('populate_by_d')
select_pl = __setting__('select_pl')
-default_playlist = __setting__('file')
+default_playlist = __setting__('users_spl')
sort_by = int(__setting__('sort_by'))
length = int(__setting__('length'))
@@ -369,12 +369,14 @@ def get_TVshows():
nepl_retrieved = json.loads(nepl_retrieved)
log('get_TVshows_querycomplete')
- for x in nepl_retrieved['result']['tvshows']:
- log(str(x))
if 'result' in nepl_retrieved and 'tvshows' in nepl_retrieved["result"]
and nepl_retrieved['result']['tvshows']:
nepl_retrieved = nepl_retrieved['result']['tvshows']
+ for x in nepl_retrieved:
+ log(str(x))
else:
+ log('no unwatched TV shows in library')
+ log(nepl_retrieved)
nepl_retrieved = {}
nepl_from_service = WINDOW.getProperty("LazyTV.nepl")
diff --git a/script.lazytv/resources/addon_clone.xml
b/script.lazytv/resources/addon_clone.xml
index 761d663..f64e383 100644
--- a/script.lazytv/resources/addon_clone.xml
+++ b/script.lazytv/resources/addon_clone.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<addon id="script.lazytv.SANNAME"
name="CLONENAME"
- version="0.9.7"
+ version="0.9.8"
provider-name="KodeKarnage">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
@@ -9,7 +9,7 @@
<extension point="xbmc.python.script"
library="default.py">
- <provides>video</provides>
+ <provides>executable video</provides>
</extension>
<extension point="xbmc.addon.metadata">
diff --git a/script.lazytv/resources/language/English/strings.po
b/script.lazytv/resources/language/English/strings.po
index 48b2056..2938f04 100644
--- a/script.lazytv/resources/language/English/strings.po
+++ b/script.lazytv/resources/language/English/strings.po
@@ -252,11 +252,11 @@ msgid "Default action"
msgstr ""
msgctxt "#32091"
-msgid "No, dont play next episode."
+msgid "Dont Play"
msgstr ""
msgctxt "#32092"
-msgid "Yes, play next episode."
+msgid "Play"
msgstr ""
msgctxt "#32093"
diff --git a/script.lazytv/service.py b/script.lazytv/service.py
index 396da4e..314d897 100644
--- a/script.lazytv/service.py
+++ b/script.lazytv/service.py
@@ -278,6 +278,7 @@ class LazyPlayer(xbmc.Player):
log(prevcheck, label='prevcheck')
if prevcheck and show_npid not in randos and
self.pl_running != 'true':
+ log('Passed prevcheck')
odlist =
ast.literal_eval(WINDOW.getProperty("%s.%s.odlist" % ('LazyTV', show_npid)))
stored_epid =
int(WINDOW.getProperty("%s.%s.EpisodeID" % ('LazyTV', show_npid)))
stored_seas =
fix_SE(int(WINDOW.getProperty("%s.%s.Season" % ('LazyTV', show_npid))))
@@ -352,6 +353,7 @@ class LazyPlayer(xbmc.Player):
# this is all to handle the next_ep_notification
self.now_name = xbmc.getInfoLabel('VideoPlayer.TVShowTitle')
+
if self.now_name == '':
if self.pl_running == 'true':
@@ -372,7 +374,7 @@ class LazyPlayer(xbmc.Player):
nlabel = lang(32092)
prompt = -1
- elif __release__ == 'Frodo':
+ if __release__ == 'Frodo':
if promptduration:
prompt =
DIALOG.select(lang(32164), [lang(32165) % promptduration, lang(32166) %
(Main.nextprompt_info['showtitle'], SE)], yeslabel = ylabel, nolabel = nlabel,
autoclose=promptduration * 1000)
else:
@@ -1154,7 +1156,7 @@ def grab_settings(firstrun = False):
nextprompt = True if __setting__('nextprompt') == 'true'
else False
promptduration = int(__setting__('promptduration'))
prevcheck = True if __setting__('prevcheck') == 'true'
else False
- promptdefaultaction = True if __setting__('promptdefaultaction') ==
'true' else False
+ promptdefaultaction = int(__setting__('promptdefaultaction'))
if not maintainsmartplaylist:
maintainsmartplaylist = True if
__setting__('maintainsmartplaylist') == 'true' else False
-----------------------------------------------------------------------
Summary of changes:
script.lazytv/addon.xml | 4 ++--
script.lazytv/default.py | 8 +++++---
script.lazytv/resources/addon_clone.xml | 4 ++--
.../resources/language/English/strings.po | 4 ++--
script.lazytv/service.py | 6 ++++--
5 files changed, 15 insertions(+), 11 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
