From aeec3e2bae1cf5f5bd663df8a0f2d9f0b41986e3 Mon Sep 17 00:00:00 2001
From: faush01 <shaun@bluebit.com.au>
Date: Sun, 6 Jan 2019 15:36:40 +1100
Subject: [PATCH] remove some checks

---
 resources/lib/functions.py | 33 +++------------------------------
 resources/lib/widgets.py   | 16 ----------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/resources/lib/functions.py b/resources/lib/functions.py
index 579b0ad..5beab73 100644
--- a/resources/lib/functions.py
+++ b/resources/lib/functions.py
@@ -30,7 +30,7 @@ from .menu_functions import displaySections, showMovieAlphaList, showGenreList,
 from .translation import string_load
 from .server_sessions import showServerSessions
 from .action_menu import ActionMenu
-from .widgets import getWidgetContent, get_widget_content_cast#, getWidgetUrlContent
+from .widgets import getWidgetContent, get_widget_content_cast
 import trakttokodi
 from .item_functions import add_gui_item, extract_item_info, ItemDetails
 from .cache_images import CacheArtwork
@@ -126,34 +126,23 @@ def mainEntryPoint():
         getWidgetContent(int(sys.argv[1]), params)
     elif mode == "WIDGET_CONTENT_CAST":
         get_widget_content_cast(int(sys.argv[1]), params)
-    #elif mode == "WIDGET_CONTENT_URL":
-    #    getWidgetUrlContent(int(sys.argv[1]), params)
-    elif mode == "PARENT_CONTENT":
-        checkServer(notify=False)
-        showParentContent(params)
     elif mode == "SHOW_CONTENT":
         # plugin://plugin.video.embycon?mode=SHOW_CONTENT&item_type=Movie|Series
-        checkServer(notify=False)
+        checkServer()
         showContent(sys.argv[0], int(sys.argv[1]), params)
     elif mode == "SEARCH":
         # plugin://plugin.video.embycon?mode=SEARCH
-        checkServer(notify=False)
         xbmcplugin.setContent(int(sys.argv[1]), 'files')
         show_search()
     elif mode == "NEW_SEARCH":
-        checkServer(notify=False)
         search_results(params)
     elif mode == "NEW_SEARCH_PERSON":
-        checkServer(notify=False)
         search_results_person(params)
     elif mode == "SHOW_SERVER_SESSIONS":
-        checkServer(notify=False)
         showServerSessions()
     elif mode == "TRAKTTOKODI":
-        checkServer(notify=False)
         trakttokodi.entry_point(params)
     else:
-        checkServer(notify=False)
         log.debug("EmbyCon -> Mode: {0}", mode)
         log.debug("EmbyCon -> URL: {0}", param_url)
 
@@ -162,6 +151,7 @@ def mainEntryPoint():
         elif mode == "PLAY":
             PLAY(params)
         else:
+            checkServer()
             displaySections()
 
     if (pr):
@@ -542,23 +532,6 @@ def showContent(pluginName, handle, params):
     getContent(contentUrl, params)
 
 
-def showParentContent(params):
-    log.debug("showParentContent Called: {0}", params)
-
-    parentId = params.get("ParentId")
-
-    contentUrl = (
-        "{server}/emby/Users/{userid}/items?ParentId=" + parentId +
-        "&IsVirtualUnaired=false" +
-        "&IsMissing=False" +
-        "&ImageTypeLimit=1" +
-        "&Fields={field_filters}" +
-        "&format=json")
-
-    log.debug("showParentContent Content Url: {0}", contentUrl)
-    getContent(contentUrl, params)
-
-
 def search_results_person(params):
 
     handle = int(sys.argv[1])
diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py
index 42448c1..ade1012 100644
--- a/resources/lib/widgets.py
+++ b/resources/lib/widgets.py
@@ -168,22 +168,6 @@ def checkForNewContent():
         home_window.setProperty("embycon_widget_reload", new_widget_hash)
         log.debug("Setting New Widget Hash: {0}", new_widget_hash)
 
-'''
-def getWidgetUrlContent(handle, params):
-    log.debug("getWidgetUrlContent Called: {0}", params)
-
-    request = params["url"]
-    request = urllib.unquote(request)
-    request = "{server}/emby/" + request + "&ImageTypeLimit=1&format=json"
-    log.debug("getWidgetUrlContent URL: {0}", request)
-
-    select_action = params.get("action", None)
-
-    list_items = populateWidgetItems(request, None, override_select_action=select_action)
-
-    xbmcplugin.addDirectoryItems(handle, list_items)
-    xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
-'''
 
 def get_widget_content_cast(handle, params):
     log.debug("getWigetContentCast Called: {0}", params)