From 34cd0fadb456bddcb560caa301566c36e856ca61 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Fri, 8 Dec 2017 20:24:36 +0100
Subject: [PATCH] Delete obsolete screensaver function

---
 resources/lib/json_rpc.py    |  3 ++-
 resources/lib/librarysync.py | 20 ++++++++++----------
 resources/lib/utils.py       | 13 -------------
 3 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/resources/lib/json_rpc.py b/resources/lib/json_rpc.py
index f42499f1..5782dd4a 100644
--- a/resources/lib/json_rpc.py
+++ b/resources/lib/json_rpc.py
@@ -272,7 +272,8 @@ def playlist_remove(playlistid, position):
 
 def get_setting(setting):
     """
-    Returns the Kodi setting, a [str], or None if not possible
+    Returns the Kodi setting (GetSettingValue), a [str], or None if not
+    possible
     """
     try:
         ret = jsonrpc('Settings.GetSettingValue').execute(
diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py
index c10e39ba..6943ec65 100644
--- a/resources/lib/librarysync.py
+++ b/resources/lib/librarysync.py
@@ -9,15 +9,16 @@ import xbmc
 from xbmcvfs import exists
 
 from utils import window, settings, getUnixTimestamp, sourcesXML,\
-    thread_methods, create_actor_db_index, dialog, LogTime, getScreensaver,\
-    setScreensaver, playlistXSP, language as lang, DateToKodi, reset,\
-    tryDecode, deletePlaylists, deleteNodes, tryEncode, compare_version
+    thread_methods, create_actor_db_index, dialog, LogTime, playlistXSP,\
+    language as lang, DateToKodi, reset, tryDecode, deletePlaylists, \
+    deleteNodes, tryEncode, compare_version
 import downloadutils
 import itemtypes
 import plexdb_functions as plexdb
 import kodidb_functions as kodidb
 import userclient
 import videonodes
+import json_rpc as js
 import variables as v
 
 from PlexFunctions import GetPlexMetadata, GetAllPlexLeaves, scrobble, \
@@ -264,9 +265,8 @@ class LibrarySync(Thread):
 
     def _fullSync(self):
         xbmc.executebuiltin('InhibitIdleShutdown(true)')
-        screensaver = getScreensaver()
-        setScreensaver(value="")
-
+        screensaver = js.get_setting('screensaver.mode')
+        js.set_setting('screensaver.mode', '')
         if self.new_items_only is True:
             # Only do the following once for new items
             # Add sources
@@ -275,7 +275,7 @@ class LibrarySync(Thread):
             # Set views. Abort if unsuccessful
             if not self.maintainViews():
                 xbmc.executebuiltin('InhibitIdleShutdown(false)')
-                setScreensaver(value=screensaver)
+                js.set_setting('screensaver.mode', screensaver)
                 return False
 
         process = {
@@ -291,7 +291,7 @@ class LibrarySync(Thread):
                     self.thread_suspended() or
                     not process[itemtype]()):
                 xbmc.executebuiltin('InhibitIdleShutdown(false)')
-                setScreensaver(value=screensaver)
+                js.set_setting('screensaver.mode', screensaver)
                 return False
 
         # Let kodi update the views in any case, since we're doing a full sync
@@ -301,7 +301,7 @@ class LibrarySync(Thread):
 
         window('plex_initialScan', clear=True)
         xbmc.executebuiltin('InhibitIdleShutdown(false)')
-        setScreensaver(value=screensaver)
+        js.set_setting('screensaver.mode', screensaver)
         if window('plex_scancrashed') == 'true':
             # Show warning if itemtypes.py crashed at some point
             dialog('ok', heading='{plex}', line1=lang(39408))
@@ -320,7 +320,7 @@ class LibrarySync(Thread):
             except Exception as e:
                 # Empty movies, tv shows?
                 log.error('Path hack failed with error message: %s' % str(e))
-        setScreensaver(value=screensaver)
+        js.set_setting('screensaver.mode', screensaver)
         return True
 
     def processView(self, folderItem, kodi_db, plex_db, totalnodes):
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 123ebd0d..52a39991 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -330,19 +330,6 @@ def create_actor_db_index():
     conn.close()
 
 
-def getScreensaver():
-    # Get the current screensaver value
-    params = {'setting': "screensaver.mode"}
-    return jsonrpc('Settings.getSettingValue').execute(params)['result']['value']
-
-
-def setScreensaver(value):
-    # Toggle the screensaver
-    params = {'setting': "screensaver.mode", 'value': value}
-    log.debug('Toggling screensaver to "%s": %s'
-              % (value, jsonrpc('Settings.setSettingValue').execute(params)))
-
-
 def reset():
     # Are you sure you want to reset your local Kodi database?
     if not dialog('yesno',