Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2025-11-11 02:46:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-add dependency add-ons for cleaner paths

Browse source
This commit is contained in:
Claus Vium 2019-02-04 20:12:49 +01:00
commit 8f58212a74
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
addon.xml
View file

@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.jellyfin" <addon id="plugin.video.jellyfin"
name="Jellyfin" name="Jellyfin"
version="10.1.0" version="10.2.0"
provider-name="angelblue05"> provider-name="jellyfin-team,angelblue05">
<requires> <requires>
<import addon="xbmc.python" version="2.25.0"/> <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> </requires>
<extension point="xbmc.python.pluginsource" <extension point="xbmc.python.pluginsource"
library="default.py"> library="default.py">
@ -34,7 +37,8 @@
<summary lang="en"></summary> <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> <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> <news>
Rebrand in progress Rebrand complete
Re-added dependency add-ons for cleaner paths
</news> </news>
<assets> <assets>
<icon>icon.png</icon> <icon>icon.png</icon>

2
resources/lib/objects/movies.py
View file

@ -192,7 +192,7 @@ class Movies(KodiDb):
obj['Path'] = obj['Path'].replace(obj['Filename'], "") obj['Path'] = obj['Path'].replace(obj['Filename'], "")
else: else:
obj['Path'] = "plugin://plugin.video.jellyfin/" obj['Path'] = "plugin://plugin.video.jellyfin.movies/"
params = { params = {
'filename': obj['Filename'].encode('utf-8'), 'filename': obj['Filename'].encode('utf-8'),
'id': obj['Id'], 'id': obj['Id'],

2
resources/lib/objects/musicvideos.py
View file

@ -174,7 +174,7 @@ class MusicVideos(KodiDb):
obj['Path'] = obj['Path'].replace(obj['Filename'], "") obj['Path'] = obj['Path'].replace(obj['Filename'], "")
else: else:
obj['Path'] = "plugin://plugin.video.jellyfin/" obj['Path'] = "plugin://plugin.video.jellyfin.musicvideos/"
params = { params = {
'filename': obj['Filename'].encode('utf-8'), 'filename': obj['Filename'].encode('utf-8'),
'id': obj['Id'], 'id': obj['Id'],

10
resources/lib/objects/tvshows.py
View file

@ -217,7 +217,7 @@ class TVShows(KodiDb):
if not validate(obj['Path']): if not validate(obj['Path']):
raise Exception("Failed to validate path. User stopped.") raise Exception("Failed to validate path. User stopped.")
else: else:
obj['TopLevel'] = "plugin://plugin.video.jellyfin/" obj['TopLevel'] = "plugin://plugin.video.jellyfin.tvshows/"
obj['Path'] = "%s%s/" % (obj['TopLevel'], obj['Id']) obj['Path'] = "%s%s/" % (obj['TopLevel'], obj['Id'])
@ -354,7 +354,7 @@ class TVShows(KodiDb):
if not self.direct_path and obj['Resume']: if not self.direct_path and obj['Resume']:
temp_obj = dict(obj) 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['PathId'] = self.get_path(*values(temp_obj, QU.get_path_obj))
temp_obj['FileId'] = self.add_file(*values(temp_obj, QU.add_file_obj)) temp_obj['FileId'] = self.add_file(*values(temp_obj, QU.add_file_obj))
self.update_file(*values(temp_obj, QU.update_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'], "") obj['Path'] = obj['Path'].replace(obj['Filename'], "")
else: else:
obj['Path'] = "plugin://plugin.video.jellyfin/%s/" % obj['SeriesId'] obj['Path'] = "plugin://plugin.video.jellyfin.tvshows/%s/" % obj['SeriesId']
params = { params = {
'filename': obj['Filename'].encode('utf-8'), 'filename': obj['Filename'].encode('utf-8'),
'id': obj['Id'], 'id': obj['Id'],
@ -493,14 +493,14 @@ class TVShows(KodiDb):
temp_obj = dict(obj) temp_obj = dict(obj)
temp_obj['Filename'] = self.get_filename(*values(temp_obj, QU.get_file_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)) self.remove_file(*values(temp_obj, QU.delete_file_obj))
elif not self.direct_path and obj['Resume']: elif not self.direct_path and obj['Resume']:
temp_obj = dict(obj) temp_obj = dict(obj)
temp_obj['Filename'] = self.get_filename(*values(temp_obj, QU.get_file_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)) temp_obj['FileId'] = self.add_file(*values(temp_obj, QU.add_file_obj))
self.update_file(*values(temp_obj, QU.update_file_obj)) self.update_file(*values(temp_obj, QU.update_file_obj))
self.add_playstate(*values(temp_obj, QU.add_bookmark_obj)) self.add_playstate(*values(temp_obj, QU.add_bookmark_obj))