Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge conflicts: sync after screensaver deactivated

Browse source
This commit is contained in:
tomkat83 2016-05-15 16:02:19 +02:00
parent abcb438f21
commit 0bd4a79ca3
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
default.py
View file

@ -140,13 +140,15 @@ class Main:
# Other functions
if mode == "settings":
xbmc.executebuiltin('Addon.OpenSettings(plugin.video.plexkodiconnect)')
elif mode in ("manualsync", "fastsync", "repair"):
elif mode in ("manualsync", "repair"):
if utils.window('emby_online') != "true":
# Server is not online, do not run the sync
xbmcgui.Dialog().ok(heading="PlexKodiConnect",
line1=("Unable to run the sync, the add-on is not "
"connected to the Emby server."))
utils.logMsg("PLEX", "Not connected to the emby server.", 1)
xbmcgui.Dialog().ok(
"PlexKodiConnect",
"Unable to run the sync, the add-on is not connected "
"to a Plex server.")
utils.logMsg("PLEX",
"Not connected to a PMS.", -1)
return
else:

1
resources/language/English/strings.xml
View file

@ -406,6 +406,7 @@
<string id="39059">Recently Added: Append show title to episode</string>
<string id="39060">Recently Added: Append season- and episode-number SxxExx</string>
<string id="39061">Would you like to download additional artwork from FanArtTV? Sync will be slower!</string>
<string id="39062">Sync when screensaver is deactivated</string>
<!-- Plex Entrypoint.py -->
<string id="39200">Log-out Plex Home User </string>

1
resources/language/German/strings.xml
View file

@ -345,6 +345,7 @@
<string id="39059">"Zuletzt hinzugefügt": Serien- an Episoden-Titel anfügen</string>
<string id="39060">"Zuletzt hinzugefügt": Staffel und Episode anfügen, SxxExx</string>
<string id="39061">Zusätzliche Bilder von FanArtTV herunterladen? Die Synchronisierung wird länger dauern!</string>
<string id="39062">Sync wenn Bildschirmschoner deaktiviert wird</string>
<!-- Plex Entrypoint.py -->
<string id="39200">Plex Home Benutzer abmelden: </string>

6
resources/lib/kodimonitor.py
View file

@ -146,12 +146,10 @@ class KodiMonitor(xbmc.Monitor):
xbmc.sleep(10000)
utils.window('emby_onWake', value="true")
elif method == "GUI.OnScreensaverDeactivated":
if utils.settings('dbSyncScreensaver') == "true":
xbmc.sleep(5000);
utils.window('emby_onWake', value="true")
xbmc.sleep(5000)
utils.window('plex_runLibScan', value="full")
elif method == "Playlist.OnClear":
pass

1
resources/settings.xml
View file

@ -54,6 +54,7 @@
<setting id="enableBackgroundSync" type="bool" label="39026" default="true" visible="true"/>
<setting id="saftyMargin" type="slider" label="39051" default="60" option="int" range="10,1,300" visible="eq(-1,true)"/>
<setting id="fullSyncInterval" type="number" label="39053" default="60" option="int" />
<setting id="dbSyncScreensaver" type="bool" label="39062" default="false" /><!--Sync when screensaver is deactivated-->
<setting type="lsep" label="30538" /><!-- Complete Re-Sync necessary -->
<setting id="FanartTV" label="30539" type="bool" default="false" /><!-- Download additional art from FanArtTV -->