The branch, frodo has been updated
via f2ce6782f80fc6fda4ebb5186c57b4b6a2dd92d0 (commit)
from 1c7d1e089a914f76fee00060f61a264cb3224bc5 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=f2ce6782f80fc6fda4ebb5186c57b4b6a2dd92d0
commit f2ce6782f80fc6fda4ebb5186c57b4b6a2dd92d0
Author: sphere <[email protected]>
Date: Mon Jun 23 09:32:09 2014 +0200
[script.lazytv] updated to version 0.9.91
diff --git a/script.lazytv/addon.xml b/script.lazytv/addon.xml
index b3bfd92..4831dab 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.90"
+ version="0.9.91"
provider-name="KodeKarnage">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/script.lazytv/default.py b/script.lazytv/default.py
index d8c85de..9fcf48b 100644
--- a/script.lazytv/default.py
+++ b/script.lazytv/default.py
@@ -70,7 +70,7 @@ window_length = int(__setting__('window_length'))
if __setting__('skinorno') == 'true':
skin = 1
__addon__.setSetting('skinorno','1')
-elif __setting__('skinorno') == 'false':
+elif __setting__('skinorno') == 'false' or __setting__('skinorno') == '32073':
skin = 0
__addon__.setSetting('skinorno','1')
else:
@@ -88,11 +88,12 @@ moviesw = True if __setting__('moviesw') == 'true'
else False
noshow = True if __setting__('noshow') == 'true' else False
excl_randos = True if __setting__('excl_randos') == 'true' else False
sort_reverse = True if __setting__('sort_reverse') == 'true' else False
+start_partials = True if __setting__('start_partials') == 'true' else False
stay_puft = True
play_now = False
refresh_now = True
-
+start_partials
try:
spec_shows = ast.literal_eval(__setting__('selection'))
@@ -283,6 +284,7 @@ def next_show_engine(showid, epid=[],eps = [], Season =
'null', Episode = 'null'
log('nextep_engine_End', showid)
+
def get_TVshows():
log('get_TVshows_started', reset = True)
log('sort by = ' + str(sort_by))
@@ -490,11 +492,61 @@ def random_playlist(population):
candidate_list = ['t' + str(x[1]) for x in stored_data_filtered] + ['m'
+ str(x) for x in movie_list]
random.shuffle(candidate_list)
+ watch_partial_now = False
+
+ if start_partials:
+
+ if candidate_list:
+ red_candy = [int(x[1:]) for x in candidate_list if x[0]
== 't']
+ else:
+ red_candy = []
+
+ lst = []
+
+ for showid in red_candy:
+
+ if WINDOW.getProperty("%s.%s.Resume" %
('LazyTV',showid)) == 'true':
+ temp_ep = WINDOW.getProperty("%s.%s.EpisodeID"
% ('LazyTV',showid))
+ if temp_ep:
+ lst.append({"jsonrpc": "2.0","method":
"VideoLibrary.GetEpisodeDetails","params": {"properties":
["lastplayed","tvshowid"],"episodeid": int(temp_ep)},"id": "1"})
+
+ lwlist = []
+
+ if lst:
+
+ xbmc_request = json.dumps(lst)
+ result = xbmc.executeJSONRPC(xbmc_request)
+
+ if result:
+ reslist = ast.literal_eval(result)
+ for res in reslist:
+ if 'result' in res:
+ if 'episodedetails' in
res['result']:
+
lwlist.append((res['result']['episodedetails']['lastplayed'],res['result']['episodedetails']['tvshowid']))
+
+ lwlist.sort(reverse=True)
+
+ if lwlist:
+
+ log(lwlist, label="lwlist = ")
+
+ R = candidate_list.index('t' + str(lwlist[0][1]))
+
+ watch_partial_now = True
+
+ log(R,label="R = ")
+
+
+
+
while count < length and candidate_list: #while the list
isnt filled, and all shows arent abandoned or movies added
log('candidate list = ' + str(candidate_list))
multi = False
- R = random.randint(0, len(candidate_list) -1 ) #get random
number
+ if start_partials and watch_partial_now:
+ watch_partial_now = False
+ else:
+ R = random.randint(0, len(candidate_list) -1 ) #get
random number
log('R = ' + str(R))
@@ -655,7 +707,6 @@ def create_next_episode_list(population):
WINDOW.setProperty("LazyTV.rando_shuffle", 'true')
-
xbmc.sleep(500)
del list_window
@@ -664,8 +715,6 @@ def create_next_episode_list(population):
WINDOW.setProperty("LazyTV.rando_shuffle", 'true')
# notifies the service to re-randomise the randos
-
-
class myPlayer(xbmc.Player):
def __init__(self, parent, *args, **kwargs):
@@ -684,8 +733,6 @@ class myPlayer(xbmc.Player):
log('Playbackended', reset =True)
self.dawindow.doModal()
-
-
class yGUI(xbmcgui.WindowXMLDialog):
@@ -1026,18 +1073,6 @@ class contextwindow(xbmcgui.WindowXMLDialog):
self.close()
-
-
-
-
-
-
-
-
-
-
-
-
def main_entry():
log('Main_entry')
@@ -1134,10 +1169,9 @@ def convert_previous_settings(ignore):
# reset IGNORE to be null
__addon__.setSetting('IGNORE','')
-
-
# this check is to ensure that the Ignore list from the previous addon is
respected and replaced in the new version
ignore = __setting__('IGNORE')
+
if ignore:
convert_previous_settings(ignore)
@@ -1209,3 +1243,4 @@ if __name__ == "__main__":
+
\ No newline at end of file
diff --git a/script.lazytv/resources/addon_clone.xml
b/script.lazytv/resources/addon_clone.xml
index 65fa38f..52e3d0d 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.90"
+ version="0.9.91"
provider-name="KodeKarnage">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
diff --git a/script.lazytv/resources/language/English/strings.po
b/script.lazytv/resources/language/English/strings.po
index 63d1f4e..0f9b0bf 100644
--- a/script.lazytv/resources/language/English/strings.po
+++ b/script.lazytv/resources/language/English/strings.po
@@ -153,6 +153,11 @@ msgctxt "#32043"
msgid "Ignore TV shows (movies only)"
msgstr ""
+msgctxt "#32044"
+msgid "Begin with latest in progress episode"
+msgstr ""
+
+
# -- 3rd page --
@@ -590,4 +595,10 @@ msgid "In this episode"
msgstr ""
+
+
+msgctxt "#32250"
+msgid "* Hidden to prevent spoilers *"
+msgstr ""
+
>>>>>>> origin/master-working
diff --git a/script.lazytv/resources/settings.xml
b/script.lazytv/resources/settings.xml
index f2a65f4..4448c3c 100644
--- a/script.lazytv/resources/settings.xml
+++ b/script.lazytv/resources/settings.xml
@@ -21,6 +21,7 @@
<setting id="multipleshows" type="bool" label="32032" default="false"/>
<setting id="premieres" type="bool" label="32033" default="false"/>
<setting id="resume_partials" type="bool" label="32034" default="false"/>
+ <setting id="start_partials" type="bool" label="32044" default="false"/>
<setting id="notify" type="bool" label="32035" default="true"/>
<setting id="movies" type="bool" label="32036" default="false"/>
<setting id="moviesw" type="bool" label="32037" default="false"/>
@@ -33,7 +34,7 @@
<!-- gap -->
</category>
<category label="32060">
- <setting id="skinorno" type="enum" label="32072" lvalues="32073|32074|32075"
default="32073"/>
+ <setting id="skinorno" type="enum" label="32072" lvalues="32073|32074|32075"
default="0"/>
<!--setting id="skinorno" type="bool" label="32072" default="true"/-->
<setting id="limitshows" type="bool" label="32061" default="false"/>
<setting id="window_length" label="32062" enable="eq(-1,true)" type="slider"
default="10" range="1,1,30" option="int" />
diff --git a/script.lazytv/resources/settings_clone.xml
b/script.lazytv/resources/settings_clone.xml
index bd8dbc9..7a6141c 100644
--- a/script.lazytv/resources/settings_clone.xml
+++ b/script.lazytv/resources/settings_clone.xml
@@ -16,6 +16,7 @@
<setting id="length" label="32031" type="slider" default="5" range="1,1,50"
option="int" />
<setting id="multipleshows" type="bool" label="32032" default="false"/>
<setting id="premieres" type="bool" label="32033" default="false"/>
+ <setting id="start_partials" type="bool" label="32044" default="false"/>
<setting id="movies" type="bool" label="32036" default="false"/>
<setting id="moviesw" type="bool" label="32037" default="false"/>
<setting id="moviemid" type="bool" label="32038" enable="eq(-1,true)"
subsetting="true" default="false"/>
@@ -27,7 +28,7 @@
<!-- gap -->
</category>
<category label="32060">
- <setting id="skinorno" type="enum" label="32072" lvalues="32073|32074|32075"
default="32073"/>
+ <setting id="skinorno" type="enum" label="32072" lvalues="32073|32074|32075"
default="0"/>
<setting id="limitshows" type="bool" label="32061" default="false"/>
<setting id="window_length" label="32062" enable="eq(-1,true)" type="slider"
default="10" range="1,1,30" option="int" />
<setting type="lsep" label="32063" enable="false"/>
diff --git a/script.lazytv/resources/skins/Default/720p/main.xml
b/script.lazytv/resources/skins/Default/720p/main.xml
index c391697..4e3bb9a 100644
--- a/script.lazytv/resources/skins/Default/720p/main.xml
+++ b/script.lazytv/resources/skins/Default/720p/main.xml
@@ -237,6 +237,7 @@
<height>190</height>
<align>left</align>
<font>Font12</font>
+
<visible>StringCompare(ListItem.Plot,$LOCALIZE[32250])</visible>
<label>[COLOR FF50e0c7]$ADDON[script.lazytv
32226]... [/COLOR]$INFO[Container(655).ListItem.Plot]</label>
</control>
</control>
-----------------------------------------------------------------------
Summary of changes:
script.lazytv/addon.xml | 2 +-
script.lazytv/default.py | 79 ++++++++++++++------
script.lazytv/resources/addon_clone.xml | 2 +-
.../resources/language/English/strings.po | 11 +++
script.lazytv/resources/settings.xml | 3 +-
script.lazytv/resources/settings_clone.xml | 3 +-
.../resources/skins/Default/720p/main.xml | 1 +
7 files changed, 75 insertions(+), 26 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
