- use /emby/Shows endpoint for series season view

- add import encodings to fix an issue on android
- clear the last time stamp on service exit
This commit is contained in:
sfaulds
2017-07-27 11:34:23 +10:00
parent 86240980b4
commit b7a41c4aa5
8 changed files with 23 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.embycon"
name="EmbyCon"
version="1.3.20"
version="1.3.21"
provider-name="Team B">
<requires>
<import addon="xbmc.python" version="2.25.0"/>

View File

@@ -4,6 +4,7 @@ import hashlib
import os
import threading
import json
import encodings
import xbmcaddon
import xbmc

View File

@@ -8,6 +8,7 @@ import cProfile
import pstats
import json
import StringIO
import encodings
import xbmcplugin
import xbmcgui
@@ -844,12 +845,20 @@ def processDirectory(results, progress, params):
extraData['mode'] = "GET_CONTENT"
if isFolder == True:
u = ('{server}/emby/Users/{userid}/items' +
'?ParentId=' + id +
'&IsVirtualUnAired=false' +
'&IsMissing=false&' +
'Fields=' + detailsString +
'&format=json')
if item.get("Type", "") == "Series":
u = ('{server}/emby/Shows/' + id +
'/Seasons'
'?userId={userid}' +
'&Fields=' + detailsString +
'&format=json')
else:
u = ('{server}/emby/Users/{userid}/items' +
'?ParentId=' + id +
'&IsVirtualUnAired=false' +
'&IsMissing=false&' +
'Fields=' + detailsString +
'&format=json')
if item.get("RecursiveItemCount") != 0:
dirItems.append(addGUIItem(u, details, extraData, display_options))

View File

@@ -3,6 +3,7 @@
import sys
import json
import urllib
import encodings
import xbmcplugin
import xbmcaddon

View File

@@ -1,5 +1,7 @@
# Gnu General Public License - see LICENSE.TXT
import encodings
import xbmc
import xbmcaddon
from json_rpc import json_rpc

View File

@@ -1,3 +1,4 @@
import encodings
import xbmcaddon
from simple_logging import SimpleLogging

View File

@@ -1,7 +1,7 @@
# Gnu General Public License - see LICENSE.TXT
import xbmcaddon
import re
import encodings
from downloadutils import DownloadUtils
from simple_logging import SimpleLogging

View File

@@ -318,6 +318,7 @@ while not xbmc_monitor.abortRequested():
# clear user and token when loggin off
home_window = HomeWindow()
home_window.clearProperty("Service_Timestamp")
home_window.clearProperty("userid")
home_window.clearProperty("AccessToken")
home_window.clearProperty("Params")