From 8f58212a74b415dabf8f75d88434cd6e09904fb0 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Mon, 4 Feb 2019 20:12:49 +0100
Subject: [PATCH] Re-add dependency add-ons for cleaner paths

---
 addon.xml                            | 10 +++++++---
 resources/lib/objects/movies.py      |  2 +-
 resources/lib/objects/musicvideos.py |  2 +-
 resources/lib/objects/tvshows.py     | 10 +++++-----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addon.xml b/addon.xml
index 6c02034c..0597278e 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.jellyfin"
         name="Jellyfin" 
-        version="10.1.0"
-        provider-name="angelblue05">
+        version="10.2.0"
+        provider-name="jellyfin-team,angelblue05">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
+    <import addon="plugin.video.jellyfin.movies" version="1.0.0"/>
+    <import addon="plugin.video.jellyfin.tvshows" version="1.0.0"/>
+    <import addon="plugin.video.jellyfin.musicvideos" version="1.0.0"/>
   </requires>
   <extension    point="xbmc.python.pluginsource"
                 library="default.py">
@@ -34,7 +37,8 @@
     <summary lang="en"></summary>
     <description lang="en">Welcome to Jellyfin for Kodi!&#10;A whole new way to manage and view your media library. The Jellyfin addon for Kodi combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Jellyfin - the most powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Jellyfin for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with the power of Jellyfin's centralized database. Features:&#10;* Direct integration with the Kodi library for native Kodi speed&#10;* Instant synchronization with the Jellyfin server&#10;* Full support for Movie, TV and Music collections&#10;* Jellyfin Server direct stream and transcoding support - use Kodi when you are away from home!</description>
     <news>
-      Rebrand in progress
+      Rebrand complete
+      Re-added dependency add-ons for cleaner paths
     </news>
     <assets>
       <icon>icon.png</icon>
diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py
index c1b2f5b7..eba1c53c 100644
--- a/resources/lib/objects/movies.py
+++ b/resources/lib/objects/movies.py
@@ -192,7 +192,7 @@ class Movies(KodiDb):
             obj['Path'] = obj['Path'].replace(obj['Filename'], "")
 
         else:
-            obj['Path'] = "plugin://plugin.video.jellyfin/"
+            obj['Path'] = "plugin://plugin.video.jellyfin.movies/"
             params = {
                 'filename': obj['Filename'].encode('utf-8'),
                 'id': obj['Id'],
diff --git a/resources/lib/objects/musicvideos.py b/resources/lib/objects/musicvideos.py
index e4beb00d..c604b6e2 100644
--- a/resources/lib/objects/musicvideos.py
+++ b/resources/lib/objects/musicvideos.py
@@ -174,7 +174,7 @@ class MusicVideos(KodiDb):
             obj['Path'] = obj['Path'].replace(obj['Filename'], "")
 
         else:
-            obj['Path'] = "plugin://plugin.video.jellyfin/"
+            obj['Path'] = "plugin://plugin.video.jellyfin.musicvideos/"
             params = {
                 'filename': obj['Filename'].encode('utf-8'),
                 'id': obj['Id'],
diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py
index 33d96dbd..1cdb8c0f 100644
--- a/resources/lib/objects/tvshows.py
+++ b/resources/lib/objects/tvshows.py
@@ -217,7 +217,7 @@ class TVShows(KodiDb):
             if not validate(obj['Path']):
                 raise Exception("Failed to validate path. User stopped.")
         else:
-            obj['TopLevel'] = "plugin://plugin.video.jellyfin/"
+            obj['TopLevel'] = "plugin://plugin.video.jellyfin.tvshows/"
             obj['Path'] = "%s%s/" % (obj['TopLevel'], obj['Id'])
 
 
@@ -354,7 +354,7 @@ class TVShows(KodiDb):
         if not self.direct_path and obj['Resume']:
 
             temp_obj = dict(obj)
-            temp_obj['Path'] = "plugin://plugin.video.jellyfin/"
+            temp_obj['Path'] = "plugin://plugin.video.jellyfin.tvshows/"
             temp_obj['PathId'] = self.get_path(*values(temp_obj, QU.get_path_obj))
             temp_obj['FileId'] = self.add_file(*values(temp_obj, QU.add_file_obj))
             self.update_file(*values(temp_obj, QU.update_file_obj))
@@ -419,7 +419,7 @@ class TVShows(KodiDb):
 
             obj['Path'] = obj['Path'].replace(obj['Filename'], "")
         else:
-            obj['Path'] = "plugin://plugin.video.jellyfin/%s/" % obj['SeriesId']
+            obj['Path'] = "plugin://plugin.video.jellyfin.tvshows/%s/" % obj['SeriesId']
             params = {
                 'filename': obj['Filename'].encode('utf-8'),
                 'id': obj['Id'],
@@ -493,14 +493,14 @@ class TVShows(KodiDb):
 
                 temp_obj = dict(obj)
                 temp_obj['Filename'] = self.get_filename(*values(temp_obj, QU.get_file_obj))
-                temp_obj['Path'] = "plugin://plugin.video.jellyfin/"
+                temp_obj['Path'] = "plugin://plugin.video.jellyfin.tvshows/"
                 self.remove_file(*values(temp_obj, QU.delete_file_obj))
 
             elif not self.direct_path and obj['Resume']:
 
                 temp_obj = dict(obj)
                 temp_obj['Filename'] = self.get_filename(*values(temp_obj, QU.get_file_obj))
-                temp_obj['PathId'] = self.get_path("plugin://plugin.video.jellyfin/")
+                temp_obj['PathId'] = self.get_path("plugin://plugin.video.jellyfin.tvshows/")
                 temp_obj['FileId'] = self.add_file(*values(temp_obj, QU.add_file_obj))
                 self.update_file(*values(temp_obj, QU.update_file_obj))
                 self.add_playstate(*values(temp_obj, QU.add_bookmark_obj))