Merge remote-tracking branch 'MediaBrowser/master' into develop
This commit is contained in:
commit
7bda97b255
3 changed files with 43 additions and 1 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<addon id="plugin.video.plexkodiconnect"
|
<addon id="plugin.video.plexkodiconnect"
|
||||||
name="PlexKodiConnect"
|
name="PlexKodiConnect"
|
||||||
version="2.2.5"
|
version="2.2.7"
|
||||||
provider-name="croneter">
|
provider-name="croneter">
|
||||||
<requires>
|
<requires>
|
||||||
<import addon="xbmc.python" version="2.1.0"/>
|
<import addon="xbmc.python" version="2.1.0"/>
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
version 2.2.7
|
||||||
|
- Prevent Kodi screensaver during the initial sync
|
||||||
|
|
||||||
|
version 2.2.6
|
||||||
|
- Fix unicode error
|
||||||
|
- Fix grouped folders error
|
||||||
|
|
||||||
version 2.2.5
|
version 2.2.5
|
||||||
- Add generate a new device Id option, found in the add-on settings > advanced.
|
- Add generate a new device Id option, found in the add-on settings > advanced.
|
||||||
- Offer to delete cached thumbnails upon database reset.
|
- Offer to delete cached thumbnails upon database reset.
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
import cProfile
|
import cProfile
|
||||||
import inspect
|
import inspect
|
||||||
|
import json
|
||||||
import pstats
|
import pstats
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from datetime import datetime, time, timedelta
|
from datetime import datetime, time, timedelta
|
||||||
|
@ -271,6 +272,40 @@ def getKodiMusicDBPath():
|
||||||
% dbVersion.get(kodibuild, "")).decode('utf-8')
|
% dbVersion.get(kodibuild, "")).decode('utf-8')
|
||||||
return dbPath
|
return dbPath
|
||||||
|
|
||||||
|
def getScreensaver():
|
||||||
|
# Get the current screensaver value
|
||||||
|
query = {
|
||||||
|
|
||||||
|
'jsonrpc': "2.0",
|
||||||
|
'id': 0,
|
||||||
|
'method': "Settings.getSettingValue",
|
||||||
|
'params': {
|
||||||
|
|
||||||
|
'setting': "screensaver.mode"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result = xbmc.executeJSONRPC(json.dumps(query))
|
||||||
|
result = json.loads(result)
|
||||||
|
screensaver = result['result']['value']
|
||||||
|
|
||||||
|
return screensaver
|
||||||
|
|
||||||
|
def setScreensaver(value):
|
||||||
|
# Toggle the screensaver
|
||||||
|
query = {
|
||||||
|
|
||||||
|
'jsonrpc': "2.0",
|
||||||
|
'id': 0,
|
||||||
|
'method': "Settings.setSettingValue",
|
||||||
|
'params': {
|
||||||
|
|
||||||
|
'setting': "screensaver.mode",
|
||||||
|
'value': value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result = xbmc.executeJSONRPC(json.dumps(query))
|
||||||
|
logMsg("EMBY", "Toggling screensaver: %s %s" % (value, result), 1)
|
||||||
|
|
||||||
def reset():
|
def reset():
|
||||||
|
|
||||||
dialog = xbmcgui.Dialog()
|
dialog = xbmcgui.Dialog()
|
||||||
|
|
Loading…
Reference in a new issue