Merge pull request #5 from SpheriZe/master
Added Ignore Specials setting for Next Episodes
This commit is contained in:
commit
ecc453ba9a
2 changed files with 8 additions and 1 deletions
|
@ -278,7 +278,13 @@ def getNextUpEpisodes(tagname,limit):
|
||||||
# If we found any, find the oldest unwatched show for each one.
|
# If we found any, find the oldest unwatched show for each one.
|
||||||
if json_result.has_key('result') and json_result['result'].has_key('tvshows'):
|
if json_result.has_key('result') and json_result['result'].has_key('tvshows'):
|
||||||
for item in json_result['result']['tvshows']:
|
for item in json_result['result']['tvshows']:
|
||||||
json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"field": "playcount", "operator": "lessthan", "value":"1"}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "cast", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
|
addonSettings = xbmcaddon.Addon(id='plugin.video.emby')
|
||||||
|
|
||||||
|
# If Ignore Specials is true only choose episodes from seasons greater than 0.
|
||||||
|
if addonSettings.getSetting("ignoreSpecialsNextEpisodes")=="true":
|
||||||
|
json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"and": [ {"field": "playcount", "operator": "lessthan", "value":"1"}, {"field": "season", "operator": "greaterthan", "value": "0"} ]}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "cast", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
|
||||||
|
else:
|
||||||
|
json_query2 = xbmc.executeJSONRPC('{"jsonrpc": "2.0", "method": "VideoLibrary.GetEpisodes", "params": { "tvshowid": %d, "sort": {"method":"episode"}, "filter": {"field": "playcount", "operator": "lessthan", "value":"1"}, "properties": [ "title", "playcount", "season", "episode", "showtitle", "plot", "file", "rating", "resume", "tvshowid", "art", "streamdetails", "firstaired", "runtime", "writer", "cast", "dateadded", "lastplayed" ], "limits":{"end":1}}, "id": "1"}' %item['tvshowid'])
|
||||||
|
|
||||||
if json_query2:
|
if json_query2:
|
||||||
json_query2 = json.loads(json_query2)
|
json_query2 = json.loads(json_query2)
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
</category>
|
</category>
|
||||||
<category label="Extras">
|
<category label="Extras">
|
||||||
<setting id="disableCoverArt" type="bool" label="30157" default="false" visible="true" enable="true" />
|
<setting id="disableCoverArt" type="bool" label="30157" default="false" visible="true" enable="true" />
|
||||||
|
<setting id="ignoreSpecialsNextEpisodes" type="bool" label="Ignore specials in next episodes" visible="true" enable="true" default="false" />
|
||||||
<setting id="showSpecialInfoDialog" type="bool" label="Show special Emby infodialog on play" default="false" visible="false" />
|
<setting id="showSpecialInfoDialog" type="bool" label="Show special Emby infodialog on play" default="false" visible="false" />
|
||||||
<setting id="autoPlaySeason" type="bool" label="30246" default="false" visible="true" enable="true" />
|
<setting id="autoPlaySeason" type="bool" label="30246" default="false" visible="true" enable="true" />
|
||||||
<setting id="autoPlaySeasonTime" type="number" label="30247" default="20" visible="eq(-1,true)" enable="true" />
|
<setting id="autoPlaySeasonTime" type="number" label="30247" default="20" visible="eq(-1,true)" enable="true" />
|
||||||
|
|
Loading…
Reference in a new issue