Rebrand addon name and id and make it compatible with Jellyfin

sebPomme · Feb 1, 2019 · 168bab2 · 168bab2
1 parent 32eaecf
commit 168bab2
Show file tree

Hide file tree

Showing 37 changed files with 136 additions and 142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ machine_guid
 /resources/media/Thumbs.db
 
 .idea/
+.DS_Store
diff --git a/addon.xml b/addon.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.emby"
-        name="Emby" 
-        version="4.0.3"
+<addon  id="plugin.video.jellyfin"
+        name="Jellyfin" 
+        version="10.1.0"
         provider-name="angelblue05">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
-    <import addon="plugin.video.emby.movies" version="0.14" />
-    <import addon="plugin.video.emby.tvshows" version="0.14" />
-    <import addon="plugin.video.emby.musicvideos" version="0.14" />
   </requires>
   <extension    point="xbmc.python.pluginsource"
                 library="default.py">
@@ -31,18 +28,13 @@
     <platform>all</platform>
     <language>en</language>
     <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
-    <forum>http://emby.media/community/index.php?/forum/99-kodi/</forum>
-    <website>http://emby.media/</website>
-    <source>https://github.com/MediaBrowser/plugin.video.emby</source>
+    <forum>https://forum.jellyfin.org</forum>
+    <website>https://jellyfin.media/</website>
+    <source>https://github.com/jellyfin/jellyfin-kodi</source>
     <summary lang="en"></summary>
-    <description lang="en">Welcome to Emby for Kodi A whole new way to manage and view your media library. The Emby addon for Kodi combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Emby - the most powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Emby for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with the power of Emby's centralized database. Features: Direct integration with the Kodi library for native Kodi speed Instant synchronization with the Emby server Full support for Movie, TV and Music collections Emby Server direct stream and transcoding support - use Kodi when you are away from home!</description>
+    <description lang="en">Welcome to Jellyfin for Kodi 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: Direct integration with the Kodi library for native Kodi speed Instant synchronization with the Jellyfin server Full support for Movie, TV and Music collections Jellyfin Server direct stream and transcoding support - use Kodi when you are away from home!</description>
     <news>
-      New stable release
-      The wiki has been updated, PLEASE READ: https://github.com/MediaBrowser/plugin.video.emby/wiki
-      Fix playback for Kodi Leia
-      Fix masterlock
-      Home videos and pictures now show under videos and picture add-ons
-      Dependencies were updated to 0.14!
+      Rebrand in progress
     </news>
   </extension>
 </addon>
diff --git a/context.py b/context.py
@@ -11,7 +11,7 @@
 
 #################################################################################################
 
-__addon__ = xbmcaddon.Addon(id='plugin.video.emby')
+__addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
 __libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')

diff --git a/context_play.py b/context_play.py
@@ -11,7 +11,7 @@
 
 #################################################################################################
 
-__addon__ = xbmcaddon.Addon(id='plugin.video.emby')
+__addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
 __libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')

diff --git a/default.py b/default.py
@@ -11,7 +11,7 @@
 
 #################################################################################################
 
-__addon__ = xbmcaddon.Addon(id='plugin.video.emby')
+__addon__ = xbmcaddon.Addon(id='plugin.video.jellyfin')
 __base__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'resources', 'lib')).decode('utf-8')
 __libraries__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('path'), 'libraries')).decode('utf-8')
 __pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'emby')).decode('utf-8')

diff --git a/icon.png b/icon.png
diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 # Translators:
 # Wolfgang Petri <horstepipe@googlemail.com>, 2018

diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 msgid ""
 msgstr ""

diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 # Translators:
 # Jean Fontaine <balayop@yahoo.fr>, 2018

diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 # Translators:
 # EffeF, 2019

diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 # Translators:
 # 63ac71fcbd0581bb567b1f0d798c7970, 2019

diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po
@@ -1,6 +1,6 @@
 # Emby for Kodi language file
 # Addon Name: Emby for Kodi
-# Addon id: plugin.video.emby
+# Addon id: plugin.video.jellyfin
 # Addon Provider: angelblue05
 # Translators:
 # Michał Sawicz <michal@sawicz.net>, 2019

diff --git a/resources/lib/client.py b/resources/lib/client.py
@@ -82,7 +82,7 @@ def get_device_id(reset=False):
     if client_id:
         return client_id
 
-    directory = xbmc.translatePath('special://profile/addon_data/plugin.video.emby/').decode('utf-8')
+    directory = xbmc.translatePath('special://profile/addon_data/plugin.video.jellyfin/').decode('utf-8')
 
     if not xbmcvfs.exists(directory):
         xbmcvfs.mkdir(directory)

diff --git a/resources/lib/database/__init__.py b/resources/lib/database/__init__.py
@@ -238,7 +238,7 @@ def reset():
     if dialog("yesno", heading="{emby}", line1=_(33086)):
         reset_artwork()
 
-    addon_data = xbmc.translatePath("special://profile/addon_data/plugin.video.emby/").decode('utf-8')
+    addon_data = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8')
 
     if dialog("yesno", heading="{emby}", line1=_(33087)):
 
@@ -326,7 +326,7 @@ def reset_artwork():
 
 def get_sync():
 
-    path = xbmc.translatePath("special://profile/addon_data/plugin.video.emby/").decode('utf-8')
+    path = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8')
 
     if not xbmcvfs.exists(path):
         xbmcvfs.mkdirs(path)
@@ -346,7 +346,7 @@ def get_sync():
 
 def save_sync(sync):
 
-    path = xbmc.translatePath("special://profile/addon_data/plugin.video.emby/").decode('utf-8')
+    path = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8')
 
     if not xbmcvfs.exists(path):
         xbmcvfs.mkdirs(path)
@@ -358,7 +358,7 @@ def save_sync(sync):
 
 def get_credentials():
 
-    path = xbmc.translatePath("special://profile/addon_data/plugin.video.emby/").decode('utf-8')
+    path = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8')
 
     if not xbmcvfs.exists(path):
         xbmcvfs.mkdirs(path)
@@ -384,7 +384,7 @@ def get_credentials():
 def save_credentials(credentials):
 
     credentials = credentials or {}
-    path = xbmc.translatePath("special://profile/addon_data/plugin.video.emby/").decode('utf-8')
+    path = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8')
 
     if not xbmcvfs.exists(path):
         xbmcvfs.mkdirs(path)

diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py
@@ -24,7 +24,7 @@
 
 LOG = logging.getLogger("EMBY."+__name__)
 LIMIT = min(int(settings('limitIndex') or 50), 50)
-CACHE = xbmc.translatePath(os.path.join(xbmcaddon.Addon(id='plugin.video.emby').getAddonInfo('profile').decode('utf-8'), 'emby')).decode('utf-8')
+CACHE = xbmc.translatePath(os.path.join(xbmcaddon.Addon(id='plugin.video.jellyfin').getAddonInfo('profile').decode('utf-8'), 'emby')).decode('utf-8')
 
 #################################################################################################
 

diff --git a/resources/lib/emby/core/connection_manager.py b/resources/lib/emby/core/connection_manager.py
@@ -43,7 +43,7 @@ def get_server_address(server, mode):
 
 class ConnectionManager(object):
 
-    min_server_version = "3.0.5930"
+    min_server_version = "10.1.0"
     server_version = min_server_version
     user = {}
     server_id = None

diff --git a/resources/lib/entrypoint/context.py b/resources/lib/entrypoint/context.py
@@ -18,7 +18,7 @@
 #################################################################################################
 
 LOG = logging.getLogger("EMBY."+__name__)
-XML_PATH = (xbmcaddon.Addon('plugin.video.emby').getAddonInfo('path'), "default", "1080i")
+XML_PATH = (xbmcaddon.Addon('plugin.video.jellyfin').getAddonInfo('path'), "default", "1080i")
 OPTIONS = {
     'Refresh': _(30410),
     'Delete': _(30409),
@@ -153,7 +153,7 @@ def action_menu(self):
             TheVoid('FavoriteItem', {'ServerId': self.server, 'Id': self.item['Id'], 'Favorite': False})
 
         elif selected == OPTIONS['Addon']:
-            xbmc.executebuiltin('Addon.OpenSettings(plugin.video.emby)')
+            xbmc.executebuiltin('Addon.OpenSettings(plugin.video.jellyfin)')
 
         elif selected == OPTIONS['Delete']:
             self.delete_item()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@ machine_guid
		/resources/media/Thumbs.db

		.idea/
		.DS_Store