From 91a55294386c65c5132c221e82fc495c60d6601b Mon Sep 17 00:00:00 2001
From: JonnyWong16 <Jonny.Wong.16@gmail.com>
Date: Sun, 14 Feb 2016 11:03:32 -0800
Subject: [PATCH] Some APIv2 cleanup

---
 plexpy/api2.py     |  2 +-
 plexpy/config.py   |  1 +
 plexpy/webserve.py | 34 ++++++++++++++--------------------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/plexpy/api2.py b/plexpy/api2.py
index 849cc41a..9c5bb105 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -257,7 +257,7 @@ class API2:
         """ Query the db with raw sql, makes backup of
             the db if the backup is older then 24h
         """
-        if not query:
+        if not plexpy.CONFIG.API_SQL or not query:
             return
 
         # allow the user to shoot them self
diff --git a/plexpy/config.py b/plexpy/config.py
index 9da5a15e..46f39490 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -32,6 +32,7 @@ _CONFIG_DEFINITIONS = {
     'TIME_FORMAT': (str, 'General', 'HH:mm'),
     'API_ENABLED': (int, 'General', 0),
     'API_KEY': (str, 'General', ''),
+    'API_SQL': (int, 'General', 0),
     'BOXCAR_ENABLED': (int, 'Boxcar', 0),
     'BOXCAR_TOKEN': (str, 'Boxcar', ''),
     'BOXCAR_SOUND': (str, 'Boxcar', ''),
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index a4fc0459..21213ed7 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -304,7 +304,7 @@ class WebInterface(object):
     def refresh_libraries_list(self, **kwargs):
         threading.Thread(target=pmsconnect.refresh_libraries).start()
         logger.info(u"Manual libraries list refresh requested.")
-
+        return True
 
     @cherrypy.expose
     def library(self, section_id=None):
@@ -457,19 +457,6 @@ class WebInterface(object):
         cherrypy.response.headers['Content-type'] = 'application/json'
         return json.dumps({'success': result})
 
-    @cherrypy.expose
-    @addtoapi()
-    def get_library_unwatched(self, section_id=None, section_type=None, **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_library_children_details(section_id=section_id,
-                                                          section_type=section_type,
-                                                          get_media_info=True)
-        # fixed a bug in this one, is this even used?
-
-        cherrypy.response.headers['Content-type'] = 'application/json'
-        return json.dumps(result)
-
     @cherrypy.expose
     @addtoapi()
     def delete_all_library_history(self, section_id, **kwargs):
@@ -589,6 +576,7 @@ class WebInterface(object):
         """ Refresh a users list in a own thread """
         threading.Thread(target=plextv.refresh_users).start()
         logger.info(u"Manual users list refresh requested.")
+        return True
 
     @cherrypy.expose
     def user(self, user_id=None):
@@ -1642,6 +1630,13 @@ class WebInterface(object):
 
             return None
 
+
+    ##### Search #####
+
+    @cherrypy.expose
+    def search(self, query=''):
+        return serve_template(templatename="search.html", title="Search", query=query)
+
     @cherrypy.expose
     @addtoapi('search')
     def search_results(self, query, **kwargs):
@@ -1655,10 +1650,6 @@ class WebInterface(object):
         else:
             logger.warn(u"Unable to retrieve data for search_results.")
 
-    @cherrypy.expose
-    def search(self, query=''):
-        return serve_template(templatename="search.html", title="Search", query=query)
-
     @cherrypy.expose
     def get_search_results_children(self, query, media_type=None, season_index=None, **kwargs):
 
@@ -1677,6 +1668,9 @@ class WebInterface(object):
             logger.warn(u"Unable to retrieve data for get_search_results_children.")
             return serve_template(templatename="info_search_results_list.html", data=None, title="Search Result List")
 
+
+    ##### Update Metadata #####        
+        
     @cherrypy.expose
     def update_metadata(self, rating_key=None, query=None, update=False, **kwargs):
         query_string = query
@@ -1763,7 +1757,7 @@ class WebInterface(object):
 
 
     @cherrypy.expose
-    @addtoapi()
+    @addtoapi('get_sessions')
     def get_pms_sessions_json(self, **kwargs):
 
         pms_connect = pmsconnect.PmsConnect()
@@ -1777,6 +1771,7 @@ class WebInterface(object):
             return False
 
     @cherrypy.expose
+    @addtoapi('get_metadata')
     def get_metadata_json(self, rating_key='', **kwargs):
 
         pms_connect = pmsconnect.PmsConnect()
@@ -1789,7 +1784,6 @@ class WebInterface(object):
             logger.warn(u"Unable to retrieve data for get_metadata_json.")
 
     @cherrypy.expose
-    @addtoapi('get_metadata')
     def get_metadata_xml(self, rating_key='', **kwargs):
 
         pms_connect = pmsconnect.PmsConnect()