Posibility to switch between Watching and Kodi

Hiumee · Jul 22, 2019 · e66b106 · e66b106
1 parent 48d63fd
commit e66b106
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/default.py b/default.py
@@ -4,7 +4,10 @@
 
 from lib import discordpresence
 
-DISCORD_CLIENT_ID = '544620244014989312'
+DISCORD_CLIENT_ID = '0'
+CLIENT_ID = {
+            "0":'544620244014989312',
+            "1":'570950300446359552'}
 
 SUPPORTED_TYPES = ['episode', 'movie']
 SETT = ['state', 'details']
@@ -49,6 +52,15 @@ def base_activity():
     return activity
 
 def get_data():
+    client_id = xbmcaddon.Addon().getSetting('client_id')
+    if client_id!=DISCORD_CLIENT_ID:
+        global DISCORD_CLIENT_ID
+        DISCORD_CLIENT_ID = client_id
+        try:
+            ipc.close()
+        except:
+            pass
+
     data  = json.loads(xbmc.executeJSONRPC('{"command": "Player.GetItem", "jsonrpc": "2.0", "method": "Player.GetItem", "id": 1, "params": {"playerid": 1, "properties": ["title", "season", "showtitle", "episode", "genre"]}}'))['result']
 
     act = base_activity()
@@ -104,7 +116,7 @@ def get_data():
 
 while ipc == None and not monitor.abortRequested():
     try:
-        ipc = discordpresence.DiscordIpcClient.for_platform(DISCORD_CLIENT_ID)
+        ipc = discordpresence.DiscordIpcClient.for_platform(CLIENT_ID[DISCORD_CLIENT_ID])
         break
     except Exception as e:
         ipc = None
@@ -127,7 +139,7 @@ def get_data():
         ipc = None
         while ipc == None and not monitor.abortRequested():
             try:
-                ipc = discordpresence.DiscordIpcClient.for_platform(DISCORD_CLIENT_ID)
+                ipc = discordpresence.DiscordIpcClient.for_platform(CLIENT_ID[DISCORD_CLIENT_ID])
                 xbmc.log("[Discord RP] Reconnected")
                 rpdata = get_data()
                 if rpdata:

diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -14,6 +14,18 @@ msgctxt "#32002"
 msgid "Show presence while not playing"
 msgstr ""
 
+msgctxt "#32003"
+msgid "Playing ..."
+msgstr ""
+
+msgctxt "#32004"
+msgid "Watching"
+msgstr ""
+
+msgctxt "#32005"
+msgid "Kodi"
+msgstr ""
+
 msgctxt "#32010"
 msgid "Customize"
 msgstr ""

diff --git a/resources/settings.xml b/resources/settings.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
     <category label="32001">
-    	<setting label="32002" type="bool" id="inmenu" default="true"/>
+        <setting label="32002" type="bool" id="inmenu" default="true"/>
+        <setting label="32003" type="enum" id="client_id" lvalues="32004|32005"/>
     </category>
     <category label="32010">
-    	<setting label="32011" type="lsep"/>
-    	<setting label="32012" type="enum" id="movie_state" lvalues="32013|32014|32015"/>
-    	<setting label="32016" type="enum" id="movie_details" lvalues="32014|32013|32015"/>
-    	<setting label="32020" type="lsep"/>
-    	<setting label="32012" type="enum" id="episode_state" lvalues="32021|32022|32013|32015"/>
-    	<setting label="32016" type="enum" id="episode_details" lvalues="32022|32021|32013|32015"/>
+        <setting label="32011" type="lsep"/>
+        <setting label="32012" type="enum" id="movie_state" lvalues="32013|32014|32015"/>
+        <setting label="32016" type="enum" id="movie_details" lvalues="32014|32013|32015"/>
+        <setting label="32020" type="lsep"/>
+        <setting label="32012" type="enum" id="episode_state" lvalues="32021|32022|32013|32015"/>
+        <setting label="32016" type="enum" id="episode_details" lvalues="32022|32021|32013|32015"/>
     </category>
 </settings>