The branch, frodo has been updated
via a36e2d82e641a97927bca5ab25511a16d3aee95f (commit)
from 1680f56c4a5be0abc16d1d81d7aedf8056c9dc00 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=a36e2d82e641a97927bca5ab25511a16d3aee95f
commit a36e2d82e641a97927bca5ab25511a16d3aee95f
Author: Martijn Kaijser <[email protected]>
Date: Sun Sep 22 11:16:05 2013 +0200
[script.lazytv] 0.1.10
diff --git a/script.lazytv/addon.xml b/script.lazytv/addon.xml
index ae485a0..b751516 100644
--- a/script.lazytv/addon.xml
+++ b/script.lazytv/addon.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.lazytv"
name="LazyTV"
- version="0.1.9"
+ version="0.1.10"
provider-name="KodeKarnage">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
+ <import addon="script.module.buggalo" version="1.1.4" optional="true"
/>
</requires>
<extension point="xbmc.python.script"
library="default.py">
diff --git a/script.lazytv/changelog.txt b/script.lazytv/changelog.txt
index 7c07a35..a9da2a0 100644
--- a/script.lazytv/changelog.txt
+++ b/script.lazytv/changelog.txt
@@ -9,4 +9,7 @@ Introduced option to populate random playlist using Smart
playlist selected in S
0.1.8
added function to populate list of next to watch episodes for all TV shows
-added function to backfill watched status
\ No newline at end of file
+added function to backfill watched status
+
+0.1.10
+added optional Buggalo
\ No newline at end of file
diff --git a/script.lazytv/default.py b/script.lazytv/default.py
index d09efac..8e43592 100644
--- a/script.lazytv/default.py
+++ b/script.lazytv/default.py
@@ -21,6 +21,23 @@
import random, xbmcgui, xbmcaddon
import os
from resources.lazy_lib import *
+
+#Buggalo
+bug_exists = False
+
+try:
+
+ _buggalo_ = xbmcaddon.Addon("script.module.buggalo")
+ _bugversion_ = _buggalo_.getAddonInfo("version")
+
+ bv = _bugversion_.split(".")
+ if int(bv[0]) > 1 or (int(bv[0]) == 1 and int(bv[1]) > 1) or
(int(bv[0]) == 1 and int(bv[1]) == 1 and int(bv[2]) > 3):
+ import buggalo
+ bug_exists = True
+
+except:
+ pass
+
#import sys
#sys.stdout = open('C:\\Temp\\test.txt', 'w')
@@ -215,16 +232,14 @@ def create_playlist():
seek = {'jsonrpc': '2.0','method':
'Player.Seek','params': {'playerid':1,'value':0.0}, 'id':1}
seek['params']['value'] = seek_percent
json_query(seek)
- print filtered_eps
- print filtered_showids
+
#removes the shows with partial episodes as the next episode from the
show list
if expartials == 'true':
partially_watched = [x['tvshowid'] for x in filtered_eps if
x['resume']['position']>0]
filtered_eps = [x for x in filtered_eps if x['tvshowid'] not in
partially_watched]
filtered_eps_showids = [show['tvshowid'] for show in
filtered_eps]
filtered_showids = [x for x in filtered_showids if x in
filtered_eps_showids]
- print filtered_eps
- print filtered_showids
+
#notifies the user when there is no shows in the show list
if not filtered_showids and partial == 'false':
dialog.ok('LazyTV', lang(30150))
@@ -318,7 +333,6 @@ def create_playlist():
if cycle % 100 == 0 and _checked == False and (streams
== 'false' or itera == 0):
#confirm all eps are streams
check_eps = [x['file'] for x in eps if
x['tvshowid'] in filtered_showids]
- print 'check_eps ', check_eps
if all(".strm" in ep.lower() for ep in
check_eps):
itera = 1000
_checked = True
@@ -405,10 +419,34 @@ def create_next_episode_list():
if __name__ == "__main__":
- if first_run == 'true':
- _addon_.setSetting(id="first_run",value="false")
- xbmcaddon.Addon().openSettings()
- elif primary_function == '0':
- create_playlist()
- elif primary_function == '1':
- create_next_episode_list()
+
+ if bug_exists:
+
+ buggalo.GMAIL_RECIPIENT = '[email protected]'
+
+ try:
+
+ if first_run == 'true':
+ _addon_.setSetting(id="first_run",value="false")
+ xbmcaddon.Addon().openSettings()
+ elif primary_function == '0':
+ create_playlist()
+ elif primary_function == '1':
+ create_next_episode_list()
+ except Exception:
+ proglog.close()
+ buggalo.onExceptionRaised()
+ else:
+
+ try:
+
+ if first_run == 'true':
+ _addon_.setSetting(id="first_run",value="false")
+ xbmcaddon.Addon().openSettings()
+ elif primary_function == '0':
+ create_playlist()
+ elif primary_function == '1':
+ create_next_episode_list()
+ except:
+ proglog.close()
+ dialog.ok('LazyTV', lang(30156), lang(30157))
diff --git a/script.lazytv/resources/language/English/strings.po
b/script.lazytv/resources/language/English/strings.po
index 48e21a2..477cff4 100644
--- a/script.lazytv/resources/language/English/strings.po
+++ b/script.lazytv/resources/language/English/strings.po
@@ -232,3 +232,11 @@ msgstr ""
msgctxt "#30155"
msgid "Creating episode list"
msgstr ""
+
+msgctxt "#30156"
+msgid "Oh dear, an error has occurred with LazyTV."
+msgstr "
+
+msgctxt "#30157"
+msgid "Install Buggalo 1.1.5 or higher to report the details of the error to
the author."
+msgstr "
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
script.lazytv/.gitattributes | 22 +++++++
.../.gitignore | 0
script.lazytv/addon.xml | 3 +-
script.lazytv/changelog.txt | 5 +-
script.lazytv/default.py | 62 ++++++++++++++++----
.../resources/language/English/strings.po | 8 +++
6 files changed, 86 insertions(+), 14 deletions(-)
create mode 100644 script.lazytv/.gitattributes
copy {service.trailer.screensaver => script.lazytv}/.gitignore (100%)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/22/13.
http://pubads.g.doubleclick.net/gampad/clk?id=64545871&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
