2017.8.3

5 files changed, 98 insertions, 17 deletions

diff --git a/plugin.video.psvue/addon.xml b/plugin.video.psvue/addon.xml
index b932f84..8019e34 100644
--- a/plugin.video.psvue/addon.xml
+++ b/plugin.video.psvue/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.psvue" name="PS Vue" version="2017.7.2" provider-name="eracknaphobia">
+<addon id="plugin.video.psvue" name="PS Vue" version="2017.8.3" provider-name="eracknaphobia">
   <requires>
    <import addon="xbmc.python" version="2.25.0"/>
    <import addon="script.module.requests" version="2.9.1"/>
@@ -13,7 +13,9 @@
     <description lang="en_GB">PlayStation™Vue is a TV service that streams live TV, movies, and sports on a variety of your favorite devices without a cable or satellite subscription.  With powerful features that allow you to save thousands of hours of your favorite shows without recording conflicts, and Premium channels that can be purchased individually or with a multi-channel plan, TV has never been the same. No annual contracts, no conflicts, no problems.</description>
     <disclaimer lang="en_GB">Requires a valid subscription to PS Vue which is currently only available in the US</disclaimer>
     <news>
-- Bug fix
+- Added Search Feature
+- Added Always Ask Profile setting
+- Ability to Customize Main Menu
     </news>
     <language>en</language>
     <platform>all</platform>
diff --git a/plugin.video.psvue/main.py b/plugin.video.psvue/main.py
index d6e68b9..c2a92ac 100644
--- a/plugin.video.psvue/main.py
+++ b/plugin.video.psvue/main.py
@@ -35,7 +35,7 @@ if mode < 998:
         sony.check_auth()
 
 if mode == None and mode < 998:
-    if ADDON.getSetting(id='default_profile') == '': sony.get_profiles()
+    if ADDON.getSetting(id='default_profile') == '' or ADDON.getSetting(id='always_ask_profile') == 'true': sony.get_profiles()
     main_menu()
 
 elif mode == 50:
@@ -65,6 +65,9 @@ elif mode == 600:
 elif mode == 700:
     featured()
 
+elif mode == 750:
+    search()
+
 elif mode == 800:
     sony.get_profiles()
     main_menu()
@@ -85,7 +88,7 @@ elif mode == 1000:
     ADDON.setSetting(id='deviceId', value='')
     sony.notification_msg(LOCAL_STRING(30006), LOCAL_STRING(30007))
 
-if mode != None and mode != 800:
+if mode != None and mode != 800 and mode != 750:
     xbmcplugin.endOfDirectory(addon_handle, cacheToDisc=False)
 elif mode == 800:
     xbmcplugin.endOfDirectory(addon_handle, updateListing=True)
diff --git a/plugin.video.psvue/resources/language/resource.language.en_gb/strings.po b/plugin.video.psvue/resources/language/resource.language.en_gb/strings.po
index 65ca71d..bc7b8f1 100644
--- a/plugin.video.psvue/resources/language/resource.language.en_gb/strings.po
+++ b/plugin.video.psvue/resources/language/resource.language.en_gb/strings.po
@@ -33,7 +33,7 @@ msgid "Logout"
 msgstr ""
 
 msgctxt "#30004"
-msgid "Change Profile"
+msgid "Set Default Profile"
 msgstr ""
 
 msgctxt "#30005"
@@ -121,7 +121,58 @@ msgctxt "#30209"
 msgid "Could not retrieve the reqpayload"
 msgstr ""
 
-
 msgctxt "#30210"
 msgid "Choose Profile"
 msgstr ""
+
+msgctxt "#30211"
+msgid "Search"
+msgstr ""
+
+msgctxt "#30212"
+msgid "Profile"
+msgstr ""
+
+msgctxt "#30213"
+msgid "Always Ask Profile"
+msgstr ""
+
+msgctxt "#30214"
+msgid "Timeline"
+msgstr ""
+
+msgctxt "#30215"
+msgid "My Shows"
+msgstr ""
+
+msgctxt "#30216"
+msgid "Favorite Channels"
+msgstr ""
+
+msgctxt "#30217"
+msgid "Live TV"
+msgstr ""
+
+msgctxt "#30218"
+msgid "Sports"
+msgstr ""
+
+msgctxt "#30219"
+msgid "Kids"
+msgstr ""
+
+msgctxt "#30220"
+msgid "Recently Watched"
+msgstr ""
+
+msgctxt "#30221"
+msgid "Featured"
+msgstr ""
+
+msgctxt "#30222"
+msgid "Search"
+msgstr ""
+
+msgctxt "#30223"
+msgid "Main Menu"
+msgstr ""
diff --git a/plugin.video.psvue/resources/lib/ps_vue.py b/plugin.video.psvue/resources/lib/ps_vue.py
index 9a54770..8181259 100644
--- a/plugin.video.psvue/resources/lib/ps_vue.py
+++ b/plugin.video.psvue/resources/lib/ps_vue.py
@@ -10,14 +10,15 @@ from sony import SONY
 
 
 def main_menu():
-    addDir(LOCAL_STRING(30100), 50, ICON)
-    addDir(LOCAL_STRING(30101), 100, ICON)
-    addDir(LOCAL_STRING(30102), 200, ICON)
-    addDir(LOCAL_STRING(30103), 300, ICON)
-    addDir(LOCAL_STRING(30104), 400, ICON)
-    addDir(LOCAL_STRING(30105), 500, ICON)
-    addDir(LOCAL_STRING(30106), 600, ICON)
-    addDir(LOCAL_STRING(30107), 700, ICON)
+    if ADDON.getSetting(id='timeline_visible') == 'true': addDir(LOCAL_STRING(30100), 50, ICON)
+    if ADDON.getSetting(id='myshows_visible') == 'true': addDir(LOCAL_STRING(30101), 100, ICON)
+    if ADDON.getSetting(id='fav_visible') == 'true': addDir(LOCAL_STRING(30102), 200, ICON)
+    if ADDON.getSetting(id='live_visible') == 'true': addDir(LOCAL_STRING(30103), 300, ICON)
+    if ADDON.getSetting(id='sports_visible') == 'true': addDir(LOCAL_STRING(30104), 400, ICON)
+    if ADDON.getSetting(id='kids_visible') == 'true': addDir(LOCAL_STRING(30105), 500, ICON)
+    if ADDON.getSetting(id='recent_visible') == 'true': addDir(LOCAL_STRING(30106), 600, ICON)
+    if ADDON.getSetting(id='featured_visible') == 'true': addDir(LOCAL_STRING(30107), 700, ICON)
+    if ADDON.getSetting(id='search_visible') == 'true': addDir(LOCAL_STRING(30211), 750, ICON)
 
 
 def timeline():
@@ -59,6 +60,14 @@ def featured():
     list_shows(json_source['body']['items'])
 
 
+def search():
+    dialog = xbmcgui.Dialog()
+    search_txt = dialog.input('Enter search text', type=xbmcgui.INPUT_ALPHANUM)
+    if search_txt == '': sys.exit()
+    json_source = get_json(EPG_URL + '/search/'+search_txt+'/offset/0/size/100')
+    list_shows(json_source['body']['programs'])
+
+
 def list_timeline():
     url = 'https://sentv-user-ext.totsuko.tv/sentv_user_ext/ws/v2/profile/ids'
     json_source = get_json(url)
@@ -385,7 +394,7 @@ def get_params():
     return param
 
 def check_device_id():
-    DEVICE_ID = ADDON.getSetting(id='deviceId')
+    DEVICE_ID = ADDON.getSetting(id='deviceId')    
     amazon_device = 'Amazon'
     amazon_device = amazon_device.encode("hex")
     old_asus = 'ASUS'
diff --git a/plugin.video.psvue/resources/settings.xml b/plugin.video.psvue/resources/settings.xml
index 2e79c26..d7110aa 100644
--- a/plugin.video.psvue/resources/settings.xml
+++ b/plugin.video.psvue/resources/settings.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
+<!--Main Menu-->
+<category label="30223">
+  <setting id="timeline_visible" type="bool" label="30214" default="true" />
+  <setting id="myshows_visible" type="bool" label="30215" default="true" />
+  <setting id="fav_visible" type="bool" label="30216" default="true" />
+  <setting id="live_visible" type="bool" label="30217" default="true" />
+  <setting id="sports_visible" type="bool" label="30218" default="true" />
+  <setting id="kids_visible" type="bool" label="30219" default="true" />
+  <setting id="recent_visible" type="bool" label="30220" default="true" />
+  <setting id="featured_visible" type="bool" label="30221" default="true" />
+  <setting id="search_visible" type="bool" label="30222" default="true" />
+</category>
   <!--Login-->
   <category label="30000">
     <setting id="username" type="text" label="30001" default=""/>
     <setting id="password" type="text" label="30002" option="hidden" default=""/>
     <setting id="logout" type="action" label="30003" action="RunPlugin(plugin://plugin.video.psvue/?mode=999)" option="close" />
-    <setting id="change_profile" type="action" label="30004" action="RunPlugin(plugin://plugin.video.psvue/?mode=800)" option="close" />
-    <setting id="reset_device_id" type="action" label="30005" action="RunPlugin(plugin://plugin.video.psvue/?mode=1000)" option="close" />
+    <setting type="action" label="30005" action="RunPlugin(plugin://plugin.video.psvue/?mode=1000)" option="close" />
+</category>
+<!--Profile-->
+<category label="30212">
+  <setting type="action" label="30004" action="RunPlugin(plugin://plugin.video.psvue/?mode=800)" option="close" />
+  <setting id="always_ask_profile" type="bool" label="30213" default="false" />
 </category>
 
   <!-- Hidden -->