diff --git a/.gitignore b/.gitignore index c0132b4de..9547020eb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ machine_guid .idea/ .DS_Store +.vscode/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7938f5fcc..118cdfc9c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # How to contribute -Thanks you for contributing to Emby for Kodi! +Thanks you for contributing to Jellyfin for Kodi! * Make pull requests towards the **master** branch; * Keep the maximum line length shorter than 100 characters to keep things clean and readable; diff --git a/README.md b/README.md index 522581671..89ebb2c43 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -# Emby for Kodi +# Jellyfin for Kodi -[![EmbyKodi_Banner](https://i.imgur.com/hx4cx41.png)](https://emby.media/community/index.php?/forum/99-kodi/) +[![EmbyKodi_Banner](https://i.imgur.com/hx4cx41.png)](https://forum.jellyfin.org/) [![Wiki](https://img.shields.io/badge/get%20started-wiki-brightgreen.svg)](https://github.com/MediaBrowser/plugin.video.emby/wiki) -[![Forums](https://img.shields.io/badge/report%20issues-forums-3960C1.svg)](https://emby.media/community/index.php?/forum/99-kodi/) +[![Forums](https://img.shields.io/badge/report%20issues-forums-3960C1.svg)](https://forum.jellyfin.org/) [![Donate](https://img.shields.io/badge/donate-kofi-blue.svg)](https://ko-fi.com/A5354BI) -[![Emby](https://img.shields.io/badge/server-emby-52b54b.svg)](https://emby.media/) +[![Emby](https://img.shields.io/badge/server-emby-52b54b.svg)](https://jellyfin.media/) ___ **A whole new way to manage and view your media library.** -The Emby for Kodi add-on combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Emby - the most powerful open source multi-client media metadata indexer and server. You can now retire your MySQL setup in favor of a more flexible setup. +The Jellyfin for Kodi add-on combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Jellyfin - the most powerful open source multi-client media metadata indexer and server. You can now retire your MySQL setup in favor of a more flexible setup. -Synchronize your media on your Emby server to the native Kodi database, browsing your media at full speed, while retaining the ability to use other Kodi add-ons to enhance your experience. In addition, you can use any Kodi skin you'd like! +Synchronize your media on your Jellyfin server to the native Kodi database, browsing your media at full speed, while retaining the ability to use other Kodi add-ons to enhance your experience. In addition, you can use any Kodi skin you'd like! ___ ### Supported -The add-on supports a hybrid approach. You can decide which Emby libraries to sync to the Kodi database. Other libraries and features are accessible dynamically, as a plugin listing. +The add-on supports a hybrid approach. You can decide which Jellyfin libraries to sync to the Kodi database. Other libraries and features are accessible dynamically, as a plugin listing. - Library types available to sync: + Movies and sets + TV shows @@ -29,13 +29,13 @@ The add-on supports a hybrid approach. You can decide which Emby libraries to sy + Theme media - Direct play and transcode - A 2-way watched and resume state between your server and Kodi. This is a near instant feature. -- Remote control your Kodi; send play commands from your Emby web client or Emby mobile apps. +- Remote control your Kodi; send play commands from your Jellyfin web client or Jellyfin mobile apps. - Extrafanart (rotating backgrounds) for skins that support it - Offer to delete content after playback -- Backup your emby kodi profile. See the [Emby backup option](https://github.com/MediaBrowser/plugin.video.emby/wiki/Create-and-restore-from-backup) +- Backup your Jellyfin Kodi profile. See the [Jellyfin backup option](https://github.com/MediaBrowser/plugin.video.emby/wiki/Create-and-restore-from-backup) - and more... -### Install Emby for Kodi +### Install Jellyfin for Kodi Get started with the [wiki guide](https://github.com/MediaBrowser/plugin.video.emby/wiki) ### Known limitations diff --git a/addon.xml b/addon.xml index c5f9cded1..7732032f8 100644 --- a/addon.xml +++ b/addon.xml @@ -16,11 +16,11 @@ - [!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(embyid))] + !String.IsEmpty(Window(10000).Property(emby_context)) + [!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(jellyfinid))] + !String.IsEmpty(Window(10000).Property(jellyfin_context)) - [[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(embyid))] + [String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,episode)]] + !String.IsEmpty(Window(10000).Property(emby_context_transcode)) + [[!String.IsEmpty(ListItem.DBID) + !String.IsEqual(ListItem.DBID,-1) | !String.IsEmpty(ListItem.Property(jellyfinid))] + [String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,episode)]] + !String.IsEmpty(Window(10000).Property(jellyfin_context_transcode)) diff --git a/context.py b/context.py index fdec02ada..5b3107f4a 100644 --- a/context.py +++ b/context.py @@ -14,8 +14,8 @@ __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') -__cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8') +__pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'jellyfin')).decode('utf-8') +__cache__ = xbmc.translatePath('special://temp/jellyfin').decode('utf-8') sys.path.insert(0, __cache__) sys.path.insert(0, __pcache__) @@ -28,7 +28,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY.context") +LOG = logging.getLogger("JELLYFIN.context") ################################################################################################# diff --git a/context_play.py b/context_play.py index 6ed686cc7..c59ce3dd5 100644 --- a/context_play.py +++ b/context_play.py @@ -14,8 +14,8 @@ __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') -__cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8') +__pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'jellyfin')).decode('utf-8') +__cache__ = xbmc.translatePath('special://temp/jellyfin').decode('utf-8') sys.path.insert(0, __cache__) sys.path.insert(0, __pcache__) @@ -28,7 +28,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY.context") +LOG = logging.getLogger("JELLYFIN.context") ################################################################################################# diff --git a/default.py b/default.py index 8092bb94e..d3ccbc891 100644 --- a/default.py +++ b/default.py @@ -14,8 +14,8 @@ __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') -__cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8') +__pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'jellyfin')).decode('utf-8') +__cache__ = xbmc.translatePath('special://temp/jellyfin').decode('utf-8') sys.path.insert(0, __cache__) sys.path.insert(0, __pcache__) @@ -28,7 +28,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY.default") +LOG = logging.getLogger("JELLYFIN.default") ################################################################################################# diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po index ed1a7a15a..78a6e0be5 100644 --- a/resources/language/resource.language.de_de/strings.po +++ b/resources/language/resource.language.de_de/strings.po @@ -1,5 +1,5 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 # Translators: @@ -9,7 +9,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2018-09-07 20:10+0000\n" "Last-Translator: Benni , 2019\n" @@ -21,8 +21,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#29999" -msgid "Emby for Kodi" -msgstr "Emby für Kodi" +msgid "Jellyfin for Kodi" +msgstr "Jellyfin für Kodi" msgctxt "#30000" msgid "Server address" @@ -193,12 +193,12 @@ msgid "TV Shows" msgstr "Serien" msgctxt "#30401" -msgid "Emby options" -msgstr "Emby Optionen" +msgid "Jellyfin options" +msgstr "Jellyfin Optionen" msgctxt "#30402" -msgid "Emby transcode" -msgstr "Emby transkodieren" +msgid "Jellyfin transcode" +msgstr "Jellyfin transkodieren" msgctxt "#30405" msgid "Add to favorites" @@ -213,8 +213,8 @@ msgid "Settings" msgstr "Einstellungen" msgctxt "#30409" -msgid "Delete from Emby" -msgstr "Vom Emby Server löschen" +msgid "Delete from Jellyfin" +msgstr "Vom Jellyfin Server löschen" msgctxt "#30410" msgid "Refresh this item" @@ -353,8 +353,8 @@ msgid "Display message" msgstr "Nachricht anzeigen" msgctxt "#30600" -msgid "Sign in with Emby Connect" -msgstr "Mit Emby Connect anmelden" +msgid "Sign in with Jellyfin Connect" +msgstr "Mit Jellyfin Connect anmelden" msgctxt "#30602" msgid "Password" @@ -393,8 +393,8 @@ msgid "Please sign in" msgstr "Bitte melden Sie sich an" msgctxt "#30613" -msgid "Change Emby Connect user" -msgstr "Emby Connect Benutzer wechseln" +msgid "Change Jellyfin Connect user" +msgstr "Jellyfin Connect Benutzer wechseln" msgctxt "#30614" msgid "Connect to server" @@ -413,8 +413,8 @@ msgid "Server or port cannot be empty" msgstr "Server oder Port muss eingetragen werden" msgctxt "#30618" -msgid "Change Emby Connect user" -msgstr "Emby Connect Benutzer wechseln" +msgid "Change Jellyfin Connect user" +msgstr "Jellyfin Connect Benutzer wechseln" msgctxt "#33000" msgid "Welcome" @@ -437,8 +437,8 @@ msgid "Choose the subtitles stream" msgstr "Untertitel Spur wählen" msgctxt "#33015" -msgid "Delete file from Emby?" -msgstr "Datei vom Emby Server löschen?" +msgid "Delete file from Jellyfin?" +msgstr "Datei vom Jellyfin Server löschen?" msgctxt "#33016" msgid "Play trailers?" @@ -454,16 +454,16 @@ msgstr "Rufe ab:" msgctxt "#33022" msgid "" -"Detected the database needs to be recreated for this version of Emby for " +"Detected the database needs to be recreated for this version of Jellyfin for " "Kodi. Proceed?" msgstr "" -"Die Datenbank muss neu erstellt werden für diese 'Emby for Kodi' Version. " +"Die Datenbank muss neu erstellt werden für diese 'Jellyfin for Kodi' Version. " "Fortfahren?" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgstr "" -"'Emby for Kodi' wird nicht richtig funktionieren ohne einen Datenbank Reset." +"'Jellyfin for Kodi' wird nicht richtig funktionieren ohne einen Datenbank Reset." msgctxt "#33025" msgid "Completed in:" @@ -475,12 +475,12 @@ msgstr "Es wurde eine neue Geräte-ID erstellt und Kodi wird nun neugestartet." msgctxt "#33035" msgid "" -"Caution! If you choose Native mode, certain Emby features will be missing, " -"such as: Emby cinema mode, direct stream/transcode options and parental " +"Caution! If you choose Native mode, certain Jellyfin features will be missing, " +"such as: Jellyfin cinema mode, direct stream/transcode options and parental " "access schedule." msgstr "" -"Achtung: Wenn du den nativen Modus wählst, werden einige Emby Funktionen " -"fehlen, wie z.B.: Emby Kinomodus, Transkodierungsoptionen und der Zeitplan " +"Achtung: Wenn du den nativen Modus wählst, werden einige Jellyfin Funktionen " +"fehlen, wie z.B.: Jellyfin Kinomodus, Transkodierungsoptionen und der Zeitplan " "für die Kindersicherung." msgctxt "#33036" @@ -502,11 +502,11 @@ msgstr "Kodi kann die Datei nicht finden:" msgctxt "#33048" msgid "" "You may need to verify your network credentials in the add-on settings or " -"use the Emby path substitution to format your path correctly (Emby dashboard" +"use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard" " > library). Stop syncing?" msgstr "" "Du solltest deine Netzwerkzugangsdaten in den Addon Einstellungen überprüfen" -" oder die Emby Funktion \"(Optionaler) Gemeinsamer Netzwerkordner\" (Emby " +" oder die Jellyfin Funktion \"(Optionaler) Gemeinsamer Netzwerkordner\" (Jellyfin " "Dashboard > Bibliothek > Verzeichnisse) benutzen. Synchronisierung " "abbrechen?" @@ -551,8 +551,8 @@ msgid "Remove all cached artwork?" msgstr "Alle zwischengespeicherten Bilder entfernen?" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" -msgstr "Alle Emby Addon Einstellungen zurücksetzen?" +msgid "Reset all Jellyfin add-on settings?" +msgstr "Alle Jellyfin Addon Einstellungen zurücksetzen?" msgctxt "#33088" msgid "" @@ -584,10 +584,10 @@ msgstr "Backup Ordner" msgctxt "#33097" msgid "" "Important, cleanonupdate was removed in your advanced settings to prevent " -"conflict with Emby for Kodi. Kodi will restart now." +"conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" "Wichtig, cleanonupdate wurde aus deinen Advanced Settings enfernt um " -"Probleme mit 'Emby for Kodi' zu vermeiden. Kodi wird nun neu gestartet." +"Probleme mit 'Jellyfin for Kodi' zu vermeiden. Kodi wird nun neu gestartet." msgctxt "#33098" msgid "Refresh boxsets" @@ -595,12 +595,12 @@ msgstr "Sammlungen aktualisieren" msgctxt "#33099" msgid "" -"Install the server plugin Kodi companion to automatically apply emby library" +"Install the server plugin Kodi companion to automatically apply jellyfin library" " updates at startup. This setting can be found in the add-on settings > sync" " options > Enable Kodi Companion." msgstr "" -"Installiere auf dem Emby Server das 'Kodi Companion' Plugin um automatische " -"Updates der Bibliothek zu erhalten. Diese Einstellung findest du unter 'Emby" +"Installiere auf dem Jellyfin Server das 'Kodi Companion' Plugin um automatische " +"Updates der Bibliothek zu erhalten. Diese Einstellung findest du unter 'Jellyfin" " Addon Einstellungen > Syncronisierung > Aktiviere Kodi Companion'." msgctxt "#33100" @@ -706,12 +706,12 @@ msgstr "" msgctxt "#33119" msgid "" "Something went wrong during the sync. You'll be able to restore progress " -"when restarting Kodi. If the problem persists, please report on the Emby for" +"when restarting Kodi. If the problem persists, please report on the Jellyfin for" " Kodi forums, with your Kodi log." msgstr "" "Es gab einen Fehler bei der Synchronisierung. Du kannst den Fortschritt " "wiederherstellen, wenn du Kodi neu startest. Sollte das Problem weiterhin " -"bestehen, melde es bitte mit deiner Kodi Logdatei im \"Emby for Kodi " +"bestehen, melde es bitte mit deiner Kodi Logdatei im \"Jellyfin for Kodi " "Forum\"." msgctxt "#33120" @@ -736,10 +736,10 @@ msgstr "Schließe Personen mit ein (langsam)" msgctxt "#33125" msgid "" -"Choose the Emby views to sync to Kodi. You can optionally sync libraries at " +"Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at " "a later time." msgstr "" -"Wähle die Emby Datenbanken, welche synchronisiert werden sollen. Optional " +"Wähle die Jellyfin Datenbanken, welche synchronisiert werden sollen. Optional " "können diese auch nachträglich synchronisiert werden." msgctxt "#33126" @@ -754,17 +754,17 @@ msgctxt "#33128" msgid "" "Failed to retrieve latest content updates. No content updates will be " "applied until Kodi is restarted. If this issue persists, please report on " -"the Emby for Kodi forums, with your Kodi log." +"the Jellyfin for Kodi forums, with your Kodi log." msgstr "" "Fehler beim Empfang der letzten Inhaltsänderungen. Es werden keine " "Inhaltsänderungen angewendet ehe Kodi neu gestartet wird. Sollte das Problem" -" weiterhin bestehen, melde es bitte mit deiner Kodi Logdatei im \"Emby for " +" weiterhin bestehen, melde es bitte mit deiner Kodi Logdatei im \"Jellyfin for " "Kodi Forum\"." msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" -"Du kannst die Bibliothek syncronisieren über 'Emby Addon > Bibliothek " +"Du kannst die Bibliothek syncronisieren über 'Jellyfin Addon > Bibliothek " "hinzufügen." msgctxt "#33130" @@ -838,22 +838,22 @@ msgstr "Datenbank entfernen" msgctxt "#33145" msgid "" -"Please make sure your Samba (smb) share of your Emby server is accessible to" +"Please make sure your Samba (smb) share of your Jellyfin server is accessible to" " your Kodi installation and that you have path substitution configured on " "your server. Otherwise, Kodi may fail to locate your files." msgstr "" -"Bitte stell sicher das deine Samba Freigabe (smb) auf deinem Emby Server für" +"Bitte stell sicher das deine Samba Freigabe (smb) auf deinem Jellyfin Server für" " Kodi zugänglich ist und das '(Optionaler) Gemeinsamer Netzwerkordner' auf " -"dem Emby Server korrekt eingestellt ist. Ansonsten kann Kodi die Dateien " +"dem Jellyfin Server korrekt eingestellt ist. Ansonsten kann Kodi die Dateien " "nicht finden." msgctxt "#33146" -msgid "Unable to connect to Emby." -msgstr "Verbindung zu Emby fehlgeschlagen." +msgid "Unable to connect to Jellyfin." +msgstr "Verbindung zu Jellyfin fehlgeschlagen." msgctxt "#33147" -msgid "Your access to Emby is restricted." -msgstr "Dein Zugang zu Emby ist eingeschränkt." +msgid "Your access to Jellyfin is restricted." +msgstr "Dein Zugang zu Jellyfin ist eingeschränkt." msgctxt "#33148" msgid "Your access to this server is restricted." @@ -882,8 +882,8 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "TV Tunes Addon nicht gefunden" msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" -msgstr "Deine Emby Media Themes wurden synchronisiert" +msgid "Your Jellyfin theme media has been synced to Kodi" +msgstr "Deine Jellyfin Media Themes wurden synchronisiert" msgctxt "#33154" msgid "Add libraries" @@ -891,11 +891,11 @@ msgstr "Bibliothek hinzufügen" msgctxt "#33155" msgid "" -"The currently applied patch for Emby for Kodi is corrupted! Please post to " -"the Emby for Kodi forums if this issue persists. This will need to be fixed " +"The currently applied patch for Jellyfin for Kodi is corrupted! Please post to " +"the Jellyfin for Kodi forums if this issue persists. This will need to be fixed " "as soon as possible." msgstr "" -"Der aktuell angewendete Patch ist fehlerhaft! Bitte melde dich im 'Emby for " +"Der aktuell angewendete Patch ist fehlerhaft! Bitte melde dich im 'Jellyfin for " "Kodi' Forum wenn der Fehler wiederholt auftritt. Der Fehler sollte so " "schnell wie möglich behoben werden." @@ -916,8 +916,8 @@ msgid "Enable audio/subtitles selection" msgstr "Audio/Untertitel Auswahl aktivieren" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " -msgstr "Um Fehler zu vermeiden update bitte 'Emby for Kodi' zur Version:" +msgid "To avoid errors, please update Jellyfin for Kodi to version: " +msgstr "Um Fehler zu vermeiden update bitte 'Jellyfin for Kodi' zur Version:" msgctxt "#33161" msgid "Check for updates" @@ -969,10 +969,10 @@ msgctxt "#33172" msgid "" "You have {number} updates pending. This may take a little while before " "seeing new content. It might be faster to update your libraries via " -"launching the Emby add-on > update libraries. Proceed anyway?" +"launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" "Es stehen {number} Updates an. Es kann eine Weile dauern ehe neue Inhalte " -"angezeigt werden. Es könnte schneller gehen die Datenbank über 'Emby Addon >" +"angezeigt werden. Es könnte schneller gehen die Datenbank über 'Jellyfin Addon >" " Datenbank aktualisieren' auf den neuesten Stand zu bringen. Trotzdem " "fortfahren? " @@ -986,7 +986,7 @@ msgstr "Parallele Downloads (Standard: 3)" msgctxt "#33175" msgid "" -"Paging tip: Each download thread requests your max items value from Emby at " +"Paging tip: Each download thread requests your max items value from Jellyfin at " "the same time." msgstr "" "Tip: Jeder Download Vorgang nutzt jeweils die eingestellte 'Maximal parallel" @@ -1012,8 +1012,8 @@ msgid "Force transcode" msgstr "Transkodierung erzwingen" msgctxt "#33180" -msgid "Restart Emby for Kodi" -msgstr "'Emby for Kodi' neustarten" +msgid "Restart Jellyfin for Kodi" +msgstr "'Jellyfin for Kodi' neustarten" msgctxt "#33181" msgid "Restarting to apply the patch" @@ -1066,12 +1066,12 @@ msgid "Enable Kodi database discovery" msgstr "'Kodi Database discovery' aktivieren?" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" -msgstr "'Emby for Kodi' Neustarten zum anwenden der Änderung?" +msgid "Restart Jellyfin for Kodi to apply this change?" +msgstr "'Jellyfin for Kodi' Neustarten zum anwenden der Änderung?" msgctxt "#33192" -msgid "Restart Emby for Kodi" -msgstr "'Emby for Kodi' neustarten" +msgid "Restart Jellyfin for Kodi" +msgstr "'Jellyfin for Kodi' neustarten" msgctxt "#33193" msgid "Restarting..." diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po index d0408eb83..ce9540531 100644 --- a/resources/language/resource.language.en_gb/strings.po +++ b/resources/language/resource.language.en_gb/strings.po @@ -1,10 +1,10 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Language-Team: \n" @@ -15,7 +15,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#29999" -msgid "Emby for Kodi" +msgid "Jellyfin for Kodi" msgstr "" msgctxt "#30000" @@ -187,11 +187,11 @@ msgid "TV Shows" msgstr "" msgctxt "#30401" -msgid "Emby options" +msgid "Jellyfin options" msgstr "" msgctxt "#30402" -msgid "Emby transcode" +msgid "Jellyfin transcode" msgstr "" msgctxt "#30405" @@ -207,7 +207,7 @@ msgid "Settings" msgstr "" msgctxt "#30409" -msgid "Delete from Emby" +msgid "Delete from Jellyfin" msgstr "" msgctxt "#30410" @@ -347,7 +347,7 @@ msgid "Display message" msgstr "" msgctxt "#30600" -msgid "Sign in with Emby Connect" +msgid "Sign in with Jellyfin Connect" msgstr "" msgctxt "#30602" @@ -387,7 +387,7 @@ msgid "Please sign in" msgstr "" msgctxt "#30613" -msgid "Change Emby Connect user" +msgid "Change Jellyfin Connect user" msgstr "" msgctxt "#30614" @@ -407,7 +407,7 @@ msgid "Server or port cannot be empty" msgstr "" msgctxt "#30618" -msgid "Change Emby Connect user" +msgid "Change Jellyfin Connect user" msgstr "" msgctxt "#33000" @@ -431,7 +431,7 @@ msgid "Choose the subtitles stream" msgstr "" msgctxt "#33015" -msgid "Delete file from Emby?" +msgid "Delete file from Jellyfin?" msgstr "" msgctxt "#33016" @@ -447,11 +447,11 @@ msgid "Gathering:" msgstr "" msgctxt "#33022" -msgid "Detected the database needs to be recreated for this version of Emby for Kodi. Proceed?" +msgid "Detected the database needs to be recreated for this version of Jellyfin for Kodi. Proceed?" msgstr "" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgstr "" msgctxt "#33025" @@ -463,7 +463,7 @@ msgid "A new device Id has been generated. Kodi will now restart." msgstr "" msgctxt "#33035" -msgid "Caution! If you choose Native mode, certain Emby features will be missing, such as: Emby cinema mode, direct stream/transcode options and parental access schedule." +msgid "Caution! If you choose Native mode, certain Jellyfin features will be missing, such as: Jellyfin cinema mode, direct stream/transcode options and parental access schedule." msgstr "" msgctxt "#33036" @@ -483,7 +483,7 @@ msgid "Kodi can't locate file:" msgstr "" msgctxt "#33048" -msgid "You may need to verify your network credentials in the add-on settings or use the Emby path substitution to format your path correctly (Emby dashboard > library). Stop syncing?" +msgid "You may need to verify your network credentials in the add-on settings or use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard > library). Stop syncing?" msgstr "" msgctxt "#33049" @@ -527,7 +527,7 @@ msgid "Remove all cached artwork?" msgstr "" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" +msgid "Reset all Jellyfin add-on settings?" msgstr "" msgctxt "#33088" @@ -555,7 +555,7 @@ msgid "Backup folder" msgstr "" msgctxt "#33097" -msgid "Important, cleanonupdate was removed in your advanced settings to prevent conflict with Emby for Kodi. Kodi will restart now." +msgid "Important, cleanonupdate was removed in your advanced settings to prevent conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" msgctxt "#33098" @@ -563,7 +563,7 @@ msgid "Refresh boxsets" msgstr "" msgctxt "#33099" -msgid "Install the server plugin Kodi companion to automatically apply emby library updates at startup. This setting can be found in the add-on settings > sync options > Enable Kodi Companion." +msgid "Install the server plugin Kodi companion to automatically apply Jellyfin library updates at startup. This setting can be found in the add-on settings > sync options > Enable Kodi Companion." msgstr "" msgctxt "#33100" @@ -643,7 +643,7 @@ msgid "You've change the playback mode. Kodi needs to be reset to apply the chan msgstr "" msgctxt "#33119" -msgid "Something went wrong during the sync. You'll be able to restore progress when restarting Kodi. If the problem persists, please report on the Emby for Kodi forums, with your Kodi log." +msgid "Something went wrong during the sync. You'll be able to restore progress when restarting Kodi. If the problem persists, please report on the Jellyfin for Kodi forums, with your Kodi log." msgstr "" msgctxt "#33120" @@ -667,7 +667,7 @@ msgid "Include people (slow)" msgstr "" msgctxt "#33125" -msgid "Choose the Emby views to sync to Kodi. You can optionally sync libraries at a later time." +msgid "Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at a later time." msgstr "" msgctxt "#33126" @@ -679,11 +679,11 @@ msgid "Proceed" msgstr "" msgctxt "#33128" -msgid "Failed to retrieve latest content updates. No content updates will be applied until Kodi is restarted. If this issue persists, please report on the Emby for Kodi forums, with your Kodi log." +msgid "Failed to retrieve latest content updates. No content updates will be applied until Kodi is restarted. If this issue persists, please report on the Jellyfin for Kodi forums, with your Kodi log." msgstr "" msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" msgctxt "#33130" @@ -747,15 +747,15 @@ msgid "Removing library" msgstr "" msgctxt "#33145" -msgid "Please make sure your Samba (smb) share of your Emby server is accessible to your Kodi installation and that you have path substitution configured on your server. Otherwise, Kodi may fail to locate your files." +msgid "Please make sure your Samba (smb) share of your Jellyfin server is accessible to your Kodi installation and that you have path substitution configured on your server. Otherwise, Kodi may fail to locate your files." msgstr "" msgctxt "#33146" -msgid "Unable to connect to Emby." +msgid "Unable to connect to Jellyfin." msgstr "" msgctxt "#33147" -msgid "Your access to Emby is restricted." +msgid "Your access to Jellyfin is restricted." msgstr "" msgctxt "#33148" @@ -779,7 +779,7 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "" msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" +msgid "Your Jellyfin theme media has been synced to Kodi" msgstr "" msgctxt "#33154" @@ -787,7 +787,7 @@ msgid "Add libraries" msgstr "" msgctxt "#33155" -msgid "The currently applied patch for Emby for Kodi is corrupted! Please post to the Emby for Kodi forums if this issue persists. This will need to be fixed as soon as possible." +msgid "The currently applied patch for Jellyfin for Kodi is corrupted! Please post to the Jellyfin for Kodi forums if this issue persists. This will need to be fixed as soon as possible." msgstr "" msgctxt "#33156" @@ -807,7 +807,7 @@ msgid "Enable audio/subtitles selection" msgstr "" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " +msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "" msgctxt "#33161" @@ -855,7 +855,7 @@ msgid "By first letter" msgstr "" msgctxt "#33172" -msgid "You have {number} updates pending. This may take a little while before seeing new content. It might be faster to update your libraries via launching the Emby add-on > update libraries. Proceed anyway?" +msgid "You have {number} updates pending. This may take a little while before seeing new content. It might be faster to update your libraries via launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" msgctxt "#33173" @@ -867,7 +867,7 @@ msgid "Paging - download threads (default: 3)" msgstr "" msgctxt "#33175" -msgid "Paging tip: Each download thread requests your max items value from Emby at the same time." +msgid "Paging tip: Each download thread requests your max items value from Jellyfin at the same time." msgstr "" msgctxt "#33176" @@ -887,7 +887,7 @@ msgid "Force transcode" msgstr "" msgctxt "#33180" -msgid "Restart Emby for Kodi" +msgid "Restart Jellyfin for Kodi" msgstr "" msgctxt "#33181" @@ -923,11 +923,11 @@ msgid "Would you like to sync Rotten Tomatoes ratings?" msgstr "" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" +msgid "Restart Jellyfin for Kodi to apply this change?" msgstr "" msgctxt "#33192" -msgid "Restart Emby for Kodi" +msgid "Restart Jellyfin for Kodi" msgstr "" msgctxt "#33193" @@ -939,7 +939,7 @@ msgid "Manage libraries" msgstr "" msgctxt "#33195" -msgid "Enable Emby for Kodi" +msgid "Enable Jellyfin for Kodi" msgstr "" msgctxt "#33196" diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po index 03a1a7163..09e453bed 100644 --- a/resources/language/resource.language.fr_fr/strings.po +++ b/resources/language/resource.language.fr_fr/strings.po @@ -1,5 +1,5 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 # Translators: @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2018-09-07 20:10+0000\n" "Last-Translator: Jean Fontaine , 2018\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgctxt "#29999" -msgid "Emby for Kodi" -msgstr "Emby pour Kodi" +msgid "Jellyfin for Kodi" +msgstr "Jellyfin pour Kodi" msgctxt "#30000" msgid "Server address" @@ -191,12 +191,12 @@ msgid "TV Shows" msgstr "Séries TV" msgctxt "#30401" -msgid "Emby options" -msgstr "Options Emby" +msgid "Jellyfin options" +msgstr "Options Jellyfin" msgctxt "#30402" -msgid "Emby transcode" -msgstr "Emby transcodage" +msgid "Jellyfin transcode" +msgstr "Jellyfin transcodage" msgctxt "#30405" msgid "Add to favorites" @@ -211,8 +211,8 @@ msgid "Settings" msgstr "Paramètres" msgctxt "#30409" -msgid "Delete from Emby" -msgstr "Supprimer d'Emby" +msgid "Delete from Jellyfin" +msgstr "Supprimer d'Jellyfin" msgctxt "#30410" msgid "Refresh this item" @@ -352,8 +352,8 @@ msgid "Display message" msgstr "Afficher le message" msgctxt "#30600" -msgid "Sign in with Emby Connect" -msgstr "S'identifier avec Emby Connect" +msgid "Sign in with Jellyfin Connect" +msgstr "S'identifier avec Jellyfin Connect" msgctxt "#30602" msgid "Password" @@ -392,8 +392,8 @@ msgid "Please sign in" msgstr "Veuillez vous identifier" msgctxt "#30613" -msgid "Change Emby Connect user" -msgstr "Changer d'utilisateur Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Changer d'utilisateur Jellyfin Connect" msgctxt "#30614" msgid "Connect to server" @@ -412,8 +412,8 @@ msgid "Server or port cannot be empty" msgstr "Le serveur ou le port ne peuvent pas être vides" msgctxt "#30618" -msgid "Change Emby Connect user" -msgstr "Changer d'utilisateur Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Changer d'utilisateur Jellyfin Connect" msgctxt "#33000" msgid "Welcome" @@ -436,8 +436,8 @@ msgid "Choose the subtitles stream" msgstr "Choisissez le flux de sous-titres" msgctxt "#33015" -msgid "Delete file from Emby?" -msgstr "Supprimer le fichier depuis Emby ?" +msgid "Delete file from Jellyfin?" +msgstr "Supprimer le fichier depuis Jellyfin ?" msgctxt "#33016" msgid "Play trailers?" @@ -453,14 +453,14 @@ msgstr "Rassemblage:" msgctxt "#33022" msgid "" -"Detected the database needs to be recreated for this version of Emby for " +"Detected the database needs to be recreated for this version of Jellyfin for " "Kodi. Proceed?" msgstr "" -"La base de données doit être recréée pour cette version d'Emby pour Kodi. " +"La base de données doit être recréée pour cette version d'Jellyfin pour Kodi. " "Continuer ?" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgstr "" msgctxt "#33025" @@ -474,12 +474,12 @@ msgstr "" msgctxt "#33035" msgid "" -"Caution! If you choose Native mode, certain Emby features will be missing, " -"such as: Emby cinema mode, direct stream/transcode options and parental " +"Caution! If you choose Native mode, certain Jellyfin features will be missing, " +"such as: Jellyfin cinema mode, direct stream/transcode options and parental " "access schedule." msgstr "" -"Attention ! Si vous choisissez le mode natif, certaines fonctions Emby " -"seront manquantes, telles que : le mode cinéma d'Emby, les options de flux " +"Attention ! Si vous choisissez le mode natif, certaines fonctions Jellyfin " +"seront manquantes, telles que : le mode cinéma d'Jellyfin, les options de flux " "direct/transcodage et la planification de l'accès parental." msgctxt "#33036" @@ -501,12 +501,12 @@ msgstr "Kodi ne peut pas localiser le fichier :" msgctxt "#33048" msgid "" "You may need to verify your network credentials in the add-on settings or " -"use the Emby path substitution to format your path correctly (Emby dashboard" +"use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard" " > library). Stop syncing?" msgstr "" "Vous devez peut-être vérifier vos identifiants réseau dans les paramètres de" -" l'extension ou utiliser la substitution de chemin Emby pour formater " -"correctement votre chemin (tableau de bord Emby > bibliothèque). Arrêter de " +" l'extension ou utiliser la substitution de chemin Jellyfin pour formater " +"correctement votre chemin (tableau de bord Jellyfin > bibliothèque). Arrêter de " "synchroniser ?" msgctxt "#33049" @@ -551,8 +551,8 @@ msgid "Remove all cached artwork?" msgstr "Supprimer toutes les illustrations en cache ?" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" -msgstr "Réinitialiser tous les paramètres de l'extension Emby ?" +msgid "Reset all Jellyfin add-on settings?" +msgstr "Réinitialiser tous les paramètres de l'extension Jellyfin ?" msgctxt "#33088" msgid "" @@ -584,10 +584,10 @@ msgstr "Dossier de sauvegarde" msgctxt "#33097" msgid "" "Important, cleanonupdate was removed in your advanced settings to prevent " -"conflict with Emby for Kodi. Kodi will restart now." +"conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" "Important, cleanonupdate a été supprimé dans vos paramètres avancés pour " -"éviter tout conflit avec Emby pour Kodi. Kodi va redémarrer maintenant." +"éviter tout conflit avec Jellyfin pour Kodi. Kodi va redémarrer maintenant." msgctxt "#33098" msgid "Refresh boxsets" @@ -595,12 +595,12 @@ msgstr "Rafraîchir les sagas" msgctxt "#33099" msgid "" -"Install the server plugin Kodi companion to automatically apply emby library" +"Install the server plugin Kodi companion to automatically apply Jellyfin library" " updates at startup. This setting can be found in the add-on settings > sync" " options > Enable Kodi Companion." msgstr "" "Installez le plugin serveur Kodi companion pour appliquer automatiquement " -"les mises à jour de la bibliothèque emby au démarrage. Ce paramètre se " +"les mises à jour de la bibliothèque Jellyfin au démarrage. Ce paramètre se " "trouve dans les paramètres complémentaires > options de synchronisation > " "Activer Kodi Companion." @@ -707,12 +707,12 @@ msgstr "" msgctxt "#33119" msgid "" "Something went wrong during the sync. You'll be able to restore progress " -"when restarting Kodi. If the problem persists, please report on the Emby for" +"when restarting Kodi. If the problem persists, please report on the Jellyfin for" " Kodi forums, with your Kodi log." msgstr "" "Quelque chose s'est mal passé pendant la synchronisation. Vous pourrez " "restaurer la progression au redémarrage de Kodi. Si le problème persiste, " -"merci de nous le signaler sur les forums Emby pour Kodi, avec votre journal " +"merci de nous le signaler sur les forums Jellyfin pour Kodi, avec votre journal " "Kodi." msgctxt "#33120" @@ -737,10 +737,10 @@ msgstr "Inclure les individus (lent)" msgctxt "#33125" msgid "" -"Choose the Emby views to sync to Kodi. You can optionally sync libraries at " +"Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at " "a later time." msgstr "" -"Choisir les vues Emby à synchroniser avec Kodi. Vous pouvez éventuellement " +"Choisir les vues Jellyfin à synchroniser avec Kodi. Vous pouvez éventuellement " "synchroniser les médiathèques ultérieurement." msgctxt "#33126" @@ -755,17 +755,17 @@ msgctxt "#33128" msgid "" "Failed to retrieve latest content updates. No content updates will be " "applied until Kodi is restarted. If this issue persists, please report on " -"the Emby for Kodi forums, with your Kodi log." +"the Jellyfin for Kodi forums, with your Kodi log." msgstr "" "Impossible de récupérer les dernières mises à jour du contenu. Aucune mise à" " jour du contenu ne sera appliquée tant que Kodi n'aura pas redémarré. Si ce" -" problème persiste, merci de le signaler sur les forums Emby pour Kodi, avec" +" problème persiste, merci de le signaler sur les forums Jellyfin pour Kodi, avec" " votre journal Kodi." msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" -"Vous pouvez synchroniser les médiathèques en lançant l'add-on Emby > Ajouter" +"Vous pouvez synchroniser les médiathèques en lançant l'add-on Jellyfin > Ajouter" " des médiathèques." msgctxt "#33130" @@ -839,22 +839,22 @@ msgstr "Suppression de la médiathèque" msgctxt "#33145" msgid "" -"Please make sure your Samba (smb) share of your Emby server is accessible to" +"Please make sure your Samba (smb) share of your Jellyfin server is accessible to" " your Kodi installation and that you have path substitution configured on " "your server. Otherwise, Kodi may fail to locate your files." msgstr "" -"Veuillez vous assurer que le partage Samba (smb) de votre serveur Emby est " +"Veuillez vous assurer que le partage Samba (smb) de votre serveur Jellyfin est " "accessible à votre installation Kodi et que vous avez configuré la " "substitution de chemin sur votre serveur. Sinon, Kodi pourrait ne pas " "localiser vos fichiers." msgctxt "#33146" -msgid "Unable to connect to Emby." -msgstr "Impossible de se connecter à Emby." +msgid "Unable to connect to Jellyfin." +msgstr "Impossible de se connecter à Jellyfin." msgctxt "#33147" -msgid "Your access to Emby is restricted." -msgstr "Votre accès à Emby est limité." +msgid "Your access to Jellyfin is restricted." +msgstr "Votre accès à Jellyfin est limité." msgctxt "#33148" msgid "Your access to this server is restricted." @@ -883,8 +883,8 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "Impossible de trouver TV Tunes dans Kodi." msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" -msgstr "Votre média de thème Emby a été synchronisé avec Kodi" +msgid "Your Jellyfin theme media has been synced to Kodi" +msgstr "Votre média de thème Jellyfin a été synchronisé avec Kodi" msgctxt "#33154" msgid "Add libraries" @@ -892,12 +892,12 @@ msgstr "Ajouter des médiathèques" msgctxt "#33155" msgid "" -"The currently applied patch for Emby for Kodi is corrupted! Please post to " -"the Emby for Kodi forums if this issue persists. This will need to be fixed " +"The currently applied patch for Jellyfin for Kodi is corrupted! Please post to " +"the Jellyfin for Kodi forums if this issue persists. This will need to be fixed " "as soon as possible." msgstr "" -"Le patch actuellement appliqué pour Emby pour Kodi est corrompu ! Veuillez " -"poster sur les forums Emby pour Kodi si ce problème persiste. Cette " +"Le patch actuellement appliqué pour Jellyfin pour Kodi est corrompu ! Veuillez " +"poster sur les forums Jellyfin pour Kodi si ce problème persiste. Cette " "situation devra être corrigée dès que possible." msgctxt "#33156" @@ -917,9 +917,9 @@ msgid "Enable audio/subtitles selection" msgstr "Activer la sélection audio/sous-titres" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " +msgid "To avoid errors, please update Jellyfin for Kodi to version: " msgstr "" -"Pour éviter les erreurs, veuillez mettre à jour la version d'Emby pour Kodi " +"Pour éviter les erreurs, veuillez mettre à jour la version d'Jellyfin pour Kodi " ": " msgctxt "#33161" @@ -972,11 +972,11 @@ msgctxt "#33172" msgid "" "You have {number} updates pending. This may take a little while before " "seeing new content. It might be faster to update your libraries via " -"launching the Emby add-on > update libraries. Proceed anyway?" +"launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" "Vous avez {number} mises à jour en attente. Cela peut prendre un peu de " "temps avant de voir le nouveau contenu. Il peut être plus rapide de mettre à" -" jour vos médiathèques en lançant l'add-on Emby > mettre à jour les " +" jour vos médiathèques en lançant l'add-on Jellyfin > mettre à jour les " "médiathèques. Procéder quand même ?" msgctxt "#33173" @@ -989,11 +989,11 @@ msgstr "" msgctxt "#33175" msgid "" -"Paging tip: Each download thread requests your max items value from Emby at " +"Paging tip: Each download thread requests your max items value from Jellyfin at " "the same time." msgstr "" "Conseil de pagination : Chaque téléchargement demande la valeur maximale des" -" éléments d'Emby en même temps." +" éléments d'Jellyfin en même temps." msgctxt "#33176" msgid "Update or repair your libraries to apply the changes below." @@ -1016,7 +1016,7 @@ msgid "Force transcode" msgstr "Forcer le transcodage" msgctxt "#33180" -msgid "Restart Emby for Kodi" +msgid "Restart Jellyfin for Kodi" msgstr "" msgctxt "#33181" @@ -1054,11 +1054,11 @@ msgid "Would you like to sync Rotten Tomatoes ratings?" msgstr "" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" +msgid "Restart Jellyfin for Kodi to apply this change?" msgstr "" msgctxt "#33192" -msgid "Restart Emby for Kodi" +msgid "Restart Jellyfin for Kodi" msgstr "" msgctxt "#33193" diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po index b4e2d6500..b5487cec8 100644 --- a/resources/language/resource.language.it_it/strings.po +++ b/resources/language/resource.language.it_it/strings.po @@ -1,5 +1,5 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 # Translators: @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2018-09-07 20:10+0000\n" "Last-Translator: EffeF, 2019\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#29999" -msgid "Emby for Kodi" -msgstr "Emby per Kodi" +msgid "Jellyfin for Kodi" +msgstr "Jellyfin per Kodi" msgctxt "#30000" msgid "Server address" @@ -191,12 +191,12 @@ msgid "TV Shows" msgstr "Serie TV" msgctxt "#30401" -msgid "Emby options" -msgstr "Opzioni Emby" +msgid "Jellyfin options" +msgstr "Opzioni Jellyfin" msgctxt "#30402" -msgid "Emby transcode" -msgstr "Transcodifica Emby" +msgid "Jellyfin transcode" +msgstr "Transcodifica Jellyfin" msgctxt "#30405" msgid "Add to favorites" @@ -211,8 +211,8 @@ msgid "Settings" msgstr "Impostazioni" msgctxt "#30409" -msgid "Delete from Emby" -msgstr "Elimina da Emby" +msgid "Delete from Jellyfin" +msgstr "Elimina da Jellyfin" msgctxt "#30410" msgid "Refresh this item" @@ -351,8 +351,8 @@ msgid "Display message" msgstr "Mostra messggio" msgctxt "#30600" -msgid "Sign in with Emby Connect" -msgstr "Accedi con Emby Connect" +msgid "Sign in with Jellyfin Connect" +msgstr "Accedi con Jellyfin Connect" msgctxt "#30602" msgid "Password" @@ -391,8 +391,8 @@ msgid "Please sign in" msgstr "Per favore accedi" msgctxt "#30613" -msgid "Change Emby Connect user" -msgstr "Cambia utente Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Cambia utente Jellyfin Connect" msgctxt "#30614" msgid "Connect to server" @@ -411,8 +411,8 @@ msgid "Server or port cannot be empty" msgstr "Server o porta non possono essere vuoti" msgctxt "#30618" -msgid "Change Emby Connect user" -msgstr "Cambia utente Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Cambia utente Jellyfin Connect" msgctxt "#33000" msgid "Welcome" @@ -435,8 +435,8 @@ msgid "Choose the subtitles stream" msgstr "Scegli il flusso dei sottotitoli" msgctxt "#33015" -msgid "Delete file from Emby?" -msgstr "Eliminare file da Emby?" +msgid "Delete file from Jellyfin?" +msgstr "Eliminare file da Jellyfin?" msgctxt "#33016" msgid "Play trailers?" @@ -452,16 +452,16 @@ msgstr "Raggruppa:" msgctxt "#33022" msgid "" -"Detected the database needs to be recreated for this version of Emby for " +"Detected the database needs to be recreated for this version of Jellyfin for " "Kodi. Proceed?" msgstr "" -"Rilevato che il database deve essere ricreato per questa versione di Emby " +"Rilevato che il database deve essere ricreato per questa versione di Jellyfin " "per Kodi. Procedere?" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgstr "" -"Emby per Kodi non funzionerà correttamente fino al ripristino del database." +"Jellyfin per Kodi non funzionerà correttamente fino al ripristino del database." msgctxt "#33025" msgid "Completed in:" @@ -473,12 +473,12 @@ msgstr "È stato generato un nuovo ID dispositivo. Kodi verrà riavviato." msgctxt "#33035" msgid "" -"Caution! If you choose Native mode, certain Emby features will be missing, " -"such as: Emby cinema mode, direct stream/transcode options and parental " +"Caution! If you choose Native mode, certain Jellyfin features will be missing, " +"such as: Jellyfin cinema mode, direct stream/transcode options and parental " "access schedule." msgstr "" -"Attenzione! Se si sceglie la modalità nativa, alcune funzionalità di Emby " -"saranno assenti, come ad esempio: modalità cinema Emby, opzioni streaming " +"Attenzione! Se si sceglie la modalità nativa, alcune funzionalità di Jellyfin " +"saranno assenti, come ad esempio: modalità cinema Jellyfin, opzioni streaming " "diretto/transcodifica e il controllo parentale." msgctxt "#33036" @@ -500,12 +500,12 @@ msgstr "Kodi non riesce a localizzare il file:" msgctxt "#33048" msgid "" "You may need to verify your network credentials in the add-on settings or " -"use the Emby path substitution to format your path correctly (Emby dashboard" +"use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard" " > library). Stop syncing?" msgstr "" "Potrebbe essere necessario verificare le credenziali di rete nelle " -"impostazioni dell'add-on o utilizzare la sostituzione del percorso Emby per " -"formattare correttamente il percorso (pannello controllo Emby > librerie). " +"impostazioni dell'add-on o utilizzare la sostituzione del percorso Jellyfin per " +"formattare correttamente il percorso (pannello controllo Jellyfin > librerie). " "Interrompere la sincronizzazione?" msgctxt "#33049" @@ -549,8 +549,8 @@ msgid "Remove all cached artwork?" msgstr "Rimuove tutte le artwork dalla cache?" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" -msgstr "Resetta tutte le impostazioni dell'add-on Emby?" +msgid "Reset all Jellyfin add-on settings?" +msgstr "Resetta tutte le impostazioni dell'add-on Jellyfin?" msgctxt "#33088" msgid "" @@ -582,10 +582,10 @@ msgstr "Cartella backup" msgctxt "#33097" msgid "" "Important, cleanonupdate was removed in your advanced settings to prevent " -"conflict with Emby for Kodi. Kodi will restart now." +"conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" "Importante, cleanonupdate è stato rimosso nelle impostazioni avanzate per " -"evitare conflitti con Emby per Kodi. Kodi verrà riavviato." +"evitare conflitti con Jellyfin per Kodi. Kodi verrà riavviato." msgctxt "#33098" msgid "Refresh boxsets" @@ -593,12 +593,12 @@ msgstr "Aggiorna collezioni" msgctxt "#33099" msgid "" -"Install the server plugin Kodi companion to automatically apply emby library" +"Install the server plugin Kodi companion to automatically apply Jellyfin library" " updates at startup. This setting can be found in the add-on settings > sync" " options > Enable Kodi Companion." msgstr "" "Installa il plugin Kodi companion sul server per applicare automaticamente " -"gli aggiornamenti della libreria Emby all'avvio. Questa impostazione può " +"gli aggiornamenti della libreria Jellyfin all'avvio. Questa impostazione può " "essere trovata nelle impostazioni dell'add-on > opzioni di sincronizzazione>" " Abilita Kodi Companion." @@ -703,12 +703,12 @@ msgstr "" msgctxt "#33119" msgid "" "Something went wrong during the sync. You'll be able to restore progress " -"when restarting Kodi. If the problem persists, please report on the Emby for" +"when restarting Kodi. If the problem persists, please report on the Jellyfin for" " Kodi forums, with your Kodi log." msgstr "" "Qualcosa è andato storto durante la sincronizzazione. Sarai in grado di " "ripristinare i progressi al riavvio di Kodi. Se il problema persiste, si " -"prega di riferire sul forum di Emby per Kodi, con il tuo log di Kodi." +"prega di riferire sul forum di Jellyfin per Kodi, con il tuo log di Kodi." msgctxt "#33120" msgid "Select the libraries to add" @@ -732,10 +732,10 @@ msgstr "Includi persone (lento)" msgctxt "#33125" msgid "" -"Choose the Emby views to sync to Kodi. You can optionally sync libraries at " +"Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at " "a later time." msgstr "" -"Scegli le viste Emby da sincronizzare con Kodi. Puoi opzionalmente " +"Scegli le viste Jellyfin da sincronizzare con Kodi. Puoi opzionalmente " "sincronizzare le librerie in un secondo momento." msgctxt "#33126" @@ -750,17 +750,17 @@ msgctxt "#33128" msgid "" "Failed to retrieve latest content updates. No content updates will be " "applied until Kodi is restarted. If this issue persists, please report on " -"the Emby for Kodi forums, with your Kodi log." +"the Jellyfin for Kodi forums, with your Kodi log." msgstr "" "Impossibile recuperare gli ultimi aggiornamenti dei contenuti. Nessun " "aggiornamento dei contenuti verrà applicato fino al riavvio di Kodi. Se il " -"problema persiste, segnalalo sul forum di Emby per Kodi, con il tuo log di " +"problema persiste, segnalalo sul forum di Jellyfin per Kodi, con il tuo log di " "Kodi." msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" -"È possibile sincronizzare le librerie avviando l'add-on Emby > Aggiungi " +"È possibile sincronizzare le librerie avviando l'add-on Jellyfin > Aggiungi " "librerie." msgctxt "#33130" @@ -834,22 +834,22 @@ msgstr "Rimozione della libreria" msgctxt "#33145" msgid "" -"Please make sure your Samba (smb) share of your Emby server is accessible to" +"Please make sure your Samba (smb) share of your Jellyfin server is accessible to" " your Kodi installation and that you have path substitution configured on " "your server. Otherwise, Kodi may fail to locate your files." msgstr "" -"Assicurati che la tua condivisione di Samba (smb) del tuo server Emby sia " +"Assicurati che la tua condivisione di Samba (smb) del tuo server Jellyfin sia " "accessibile all'installazione di Kodi e che sia stata configurata la " "sostituzione del percorso sul tuo server. In caso contrario, Kodi potrebbe " "non riuscire a individuare i file." msgctxt "#33146" -msgid "Unable to connect to Emby." -msgstr "Impossibile connettersi a Emby." +msgid "Unable to connect to Jellyfin." +msgstr "Impossibile connettersi a Jellyfin." msgctxt "#33147" -msgid "Your access to Emby is restricted." -msgstr "Il tuo accesso a Emby è limitato." +msgid "Your access to Jellyfin is restricted." +msgstr "Il tuo accesso a Jellyfin è limitato." msgctxt "#33148" msgid "Your access to this server is restricted." @@ -878,8 +878,8 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "Impossibile trovare TV Tunes in Kodi." msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" -msgstr "I tuoi temi multimediali Emby sono stati sincronizzati con Kodi" +msgid "Your Jellyfin theme media has been synced to Kodi" +msgstr "I tuoi temi multimediali Jellyfin sono stati sincronizzati con Kodi" msgctxt "#33154" msgid "Add libraries" @@ -887,12 +887,12 @@ msgstr "Aggiungi librerie" msgctxt "#33155" msgid "" -"The currently applied patch for Emby for Kodi is corrupted! Please post to " -"the Emby for Kodi forums if this issue persists. This will need to be fixed " +"The currently applied patch for Jellyfin for Kodi is corrupted! Please post to " +"the Jellyfin for Kodi forums if this issue persists. This will need to be fixed " "as soon as possible." msgstr "" -"La patch attualmente applicata per Emby per Kodi è corrotta! Si prega di " -"postare sul forum di Emby per Kodi se questo problema persiste. Questo dovrà" +"La patch attualmente applicata per Jellyfin per Kodi è corrotta! Si prega di " +"postare sul forum di Jellyfin per Kodi se questo problema persiste. Questo dovrà" " essere risolto il prima possibile." msgctxt "#33156" @@ -912,8 +912,8 @@ msgid "Enable audio/subtitles selection" msgstr "Abilita selezione audio/sottotitoli" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " -msgstr "Per evitare errori, aggiorna Emby per Kodi alla versione:" +msgid "To avoid errors, please update Jellyfin for Kodi to version: " +msgstr "Per evitare errori, aggiorna Jellyfin per Kodi alla versione:" msgctxt "#33161" msgid "Check for updates" @@ -964,11 +964,11 @@ msgctxt "#33172" msgid "" "You have {number} updates pending. This may take a little while before " "seeing new content. It might be faster to update your libraries via " -"launching the Emby add-on > update libraries. Proceed anyway?" +"launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" "Hai {number} aggiornamenti in sospeso. Questo potrebbe richiedere un po' di " "tempo prima di poter vedere i nuovi contenuti. Potrebbe essere più rapido " -"aggiornare le tue librerie avviando l'add-on di Emby > Aggiorna librerie. " +"aggiornare le tue librerie avviando l'add-on di Jellyfin > Aggiorna librerie. " "Procedere comunque?" msgctxt "#33173" @@ -981,11 +981,11 @@ msgstr "Chiamata - thread di download (default: 3)" msgctxt "#33175" msgid "" -"Paging tip: Each download thread requests your max items value from Emby at " +"Paging tip: Each download thread requests your max items value from Jellyfin at " "the same time." msgstr "" "Suggerimento: ogni thread di download richiede il tuoi elementi richiesti " -"massimi da Emby contemporaneamente." +"massimi da Jellyfin contemporaneamente." msgctxt "#33176" msgid "Update or repair your libraries to apply the changes below." @@ -1005,8 +1005,8 @@ msgid "Force transcode" msgstr "Forza transcodifica" msgctxt "#33180" -msgid "Restart Emby for Kodi" -msgstr "Riavvia Emby per Kodi" +msgid "Restart Jellyfin for Kodi" +msgstr "Riavvia Jellyfin per Kodi" msgctxt "#33181" msgid "Restarting to apply the patch" @@ -1059,12 +1059,12 @@ msgid "Enable Kodi database discovery" msgstr "Abilita il rilevamento del database Kodi" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" -msgstr "Riavvia Emby per Kodi per applicare questo cambiamento?" +msgid "Restart Jellyfin for Kodi to apply this change?" +msgstr "Riavvia Jellyfin per Kodi per applicare questo cambiamento?" msgctxt "#33192" -msgid "Restart Emby for Kodi" -msgstr "Riavvia Emby per Kodi" +msgid "Restart Jellyfin for Kodi" +msgstr "Riavvia Jellyfin per Kodi" msgctxt "#33193" msgid "Restarting..." diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po index 732a7d13a..62f91c108 100644 --- a/resources/language/resource.language.nl_nl/strings.po +++ b/resources/language/resource.language.nl_nl/strings.po @@ -1,5 +1,5 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 # Translators: @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2018-09-07 20:10+0000\n" "Last-Translator: 63ac71fcbd0581bb567b1f0d798c7970, 2019\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#29999" -msgid "Emby for Kodi" -msgstr "Emby voor Kodi" +msgid "Jellyfin for Kodi" +msgstr "Jellyfin voor Kodi" msgctxt "#30000" msgid "Server address" @@ -191,12 +191,12 @@ msgid "TV Shows" msgstr "TV series" msgctxt "#30401" -msgid "Emby options" -msgstr "Emby opties" +msgid "Jellyfin options" +msgstr "Jellyfin opties" msgctxt "#30402" -msgid "Emby transcode" -msgstr "Emby transcode" +msgid "Jellyfin transcode" +msgstr "Jellyfin transcode" msgctxt "#30405" msgid "Add to favorites" @@ -211,8 +211,8 @@ msgid "Settings" msgstr "Instellingen" msgctxt "#30409" -msgid "Delete from Emby" -msgstr "Uit Emby verwijderen" +msgid "Delete from Jellyfin" +msgstr "Uit Jellyfin verwijderen" msgctxt "#30410" msgid "Refresh this item" @@ -351,8 +351,8 @@ msgid "Display message" msgstr "Melding tonen" msgctxt "#30600" -msgid "Sign in with Emby Connect" -msgstr "Aanmelden met Emby Connect" +msgid "Sign in with Jellyfin Connect" +msgstr "Aanmelden met Jellyfin Connect" msgctxt "#30602" msgid "Password" @@ -391,8 +391,8 @@ msgid "Please sign in" msgstr "Aanmelden" msgctxt "#30613" -msgid "Change Emby Connect user" -msgstr "Emby Connect gebruiker wijzigen" +msgid "Change Jellyfin Connect user" +msgstr "Jellyfin Connect gebruiker wijzigen" msgctxt "#30614" msgid "Connect to server" @@ -411,8 +411,8 @@ msgid "Server or port cannot be empty" msgstr "Server of poort kan niet leeg zijn" msgctxt "#30618" -msgid "Change Emby Connect user" -msgstr "Emby Connect gebruiker wijzigen" +msgid "Change Jellyfin Connect user" +msgstr "Jellyfin Connect gebruiker wijzigen" msgctxt "#33000" msgid "Welcome" @@ -435,8 +435,8 @@ msgid "Choose the subtitles stream" msgstr "Kies ondertitel stream" msgctxt "#33015" -msgid "Delete file from Emby?" -msgstr "Bestand uit Emby verwijderen?" +msgid "Delete file from Jellyfin?" +msgstr "Bestand uit Jellyfin verwijderen?" msgctxt "#33016" msgid "Play trailers?" @@ -452,15 +452,15 @@ msgstr "Verzamelen:" msgctxt "#33022" msgid "" -"Detected the database needs to be recreated for this version of Emby for " +"Detected the database needs to be recreated for this version of Jellyfin for " "Kodi. Proceed?" msgstr "" -"De databank moet opnieuw gemaakt worden voor deze versie van Emby for Kodi. " +"De databank moet opnieuw gemaakt worden voor deze versie van Jellyfin for Kodi. " "Verder gaan?" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." -msgstr "Emby for Kodi werkt niet correct voor dat de databank gereset is." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." +msgstr "Jellyfin for Kodi werkt niet correct voor dat de databank gereset is." msgctxt "#33025" msgid "Completed in:" @@ -472,12 +472,12 @@ msgstr "Een nieuw apparaat id is aangemaakt. Kodi start nu opnieuw." msgctxt "#33035" msgid "" -"Caution! If you choose Native mode, certain Emby features will be missing, " -"such as: Emby cinema mode, direct stream/transcode options and parental " +"Caution! If you choose Native mode, certain Jellyfin features will be missing, " +"such as: Jellyfin cinema mode, direct stream/transcode options and parental " "access schedule." msgstr "" -"Opgepast! Bij het kiezen van Native mode, zullen bepaalde Emby mogelijkheden" -" ontbreken zoals: Emby Cinema modus, direct stream/transcode opties and " +"Opgepast! Bij het kiezen van Native mode, zullen bepaalde Jellyfin mogelijkheden" +" ontbreken zoals: Jellyfin Cinema modus, direct stream/transcode opties and " "ouderlijke toegang planning." msgctxt "#33036" @@ -499,12 +499,12 @@ msgstr "Kodi kan volgende bestand niet vinden:" msgctxt "#33048" msgid "" "You may need to verify your network credentials in the add-on settings or " -"use the Emby path substitution to format your path correctly (Emby dashboard" +"use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard" " > library). Stop syncing?" msgstr "" "Misschien is het nodig uw netwerk gegevens na te kijken in de add-on " -"instellingen of gebruik de Emby path vervanging om uw folder correct te " -"formateren (Emby dashboard > bibliotheek). Synchroniseren stoppen?" +"instellingen of gebruik de Jellyfin path vervanging om uw folder correct te " +"formateren (Jellyfin dashboard > bibliotheek). Synchroniseren stoppen?" msgctxt "#33049" msgid "New" @@ -547,8 +547,8 @@ msgid "Remove all cached artwork?" msgstr "Cached artwork verwijderen?" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" -msgstr "Alle Emby add-on instellingen resetten?" +msgid "Reset all Jellyfin add-on settings?" +msgstr "Alle Jellyfin add-on instellingen resetten?" msgctxt "#33088" msgid "" @@ -580,10 +580,10 @@ msgstr "Backup folder" msgctxt "#33097" msgid "" "Important, cleanonupdate was removed in your advanced settings to prevent " -"conflict with Emby for Kodi. Kodi will restart now." +"conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" "Belangrijd, cleanonupdate is verwijderen uit de geavanceerde instellingen om" -" een conflict met Emby for Kodi te voorkomen. Kodi start nu opnieuw op." +" een conflict met Jellyfin for Kodi te voorkomen. Kodi start nu opnieuw op." msgctxt "#33098" msgid "Refresh boxsets" @@ -591,11 +591,11 @@ msgstr "Boxsets vernieuwen" msgctxt "#33099" msgid "" -"Install the server plugin Kodi companion to automatically apply emby library" +"Install the server plugin Kodi companion to automatically apply Jellyfin library" " updates at startup. This setting can be found in the add-on settings > sync" " options > Enable Kodi Companion." msgstr "" -"Installeer de server plugin Kodi companion om Emby bibliotheek updates " +"Installeer de server plugin Kodi companion om Jellyfin bibliotheek updates " "automatisch te laten lopen bij het opstarten. Deze instellingen kan gevonden" " worden in de add-on instellingen > synchroniseer opties > Kodi Companion " "inschakelen." @@ -700,12 +700,12 @@ msgstr "" msgctxt "#33119" msgid "" "Something went wrong during the sync. You'll be able to restore progress " -"when restarting Kodi. If the problem persists, please report on the Emby for" +"when restarting Kodi. If the problem persists, please report on the Jellyfin for" " Kodi forums, with your Kodi log." msgstr "" "Er is iets mis gegaan tijdens de synchronisatie. U kunt de voortgang " "herstellen als u Kodi opnieuw opstart. Als het probleem blijft, meld dit " -"probleem dan op de Emby for Kodi forums, met uw Kodi log." +"probleem dan op de Jellyfin for Kodi forums, met uw Kodi log." msgctxt "#33120" msgid "Select the libraries to add" @@ -729,10 +729,10 @@ msgstr "Mensen meerekenen (langzaam)" msgctxt "#33125" msgid "" -"Choose the Emby views to sync to Kodi. You can optionally sync libraries at " +"Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at " "a later time." msgstr "" -"Kies de Emby zichten om naar Kodi te synchroniseren. U kunt later de " +"Kies de Jellyfin zichten om naar Kodi te synchroniseren. U kunt later de " "bibliotheken optioneel synchroniseren." msgctxt "#33126" @@ -747,16 +747,16 @@ msgctxt "#33128" msgid "" "Failed to retrieve latest content updates. No content updates will be " "applied until Kodi is restarted. If this issue persists, please report on " -"the Emby for Kodi forums, with your Kodi log." +"the Jellyfin for Kodi forums, with your Kodi log." msgstr "" "Het is mislukt om de laatste inhoud updates te verkrijgen. Er worden geen " "inhoud updates toe gepast totdat Kodi opnieuw is opgestart. Als deze fout " -"blijft komen, meld u dan op de Emby for Kodi forums met uw Kodi log." +"blijft komen, meld u dan op de Jellyfin for Kodi forums met uw Kodi log." msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" -"U kunt bibliotheken synchroniseren door de Emby add-on > bibliotheken " +"U kunt bibliotheken synchroniseren door de Jellyfin add-on > bibliotheken " "toevoegen te starten." msgctxt "#33130" @@ -829,21 +829,21 @@ msgstr "Bibliotheek wordt verwijderen" msgctxt "#33145" msgid "" -"Please make sure your Samba (smb) share of your Emby server is accessible to" +"Please make sure your Samba (smb) share of your Jellyfin server is accessible to" " your Kodi installation and that you have path substitution configured on " "your server. Otherwise, Kodi may fail to locate your files." msgstr "" -"Controleer of uw Samba (smb) gedeelde map van uw Emby server toegankelijk is" +"Controleer of uw Samba (smb) gedeelde map van uw Jellyfin server toegankelijk is" " voor uw Kodi installatie en dat path substitution op uw server is " "ingesteld. anders kan voorkomen dat het Kodi mislukt uw bestanden te vinden." msgctxt "#33146" -msgid "Unable to connect to Emby." -msgstr "Niet in staat om met Emby te verbinden." +msgid "Unable to connect to Jellyfin." +msgstr "Niet in staat om met Jellyfin te verbinden." msgctxt "#33147" -msgid "Your access to Emby is restricted." -msgstr "Uw toegang tot Emby is beperkt." +msgid "Your access to Jellyfin is restricted." +msgstr "Uw toegang tot Jellyfin is beperkt." msgctxt "#33148" msgid "Your access to this server is restricted." @@ -872,8 +872,8 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "Niet in staat om TV Tunes in Kodi te vinden." msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" -msgstr "Uw Emby thema media is gesynchroniseerd met Kodi" +msgid "Your Jellyfin theme media has been synced to Kodi" +msgstr "Uw Jellyfin thema media is gesynchroniseerd met Kodi" msgctxt "#33154" msgid "Add libraries" @@ -881,12 +881,12 @@ msgstr "Bibliotheken toevoegen" msgctxt "#33155" msgid "" -"The currently applied patch for Emby for Kodi is corrupted! Please post to " -"the Emby for Kodi forums if this issue persists. This will need to be fixed " +"The currently applied patch for Jellyfin for Kodi is corrupted! Please post to " +"the Jellyfin for Kodi forums if this issue persists. This will need to be fixed " "as soon as possible." msgstr "" -"De huidige toegepaste patch voor Emby is beschadigd! Maak alstublieft een " -"melding op de Emby voor Kodi forums als het probleem blijft. Dit moet yo " +"De huidige toegepaste patch voor Jellyfin is beschadigd! Maak alstublieft een " +"melding op de Jellyfin voor Kodi forums als het probleem blijft. Dit moet yo " "snel als mogelijk verholpen worden." msgctxt "#33156" @@ -906,8 +906,8 @@ msgid "Enable audio/subtitles selection" msgstr "Schaken audio/ondertitel keuze in" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " -msgstr "Om problemen voorkomen, update Emby for Kodi naar versie:" +msgid "To avoid errors, please update Jellyfin for Kodi to version: " +msgstr "Om problemen voorkomen, update Jellyfin for Kodi naar versie:" msgctxt "#33161" msgid "Check for updates" @@ -958,11 +958,11 @@ msgctxt "#33172" msgid "" "You have {number} updates pending. This may take a little while before " "seeing new content. It might be faster to update your libraries via " -"launching the Emby add-on > update libraries. Proceed anyway?" +"launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" "U heeft {number} wachtende updates. Het kan misschien even during voordat u " "nieuwe inhoud ziet. Misschien gaat het updaten van uw bibliotheken sneller " -"door de Emby add-on bibliotheken updaten te starten. Toch doorgaan?" +"door de Jellyfin add-on bibliotheken updaten te starten. Toch doorgaan?" msgctxt "#33173" msgid "Forget about the previous sync? This is not recommended." @@ -974,10 +974,10 @@ msgstr "Paging - download threads (standaard: 3)" msgctxt "#33175" msgid "" -"Paging tip: Each download thread requests your max items value from Emby at " +"Paging tip: Each download thread requests your max items value from Jellyfin at " "the same time." msgstr "" -"Paging tip: Elke download thread vraagt naar uw maximum items waarde by Emby" +"Paging tip: Elke download thread vraagt naar uw maximum items waarde by Jellyfin" " op hetzelfde moment." msgctxt "#33176" @@ -999,8 +999,8 @@ msgid "Force transcode" msgstr "Transkodering dwingen" msgctxt "#33180" -msgid "Restart Emby for Kodi" -msgstr "Emby for Kodi opnieuw starten" +msgid "Restart Jellyfin for Kodi" +msgstr "Jellyfin for Kodi opnieuw starten" msgctxt "#33181" msgid "Restarting to apply the patch" @@ -1039,12 +1039,12 @@ msgid "Would you like to sync Rotten Tomatoes ratings?" msgstr "Rotten Tomatoes ratings synchroniseren?" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" -msgstr "Emby for Kodi opnieuw opstarten om de wijziging toe te passen?" +msgid "Restart Jellyfin for Kodi to apply this change?" +msgstr "Jellyfin for Kodi opnieuw opstarten om de wijziging toe te passen?" msgctxt "#33192" -msgid "Restart Emby for Kodi" -msgstr "Emby for Kodi opnieuw starten" +msgid "Restart Jellyfin for Kodi" +msgstr "Jellyfin for Kodi opnieuw starten" msgctxt "#33193" msgid "Restarting..." @@ -1055,8 +1055,8 @@ msgid "Manage libraries" msgstr "Bibliotheken beheren" msgctxt "#33195" -msgid "Enable Emby for Kodi" -msgstr "Emby for Kodi inschakelen" +msgid "Enable Jellyfin for Kodi" +msgstr "Jellyfin for Kodi inschakelen" msgctxt "#33196" msgid "Advanced options" diff --git a/resources/language/resource.language.pl_pl/strings.po b/resources/language/resource.language.pl_pl/strings.po index 8170e3e2e..314f76efe 100644 --- a/resources/language/resource.language.pl_pl/strings.po +++ b/resources/language/resource.language.pl_pl/strings.po @@ -1,5 +1,5 @@ -# Emby for Kodi language file -# Addon Name: Emby for Kodi +# Jellyfin for Kodi language file +# Addon Name: Jellyfin for Kodi # Addon id: plugin.video.jellyfin # Addon Provider: angelblue05 # Translators: @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Emby for Kodi\n" +"Project-Id-Version: Jellyfin for Kodi\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2018-09-07 20:10+0000\n" "Last-Translator: Michał Sawicz , 2019\n" @@ -19,8 +19,8 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n" msgctxt "#29999" -msgid "Emby for Kodi" -msgstr "Emby dla Kodi" +msgid "Jellyfin for Kodi" +msgstr "Jellyfin dla Kodi" msgctxt "#30000" msgid "Server address" @@ -191,12 +191,12 @@ msgid "TV Shows" msgstr "Seriale" msgctxt "#30401" -msgid "Emby options" -msgstr "Opcje Emby" +msgid "Jellyfin options" +msgstr "Opcje Jellyfin" msgctxt "#30402" -msgid "Emby transcode" -msgstr "Transkodowanie Emby" +msgid "Jellyfin transcode" +msgstr "Transkodowanie Jellyfin" msgctxt "#30405" msgid "Add to favorites" @@ -211,8 +211,8 @@ msgid "Settings" msgstr "Ustawienia" msgctxt "#30409" -msgid "Delete from Emby" -msgstr "Usuń z Emby" +msgid "Delete from Jellyfin" +msgstr "Usuń z Jellyfin" msgctxt "#30410" msgid "Refresh this item" @@ -351,8 +351,8 @@ msgid "Display message" msgstr "Wyświetl wiadomość" msgctxt "#30600" -msgid "Sign in with Emby Connect" -msgstr "Zaloguj z Emby Connect" +msgid "Sign in with Jellyfin Connect" +msgstr "Zaloguj z Jellyfin Connect" msgctxt "#30602" msgid "Password" @@ -391,8 +391,8 @@ msgid "Please sign in" msgstr "Proszę się zalogować" msgctxt "#30613" -msgid "Change Emby Connect user" -msgstr "Zmień użytkownika Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Zmień użytkownika Jellyfin Connect" msgctxt "#30614" msgid "Connect to server" @@ -411,8 +411,8 @@ msgid "Server or port cannot be empty" msgstr "Nazwa hosta i port nie mogą być puste" msgctxt "#30618" -msgid "Change Emby Connect user" -msgstr "Zmień użytkownika Emby Connect" +msgid "Change Jellyfin Connect user" +msgstr "Zmień użytkownika Jellyfin Connect" msgctxt "#33000" msgid "Welcome" @@ -435,8 +435,8 @@ msgid "Choose the subtitles stream" msgstr "Wybierz napisy" msgctxt "#33015" -msgid "Delete file from Emby?" -msgstr "Usunąć plik z Emby?" +msgid "Delete file from Jellyfin?" +msgstr "Usunąć plik z Jellyfin?" msgctxt "#33016" msgid "Play trailers?" @@ -452,16 +452,16 @@ msgstr "Pobieranie:" msgctxt "#33022" msgid "" -"Detected the database needs to be recreated for this version of Emby for " +"Detected the database needs to be recreated for this version of Jellyfin for " "Kodi. Proceed?" msgstr "" -"Wykryto konieczność rekonstrukcji bazy dla tej wersji Emby dla Kodi. " +"Wykryto konieczność rekonstrukcji bazy dla tej wersji Jellyfin dla Kodi. " "Kontynuować?" msgctxt "#33023" -msgid "Emby for Kodi will not work correctly until the database is reset." +msgid "Jellyfin for Kodi will not work correctly until the database is reset." msgstr "" -"Emby dla Kodi nie będzie działało poprawnie dopóki baza nie zostanie " +"Jellyfin dla Kodi nie będzie działało poprawnie dopóki baza nie zostanie " "zresetowana." msgctxt "#33025" @@ -476,11 +476,11 @@ msgstr "" msgctxt "#33035" msgid "" -"Caution! If you choose Native mode, certain Emby features will be missing, " -"such as: Emby cinema mode, direct stream/transcode options and parental " +"Caution! If you choose Native mode, certain Jellyfin features will be missing, " +"such as: Jellyfin cinema mode, direct stream/transcode options and parental " "access schedule." msgstr "" -"Uwaga! Jeśli wybierzesz tryb Natywny, niektóre funkcje Emby będą " +"Uwaga! Jeśli wybierzesz tryb Natywny, niektóre funkcje Jellyfin będą " "niedostępne, np.: tryb kinowy, opcje strumieniowania bezpośredniego i " "transkodowania, harmonogram ograniczeń wiekowych." @@ -503,11 +503,11 @@ msgstr "Kodi nie odnalazł pliku:" msgctxt "#33048" msgid "" "You may need to verify your network credentials in the add-on settings or " -"use the Emby path substitution to format your path correctly (Emby dashboard" +"use the Jellyfin path substitution to format your path correctly (Jellyfin dashboard" " > library). Stop syncing?" msgstr "" "Być może należy sprawdzić dane logowania w sieci w ustawieniach dodatku lub " -"format podstawienia ścieżki w Emby (Kokpit Emby > Biblioteki). Zatrzymać " +"format podstawienia ścieżki w Jellyfin (Kokpit Jellyfin > Biblioteki). Zatrzymać " "synchronizację?" msgctxt "#33049" @@ -551,8 +551,8 @@ msgid "Remove all cached artwork?" msgstr "Usunąć pobrane grafiki?" msgctxt "#33087" -msgid "Reset all Emby add-on settings?" -msgstr "Zresetować wszystkie ustawienia dodatku Emby?" +msgid "Reset all Jellyfin add-on settings?" +msgstr "Zresetować wszystkie ustawienia dodatku Jellyfin?" msgctxt "#33088" msgid "" @@ -584,10 +584,10 @@ msgstr "Folder kopii zapasowej" msgctxt "#33097" msgid "" "Important, cleanonupdate was removed in your advanced settings to prevent " -"conflict with Emby for Kodi. Kodi will restart now." +"conflict with Jellyfin for Kodi. Kodi will restart now." msgstr "" "Ważne: \"cleanonupdate\" zostało usunięte z ustawień zaawansowanych aby " -"zapobiec konfliktowi z Emby dla Kodi. Kodi zostanie uruchomione ponownie." +"zapobiec konfliktowi z Jellyfin dla Kodi. Kodi zostanie uruchomione ponownie." msgctxt "#33098" msgid "Refresh boxsets" @@ -595,11 +595,11 @@ msgstr "Odśwież kolekcje" msgctxt "#33099" msgid "" -"Install the server plugin Kodi companion to automatically apply emby library" +"Install the server plugin Kodi companion to automatically apply Jellyfin library" " updates at startup. This setting can be found in the add-on settings > sync" " options > Enable Kodi Companion." msgstr "" -"Zainstaluj wtyczkę serwera Emby \"Kodi Companion\" by automatycznie pobierać" +"Zainstaluj wtyczkę serwera Jellyfin \"Kodi Companion\" by automatycznie pobierać" " aktualizacje bazy danych. Właściwa opcja znajduje się w ustawieniach " "dodatku > Synchronizacja > Włącz Kodi Companion." @@ -700,12 +700,12 @@ msgstr "" msgctxt "#33119" msgid "" "Something went wrong during the sync. You'll be able to restore progress " -"when restarting Kodi. If the problem persists, please report on the Emby for" +"when restarting Kodi. If the problem persists, please report on the Jellyfin for" " Kodi forums, with your Kodi log." msgstr "" "Coś poszło nie tak podczas synchronizacji. Po uruchomieniu Kodi ponownie " "będzie możliwe jej wznowienie. Jeśli problem się powtórzy, proszę zgłoś go " -"na forum Emby for Kodi, dołączając dziennik zdarzeń Kodi." +"na forum Jellyfin for Kodi, dołączając dziennik zdarzeń Kodi." msgctxt "#33120" msgid "Select the libraries to add" @@ -729,10 +729,10 @@ msgstr "Pobieraj twórców (wolne)" msgctxt "#33125" msgid "" -"Choose the Emby views to sync to Kodi. You can optionally sync libraries at " +"Choose the Jellyfin views to sync to Kodi. You can optionally sync libraries at " "a later time." msgstr "" -"Wybierz biblioteki Emby do synchronizacji z Kodi. Możesz to także zrobić " +"Wybierz biblioteki Jellyfin do synchronizacji z Kodi. Możesz to także zrobić " "później." msgctxt "#33126" @@ -747,16 +747,16 @@ msgctxt "#33128" msgid "" "Failed to retrieve latest content updates. No content updates will be " "applied until Kodi is restarted. If this issue persists, please report on " -"the Emby for Kodi forums, with your Kodi log." +"the Jellyfin for Kodi forums, with your Kodi log." msgstr "" "Nie udało się pobrać ostatnich aktualizacji. Nie zostaną one zapisane dopóki" " Kodi nie zostanie zrestartowane. Jeśli problem się powtórzy, proszę zgłoś " -"go na forum Emby for Kodi, dołączając dziennik zdarzeń Kodi." +"go na forum Jellyfin for Kodi, dołączając dziennik zdarzeń Kodi." msgctxt "#33129" -msgid "You can sync libraries by launching the Emby add-on > Add libraries." +msgid "You can sync libraries by launching the Jellyfin add-on > Add libraries." msgstr "" -"Możesz zsynchronizować biblioteki wybierając dodatek Emby > Dodaj biblioteki" +"Możesz zsynchronizować biblioteki wybierając dodatek Jellyfin > Dodaj biblioteki" msgctxt "#33130" msgid "Select the source" @@ -797,7 +797,7 @@ msgid "" "remove content, you'll need to repair the library." msgstr "" "Możesz ręcznie aktualizować bibliotekę zamiast polegać na wtyczce serwera " -"Kodi Companion. Wybierz \"Zaktualizuj biblioteki\" w dodatku Emby. Aby " +"Kodi Companion. Wybierz \"Zaktualizuj biblioteki\" w dodatku Jellyfin. Aby " "usunąć zawartość, należy naprawić biblioteki." msgctxt "#33139" @@ -826,21 +826,21 @@ msgstr "Usuwanie biblioteki" msgctxt "#33145" msgid "" -"Please make sure your Samba (smb) share of your Emby server is accessible to" +"Please make sure your Samba (smb) share of your Jellyfin server is accessible to" " your Kodi installation and that you have path substitution configured on " "your server. Otherwise, Kodi may fail to locate your files." msgstr "" -"Upewnij się, że udział Samba (smb) twojego serwera Emby jest dostępny dla " +"Upewnij się, że udział Samba (smb) twojego serwera Jellyfin jest dostępny dla " "tej instalacji Kodi i udostępniony folder sieciowy jest skonfigurowany na " "serwerze. W przeciwnym razie Kodi może nie odnaleźć twoich plików." msgctxt "#33146" -msgid "Unable to connect to Emby." -msgstr "Błąd połączenia z Emby" +msgid "Unable to connect to Jellyfin." +msgstr "Błąd połączenia z Jellyfin" msgctxt "#33147" -msgid "Your access to Emby is restricted." -msgstr "Dostęp do Emby jest ograniczony." +msgid "Your access to Jellyfin is restricted." +msgstr "Dostęp do Jellyfin jest ograniczony." msgctxt "#33148" msgid "Your access to this server is restricted." @@ -868,7 +868,7 @@ msgid "Unable to locate TV Tunes in Kodi." msgstr "Nie znaleziono TV Tunes w Kodi." msgctxt "#33153" -msgid "Your Emby theme media has been synced to Kodi" +msgid "Your Jellyfin theme media has been synced to Kodi" msgstr "Media przewodnie zostały zsynchronizowane z Kodi" msgctxt "#33154" @@ -877,12 +877,12 @@ msgstr "Dodaj biblioteki" msgctxt "#33155" msgid "" -"The currently applied patch for Emby for Kodi is corrupted! Please post to " -"the Emby for Kodi forums if this issue persists. This will need to be fixed " +"The currently applied patch for Jellyfin for Kodi is corrupted! Please post to " +"the Jellyfin for Kodi forums if this issue persists. This will need to be fixed " "as soon as possible." msgstr "" -"Zainstalowana poprawka Emby dla Kodi jest uszkodzona! Proszę zgłoś ten błąd " -"na forum Emby for Kodi jeśli problem się powtórzy. Konieczna jest szybka " +"Zainstalowana poprawka Jellyfin dla Kodi jest uszkodzona! Proszę zgłoś ten błąd " +"na forum Jellyfin for Kodi jeśli problem się powtórzy. Konieczna jest szybka " "aktualizacja." msgctxt "#33156" @@ -902,8 +902,8 @@ msgid "Enable audio/subtitles selection" msgstr "Włącz wybór ścieżki dźwiękowej/napisów" msgctxt "#33160" -msgid "To avoid errors, please update Emby for Kodi to version: " -msgstr "Aby uniknąć błędów, należy zaktualizować Emby dla Kodi do wersji:" +msgid "To avoid errors, please update Jellyfin for Kodi to version: " +msgstr "Aby uniknąć błędów, należy zaktualizować Jellyfin dla Kodi do wersji:" msgctxt "#33161" msgid "Check for updates" @@ -954,10 +954,10 @@ msgctxt "#33172" msgid "" "You have {number} updates pending. This may take a little while before " "seeing new content. It might be faster to update your libraries via " -"launching the Emby add-on > update libraries. Proceed anyway?" +"launching the Jellyfin add-on > update libraries. Proceed anyway?" msgstr "" "Do pobrania jest {number} aktualizacji. To może trochę potrwać. Szybszą " -"opcją może być pełna aktualizacja w dodatku Emby > Aktualizuj biblioteki. " +"opcją może być pełna aktualizacja w dodatku Jellyfin > Aktualizuj biblioteki. " "Kontynuować mimo to?" msgctxt "#33173" @@ -970,7 +970,7 @@ msgstr "Paginacja - wątki pobierania (domyślnie: 3)" msgctxt "#33175" msgid "" -"Paging tip: Each download thread requests your max items value from Emby at " +"Paging tip: Each download thread requests your max items value from Jellyfin at " "the same time." msgstr "" "Paginacja: każdy z wątków pobiera maksymalną ilość pozycji w tym samym " @@ -993,8 +993,8 @@ msgid "Force transcode" msgstr "Wymuś transkodowanie" msgctxt "#33180" -msgid "Restart Emby for Kodi" -msgstr "Zrestartuj Emby dla Kodi" +msgid "Restart Jellyfin for Kodi" +msgstr "Zrestartuj Jellyfin dla Kodi" msgctxt "#33181" msgid "Restarting to apply the patch" @@ -1034,12 +1034,12 @@ msgid "Would you like to sync Rotten Tomatoes ratings?" msgstr "Czy synchronizować ocenę z Rotten Tomatoes?" msgctxt "#33191" -msgid "Restart Emby for Kodi to apply this change?" -msgstr "Zrestartować Emby dla Kodi by zaaplikować tę zmianę?" +msgid "Restart Jellyfin for Kodi to apply this change?" +msgstr "Zrestartować Jellyfin dla Kodi by zaaplikować tę zmianę?" msgctxt "#33192" -msgid "Restart Emby for Kodi" -msgstr "Zrestartuj Emby dla Kodi" +msgid "Restart Jellyfin for Kodi" +msgstr "Zrestartuj Jellyfin dla Kodi" msgctxt "#33193" msgid "Restarting..." @@ -1050,7 +1050,7 @@ msgid "Manage libraries" msgstr "Zarządzaj bibliotekami" msgctxt "#33195" -msgid "Enable Emby for Kodi" +msgid "Enable Jellyfin for Kodi" msgstr "" msgctxt "#33196" diff --git a/resources/lib/client.py b/resources/lib/client.py index 6c2b1a15c..44a4f041b 100644 --- a/resources/lib/client.py +++ b/resources/lib/client.py @@ -15,7 +15,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -71,13 +71,13 @@ def get_device_name(): def get_device_id(reset=False): ''' Return the device_id if already loaded. - It will load from emby_guid file. If it's a fresh + It will load from jellyfin_guid file. If it's a fresh setup, it will generate a new GUID to uniquely identify the setup for all users. - window prop: emby_deviceId + window prop: jellyfin_deviceId ''' - client_id = window('emby_deviceId') + client_id = window('jellyfin_deviceId') if client_id: return client_id @@ -87,29 +87,29 @@ def get_device_id(reset=False): if not xbmcvfs.exists(directory): xbmcvfs.mkdir(directory) - emby_guid = os.path.join(directory, "emby_guid") - file_guid = xbmcvfs.File(emby_guid) + jellyfin_guid = os.path.join(directory, "jellyfin_guid") + file_guid = xbmcvfs.File(jellyfin_guid) client_id = file_guid.read() if not client_id or reset: LOG.info("Generating a new GUID.") client_id = str("%012X" % create_id()) - file_guid = xbmcvfs.File(emby_guid, 'w') + file_guid = xbmcvfs.File(jellyfin_guid, 'w') file_guid.write(client_id) file_guid.close() LOG.info("DeviceId loaded: %s", client_id) - window('emby_deviceId', value=client_id) + window('jellyfin_deviceId', value=client_id) return client_id def reset_device_id(): - window('emby_deviceId', clear=True) + window('jellyfin_deviceId', clear=True) get_device_id(True) - dialog("ok", heading="{emby}", line1=_(33033)) + dialog("ok", heading="{jellyfin}", line1=_(33033)) xbmc.executebuiltin('RestartApp') def get_info(): diff --git a/resources/lib/connect.py b/resources/lib/connect.py index 86bee85d6..c05250032 100644 --- a/resources/lib/connect.py +++ b/resources/lib/connect.py @@ -20,7 +20,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) XML_PATH = (xbmcaddon.Addon(addon_id()).getAddonInfo('path'), "default", "1080i") ################################################################################################## @@ -78,11 +78,11 @@ def get_ssl(self): def get_client(self, server_id=None): - ''' Get Emby client. + ''' Get Jellyfin client. ''' client = Emby(server_id) client['config/app']("Kodi", self.info['Version'], self.info['DeviceName'], self.info['DeviceId']) - client['config']['http.user_agent'] = "Emby-Kodi/%s" % self.info['Version'] + client['config']['http.user_agent'] = "Jellyfin-Kodi/%s" % self.info['Version'] client['config']['auth.ssl'] = self.get_ssl() return client @@ -152,20 +152,20 @@ def get_user(self, client): settings('username', self.user['Name']) if 'PrimaryImageTag' in self.user: - window('EmbyUserImage', api.API(self.user, client['auth/server-address']).get_user_artwork(self.user['Id'])) + window('JellyfinUserImage', api.API(self.user, client['auth/server-address']).get_user_artwork(self.user['Id'])) def select_servers(self, state=None): state = state or self.connect_manager.connect({'enableAutoLogin': False}) user = state.get('ConnectUser') or {} - dialog = ServerConnect("script-emby-connect-server.xml", *XML_PATH) + dialog = ServerConnect("script-jellyfin-connect-server.xml", *XML_PATH) dialog.set_args(**{ 'connect_manager': self.connect_manager, 'username': user.get('DisplayName', ""), 'user_image': user.get('ImageUrl'), 'servers': state.get('Servers', []), - 'emby_connect': False if user else True + 'jellyfin_connect': False if user else True }) dialog.doModal() @@ -174,7 +174,7 @@ def select_servers(self, state=None): return elif dialog.is_connect_login(): - LOG.debug("Login with emby connect") + LOG.debug("Login with jellyfin connect") try: self.login_connect() except RuntimeError: pass @@ -209,7 +209,7 @@ def manual_server(self, manager=None): ''' Return server or raise error. ''' - dialog = ServerManual("script-emby-connect-server-manual.xml", *XML_PATH) + dialog = ServerManual("script-jellyfin-connect-server-manual.xml", *XML_PATH) dialog.set_args(**{'connect_manager': manager or self.connect_manager}) dialog.doModal() @@ -220,7 +220,7 @@ def manual_server(self, manager=None): def setup_login_connect(self): - ''' Setup emby connect by itself. + ''' Setup jellyfin connect by itself. ''' client = self.get_client() client.set_credentials(get_credentials()) @@ -238,7 +238,7 @@ def login_connect(self, manager=None): ''' Return connect user or raise error. ''' - dialog = LoginConnect("script-emby-connect-login.xml", *XML_PATH) + dialog = LoginConnect("script-jellyfin-connect-login.xml", *XML_PATH) dialog.set_args(**{'connect_manager': manager or self.connect_manager}) dialog.doModal() @@ -258,7 +258,7 @@ def login(self): except RuntimeError: raise RuntimeError("No user selected") - dialog = UsersConnect("script-emby-connect-users.xml", *XML_PATH) + dialog = UsersConnect("script-jellyfin-connect-users.xml", *XML_PATH) dialog.set_args(**{'server': server, 'users': users}) dialog.doModal() @@ -303,7 +303,7 @@ def login_manual(self, user=None, manager=None): ''' Return manual login user authenticated or raise error. ''' - dialog = LoginManual("script-emby-connect-login-manual.xml", *XML_PATH) + dialog = LoginManual("script-jellyfin-connect-login-manual.xml", *XML_PATH) dialog.set_args(**{'connect_manager': manager or self.connect_manager, 'username': user or {}}) dialog.doModal() diff --git a/resources/lib/database/__init__.py b/resources/lib/database/__init__.py index b6161cb88..3fb5e7157 100644 --- a/resources/lib/database/__init__.py +++ b/resources/lib/database/__init__.py @@ -18,7 +18,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -26,7 +26,7 @@ class Database(object): ''' This should be called like a context. - i.e. with Database('emby') as db: + i.e. with Database('jellyfin') as db: db.cursor db.conn.commit() ''' @@ -36,7 +36,7 @@ class Database(object): def __init__(self, file=None, commit_close=True): - ''' file: emby, texture, music, video, :memory: or path to file + ''' file: jellyfin, texture, music, video, :memory: or path to file ''' self.db_file = file or "video" self.commit_close = commit_close @@ -50,14 +50,14 @@ def __enter__(self): self.conn = sqlite3.connect(self.path, timeout=self.timeout) self.cursor = self.conn.cursor() - if self.db_file in ('video', 'music', 'texture', 'emby'): + if self.db_file in ('video', 'music', 'texture', 'jellyfin'): self.conn.execute("PRAGMA journal_mode=WAL") # to avoid writing conflict with kodi LOG.debug("--->[ database: %s ] %s", self.db_file, id(self.conn)) - if not window('emby_db_check.bool') and self.db_file == 'emby': + if not window('jellyfin_db_check.bool') and self.db_file == 'jellyfin': - window('emby_db_check.bool', True) + window('jellyfin_db_check.bool', True) emby_tables(self.cursor) self.conn.commit() @@ -185,45 +185,45 @@ def __exit__(self, exc_type, exc_val, exc_tb): def emby_tables(cursor): - ''' Create the tables for the emby database. - emby, view, version + ''' Create the tables for the jellyfin database. + jellyfin, view, version ''' cursor.execute( - """CREATE TABLE IF NOT EXISTS emby( - emby_id TEXT UNIQUE, media_folder TEXT, emby_type TEXT, media_type TEXT, + """CREATE TABLE IF NOT EXISTS jellyfin( + jellyfin_id TEXT UNIQUE, media_folder TEXT, jellyfin_type TEXT, media_type TEXT, kodi_id INTEGER, kodi_fileid INTEGER, kodi_pathid INTEGER, parent_id INTEGER, - checksum INTEGER, emby_parent_id TEXT)""") + checksum INTEGER, jellyfin_parent_id TEXT)""") cursor.execute( """CREATE TABLE IF NOT EXISTS view( view_id TEXT UNIQUE, view_name TEXT, media_type TEXT)""") cursor.execute("CREATE TABLE IF NOT EXISTS version(idVersion TEXT)") - columns = cursor.execute("SELECT * FROM emby") - if 'emby_parent_id' not in [description[0] for description in columns.description]: + columns = cursor.execute("SELECT * FROM jellyfin") + if 'jellyfin_parent_id' not in [description[0] for description in columns.description]: - LOG.info("Add missing column emby_parent_id") - cursor.execute("ALTER TABLE emby ADD COLUMN emby_parent_id 'TEXT'") + LOG.info("Add missing column jellyfin_parent_id") + cursor.execute("ALTER TABLE jellyfin ADD COLUMN jellyfin_parent_id 'TEXT'") def reset(): - ''' Reset both the emby database and the kodi database. + ''' Reset both the jellyfin database and the kodi database. ''' from views import Views views = Views() - if not dialog("yesno", heading="{emby}", line1=_(33074)): + if not dialog("yesno", heading="{jellyfin}", line1=_(33074)): return - window('emby_should_stop.bool', True) + window('jellyfin_should_stop.bool', True) count = 10 - while window('emby_sync.bool'): + while window('jellyfin_sync.bool'): LOG.info("Sync is running...") count -= 1 if not count: - dialog("ok", heading="{emby}", line1=_(33085)) + dialog("ok", heading="{jellyfin}", line1=_(33085)) return @@ -235,12 +235,12 @@ def reset(): views.delete_playlists() views.delete_nodes() - if dialog("yesno", heading="{emby}", line1=_(33086)): + if dialog("yesno", heading="{jellyfin}", line1=_(33086)): reset_artwork() addon_data = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8') - if dialog("yesno", heading="{emby}", line1=_(33087)): + if dialog("yesno", heading="{jellyfin}", line1=_(33087)): xbmcvfs.delete(os.path.join(addon_data, "settings.xml")) xbmcvfs.delete(os.path.join(addon_data, "data.json")) @@ -253,7 +253,7 @@ def reset(): settings('MinimumSetup', "") settings('MusicRescan.bool', False) settings('SyncInstallRunDone.bool', False) - dialog("ok", heading="{emby}", line1=_(33088)) + dialog("ok", heading="{jellyfin}", line1=_(33088)) xbmc.executebuiltin('RestartApp') def reset_kodi(): @@ -267,7 +267,7 @@ def reset_kodi(): if name != 'version': videodb.cursor.execute("DELETE FROM " + name) - if settings('enableMusic.bool') or dialog("yesno", heading="{emby}", line1=_(33162)): + if settings('enableMusic.bool') or dialog("yesno", heading="{jellyfin}", line1=_(33162)): with Database('music') as musicdb: musicdb.cursor.execute("SELECT tbl_name FROM sqlite_master WHERE type='table'") @@ -282,7 +282,7 @@ def reset_kodi(): def reset_emby(): - with Database('emby') as embydb: + with Database('jellyfin') as embydb: embydb.cursor.execute("SELECT tbl_name FROM sqlite_master WHERE type='table'") for table in embydb.cursor.fetchall(): @@ -291,11 +291,11 @@ def reset_emby(): if name not in ('version', 'view'): embydb.cursor.execute("DELETE FROM " + name) - embydb.cursor.execute("DROP table IF EXISTS emby") + embydb.cursor.execute("DROP table IF EXISTS jellyfin") embydb.cursor.execute("DROP table IF EXISTS view") embydb.cursor.execute("DROP table IF EXISTS version") - LOG.warn("[ reset emby ]") + LOG.warn("[ reset jellyfin ]") def reset_artwork(): @@ -382,7 +382,6 @@ def get_credentials(): return credentials def save_credentials(credentials): - credentials = credentials or {} path = xbmc.translatePath("special://profile/addon_data/plugin.video.jellyfin/").decode('utf-8') @@ -394,13 +393,13 @@ def save_credentials(credentials): def get_item(kodi_id, media): - ''' Get emby item based on kodi id and media. + ''' Get jellyfin item based on kodi id and media. ''' - with Database('emby') as embydb: + with Database('jellyfin') as jellyfindb: item = emby_db.EmbyDatabase(embydb.cursor).get_full_item_by_kodi_id(kodi_id, media) if not item: - LOG.debug("Not an emby item") + LOG.debug("Not an jellyfin item") return diff --git a/resources/lib/database/emby_db.py b/resources/lib/database/emby_db.py index dc3cc7442..88c5f2606 100644 --- a/resources/lib/database/emby_db.py +++ b/resources/lib/database/emby_db.py @@ -8,7 +8,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/database/queries.py b/resources/lib/database/queries.py index e03a8f0f6..00d032df2 100644 --- a/resources/lib/database/queries.py +++ b/resources/lib/database/queries.py @@ -1,8 +1,8 @@ get_item = """ SELECT kodi_id, kodi_fileid, kodi_pathid, parent_id, media_type, - emby_type, media_folder, emby_parent_id - FROM emby - WHERE emby_id = ? + jellyfin_type, media_folder, jellyfin_parent_id + FROM jellyfin + WHERE jellyfin_id = ? """ get_item_obj = [ "{Id}" ] @@ -10,20 +10,20 @@ ] get_item_song_obj = [ "{SongAlbumId}" ] -get_item_id_by_parent = """ SELECT emby_id, kodi_id - FROM emby +get_item_id_by_parent = """ SELECT jellyfin_id, kodi_id + FROM jellyfin WHERE parent_id = ? AND media_type = ? """ get_item_id_by_parent_boxset_obj = [ "{SetId}","movie" ] -get_item_by_parent = """ SELECT emby_id, kodi_id, kodi_fileid - FROM emby +get_item_by_parent = """ SELECT jellyfin_id, kodi_id, kodi_fileid + FROM jellyfin WHERE parent_id = ? AND media_type = ? """ -get_item_by_media_folder = """ SELECT emby_id, emby_type - FROM emby +get_item_by_media_folder = """ SELECT jellyfin_id, jellyfin_type + FROM jellyfin WHERE media_folder = ? """ get_item_by_parent_movie_obj = [ "{KodiId}","movie" @@ -39,31 +39,31 @@ get_item_by_parent_song_obj = [ "{ParentId}","song" ] get_item_by_wild = """ SELECT kodi_id, media_type - FROM emby - WHERE emby_id LIKE ? + FROM jellyfin + WHERE jellyfin_id LIKE ? """ get_item_by_wild_obj = [ "{Id}" ] -get_item_by_kodi = """ SELECT emby_id, parent_id, media_folder, emby_type, checksum - FROM emby +get_item_by_kodi = """ SELECT jellyfin_id, parent_id, media_folder, jellyfin_type, checksum + FROM jellyfin WHERE kodi_id = ? AND media_type = ? """ -get_checksum = """ SELECT emby_id, checksum - FROM emby - WHERE emby_type = ? +get_checksum = """ SELECT jellyfin_id, checksum + FROM jellyfin + WHERE jellyfin_type = ? """ get_view_name = """ SELECT view_name FROM view WHERE view_id = ? """ -get_media_by_id = """ SELECT emby_type - FROM emby - WHERE emby_id = ? +get_media_by_id = """ SELECT jellyfin_type + FROM jellyfin + WHERE jellyfin_id = ? """ -get_media_by_parent_id = """ SELECT emby_id, emby_type, kodi_id, kodi_fileid - FROM emby - WHERE emby_parent_id = ? +get_media_by_parent_id = """ SELECT jellyfin_id, jellyfin_type, kodi_id, kodi_fileid + FROM jellyfin + WHERE jellyfin_parent_id = ? """ get_view = """ SELECT view_name, media_type FROM view @@ -76,8 +76,8 @@ FROM view WHERE media_type = ? """ -get_items_by_media = """ SELECT emby_id - FROM emby +get_items_by_media = """ SELECT jellyfin_id + FROM jellyfin WHERE media_type = ? """ get_version = """ SELECT idVersion @@ -86,36 +86,36 @@ -add_reference = """ INSERT OR REPLACE INTO emby(emby_id, kodi_id, kodi_fileid, kodi_pathid, emby_type, - media_type, parent_id, checksum, media_folder, emby_parent_id) +add_reference = """ INSERT OR REPLACE INTO jellyfin(jellyfin_id, kodi_id, kodi_fileid, kodi_pathid, jellyfin_type, + media_type, parent_id, checksum, media_folder, jellyfin_parent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """ add_reference_movie_obj = [ "{Id}","{MovieId}","{FileId}","{PathId}","Movie","movie", None,"{Checksum}","{LibraryId}", - "{EmbyParentId}" + "{JellyfinParentId}" ] add_reference_boxset_obj = [ "{Id}","{SetId}",None,None,"BoxSet","set",None,"{Checksum}",None,None ] add_reference_tvshow_obj = [ "{Id}","{ShowId}",None,"{PathId}","Series","tvshow",None,"{Checksum}","{LibraryId}", - "{EmbyParentId}" + "{JellyfinParentId}" ] add_reference_season_obj = [ "{Id}","{SeasonId}",None,None,"Season","season","{ShowId}",None,None,None ] add_reference_pool_obj = [ "{SeriesId}","{ShowId}",None,"{PathId}","Series","tvshow",None,"{Checksum}","{LibraryId}",None ] add_reference_episode_obj = [ "{Id}","{EpisodeId}","{FileId}","{PathId}","Episode","episode","{SeasonId}","{Checksum}", - None,"{EmbyParentId}" + None,"{JellyfinParentId}" ] add_reference_mvideo_obj = [ "{Id}","{MvideoId}","{FileId}","{PathId}","MusicVideo","musicvideo",None,"{Checksum}", - "{LibraryId}","{EmbyParentId}" + "{LibraryId}","{JellyfinParentId}" ] add_reference_artist_obj = [ "{Id}","{ArtistId}",None,None,"{ArtistType}","artist",None,"{Checksum}","{LibraryId}", - "{EmbyParentId}" + "{JellyfinParentId}" ] -add_reference_album_obj = [ "{Id}","{AlbumId}",None,None,"MusicAlbum","album",None,"{Checksum}",None,"{EmbyParentId}" +add_reference_album_obj = [ "{Id}","{AlbumId}",None,None,"MusicAlbum","album",None,"{Checksum}",None,"{JellyfinParentId}" ] add_reference_song_obj = [ "{Id}","{SongId}",None,"{PathId}","Audio","song","{AlbumId}","{Checksum}", - None,"{EmbyParentId}" - ] + None,"{JellyfinParentId}" + ] add_view = """ INSERT OR REPLACE INTO view(view_id, view_name, media_type) VALUES (?, ?, ?) """ @@ -124,15 +124,15 @@ """ -update_reference = """ UPDATE emby +update_reference = """ UPDATE jellyfin SET checksum = ? - WHERE emby_id = ? + WHERE jellyfin_id = ? """ update_reference_obj = [ "{Checksum}", "{Id}" ] -update_parent = """ UPDATE emby +update_parent = """ UPDATE jellyfin SET parent_id = ? - WHERE emby_id = ? + WHERE jellyfin_id = ? """ update_parent_movie_obj = [ "{SetId}","{Id}" ] @@ -142,12 +142,12 @@ -delete_item = """ DELETE FROM emby - WHERE emby_id = ? +delete_item = """ DELETE FROM jellyfin + WHERE jellyfin_id = ? """ delete_item_obj = [ "{Id}" ] -delete_item_by_parent = """ DELETE FROM emby +delete_item_by_parent = """ DELETE FROM jellyfin WHERE parent_id = ? AND media_type = ? """ @@ -163,20 +163,20 @@ ] delete_item_by_parent_album_obj = [ "{KodiId}","album" ] -delete_item_by_kodi = """ DELETE FROM emby +delete_item_by_kodi = """ DELETE FROM jellyfin WHERE kodi_id = ? AND media_type = ? """ -delete_item_by_wild = """ DELETE FROM emby - WHERE emby_id LIKE ? +delete_item_by_wild = """ DELETE FROM jellyfin + WHERE jellyfin_id LIKE ? """ delete_view = """ DELETE FROM view WHERE view_id = ? """ delete_parent_boxset_obj = [ None, "{Movie}" ] -delete_media_by_parent_id = """ DELETE FROM emby - WHERE emby_parent_id = ? +delete_media_by_parent_id = """ DELETE FROM jellyfin + WHERE jellyfin_parent_id = ? """ delete_version = """ DELETE FROM version """ diff --git a/resources/lib/dialogs/context.py b/resources/lib/dialogs/context.py index 562809ac1..9d1c2c2e4 100644 --- a/resources/lib/dialogs/context.py +++ b/resources/lib/dialogs/context.py @@ -12,7 +12,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 @@ -45,8 +45,8 @@ def get_selected(self): def onInit(self): - if window('EmbyUserImage'): - self.getControl(USER_IMAGE).setImage(window('EmbyUserImage')) + if window('JellyfinUserImage'): + self.getControl(USER_IMAGE).setImage(window('JellyfinUserImage')) height = 479 + (len(self._options) * 55) LOG.info("options: %s", self._options) diff --git a/resources/lib/dialogs/loginconnect.py b/resources/lib/dialogs/loginconnect.py index ed4904228..04ba48dc8 100644 --- a/resources/lib/dialogs/loginconnect.py +++ b/resources/lib/dialogs/loginconnect.py @@ -12,7 +12,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 @@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs): xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) def set_args(self, **kwargs): - # connect_manager, user_image, servers, emby_connect + # connect_manager, user_image, servers, jellyfin_connect for key, value in kwargs.iteritems(): setattr(self, key, value) @@ -70,7 +70,7 @@ def onInit(self): def onClick(self, control): if control == SIGN_IN: - # Sign in to emby connect + # Sign in to jellyfin connect self._disable_error() user = self.user_field.getText() @@ -128,8 +128,8 @@ def _login(self, username, password): settings('connectUsername', value=username) settings('idMethod', value="1") - dialog("notification", heading="{emby}", message="%s %s" % (_(33000), username.decode('utf-8')), - icon=result['User'].get('ImageUrl') or "{emby}", + dialog("notification", heading="{jellyfin}", message="%s %s" % (_(33000), username.decode('utf-8')), + icon=result['User'].get('ImageUrl') or "{jellyfin}", time=2000, sound=False) diff --git a/resources/lib/dialogs/loginmanual.py b/resources/lib/dialogs/loginmanual.py index 5c8846283..2122089eb 100644 --- a/resources/lib/dialogs/loginmanual.py +++ b/resources/lib/dialogs/loginmanual.py @@ -12,7 +12,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 diff --git a/resources/lib/dialogs/resume.py b/resources/lib/dialogs/resume.py index 9dfe8610f..aeb0397f5 100644 --- a/resources/lib/dialogs/resume.py +++ b/resources/lib/dialogs/resume.py @@ -10,7 +10,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 diff --git a/resources/lib/dialogs/serverconnect.py b/resources/lib/dialogs/serverconnect.py index 2b79c497a..497abb517 100644 --- a/resources/lib/dialogs/serverconnect.py +++ b/resources/lib/dialogs/serverconnect.py @@ -12,7 +12,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 @@ -45,7 +45,7 @@ def __init__(self, *args, **kwargs): xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) def set_args(self, **kwargs): - # connect_manager, user_image, servers, emby_connect + # connect_manager, user_image, servers, jellyfin_connect for key, value in kwargs.iteritems(): setattr(self, key, value) @@ -76,7 +76,7 @@ def onInit(self): if self.user_image is not None: self.getControl(USER_IMAGE).setImage(self.user_image) - if not self.emby_connect: # Change connect user + if not self.jellyfin_connect: # Change connect user self.getControl(EMBY_CONNECT).setLabel("[B]%s[/B]" % _(30618)) if self.servers: diff --git a/resources/lib/dialogs/servermanual.py b/resources/lib/dialogs/servermanual.py index 45eebcf31..49d2413a3 100644 --- a/resources/lib/dialogs/servermanual.py +++ b/resources/lib/dialogs/servermanual.py @@ -13,7 +13,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 @@ -40,7 +40,7 @@ def __init__(self, *args, **kwargs): xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) def set_args(self, **kwargs): - # connect_manager, user_image, servers, emby_connect + # connect_manager, user_image, servers, jellyfin_connect for key, value in kwargs.iteritems(): setattr(self, key, value) @@ -72,7 +72,7 @@ def onInit(self): def onClick(self, control): if control == CONNECT: - # Sign in to emby connect + # Sign in to jellyfin connect self._disable_error() server = self.host_field.getText() diff --git a/resources/lib/dialogs/usersconnect.py b/resources/lib/dialogs/usersconnect.py index 5c4a55b07..a5fadda5a 100644 --- a/resources/lib/dialogs/usersconnect.py +++ b/resources/lib/dialogs/usersconnect.py @@ -9,7 +9,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ACTION_PARENT_DIR = 9 ACTION_PREVIOUS_MENU = 10 ACTION_BACK = 92 @@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs): xbmcgui.WindowXMLDialog.__init__(self, *args, **kwargs) def set_args(self, **kwargs): - # connect_manager, user_image, servers, emby_connect + # connect_manager, user_image, servers, jellyfin_connect for key, value in kwargs.iteritems(): setattr(self, key, value) diff --git a/resources/lib/downloader.py b/resources/lib/downloader.py index 6cc5c35c9..f70218c03 100644 --- a/resources/lib/downloader.py +++ b/resources/lib/downloader.py @@ -22,9 +22,9 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) LIMIT = min(int(settings('limitIndex') or 50), 50) -CACHE = xbmc.translatePath(os.path.join(xbmcaddon.Addon(id='plugin.video.jellyfin').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'), 'jellyfin')).decode('utf-8') ################################################################################################# @@ -317,7 +317,7 @@ def run(self): self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break class TheVoid(object): @@ -342,16 +342,16 @@ def get(self): while True: - response = window('emby_%s.json' % self.data['VoidName']) + response = window('jellyfin_%s.json' % self.data['VoidName']) if response != "": - LOG.debug("--<[ nostromo/emby_%s.json ]", self.data['VoidName']) - window('emby_%s' % self.data['VoidName'], clear=True) + LOG.debug("--<[ nostromo/jellyfin_%s.json ]", self.data['VoidName']) + window('jellyfin_%s' % self.data['VoidName'], clear=True) return response - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): LOG.info("Abandon mission! A black hole just swallowed [ %s/%s ]", self.method, self.data['VoidName']) return diff --git a/resources/lib/emby/__init__.py b/resources/lib/emby/__init__.py index cc9f4775d..2112b5e2d 100644 --- a/resources/lib/emby/__init__.py +++ b/resources/lib/emby/__init__.py @@ -14,13 +14,13 @@ def emit(self, record): print(self.format(record)) loghandler = NullHandler -LOG = logging.getLogger('Emby') +LOG = logging.getLogger('Jellyfin') ################################################################################################# def config(level=logging.INFO): - logger = logging.getLogger('Emby') + logger = logging.getLogger('Jellyfin') logger.addHandler(Emby.loghandler()) logger.setLevel(level) @@ -40,15 +40,15 @@ def wrapper(self, *args, **kwargs): class Emby(object): - ''' This is your Embyclient, you can create more than one. The server_id is only a temporary thing - to communicate with the EmbyClient(). + ''' This is your Jellyfinclient, you can create more than one. The server_id is only a temporary thing + to communicate with the JellyfinClient(). - from emby import Emby + from jellyfin import Jellyfin - Emby('123456')['config/app'] + Jellyfin('123456')['config/app'] # Permanent client reference - client = Emby('123456').get_client() + client = Jellyfin('123456').get_client() client['config/app'] ''' @@ -68,9 +68,9 @@ def get_client(self): @classmethod def set_loghandler(cls, func=loghandler, level=logging.INFO): - for handler in logging.getLogger('Emby').handlers: + for handler in logging.getLogger('Jellyfin').handlers: if isinstance(handler, cls.loghandler): - logging.getLogger('Emby').removeHandler(handler) + logging.getLogger('Jellyfin').removeHandler(handler) cls.loghandler = func config(level) @@ -83,7 +83,7 @@ def close(self): self.client[self.server_id].stop() self.client.pop(self.server_id, None) - LOG.info("---[ STOPPED EMBYCLIENT: %s ]---", self.server_id) + LOG.info("---[ STOPPED JELLYFINCLIENT: %s ]---", self.server_id) @classmethod def close_all(cls): @@ -92,7 +92,7 @@ def close_all(cls): cls.client[client].stop() cls.client = {} - LOG.info("---[ STOPPED ALL EMBYCLIENTS ]---") + LOG.info("---[ STOPPED ALL JELLYFINCLIENT ]---") @classmethod def get_active_clients(cls): @@ -119,8 +119,8 @@ def construct(self): self.client[self.server_id] = EmbyClient() if self.server_id == 'default': - LOG.info("---[ START EMBYCLIENT ]---") + LOG.info("---[ START JELLYFINCLIENT ]---") else: - LOG.info("---[ START EMBYCLIENT: %s ]---", self.server_id) + LOG.info("---[ START JELLYFINCLIENT: %s ]---", self.server_id) config() \ No newline at end of file diff --git a/resources/lib/emby/client.py b/resources/lib/emby/client.py index d78fc07dc..d4ba426bf 100644 --- a/resources/lib/emby/client.py +++ b/resources/lib/emby/client.py @@ -12,7 +12,7 @@ ################################################################################################# -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################# @@ -30,7 +30,7 @@ class EmbyClient(object): logged_in = False def __init__(self): - LOG.debug("EmbyClient initializing...") + LOG.debug("JellyfinClient initializing...") self.config = Config() self.http = HTTP(self) diff --git a/resources/lib/emby/core/api.py b/resources/lib/emby/core/api.py index 7dbdc19af..d23efdecf 100644 --- a/resources/lib/emby/core/api.py +++ b/resources/lib/emby/core/api.py @@ -50,7 +50,7 @@ def _delete(self, handler, params=None): ################################################################################################# - # Bigger section of the Emby api + # Bigger section of the Jellyfin api ################################################################################################# diff --git a/resources/lib/emby/core/configuration.py b/resources/lib/emby/core/configuration.py index 6966c85fa..ae1f1ccdf 100644 --- a/resources/lib/emby/core/configuration.py +++ b/resources/lib/emby/core/configuration.py @@ -12,7 +12,7 @@ DEFAULT_HTTP_MAX_RETRIES = 3 DEFAULT_HTTP_TIMEOUT = 30 -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################# diff --git a/resources/lib/emby/core/connection_manager.py b/resources/lib/emby/core/connection_manager.py index 85e9ff4a2..64b716874 100644 --- a/resources/lib/emby/core/connection_manager.py +++ b/resources/lib/emby/core/connection_manager.py @@ -14,7 +14,7 @@ ################################################################################################# -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) CONNECTION_STATE = { 'Unavailable': 0, 'ServerSelection': 1, @@ -516,7 +516,7 @@ def _get_connect_user(self, user_id, access_token): def _server_discovery(self): MULTI_GROUP = ("", 7359) - MESSAGE = "who is EmbyServer?" + MESSAGE = "who is JellyfinServer?" sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock.settimeout(1.0) # This controls the socket.timeout exception diff --git a/resources/lib/emby/core/credentials.py b/resources/lib/emby/core/credentials.py index 6e47e3425..83c4f9247 100644 --- a/resources/lib/emby/core/credentials.py +++ b/resources/lib/emby/core/credentials.py @@ -10,7 +10,7 @@ ################################################################################################# -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################# diff --git a/resources/lib/emby/core/exceptions.py b/resources/lib/emby/core/exceptions.py index 2a00a336c..c2a93ff1b 100644 --- a/resources/lib/emby/core/exceptions.py +++ b/resources/lib/emby/core/exceptions.py @@ -3,7 +3,7 @@ ################################################################################################# class HTTPException(Exception): - # Emby HTTP exception + # Jellyfin HTTP exception def __init__(self, status, message): self.status = status self.message = message diff --git a/resources/lib/emby/core/http.py b/resources/lib/emby/core/http.py index 8b8a6f836..65e6589e1 100644 --- a/resources/lib/emby/core/http.py +++ b/resources/lib/emby/core/http.py @@ -11,7 +11,7 @@ ################################################################################################# -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('Jellyfin.'+__name__) ################################################################################################# @@ -69,7 +69,7 @@ def _replace_user_info(self, string): def request(self, data, session=None): - ''' Give a chance to retry the connection. Emby sometimes can be slow to answer back + ''' Give a chance to retry the connection. Jellyfin sometimes can be slow to answer back data dictionary can contain: type: GET, POST, etc. url: (optional) diff --git a/resources/lib/emby/core/ws_client.py b/resources/lib/emby/core/ws_client.py index 7d70ce64f..f2f52c3a7 100644 --- a/resources/lib/emby/core/ws_client.py +++ b/resources/lib/emby/core/ws_client.py @@ -13,7 +13,7 @@ ################################################################################################## -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################## diff --git a/resources/lib/emby/helpers/utils.py b/resources/lib/emby/helpers/utils.py index 3faa66c4f..0bfa0bc1e 100644 --- a/resources/lib/emby/helpers/utils.py +++ b/resources/lib/emby/helpers/utils.py @@ -7,7 +7,7 @@ ################################################################################################# -LOG = logging.getLogger('Emby.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################# diff --git a/resources/lib/entrypoint/__init__.py b/resources/lib/entrypoint/__init__.py index 3778b389b..d85962f52 100644 --- a/resources/lib/entrypoint/__init__.py +++ b/resources/lib/entrypoint/__init__.py @@ -15,7 +15,7 @@ Emby.set_loghandler(loghandler.LogHandler, logging.DEBUG) loghandler.reset() loghandler.config() -LOG = logging.getLogger('EMBY.entrypoint') +LOG = logging.getLogger('JELLYFIN.entrypoint') ################################################################################################# diff --git a/resources/lib/entrypoint/context.py b/resources/lib/entrypoint/context.py index f45bb06ce..a9ba6ad95 100644 --- a/resources/lib/entrypoint/context.py +++ b/resources/lib/entrypoint/context.py @@ -17,7 +17,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) XML_PATH = (xbmcaddon.Addon('plugin.video.jellyfin').getAddonInfo('path'), "default", "1080i") OPTIONS = { 'Refresh': _(30410), @@ -40,13 +40,13 @@ def __init__(self, transcode=False, delete=False): try: self.kodi_id = sys.listitem.getVideoInfoTag().getDbId() or None self.media = self.get_media_type() - self.server = sys.listitem.getProperty('embyserver') or None - item_id = sys.listitem.getProperty('embyid') + self.server = sys.listitem.getProperty('jellyfinserver') or None + item_id = sys.listitem.getProperty('jellyfinid') except AttributeError: self.server = None - if xbmc.getInfoLabel('ListItem.Property(embyid)'): - item_id = xbmc.getInfoLabel('ListItem.Property(embyid)') + if xbmc.getInfoLabel('ListItem.Property(jellyfinid)'): + item_id = xbmc.getInfoLabel('ListItem.Property(jellyfinid)') else: self.kodi_id = xbmc.getInfoLabel('ListItem.DBID') self.media = xbmc.getInfoLabel('ListItem.DBTYPE') @@ -96,7 +96,7 @@ def get_media_type(self): def get_item_id(self): - ''' Get synced item from embydb. + ''' Get synced item from jellyfindb. ''' item = database.get_item(self.kodi_id, self.media) @@ -130,7 +130,7 @@ def select_menu(self): options.append(OPTIONS['Addon']) - context_menu = context.ContextMenu("script-emby-context.xml", *XML_PATH) + context_menu = context.ContextMenu("script-jellyfin-context.xml", *XML_PATH) context_menu.set_options(options) context_menu.doModal() @@ -164,7 +164,7 @@ def delete_item(self): if not settings('skipContextMenu.bool'): - if not dialog("yesno", heading="{emby}", line1=_(33015)): + if not dialog("yesno", heading="{jellyfin}", line1=_(33015)): delete = False if delete: diff --git a/resources/lib/entrypoint/default.py b/resources/lib/entrypoint/default.py index 43d43e844..0305e254d 100644 --- a/resources/lib/entrypoint/default.py +++ b/resources/lib/entrypoint/default.py @@ -24,7 +24,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -55,15 +55,15 @@ def __init__(self): if '/extrafanart' in base_url: - emby_path = path[1:] - emby_id = params.get('id') - get_fanart(emby_id, emby_path, server) + jellyfin_path = path[1:] + jellyfin_id = params.get('id') + get_fanart(jellyfin_id, jellyfin_path, server) elif '/Extras' in base_url or '/VideoFiles' in base_url: - emby_path = path[1:] - emby_id = params.get('id') - get_video_extras(emby_id, emby_path, server) + jellyfin_path = path[1:] + jellyfin_id = params.get('id') + get_video_extras(jellyfin_id, jellyfin_path, server) elif mode =='play': @@ -101,7 +101,7 @@ def __init__(self): elif mode == 'addlibs': event('AddLibrarySelection') elif mode == 'connect': - event('EmbyConnect') + event('jellyfinConnect') elif mode == 'addserver': event('AddServer') elif mode == 'login': @@ -123,14 +123,14 @@ def __init__(self): elif mode == 'backup': backup() elif mode == 'restartservice': - window('emby.restart.bool', True) + window('jellyfin.restart.bool', True) else: listing() def listing(): - ''' Display all emby nodes and dynamic entries when appropriate. + ''' Display all jellyfin nodes and dynamic entries when appropriate. ''' total = int(window('Emby.nodes.total') or 0) sync = get_sync() @@ -240,12 +240,12 @@ def browse(media, view_id=None, folder=None, server_id=None): ''' LOG.info("--[ v:%s/%s ] %s", view_id, media, folder) - if not window('emby_online.bool') and server_id is None: + if not window('jellyfin_online.bool') and server_id is None: monitor = xbmc.Monitor() for i in range(300): - if window('emby_online.bool'): + if window('jellyfin_online.bool'): break elif monitor.waitForAbort(0.1): return @@ -330,8 +330,8 @@ def browse(media, view_id=None, folder=None, server_id=None): for item in listing: li = xbmcgui.ListItem() - li.setProperty('embyid', item['Id']) - li.setProperty('embyserver', server_id) + li.setProperty('jellyfinid', item['Id']) + li.setProperty('jellyfinserver', server_id) actions.set_listitem(item, li) if item.get('IsFolder'): @@ -402,7 +402,7 @@ def browse(media, view_id=None, folder=None, server_id=None): def browse_subfolders(media, view_id, server_id=None): - ''' Display submenus for emby views. + ''' Display submenus for jellyfin views. ''' from views import DYNNODES @@ -498,7 +498,7 @@ def get_fanart(item_id, path, server_id=None): LOG.info("[ extra fanart ] %s", item_id) objects = Objects() list_li = [] - directory = xbmc.translatePath("special://thumbnails/emby/%s/" % item_id).decode('utf-8') + directory = xbmc.translatePath("special://thumbnails/jellyfin/%s/" % item_id).decode('utf-8') server = TheVoid('GetServerAddress', {'ServerId': server_id}).get() if not xbmcvfs.exists(directory): @@ -543,7 +543,7 @@ def get_video_extras(item_id, path, server_id=None): # TODO """ - def getVideoFiles(embyId,embyPath): + def getVideoFiles(jellyfinId,jellyfinPath): #returns the video files for the item as plugin listing, can be used for browsing the actual files or videoextras etc. emby = embyserver.Read_EmbyServer() if not embyId: @@ -573,7 +573,7 @@ def get_next_episodes(item_id, limit): ''' Only for synced content. ''' - with Database('emby') as embydb: + with Database('jellyfin') as embydb: db = emby_db.EmbyDatabase(embydb.cursor) library = db.get_view_name(item_id) @@ -730,7 +730,7 @@ def add_user(): ''' Add or remove users from the default server session. ''' - if not window('emby_online.bool'): + if not window('jellyfin_online.bool'): return session = TheVoid('GetSession', {}).get() @@ -782,11 +782,11 @@ def get_themes(): tvtunes.setSetting('custom_path', library) LOG.info("TV Tunes custom path is enabled and set.") else: - dialog("ok", heading="{emby}", line1=_(33152)) + dialog("ok", heading="{jellyfin}", line1=_(33152)) return - with Database('emby') as embydb: + with Database('jellyfin') as embydb: all_views = emby_db.EmbyDatabase(embydb.cursor).get_views() views = [x[0] for x in all_views if x[2] in ('movies', 'tvshows', 'mixed')] @@ -831,7 +831,7 @@ def get_themes(): tvtunes_nfo(nfo_file, paths) - dialog("notification", heading="{emby}", message=_(33153), icon="{emby}", time=1000, sound=False) + dialog("notification", heading="{jellyfin}", message=_(33153), icon="{jellyfin}", time=1000, sound=False) def delete_item(): @@ -843,7 +843,7 @@ def delete_item(): def backup(): - ''' Emby backup. + ''' Jellyfin backup. ''' from helper.utils import delete_folder, copytree @@ -857,7 +857,7 @@ def backup(): backup = os.path.join(path, folder_name) if xbmcvfs.exists(backup + '/'): - if not dialog("yesno", heading="{emby}", line1=_(33090)): + if not dialog("yesno", heading="{jellyfin}", line1=_(33090)): return backup() @@ -870,7 +870,7 @@ def backup(): if not xbmcvfs.mkdirs(path) or not xbmcvfs.mkdirs(destination_databases): LOG.info("Unable to create all directories") - dialog("notification", heading="{emby}", icon="{emby}", message=_(33165), sound=False) + dialog("notification", heading="{jellyfin}", icon="{jellyfin}", message=_(33165), sound=False) return @@ -878,9 +878,9 @@ def backup(): databases = Objects().objects - db = xbmc.translatePath(databases['emby']).decode('utf-8') + db = xbmc.translatePath(databases['jellyfin']).decode('utf-8') xbmcvfs.copy(db, os.path.join(destination_databases, db.rsplit('\\', 1)[1])) - LOG.info("copied emby.db") + LOG.info("copied jellyfin.db") db = xbmc.translatePath(databases['video']).decode('utf-8') filename = db.rsplit('\\', 1)[1] @@ -895,4 +895,4 @@ def backup(): LOG.info("copied %s", filename) LOG.info("backup completed") - dialog("ok", heading="{emby}", line1="%s %s" % (_(33091), backup)) + dialog("ok", heading="{jellyfin}", line1="%s %s" % (_(33091), backup)) diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py index 0b0392f5b..270f5b468 100644 --- a/resources/lib/entrypoint/service.py +++ b/resources/lib/entrypoint/service.py @@ -26,7 +26,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -43,7 +43,7 @@ class Service(xbmc.Monitor): def __init__(self): - window('emby_should_stop', clear=True) + window('jellyfin_should_stop', clear=True) self.settings['addon_version'] = client.get_version() self.settings['profile'] = xbmc.translatePath('special://profile') @@ -53,14 +53,14 @@ def __init__(self): self.settings['enable_context'] = settings('enableContext.bool') self.settings['enable_context_transcode'] = settings('enableContextTranscode.bool') self.settings['kodi_companion'] = settings('kodiCompanion.bool') - window('emby_logLevel', value=str(self.settings['log_level'])) - window('emby_kodiProfile', value=self.settings['profile']) + window('jellyfin_logLevel', value=str(self.settings['log_level'])) + window('jellyfin_kodiProfile', value=self.settings['profile']) settings('platformDetected', client.get_platform()) if self.settings['enable_context']: - window('emby_context.bool', True) + window('jellyfin_context.bool', True) if self.settings['enable_context_transcode']: - window('emby_context_transcode.bool', True) + window('jellyfin_context_transcode.bool', True) LOG.warn("--->>>[ %s ]", client.get_addon_name()) LOG.warn("Version: %s", client.get_version()) @@ -78,7 +78,7 @@ def __init__(self): except Exception as error: LOG.error(error) - window('emby.connected.bool', True) + window('jellyfin.connected.bool', True) self.check_update() settings('groupedSets.bool', objects.utils.get_grouped_set()) xbmc.Monitor.__init__(self) @@ -99,9 +99,9 @@ def service(self): self.settings['mode'] = settings('useDirectPaths') while self.running: - if window('emby_online.bool'): + if window('jellyfin_online.bool'): - if self.settings['profile'] != window('emby_kodiProfile'): + if self.settings['profile'] != window('jellyfin_kodiProfile'): LOG.info("[ profile switch ] %s", self.settings['profile']) break @@ -118,10 +118,10 @@ def service(self): if update: self.settings['last_progress_report'] = datetime.today() - if window('emby.restart.bool'): + if window('jellyfin.restart.bool'): - window('emby.restart', clear=True) - dialog("notification", heading="{emby}", message=_(33193), icon="{emby}", time=1000, sound=False) + window('jellyfin.restart', clear=True) + dialog("notification", heading="{jellyfin}", message=_(33193), icon="{jellyfin}", time=1000, sound=False) raise Exception('RestartService') @@ -142,7 +142,7 @@ def start_default(self): def stop_default(self): - window('emby_online', clear=True) + window('jellyfin_online', clear=True) Emby().close() if self.library_thread is not None: @@ -154,7 +154,7 @@ def check_version(self): ''' Check the database version to ensure we do not need to do a reset. ''' - with Database('emby') as embydb: + with Database('jellyfin') as embydb: version = emby_db.EmbyDatabase(embydb.cursor).get_version() LOG.info("---[ db/%s ]", version) @@ -202,12 +202,12 @@ def check_update(self, forced=False): get_objects(zipfile, label + '.zip') self.reload_objects() - dialog("notification", heading="{emby}", message=_(33156), icon="{emby}") + dialog("notification", heading="{jellyfin}", message=_(33156), icon="{jellyfin}") LOG.info("--[ new objects/%s ]", objects.version) try: if compare_version(self.settings['addon_version'], objects.embyversion) < 0: - dialog("ok", heading="{emby}", line1="%s %s" % (_(33160), objects.embyversion)) + dialog("ok", heading="{jellyfin}", line1="%s %s" % (_(33160), objects.embyversion)) except Exception: pass @@ -229,7 +229,7 @@ def onNotification(self, sender, method, data): if method not in ('ServerUnreachable', 'ServerShuttingDown', 'UserDataChanged', 'ServerConnect', 'LibraryChanged', 'ServerOnline', 'SyncLibrary', 'RepairLibrary', 'RemoveLibrary', - 'EmbyConnect', 'SyncLibrarySelection', 'RepairLibrarySelection', 'AddServer', + 'JellyfinConnect', 'SyncLibrarySelection', 'RepairLibrarySelection', 'AddServer', 'Unauthorized', 'UpdateServer', 'UserConfigurationUpdated', 'ServerRestarting', 'RemoveServer', 'AddLibrarySelection', 'CheckUpdate', 'RemoveLibrarySelection'): return @@ -246,7 +246,7 @@ def onNotification(self, sender, method, data): if method == 'ServerOnline': if data.get('ServerId') is None: - window('emby_online.bool', True) + window('jellyfin_online.bool', True) self.settings['auth_check'] = True self.warn = True @@ -254,8 +254,8 @@ def onNotification(self, sender, method, data): users = [user for user in (settings('additionalUsers') or "").decode('utf-8').split(',') if user] users.insert(0, settings('username').decode('utf-8')) - dialog("notification", heading="{emby}", message="%s %s" % (_(33000), ", ".join(users)), - icon="{emby}", time=1500, sound=False) + dialog("notification", heading="{jellyfin}", message="%s %s" % (_(33000), ", ".join(users)), + icon="{jellyfin}", time=1500, sound=False) if self.library_thread is None: @@ -267,7 +267,7 @@ def onNotification(self, sender, method, data): if self.warn or data.get('ServerId'): self.warn = data.get('ServerId') is not None - dialog("notification", heading="{emby}", message=_(33146) if data.get('ServerId') is None else _(33149), icon=xbmcgui.NOTIFICATION_ERROR) + dialog("notification", heading="{jellyfin}", message=_(33146) if data.get('ServerId') is None else _(33149), icon=xbmcgui.NOTIFICATION_ERROR) if data.get('ServerId') is None: self.stop_default() @@ -278,7 +278,7 @@ def onNotification(self, sender, method, data): self.start_default() elif method == 'Unauthorized': - dialog("notification", heading="{emby}", message=_(33147) if data['ServerId'] is None else _(33148), icon=xbmcgui.NOTIFICATION_ERROR) + dialog("notification", heading="{jellyfin}", message=_(33147) if data['ServerId'] is None else _(33148), icon=xbmcgui.NOTIFICATION_ERROR) if data.get('ServerId') is None and self.settings['auth_check']: @@ -295,7 +295,7 @@ def onNotification(self, sender, method, data): return if settings('restartMsg.bool'): - dialog("notification", heading="{emby}", message=_(33006), icon="{emby}") + dialog("notification", heading="{jellyfin}", message=_(33006), icon="{jellyfin}") self.stop_default() @@ -308,7 +308,7 @@ def onNotification(self, sender, method, data): self.connect.register(data['Id']) xbmc.executebuiltin("Container.Refresh") - elif method == 'EmbyConnect': + elif method == 'JellyfinConnect': self.connect.setup_login_connect() elif method == 'AddServer': @@ -323,18 +323,18 @@ def onNotification(self, sender, method, data): elif method == 'UpdateServer': - dialog("ok", heading="{emby}", line1=_(33151)) + dialog("ok", heading="{jellyfin}", line1=_(33151)) self.connect.setup_manual_server() elif method == 'UserDataChanged' and self.library_thread: - if data.get('ServerId') or not window('emby_startup.bool'): + if data.get('ServerId') or not window('jellyfin_startup.bool'): return LOG.info("[ UserDataChanged ] %s", data) self.library_thread.userdata(data['UserDataList']) elif method == 'LibraryChanged' and self.library_thread: - if data.get('ServerId') or not window('emby_startup.bool'): + if data.get('ServerId') or not window('jellyfin_startup.bool'): return LOG.info("[ LibraryChanged ] %s", data) @@ -342,7 +342,7 @@ def onNotification(self, sender, method, data): self.library_thread.removed(data['ItemsRemoved']) elif method == 'System.OnQuit': - window('emby_should_stop.bool', True) + window('jellyfin_should_stop.bool', True) self.running = False elif method in ('SyncLibrarySelection', 'RepairLibrarySelection', 'AddLibrarySelection', 'RemoveLibrarySelection'): @@ -382,7 +382,7 @@ def onNotification(self, sender, method, data): elif method == 'System.OnSleep': LOG.info("-->[ sleep ]") - window('emby_should_stop.bool', True) + window('jellyfin_should_stop.bool', True) if self.library_thread is not None: @@ -403,7 +403,7 @@ def onNotification(self, sender, method, data): LOG.info("--<[ sleep ]") xbmc.sleep(10000)# Allow network to wake up self.monitor.sleep = False - window('emby_should_stop', clear=True) + window('jellyfin_should_stop', clear=True) try: self.connect.register() @@ -426,34 +426,34 @@ def onNotification(self, sender, method, data): elif method == 'CheckUpdate': if not self.check_update(True): - dialog("notification", heading="{emby}", message=_(21341), icon="{emby}", sound=False) + dialog("notification", heading="{jellyfin}", message=_(21341), icon="{jellyfin}", sound=False) else: - dialog("notification", heading="{emby}", message=_(33181), icon="{emby}", sound=False) - window('emby.restart.bool', True) + dialog("notification", heading="{jellyfin}", message=_(33181), icon="{jellyfin}", sound=False) + window('jellyfin.restart.bool', True) def onSettingsChanged(self): ''' React to setting changes that impact window values. ''' - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): return if settings('logLevel') != self.settings['log_level']: log_level = settings('logLevel') - window('emby_logLevel', str(log_level)) + window('jellyfin_logLevel', str(log_level)) self.settings['logLevel'] = log_level LOG.warn("New log level: %s", log_level) if settings('enableContext.bool') != self.settings['enable_context']: - window('emby_context', settings('enableContext')) + window('jellyfin_context', settings('enableContext')) self.settings['enable_context'] = settings('enableContext.bool') LOG.warn("New context setting: %s", self.settings['enable_context']) if settings('enableContextTranscode.bool') != self.settings['enable_context_transcode']: - window('emby_context_transcode', settings('enableContextTranscode')) + window('jellyfin_context_transcode', settings('enableContextTranscode')) self.settings['enable_context_transcode'] = settings('enableContextTranscode.bool') LOG.warn("New context transcode setting: %s", self.settings['enable_context_transcode']) @@ -465,13 +465,13 @@ def onSettingsChanged(self): if not self.settings.get('mode_warn'): self.settings['mode_warn'] = True - dialog("yesno", heading="{emby}", line1=_(33118)) + dialog("yesno", heading="{jellyfin}", line1=_(33118)) if settings('kodiCompanion.bool') != self.settings['kodi_companion']: self.settings['kodi_companion'] = settings('kodiCompanion.bool') if not self.settings['kodi_companion']: - dialog("ok", heading="{emby}", line1=_(33138)) + dialog("ok", heading="{jellyfin}", line1=_(33138)) def reload_objects(self): @@ -497,14 +497,14 @@ def reload_objects(self): def shutdown(self): LOG.warn("---<[ EXITING ]") - window('emby_should_stop.bool', True) + window('jellyfin_should_stop.bool', True) properties = [ # TODO: review - "emby_state", "emby_serverStatus", "emby_currUser", + "jellyfin_state", "jellyfin_serverStatus", "jellyfin_currUser", - "emby_play", "emby_online", "emby.connected", "emby.resume", "emby_startup", - "emby.external", "emby.external_check", "emby_deviceId", "emby_db_check", "emby_pathverified", - "emby_sync" + "jellyfin_play", "jellyfin_online", "jellyfin.connected", "jellyfin.resume", "jellyfin_startup", + "jellyfin.external", "jellyfin.external_check", "jellyfin_deviceId", "jellyfin_db_check", "jellyfin_pathverified", + "jellyfin_sync" ] for prop in properties: window(prop, clear=True) diff --git a/resources/lib/full_sync.py b/resources/lib/full_sync.py index 0381ac9b6..aca9be55f 100644 --- a/resources/lib/full_sync.py +++ b/resources/lib/full_sync.py @@ -19,7 +19,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -27,7 +27,7 @@ class FullSync(object): ''' This should be called like a context. - i.e. with FullSync('emby') as sync: + i.e. with FullSync('jellyfin') as sync: sync.libraries() ''' # Borg - multiple instances, shared state @@ -45,7 +45,7 @@ def __init__(self, library, server): self.__dict__ = self._shared_state if self.running: - dialog("ok", heading="{emby}", line1=_(33197)) + dialog("ok", heading="{jellyfin}", line1=_(33197)) raise Exception("Sync is already running.") @@ -65,7 +65,7 @@ def __enter__(self): set_screensaver(value="") self.running = True - window('emby_sync.bool', True) + window('jellyfin_sync.bool', True) return self @@ -104,7 +104,7 @@ def libraries(self, library_id=None, update=False): def get_libraries(self, library_id=None): - with Database('emby') as embydb: + with Database('jellyfin') as embydb: if library_id is None: return emby_db.EmbyDatabase(embydb.cursor).get_views() else: @@ -117,10 +117,10 @@ def mapping(self): ''' if self.sync['Libraries']: - if not dialog("yesno", heading="{emby}", line1=_(33102)): + if not dialog("yesno", heading="{jellyfin}", line1=_(33102)): - if not dialog("yesno", heading="{emby}", line1=_(33173)): - dialog("ok", heading="{emby}", line1=_(33122)) + if not dialog("yesno", heading="{jellyfin}", line1=_(33173)): + dialog("ok", heading="{jellyfin}", line1=_(33122)) raise LibraryException("ProgressStopped") else: @@ -146,7 +146,7 @@ def select_libraries(self, libraries): ''' Select all or certain libraries to be whitelisted. ''' - if dialog("yesno", heading="{emby}", line1=_(33125), nolabel=_(33127), yeslabel=_(33126)): + if dialog("yesno", heading="{jellyfin}", line1=_(33125), nolabel=_(33127), yeslabel=_(33126)): LOG.info("Selected sync later.") raise LibraryException('SyncLibraryLater') @@ -204,8 +204,8 @@ def start(self): save_sync(self.sync) xbmc.executebuiltin('UpdateLibrary(video)') - dialog("notification", heading="{emby}", message="%s %s" % (_(33025), str(elapsed).split('.')[0]), - icon="{emby}", sound=False) + dialog("notification", heading="{jellyfin}", message="%s %s" % (_(33025), str(elapsed).split('.')[0]), + icon="{jellyfin}", sound=False) LOG.info("Full sync completed in: %s", str(elapsed).split('.')[0]) def process_library(self, library_id): @@ -251,7 +251,7 @@ def process_library(self, library_id): if not 'Failed to validate path' in error: - dialog("ok", heading="{emby}", line1=_(33119)) + dialog("ok", heading="{jellyfin}", line1=_(33119)) LOG.error("full sync exited unexpectedly") save_sync(self.sync) @@ -266,7 +266,7 @@ def movies(self, library, dialog): with self.library.database_lock: with Database() as videodb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = Movies(self.server, embydb, videodb, self.direct_path) @@ -287,7 +287,7 @@ def movies(self, library, dialog): def movies_compare(self, library, obj, embydb): - ''' Compare entries from library to what's in the embydb. Remove surplus + ''' Compare entries from library to what's in the jellyfindb. Remove surplus ''' db = emby_db.EmbyDatabase(embydb.cursor) @@ -307,7 +307,7 @@ def tvshows(self, library, dialog): with self.library.database_lock: with Database() as videodb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = TVShows(self.server, embydb, videodb, self.direct_path, True) for items in server.get_items(library['Id'], "Series", False, self.sync['RestorePoint'].get('params')): @@ -357,7 +357,7 @@ def musicvideos(self, library, dialog): with self.library.database_lock: with Database() as videodb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = MusicVideos(self.server, embydb, videodb, self.direct_path) for items in server.get_items(library['Id'], "MusicVideo", False, self.sync['RestorePoint'].get('params')): @@ -397,7 +397,7 @@ def music(self, library, dialog): with self.library.music_database_lock: with Database('music') as musicdb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = Music(self.server, embydb, musicdb, self.direct_path) for items in server.get_artists(library['Id'], False, self.sync['RestorePoint'].get('params')): @@ -459,7 +459,7 @@ def boxsets(self, library_id=None, dialog=None): with self.library.database_lock: with Database() as videodb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = Movies(self.server, embydb, videodb, self.direct_path) for items in server.get_items(library_id, "BoxSet", False, self.sync['RestorePoint'].get('params')): @@ -482,7 +482,7 @@ def refresh_boxsets(self): with self.library.database_lock: with Database() as videodb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: obj = Movies(self.server, embydb, videodb, self.direct_path) obj.boxsets_reset() @@ -497,7 +497,7 @@ def remove_library(self, library_id, dialog): MEDIA = self.library.MEDIA direct_path = self.library.direct_path - with Database('emby') as embydb: + with Database('jellyfin') as embydb: db = emby_db.EmbyDatabase(embydb.cursor) library = db.get_view(library_id.replace('Mixed:', "")) @@ -558,7 +558,7 @@ def __exit__(self, exc_type, exc_val, exc_tb): ''' Exiting sync ''' self.running = False - window('emby_sync', clear=True) + window('jellyfin_sync', clear=True) if not settings('dbSyncScreensaver.bool') and self.screensaver is not None: diff --git a/resources/lib/helper/api.py b/resources/lib/helper/api.py index beee246f4..3b43c01bd 100644 --- a/resources/lib/helper/api.py +++ b/resources/lib/helper/api.py @@ -10,7 +10,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -28,7 +28,7 @@ def __init__(self, item, server=None): def get_playcount(self, played, playcount): - ''' Convert Emby played/playcount into + ''' Convert Jellyfin played/playcount into the Kodi equivalent. The playcount is tied to the watch status. ''' return (playcount or 1) if played else None @@ -231,7 +231,7 @@ def get_file_path(self, path=None): def get_user_artwork(self, user_id): - ''' Get emby user profile picture. + ''' Get jellyfin user profile picture. ''' return "%s/emby/Users/%s/Images/Primary?Format=original" % (self.server, user_id) @@ -302,7 +302,7 @@ def get_all_artwork(self, obj, parent_info=False): def get_backdrops(self, item_id, tags, query=None): - ''' Get backdrops based of "BackdropImageTags" in the emby object. + ''' Get backdrops based of "BackdropImageTags" in the jellyfin object. ''' backdrops = [] diff --git a/resources/lib/helper/exceptions.py b/resources/lib/helper/exceptions.py index b3bacc3fc..6e2e747eb 100644 --- a/resources/lib/helper/exceptions.py +++ b/resources/lib/helper/exceptions.py @@ -3,7 +3,7 @@ ################################################################################################# class LibraryException(Exception): - # Emby library sync exception + # Jellyfin library sync exception def __init__(self, status): self.status = status diff --git a/resources/lib/helper/loghandler.py b/resources/lib/helper/loghandler.py index 8fb2698f7..04fa723c8 100644 --- a/resources/lib/helper/loghandler.py +++ b/resources/lib/helper/loghandler.py @@ -14,14 +14,14 @@ def config(): - logger = logging.getLogger('EMBY') + logger = logging.getLogger('JELLYFIN') logger.addHandler(LogHandler()) logger.setLevel(logging.DEBUG) def reset(): - for handler in logging.getLogger('EMBY').handlers: - logging.getLogger('EMBY').removeHandler(handler) + for handler in logging.getLogger('JELLYFIN').handlers: + logging.getLogger('JELLYFIN').removeHandler(handler) class LogHandler(logging.StreamHandler): @@ -56,10 +56,10 @@ def emit(self, record): if self.mask_info: for server in self.sensitive['Server']: - string = string.replace(server.encode('utf-8') or "{server}", "{emby-server}") + string = string.replace(server.encode('utf-8') or "{server}", "{jellyfin-server}") for token in self.sensitive['Token']: - string = string.replace(token.encode('utf-8') or "{token}", "{emby-token}") + string = string.replace(token.encode('utf-8') or "{token}", "{jellyfin-token}") try: xbmc.log(string, level=xbmc.LOGNOTICE) @@ -76,7 +76,7 @@ def _get_log_level(cls, level): logging.DEBUG: 2 } try: - log_level = int(window('emby_logLevel')) + log_level = int(window('jellyfin_logLevel')) except ValueError: log_level = 0 diff --git a/resources/lib/helper/playutils.py b/resources/lib/helper/playutils.py index 9814416be..b8a9966dc 100644 --- a/resources/lib/helper/playutils.py +++ b/resources/lib/helper/playutils.py @@ -21,7 +21,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -32,7 +32,7 @@ def set_properties(item, method, server_id=None): ''' info = item.get('PlaybackInfo') or {} - current = window('emby_play.json') or [] + current = window('jellyfin_play.json') or [] current.append({ 'Type': item['Type'], 'Id': item['Id'], @@ -51,7 +51,7 @@ def set_properties(item, method, server_id=None): 'CurrentEpisode': info.get('CurrentEpisode') }) - window('emby_play.json', current) + window('jellyfin_play.json', current) class PlayUtils(object): @@ -178,7 +178,7 @@ def is_strm(self, source): def get(self, source, audio=None, subtitle=None): ''' The server returns sources based on the MaxStreamingBitrate value and other filters. - prop: embyfilename for ?? I thought it was to pass the real path to subtitle add-ons but it's not working? + prop: jellyfinfilename for ?? I thought it was to pass the real path to subtitle add-ons but it's not working? ''' self.info['MediaSourceId'] = source['Id'] @@ -214,7 +214,7 @@ def get(self, source, audio=None, subtitle=None): self.item['PlaybackInfo'].update(self.info) API = api.API(self.item, self.info['ServerAddress']) - window('embyfilename', value=API.get_file_path(source.get('Path')).encode('utf-8')) + window('jellyfinfilename', value=API.get_file_path(source.get('Path')).encode('utf-8')) def live_stream(self, source): @@ -454,7 +454,7 @@ def get_device_profile(self): def set_external_subs(self, source, listitem): ''' Try to download external subs locally so we can label them. - Since Emby returns all possible tracks together, sort them. + Since Jellyfin returns all possible tracks together, sort them. IsTextSubtitleStream if true, is available to download from server. ''' if not settings('enableExternalSubs.bool') or not source['MediaStreams']: @@ -528,7 +528,7 @@ def get_audio_subs(self, source, audio=None, subtitle=None): ''' For transcoding only Present the list of audio/subs to select from, before playback starts. - Since Emby returns all possible tracks together, sort them. + Since Jellyfin returns all possible tracks together, sort them. IsTextSubtitleStream if true, is available to download from server. ''' prefs = "" diff --git a/resources/lib/helper/translate.py b/resources/lib/helper/translate.py index d6d622488..70c5e3cb1 100644 --- a/resources/lib/helper/translate.py +++ b/resources/lib/helper/translate.py @@ -11,7 +11,7 @@ ################################################################################################## -LOG = logging.getLogger('EMBY.'+__name__) +LOG = logging.getLogger('JELLYFIN.'+__name__) ################################################################################################## diff --git a/resources/lib/helper/utils.py b/resources/lib/helper/utils.py index 09e229b41..da7bee4dd 100644 --- a/resources/lib/helper/utils.py +++ b/resources/lib/helper/utils.py @@ -21,7 +21,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -149,10 +149,10 @@ def dialog(dialog_type, *args, **kwargs): d = xbmcgui.Dialog() if "icon" in kwargs: - kwargs['icon'] = kwargs['icon'].replace("{emby}", + kwargs['icon'] = kwargs['icon'].replace("{jellyfin}", "special://home/addons/plugin.video.jellyfin/icon.png") if "heading" in kwargs: - kwargs['heading'] = kwargs['heading'].replace("{emby}", _('addon_name')) + kwargs['heading'] = kwargs['heading'].replace("{jellyfin}", _('addon_name')) types = { 'yesno': d.yesno, @@ -172,11 +172,11 @@ def should_stop(): if xbmc.Monitor().waitForAbort(0.00001): return True - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): LOG.info("exiiiiitttinggg") return True - if not window('emby_online.bool'): + if not window('jellyfin_online.bool'): return True return False @@ -235,7 +235,7 @@ def validate(path): ''' Verify if path is accessible. ''' - if window('emby_pathverified.bool'): + if window('jellyfin_pathverified.bool'): return True path = path if os.path.supports_unicode_filenames else path.encode('utf-8') @@ -243,11 +243,11 @@ def validate(path): if not xbmcvfs.exists(path): LOG.info("Could not find %s", path) - if dialog("yesno", heading="{emby}", line1="%s %s. %s" % (_(33047), path, _(33048))): + if dialog("yesno", heading="{jellyfin}", line1="%s %s. %s" % (_(33047), path, _(33048))): return False - window('emby_pathverified.bool', True) + window('jellyfin_pathverified.bool', True) return True @@ -292,7 +292,7 @@ def delete_folder(path=None): ''' LOG.debug("--[ delete folder ]") delete_path = path is not None - path = path or xbmc.translatePath('special://temp/emby').decode('utf-8') + path = path or xbmc.translatePath('special://temp/jellyfin').decode('utf-8') dirs, files = xbmcvfs.listdir(path) delete_recursive(path, dirs) diff --git a/resources/lib/helper/wrapper.py b/resources/lib/helper/wrapper.py index 7747ff6e0..a0172cdb0 100644 --- a/resources/lib/helper/wrapper.py +++ b/resources/lib/helper/wrapper.py @@ -11,7 +11,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -101,7 +101,7 @@ def wrapper(*args, **kwargs): def emby_item(): - ''' Wrapper to retrieve the emby_db item. + ''' Wrapper to retrieve the jellyfin_db item. ''' def decorator(func): def wrapper(self, item, *args, **kwargs): diff --git a/resources/lib/helper/xmls.py b/resources/lib/helper/xmls.py index 5ca11099d..071233b37 100644 --- a/resources/lib/helper/xmls.py +++ b/resources/lib/helper/xmls.py @@ -13,14 +13,14 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# def sources(): ''' Create master lock compatible sources. - Also add the kodi.emby.media source. + Also add the kodi.jellyfin.media source. ''' path = xbmc.translatePath("special://profile/").decode('utf-8') file = os.path.join(path, 'sources.xml') @@ -52,7 +52,7 @@ def sources(): if (protocol == 'smb://' and count_smb > 0) or (protocol == 'http://' and count_http > 0): source = etree.SubElement(video, 'source') - etree.SubElement(source, 'name').text = "Emby" + etree.SubElement(source, 'name').text = "Jellyfin" etree.SubElement(source, 'path', attrib={'pathversion': "1"}).text = protocol etree.SubElement(source, 'allowsharing').text = "true" @@ -63,12 +63,13 @@ def sources(): files = etree.SubElement(xml, 'files') for source in xml.findall('.//path'): - if source.text == 'http://kodi.emby.media': + # TODO get a repo url + if source.text == 'http://kodi.jellyfin.media': break else: source = etree.SubElement(files, 'source') - etree.SubElement(source, 'name').text = "kodi.emby.media" - etree.SubElement(source, 'path', attrib={'pathversion': "1"}).text = "http://kodi.emby.media" + etree.SubElement(source, 'name').text = "kodi.jellyfin.media" + etree.SubElement(source, 'path', attrib={'pathversion': "1"}).text = "http://kodi.jellyfin.media" etree.SubElement(source, 'allowsharing').text = "true" except Exception as error: LOG.exception(error) @@ -124,7 +125,7 @@ def advanced_settings(): indent(xml) write_xml(etree.tostring(xml, 'UTF-8'), path) - dialog("ok", heading="{emby}", line1=_(33097)) + dialog("ok", heading="{jellyfin}", line1=_(33097)) xbmc.executebuiltin('RestartApp') return True diff --git a/resources/lib/library.py b/resources/lib/library.py index a69098e44..01e2405ad 100644 --- a/resources/lib/library.py +++ b/resources/lib/library.py @@ -22,7 +22,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) LIMIT = min(int(settings('limitIndex') or 50), 50) DTHREADS = int(settings('limitThreads') or 3) MEDIA = { @@ -101,7 +101,7 @@ def run(self): if not self.startup(): self.stop_client() - window('emby_startup.bool', True) + window('jellyfin_startup.bool', True) while not self.stop_thread: @@ -151,7 +151,7 @@ def service(self): self.worker_notify() if self.pending_refresh: - window('emby_sync.bool', True) + window('jellyfin_sync.bool', True) if self.total_updates > self.progress_display: queue_size = self.worker_queue_size() @@ -177,7 +177,7 @@ def service(self): self.pending_refresh = False self.save_last_sync() self.total_updates = 0 - window('emby_sync', clear=True) + window('jellyfin_sync', clear=True) if self.progress_updates: @@ -206,7 +206,7 @@ def enable_pending_refresh(self): ''' When there's an active thread. Let the main thread know. ''' self.pending_refresh = True - window('emby_sync.bool', True) + window('jellyfin_sync.bool', True) def worker_queue_size(self): @@ -227,7 +227,7 @@ def worker_queue_size(self): def worker_downloads(self): - ''' Get items from emby and place them in the appropriate queues. + ''' Get items from jellyfin and place them in the appropriate queues. ''' for queue in ((self.updated_queue, self.updated_output), (self.userdata_queue, self.userdata_output)): if queue[0].qsize() and len(self.download_threads) < DTHREADS: @@ -238,7 +238,7 @@ def worker_downloads(self): def worker_sort(self): - ''' Get items based on the local emby database and place item in appropriate queues. + ''' Get items based on the local jellyfin database and place item in appropriate queues. ''' if self.removed_queue.qsize() and len(self.emby_threads) < 2: @@ -350,10 +350,10 @@ def startup(self): if settings('kodiCompanion.bool'): for plugin in self.server['api'].get_plugins(): - if plugin['Name'] in ("Emby.Kodi Sync Queue", "Kodi companion"): + if plugin['Name'] in ("Jellyfin.Kodi Sync Queue", "Kodi companion"): if not self.fast_sync(): - dialog("ok", heading="{emby}", line1=_(33128)) + dialog("ok", heading="{jellyfin}", line1=_(33128)) raise Exception("Failed to retrieve latest updates") @@ -369,7 +369,7 @@ def startup(self): if error.status in 'SyncLibraryLater': - dialog("ok", heading="{emby}", line1=_(33129)) + dialog("ok", heading="{jellyfin}", line1=_(33129)) settings('SyncInstallRunDone.bool', True) sync = get_sync() sync['Libraries'] = [] @@ -379,7 +379,7 @@ def startup(self): elif error.status == 'CompanionMissing': - dialog("ok", heading="{emby}", line1=_(33099)) + dialog("ok", heading="{jellyfin}", line1=_(33099)) settings('kodiCompanion.bool', False) return True @@ -422,7 +422,7 @@ def fast_sync(self): ''' Inverse yes no, in case the dialog is forced closed by Kodi. ''' - if dialog("yesno", heading="{emby}", line1=_(33172).replace('{number}', str(total)), nolabel=_(107), yeslabel=_(106)): + if dialog("yesno", heading="{jellyfin}", line1=_(33172).replace('{number}', str(total)), nolabel=_(107), yeslabel=_(106)): LOG.warn("Large updates skipped.") return True @@ -482,7 +482,7 @@ def select_libraries(self, mode=None): whitelist = [x.replace('Mixed:', "") for x in sync['Whitelist']] libraries = [] - with Database('emby') as embydb: + with Database('jellyfin') as embydb: db = emby_db.EmbyDatabase(embydb.cursor) if mode in ('SyncLibrarySelection', 'RepairLibrarySelection', 'RemoveLibrarySelection'): @@ -614,7 +614,7 @@ def run(self): with self.lock: with self.database as kodidb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: while True: @@ -636,7 +636,7 @@ def run(self): self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break LOG.info("--<[ q:updated/%s ]", id(self)) @@ -658,7 +658,7 @@ def run(self): with self.lock: with self.database as kodidb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: while True: @@ -679,7 +679,7 @@ def run(self): self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break LOG.info("--<[ q:userdata/%s ]", id(self)) @@ -698,7 +698,7 @@ def __init__(self, queue, output, *args): def run(self): - with Database('emby') as embydb: + with Database('jellyfin') as embydb: database = emby_db.EmbyDatabase(embydb.cursor) while True: @@ -715,14 +715,14 @@ def run(self): items = database.get_media_by_parent_id(item_id) if not items: - LOG.info("Could not find media %s in the emby database.", item_id) + LOG.info("Could not find media %s in the jellyfin database.", item_id) else: for item in items: self.output[item[1]].put({'Id': item[0], 'Type': item[1]}) self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break LOG.info("--<[ q:sort/%s ]", id(self)) @@ -744,7 +744,7 @@ def run(self): with self.lock: with self.database as kodidb: - with Database('emby') as embydb: + with Database('jellyfin') as embydb: while True: @@ -765,7 +765,7 @@ def run(self): self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break LOG.info("--<[ q:removed/%s ]", id(self)) @@ -796,11 +796,11 @@ def run(self): if time and (not self.player.isPlayingVideo() or xbmc.getCondVisibility('VideoPlayer.Content(livetv)')): dialog("notification", heading="%s %s" % (_(33049), item[0]), message=item[1], - icon="{emby}", time=time, sound=False) + icon="{jellyfin}", time=time, sound=False) self.queue.task_done() - if window('emby_should_stop.bool'): + if window('jellyfin_should_stop.bool'): break LOG.info("--<[ q:notify/%s ]", id(self)) diff --git a/resources/lib/monitor.py b/resources/lib/monitor.py index cbb03f267..2d297abbf 100644 --- a/resources/lib/monitor.py +++ b/resources/lib/monitor.py @@ -22,7 +22,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -114,7 +114,7 @@ def onNotification(self, sender, method, data): except Exception as error: LOG.error(error) - dialog("ok", heading="{emby}", line1=_(33142)) + dialog("ok", heading="{jellyfin}", line1=_(33142)) return @@ -272,8 +272,8 @@ def onNotification(self, sender, method, data): def void_responder(self, data, result): - window('emby_%s.json' % data['VoidName'], result) - LOG.debug("--->[ nostromo/emby_%s.json ] sent", data['VoidName']) + window('jellyfin_%s.json' % data['VoidName'], result) + LOG.debug("--->[ nostromo/jellyfin_%s.json ] sent", data['VoidName']) def server_instance(self, server_id=None): @@ -323,7 +323,7 @@ def additional_users(self, server): ''' Setup additional users images. ''' for i in range(10): - window('EmbyAdditionalUserImage.%s' % i, clear=True) + window('JellyfinAdditionalUserImage.%s' % i, clear=True) try: session = server['api'].get_device(self.device_id) @@ -336,12 +336,12 @@ def additional_users(self, server): info = server['api'].get_user(user['UserId']) image = api.API(info, server['config/auth.server']).get_user_artwork(user['UserId']) - window('EmbyAdditionalUserImage.%s' % index, image) - window('EmbyAdditionalUserPosition.%s' % user['UserId'], str(index)) + window('JellyfinAdditionalUserImage.%s' % index, image) + window('JellyfinAdditionalUserPosition.%s' % user['UserId'], str(index)) def playstate(self, data): - ''' Emby playstate updates. + ''' Jellyfin playstate updates. ''' command = data['Command'] actions = { @@ -367,7 +367,7 @@ def playstate(self, data): def general_commands(self, data): - ''' General commands from Emby to control the Kodi interface. + ''' General commands from Jellyfin to control the Kodi interface. ''' command = data['Name'] args = data['Arguments'] @@ -392,7 +392,7 @@ def general_commands(self, data): elif command == 'DisplayMessage': dialog("notification", heading=args['Header'], message=args['Text'], - icon="{emby}", time=int(settings('displayMessage'))*1000) + icon="{jellyfin}", time=int(settings('displayMessage'))*1000) elif command == 'SendString': JSONRPC('Input.SendText').execute({'text': args['String'], 'done': False}) diff --git a/resources/lib/objects/actions.py b/resources/lib/objects/actions.py index b439dbd3e..cdd92dad0 100644 --- a/resources/lib/objects/actions.py +++ b/resources/lib/objects/actions.py @@ -23,7 +23,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -89,8 +89,8 @@ def set_playlist(self, item, listitem, db_id=None, transcode=False): Detect the seektime for video type content. Verify the default video action set in Kodi for accurate resume behavior. ''' - seektime = window('emby.resume.bool') - window('emby.resume', clear=True) + seektime = window('jellyfin.resume.bool') + window('jellyfin.resume', clear=True) if item['MediaType'] in ('Video', 'Audio'): resume = item['UserData'].get('PlaybackPositionTicks') @@ -128,7 +128,7 @@ def _set_intros(self, item): if settings('askCinema') == "true": - resp = dialog("yesno", heading="{emby}", line1=_(33016)) + resp = dialog("yesno", heading="{jellyfin}", line1=_(33016)) if not resp: enabled = False @@ -148,7 +148,7 @@ def _set_intros(self, item): self.stack.append([intro['PlaybackInfo']['Path'], listitem]) - window('emby.skip.%s' % intro['Id'], value="true") + window('jellyfin.skip.%s' % intro['Id'], value="true") def _set_additional_parts(self, item_id): @@ -659,7 +659,7 @@ def resume_dialog(self, seektime): LOG.info("Resume dialog called.") XML_PATH = (xbmcaddon.Addon('plugin.video.jellyfin').getAddonInfo('path'), "default", "1080i") - dialog = resume.ResumeDialog("script-emby-resume.xml", *XML_PATH) + dialog = resume.ResumeDialog("script-jellyfin-resume.xml", *XML_PATH) dialog.set_resume_point("Resume from %s" % str(timedelta(seconds=seektime)).split(".")[0]) dialog.doModal() @@ -721,14 +721,14 @@ def on_update(data, server): if item: - if not window('emby.skip.%s.bool' % item[0]): + if not window('jellyfin.skip.%s.bool' % item[0]): server['api'].item_played(item[0], playcount) - window('emby.skip.%s' % item[0], clear=True) + window('jellyfin.skip.%s' % item[0], clear=True) def on_play(data, server): - ''' Setup progress for emby playback. + ''' Setup progress for jellyfin playback. ''' player = xbmc.Player() @@ -781,7 +781,7 @@ def special_listener(): ''' player = xbmc.Player() isPlaying = player.isPlaying() - count = int(window('emby.external_count') or 0) + count = int(window('jellyfin.external_count') or 0) if (not isPlaying and xbmc.getCondVisibility('Window.IsVisible(DialogContextMenu.xml)') and xbmc.getInfoLabel('Control.GetLabel(1002)') == xbmc.getLocalizedString(12021)): @@ -791,24 +791,24 @@ def special_listener(): if control == 1002: # Start from beginning LOG.info("Resume dialog: Start from beginning selected.") - window('emby.resume.bool', False) + window('jellyfin.resume.bool', False) else: LOG.info("Resume dialog: Resume selected.") - window('emby.resume.bool', True) + window('jellyfin.resume.bool', True) - elif isPlaying and not window('emby.external_check'): + elif isPlaying and not window('jellyfin.external_check'): time = player.getTime() if time > 1: # Not external player. - window('emby.external_check', value="true") - window('emby.external_count', value="0") + window('jellyfin.external_check', value="true") + window('jellyfin.external_count', value="0") elif count == 120: LOG.info("External player detected.") - window('emby.external.bool', True) - window('emby.external_check.bool', True) - window('emby.external_count', value="0") + window('jellyfin.external.bool', True) + window('jellyfin.external_check.bool', True) + window('jellyfin.external_count', value="0") elif time == 0: - window('emby.external_count', value=str(count + 1)) + window('jellyfin.external_count', value=str(count + 1)) diff --git a/resources/lib/objects/kodi/artwork.py b/resources/lib/objects/kodi/artwork.py index 15144e997..6e5412d70 100644 --- a/resources/lib/objects/kodi/artwork.py +++ b/resources/lib/objects/kodi/artwork.py @@ -17,7 +17,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -247,7 +247,7 @@ def run(self): ################################################################################################## -log = logging.getLogger("EMBY."+__name__) +log = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -278,7 +278,7 @@ def texture_cache_sync(self): # This method will sync all Kodi artwork to textures13.db # and cache them locally. This takes diskspace! if not dialog(type_="yesno", - heading="{emby}", + heading="{jellyfin}", line1=_(33042)): return @@ -288,7 +288,7 @@ def texture_cache_sync(self): pdialog.create(_(29999), _(33043)) # ask to rest all existing or not - if dialog(type_="yesno", heading="{emby}", line1=_(33044)): + if dialog(type_="yesno", heading="{jellyfin}", line1=_(33044)): log.info("Resetting all cache data first") self.delete_cache() diff --git a/resources/lib/objects/kodi/kodi.py b/resources/lib/objects/kodi/kodi.py index 81e9078d0..845d3ff96 100644 --- a/resources/lib/objects/kodi/kodi.py +++ b/resources/lib/objects/kodi/kodi.py @@ -12,7 +12,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/objects/kodi/movies.py b/resources/lib/objects/kodi/movies.py index e2600a75d..a01f7fe1d 100644 --- a/resources/lib/objects/kodi/movies.py +++ b/resources/lib/objects/kodi/movies.py @@ -9,7 +9,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/objects/kodi/music.py b/resources/lib/objects/kodi/music.py index 3e1db882b..5402a3b5c 100644 --- a/resources/lib/objects/kodi/music.py +++ b/resources/lib/objects/kodi/music.py @@ -9,7 +9,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/objects/kodi/musicvideos.py b/resources/lib/objects/kodi/musicvideos.py index 50b8e91da..5e8f7e54d 100644 --- a/resources/lib/objects/kodi/musicvideos.py +++ b/resources/lib/objects/kodi/musicvideos.py @@ -9,7 +9,7 @@ ################################################################################################## -log = logging.getLogger("EMBY."+__name__) +log = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/objects/kodi/queries.py b/resources/lib/objects/kodi/queries.py index d2c371102..2678cd753 100644 --- a/resources/lib/objects/kodi/queries.py +++ b/resources/lib/objects/kodi/queries.py @@ -1,5 +1,5 @@ -''' Queries for the Kodi database. obj reflect key/value to retrieve from emby items. +''' Queries for the Kodi database. obj reflect key/value to retrieve from jellyfin items. Some functions require additional information, therefore obj do not always reflect the Kodi database query values. ''' diff --git a/resources/lib/objects/kodi/tvshows.py b/resources/lib/objects/kodi/tvshows.py index 8da80f000..35ee64c1c 100644 --- a/resources/lib/objects/kodi/tvshows.py +++ b/resources/lib/objects/kodi/tvshows.py @@ -9,7 +9,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## diff --git a/resources/lib/objects/movies.py b/resources/lib/objects/movies.py index c49c587c4..426a3e7fc 100644 --- a/resources/lib/objects/movies.py +++ b/resources/lib/objects/movies.py @@ -14,7 +14,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -320,7 +320,7 @@ def userdata(self, item, e_item): @emby_item() def remove(self, item_id, e_item): - ''' Remove movieid, fileid, emby reference. + ''' Remove movieid, fileid, jellyfin reference. Remove artwork, boxset ''' obj = {'Id': item_id} diff --git a/resources/lib/objects/music.py b/resources/lib/objects/music.py index a80b0d33d..fe0fd4282 100644 --- a/resources/lib/objects/music.py +++ b/resources/lib/objects/music.py @@ -14,7 +14,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -103,7 +103,7 @@ def artist_add(self, obj): ''' Add object to kodi. - safety checks: It looks like Emby supports the same artist multiple times. + safety checks: It looks like Jellyfin supports the same artist multiple times. Kodi doesn't allow that. In case that happens we just merge the artist entries. ''' obj['ArtistId'] = self.get(*values(obj, QU.get_artist_obj)) @@ -203,7 +203,7 @@ def artist_discography(self, obj): def artist_link(self, obj): ''' Assign main artists to album. - Artist does not exist in emby database, create the reference. + Artist does not exist in jellyfin database, create the reference. ''' for artist in (obj['AlbumArtists'] or []): @@ -392,7 +392,7 @@ def song_artist_discography(self, obj): def song_artist_link(self, obj): ''' Assign main artists to song. - Artist does not exist in emby database, create the reference. + Artist does not exist in jellyfin database, create the reference. ''' for index, artist in enumerate(obj['ArtistItems'] or []): @@ -533,7 +533,7 @@ def remove_song(self, kodi_id, item_id): @emby_item() def get_child(self, item_id, e_item): - ''' Get all child elements from tv show emby id. + ''' Get all child elements from tv show jellyfin id. ''' obj = {'Id': item_id} child = [] diff --git a/resources/lib/objects/musicvideos.py b/resources/lib/objects/musicvideos.py index 1dc536e65..69b55189e 100644 --- a/resources/lib/objects/musicvideos.py +++ b/resources/lib/objects/musicvideos.py @@ -14,7 +14,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -51,7 +51,7 @@ def musicvideo(self, item, e_item, library): ''' If item does not exist, entry will be added. If item exists, entry will be updated. - If we don't get the track number from Emby, see if we can infer it + If we don't get the track number from Jellyfin, see if we can infer it from the sortname attribute. ''' API = api.API(item, self.server['auth/server-address']) @@ -220,7 +220,7 @@ def userdata(self, item, e_item): @emby_item() def remove(self, item_id, e_item): - ''' Remove mvideoid, fileid, pathid, emby reference. + ''' Remove mvideoid, fileid, pathid, jellyfin reference. ''' obj = {'Id': item_id} diff --git a/resources/lib/objects/obj.py b/resources/lib/objects/obj.py index e5f76964a..16b0a34ee 100644 --- a/resources/lib/objects/obj.py +++ b/resources/lib/objects/obj.py @@ -8,7 +8,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -37,7 +37,7 @@ def map(self, item, mapping_name): ''' Syntax to traverse the item dictionary. This of the query almost as a url. - Item is the Emby item json object structure + Item is the Jellyfin item json object structure ",": each element will be used as a fallback until a value is found. "?": split filters and key name from the query part, i.e. MediaSources/0?$Name diff --git a/resources/lib/objects/obj_map.json b/resources/lib/objects/obj_map.json index 420c01204..f2ff9d15a 100644 --- a/resources/lib/objects/obj_map.json +++ b/resources/lib/objects/obj_map.json @@ -2,7 +2,7 @@ "video": "special://database/MyVideos107.db", "music": "special://database/MyMusic60.db", "texture": "special://database/Textures13.db", - "emby": "special://database/emby.db", + "jellyfin": "special://database/jellyfin.db", "MovieProviderName": "imdb", "Movie": { "Id": "Id", @@ -40,7 +40,7 @@ "Audio": "MediaSources/0/MediaStreams:?Type=Audio", "Video": "MediaSources/0/MediaStreams:?Type=Video", "Container": "MediaSources/0/Container", - "EmbyParentId": "ParentId", + "JellyfinParentId": "ParentId", "CriticRating": "CriticRating" }, "MovieUserData": { @@ -77,7 +77,7 @@ "Tags": "Tags", "Favorite": "UserData/IsFavorite", "RecursiveCount": "RecursiveItemCount", - "EmbyParentId": "ParentId", + "JellyfinParentId": "ParentId", "Status": "Status" }, "Season": { @@ -119,7 +119,7 @@ "Video": "MediaSources/0/MediaStreams:?Type=Video", "Container": "MediaSources/0/Container", "Location": "LocationType", - "EmbyParentId": "SeriesId,ParentId" + "JellyfinParentId": "SeriesId,ParentId" }, "EpisodeUserData": { "Id": "Id", @@ -160,7 +160,7 @@ "Played": "UserData/Played", "Favorite": "UserData/IsFavorite", "Directors": "People:?Type=Director$Name", - "EmbyParentId": "ParentId" + "JellyfinParentId": "ParentId" }, "MusicVideoUserData": { "Id": "Id", @@ -178,7 +178,7 @@ "UniqueId": "ProviderIds/MusicBrainzArtist", "Genres": "Genres", "Bio": "Overview", - "EmbyParentId": "ParentId" + "JellyfinParentId": "ParentId" }, "Album": { "Id": "Id", @@ -190,7 +190,7 @@ "AlbumArtists": "AlbumArtists", "Artists": "AlbumArtists:?$Name", "ArtistItems": "ArtistItems", - "EmbyParentId": "ParentId" + "JellyfinParentId": "ParentId" }, "Song": { "Id": "Id", @@ -213,7 +213,7 @@ "Album": "Album", "SongAlbumId": "AlbumId", "Container": "MediaSources/0/Container", - "EmbyParentId": "ParentId" + "JellyfinParentId": "ParentId" }, "SongUserData": { "Id": "Id", diff --git a/resources/lib/objects/tvshows.py b/resources/lib/objects/tvshows.py index d3ab66fbe..4d9c0b012 100644 --- a/resources/lib/objects/tvshows.py +++ b/resources/lib/objects/tvshows.py @@ -16,7 +16,7 @@ ################################################################################################## -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################## @@ -512,7 +512,7 @@ def userdata(self, item, e_item): @emby_item() def remove(self, item_id, e_item): - ''' Remove showid, fileid, pathid, emby reference. + ''' Remove showid, fileid, pathid, jellyfin reference. There's no episodes left, delete show and any possible remaining seasons ''' obj = {'Id': item_id} @@ -614,7 +614,7 @@ def remove_episode(self, kodi_id, file_id, item_id): @emby_item() def get_child(self, item_id, e_item): - ''' Get all child elements from tv show emby id. + ''' Get all child elements from tv show jellyfin id. ''' obj = {'Id': item_id} child = [] diff --git a/resources/lib/objects/utils.py b/resources/lib/objects/utils.py index f952d6317..9f3b5052d 100644 --- a/resources/lib/objects/utils.py +++ b/resources/lib/objects/utils.py @@ -8,7 +8,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# diff --git a/resources/lib/player.py b/resources/lib/player.py index 277b50d8b..aadc60ec0 100644 --- a/resources/lib/player.py +++ b/resources/lib/player.py @@ -15,7 +15,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -43,7 +43,7 @@ def onPlayBackStarted(self): ''' We may need to wait for info to be set in kodi monitor. Accounts for scenario where Kodi starts playback and exits immediately. - First, ensure previous playback terminated correctly in Emby. + First, ensure previous playback terminated correctly in Jellyfin. ''' self.stop_playback() self.up_next = False @@ -69,7 +69,7 @@ def onPlayBackStarted(self): return - items = window('emby_play.json') + items = window('jellyfin_play.json') item = None while not items: @@ -77,11 +77,11 @@ def onPlayBackStarted(self): if monitor.waitForAbort(2): return - items = window('emby_play.json') + items = window('jellyfin_play.json') count += 1 if count == 20: - LOG.info("Could not find emby prop...") + LOG.info("Could not find jellyfin prop...") return @@ -93,7 +93,7 @@ def onPlayBackStarted(self): else: item = items.pop(0) - window('emby_play.json', items) + window('jellyfin_play.json', items) self.set_item(current_file, item) data = { @@ -111,7 +111,7 @@ def onPlayBackStarted(self): 'SubtitleStreamIndex': item['SubtitleStreamIndex'] } item['Server']['api'].session_playing(data) - window('emby.skip.%s.bool' % item['Id'], True) + window('jellyfin.skip.%s.bool' % item['Id'], True) if monitor.waitForAbort(2): return @@ -302,7 +302,7 @@ def onPlayBackSeek(self, time, seekOffset): def report_playback(self, report=True): - ''' Report playback progress to emby server. + ''' Report playback progress to jellyfin server. Check if the user seek. ''' current_file = self.get_playing_file() @@ -312,7 +312,7 @@ def report_playback(self, report=True): item = self.get_file_info(current_file) - if window('emby.external.bool'): + if window('jellyfin.external.bool'): return if not report: @@ -365,7 +365,7 @@ def onPlayBackStopped(self): ''' Will be called when user stops playing a file. ''' - window('emby_play', clear=True) + window('jellyfin_play', clear=True) self.stop_playback() LOG.info("--<[ playback ]") @@ -388,10 +388,10 @@ def stop_playback(self): for file in self.played: item = self.get_file_info(file) - window('emby.skip.%s.bool' % item['Id'], True) + window('jellyfin.skip.%s.bool' % item['Id'], True) - if window('emby.external.bool'): - window('emby.external', clear=True) + if window('jellyfin.external.bool'): + window('jellyfin.external', clear=True) if int(item['CurrentPosition']) == 1: item['CurrentPosition'] = int(item['Runtime']) @@ -442,6 +442,6 @@ def stop_playback(self): if dialog("yesno", heading=_(30091), line1=_(33015), autoclose=120000): item['Server']['api'].delete_item(item['Id']) - window('emby.external_check', clear=True) + window('jellyfin.external_check', clear=True) self.played.clear() diff --git a/resources/lib/setup.py b/resources/lib/setup.py index 6701ecbc2..001161ad1 100644 --- a/resources/lib/setup.py +++ b/resources/lib/setup.py @@ -10,7 +10,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# @@ -42,7 +42,7 @@ def set_web_server(self): if not self.get_web_server(): settings('enableTextureCache.bool', False) - dialog("ok", heading="{emby}", line1=_(33103)) + dialog("ok", heading="{jellyfin}", line1=_(33103)) return @@ -105,24 +105,24 @@ def _is_mode(self): settings('useDirectPaths', value="1" if value else "0") if value: - dialog("ok", heading="{emby}", line1=_(33145)) + dialog("ok", heading="{jellyfin}", line1=_(33145)) def _is_artwork_caching(self): - value = dialog("yesno", heading="{emby}", line1=_(33117)) + value = dialog("yesno", heading="{jellyfin}", line1=_(33117)) settings('enableTextureCache.bool', value) def _is_empty_shows(self): - value = dialog("yesno", heading="{emby}", line1=_(33100)) + value = dialog("yesno", heading="{jellyfin}", line1=_(33100)) settings('syncEmptyShows.bool', value) def _is_rotten_tomatoes(self): - value = dialog("yesno", heading="{emby}", line1=_(33188)) + value = dialog("yesno", heading="{jellyfin}", line1=_(33188)) settings('syncRottenTomatoes.bool', value) def _is_music(self): - value = dialog("yesno", heading="{emby}", line1=_(33039)) + value = dialog("yesno", heading="{jellyfin}", line1=_(33039)) settings('enableMusic.bool', value=value) diff --git a/resources/lib/views.py b/resources/lib/views.py index 7b39ea2ae..d7899cc12 100644 --- a/resources/lib/views.py +++ b/resources/lib/views.py @@ -19,7 +19,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) NODES = { 'tvshows': [ ('all', None), @@ -148,16 +148,16 @@ def __init__(self): def add_library(self, view): - ''' Add entry to view table in emby database. + ''' Add entry to view table in jellyfin database. ''' - with Database('emby') as embydb: + with Database('jellyfin') as embydb: emby_db.EmbyDatabase(embydb.cursor).add_view(view['Id'], view['Name'], view['Media']) def remove_library(self, view_id): - ''' Remove entry from view table in emby database. + ''' Remove entry from view table in jellyfin database. ''' - with Database('emby') as embydb: + with Database('jellyfin') as embydb: emby_db.EmbyDatabase(embydb.cursor).remove_view(view_id) self.delete_playlist_by_id(view_id) @@ -203,7 +203,7 @@ def get_views(self): self.add_library(library) - with Database('emby') as embydb: + with Database('jellyfin') as embydb: views = emby_db.EmbyDatabase(embydb.cursor).get_views() removed = [] @@ -226,7 +226,7 @@ def get_nodes(self): playlist_path = xbmc.translatePath("special://profile/playlists/video").decode('utf-8') index = 0 - with Database('emby') as embydb: + with Database('jellyfin') as embydb: db = emby_db.EmbyDatabase(embydb.cursor) for library in self.sync['Whitelist']: @@ -268,7 +268,7 @@ def add_playlist(self, path, view, mixed=False): ''' Create or update the xps file. ''' - file = os.path.join(path, "emby%s%s.xsp" % (view['Media'], view['Id'])) + file = os.path.join(path, "jellyfin%s%s.xsp" % (view['Media'], view['Id'])) try: xml = etree.parse(file).getroot() @@ -297,7 +297,7 @@ def add_nodes(self, path, view, mixed=False): ''' Create or update the video node file. ''' - folder = os.path.join(path, "emby%s%s" % (view['Media'], view['Id'])) + folder = os.path.join(path, "jellyfin%s%s" % (view['Media'], view['Id'])) if not xbmcvfs.exists(folder): xbmcvfs.mkdir(folder) @@ -311,7 +311,7 @@ def add_nodes(self, path, view, mixed=False): def add_single_node(self, path, index, item_type, view): - file = os.path.join(path, "emby_%s.xml" % view['Tag'].replace(" ", "")) + file = os.path.join(path, "jellyfin_%s.xml" % view['Tag'].replace(" ", "")) try: xml = etree.parse(file).getroot() @@ -657,7 +657,7 @@ def node_favepisodes(self, root, path): def order_media_folders(self, folders): - ''' Returns a list of sorted media folders based on the Emby views. + ''' Returns a list of sorted media folders based on the Jellyfin views. Insert them in SortedViews and remove Views that are not in media folders. ''' if not folders: @@ -677,12 +677,12 @@ def order_media_folders(self, folders): def window_nodes(self): ''' Just read from the database and populate based on SortedViews - Setup the window properties that reflect the emby server views and more. + Setup the window properties that reflect the jellyfin server views and more. ''' self.window_clear() - self.window_clear('Emby.wnodes') + self.window_clear('Jellyfin.wnodes') - with Database('emby') as embydb: + with Database('jellyfin') as embydb: libraries = emby_db.EmbyDatabase(embydb.cursor).get_views() libraries = self.order_media_folders(libraries or []) @@ -743,8 +743,8 @@ def window_nodes(self): self.window_single_node(index, "favorites", single) index += 1 - window('Emby.nodes.total', str(index)) - window('Emby.wnodes.total', str(windex)) + window('Jellyfin.nodes.total', str(index)) + window('Jellyfin.wnodes.total', str(windex)) def window_node(self, index, view, node=None, node_label=None): @@ -773,17 +773,17 @@ def window_node(self, index, view, node=None, node_label=None): if node in ('all', 'music'): - window_prop = "Emby.nodes.%s" % index + window_prop = "Jellyfin.nodes.%s" % index window('%s.index' % window_prop, path.replace('all.xml', "")) # dir window('%s.title' % window_prop, view['Name'].encode('utf-8')) window('%s.content' % window_prop, path) elif node == 'browse': - window_prop = "Emby.nodes.%s" % index + window_prop = "Jellyfin.nodes.%s" % index window('%s.title' % window_prop, view['Name'].encode('utf-8')) else: - window_prop = "Emby.nodes.%s.%s" % (index, node) + window_prop = "Jellyfin.nodes.%s.%s" % (index, node) window('%s.title' % window_prop, node_label.encode('utf-8')) window('%s.content' % window_prop, path) @@ -796,10 +796,10 @@ def window_single_node(self, index, item_type, view): ''' Single destination node. ''' - path = "library://video/emby_%s.xml" % view['Tag'].replace(" ", "") + path = "library://video/jellyfin_%s.xml" % view['Tag'].replace(" ", "") window_path = "ActivateWindow(Videos,%s,return)" % path - window_prop = "Emby.nodes.%s" % index + window_prop = "Jellyfin.nodes.%s" % index window('%s.title' % window_prop, view['Name']) window('%s.path' % window_prop, window_path) window('%s.content' % window_prop, path) @@ -825,18 +825,18 @@ def window_wnode(self, index, view, node=None, node_label=None): if node == 'all': - window_prop = "Emby.wnodes.%s" % index + window_prop = "Jellyfin.wnodes.%s" % index window('%s.index' % window_prop, path.replace('all.xml', "")) # dir window('%s.title' % window_prop, view['Name'].encode('utf-8')) window('%s.content' % window_prop, path) elif node == 'browse': - window_prop = "Emby.wnodes.%s" % index + window_prop = "Jellyfin.wnodes.%s" % index window('%s.title' % window_prop, view['Name'].encode('utf-8')) window('%s.content' % window_prop, path) else: - window_prop = "Emby.wnodes.%s.%s" % (index, node) + window_prop = "Jellyfin.wnodes.%s.%s" % (index, node) window('%s.title' % window_prop, node_label.encode('utf-8')) window('%s.content' % window_prop, path) @@ -865,7 +865,7 @@ def window_artwork(self, prop, view_id): window('%s.artwork' % prop, clear=True) def window_path(self, view, node): - return "library://video/emby%s%s/%s.xml" % (view['Media'], view['Id'], node) + return "library://video/jellyfin%s%s/%s.xml" % (view['Media'], view['Id'], node) def window_music(self, view): return "library://music/" @@ -898,7 +898,7 @@ def window_clear(self, name=None): ''' Clearing window prop setup for Views. ''' - total = int(window((name or 'Emby.nodes') + '.total') or 0) + total = int(window((name or 'Jellyfin.nodes') + '.total') or 0) props = [ "index","id","path","artwork","title","content","type" @@ -914,10 +914,10 @@ def window_clear(self, name=None): ] for i in range(total): for prop in props: - window('Emby.nodes.%s.%s' % (str(i), prop), clear=True) + window('Jellyfin.nodes.%s.%s' % (str(i), prop), clear=True) for prop in props: - window('Emby.nodes.%s' % prop, clear=True) + window('Jellyfin.nodes.%s' % prop, clear=True) def delete_playlist(self, path): @@ -926,12 +926,12 @@ def delete_playlist(self, path): def delete_playlists(self): - ''' Remove all emby playlists. + ''' Remove all jellyfin playlists. ''' path = xbmc.translatePath("special://profile/playlists/video/").decode('utf-8') _, files = xbmcvfs.listdir(path) for file in files: - if file.decode('utf-8').startswith('emby'): + if file.decode('utf-8').startswith('jellyfin'): self.delete_playlist(os.path.join(path, file.decode('utf-8'))) def delete_playlist_by_id(self, view_id): @@ -943,7 +943,7 @@ def delete_playlist_by_id(self, view_id): for file in files: file = file.decode('utf-8') - if file.startswith('emby') and file.endswith('%s.xsp' % view_id): + if file.startswith('jellyfin') and file.endswith('%s.xsp' % view_id): self.delete_playlist(os.path.join(path, file.decode('utf-8'))) def delete_node(self, path): @@ -960,12 +960,12 @@ def delete_nodes(self): for file in files: - if file.startswith('emby'): + if file.startswith('jellyfin'): self.delete_node(os.path.join(path, file.decode('utf-8'))) for directory in dirs: - if directory.startswith('emby'): + if directory.startswith('jellyfin'): _, files = xbmcvfs.listdir(os.path.join(path, directory.decode('utf-8'))) for file in files: @@ -982,7 +982,7 @@ def delete_node_by_id(self, view_id): for directory in dirs: - if directory.startswith('emby') and directory.endswith(view_id): + if directory.startswith('jellyfin') and directory.endswith(view_id): _, files = xbmcvfs.listdir(os.path.join(path, directory.decode('utf-8'))) for file in files: diff --git a/resources/lib/webservice.py b/resources/lib/webservice.py index 0561d3019..99b23c88f 100644 --- a/resources/lib/webservice.py +++ b/resources/lib/webservice.py @@ -13,7 +13,7 @@ ################################################################################################# PORT = 57578 -LOG = logging.getLogger("EMBY."+__name__) +LOG = logging.getLogger("JELLYFIN."+__name__) ################################################################################################# diff --git a/resources/settings.xml b/resources/settings.xml index 3cec88c26..dff56dec1 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -1,8 +1,8 @@ - - + + diff --git a/resources/skins/default/1080i/script-emby-connect-login-manual.xml b/resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-connect-login-manual.xml rename to resources/skins/default/1080i/script-jellyfin-connect-login-manual.xml diff --git a/resources/skins/default/1080i/script-emby-connect-login.xml b/resources/skins/default/1080i/script-jellyfin-connect-login.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-connect-login.xml rename to resources/skins/default/1080i/script-jellyfin-connect-login.xml diff --git a/resources/skins/default/1080i/script-emby-connect-server-manual.xml b/resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-connect-server-manual.xml rename to resources/skins/default/1080i/script-jellyfin-connect-server-manual.xml diff --git a/resources/skins/default/1080i/script-emby-connect-server.xml b/resources/skins/default/1080i/script-jellyfin-connect-server.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-connect-server.xml rename to resources/skins/default/1080i/script-jellyfin-connect-server.xml diff --git a/resources/skins/default/1080i/script-emby-connect-users.xml b/resources/skins/default/1080i/script-jellyfin-connect-users.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-connect-users.xml rename to resources/skins/default/1080i/script-jellyfin-connect-users.xml diff --git a/resources/skins/default/1080i/script-emby-context.xml b/resources/skins/default/1080i/script-jellyfin-context.xml similarity index 100% rename from resources/skins/default/1080i/script-emby-context.xml rename to resources/skins/default/1080i/script-jellyfin-context.xml diff --git a/resources/skins/default/1080i/script-emby-resume.xml b/resources/skins/default/1080i/script-jellyfin-resume.xml similarity index 95% rename from resources/skins/default/1080i/script-emby-resume.xml rename to resources/skins/default/1080i/script-jellyfin-resume.xml index 2d8d591a2..0443877b3 100644 --- a/resources/skins/default/1080i/script-emby-resume.xml +++ b/resources/skins/default/1080i/script-jellyfin-resume.xml @@ -51,8 +51,8 @@ 100% 25 keep - $INFO[Window(Home).Property(EmbyUserImage)] - !String.IsEmpty(Window(Home).Property(EmbyUserImage)) + $INFO[Window(Home).Property(JellyfinUserImage)] + !String.IsEmpty(Window(Home).Property(JellyfinUserImage)) 20 @@ -60,7 +60,7 @@ 25 keep userflyoutdefault.png - String.IsEmpty(Window(Home).Property(EmbyUserImage)) + String.IsEmpty(Window(Home).Property(JellyfinUserImage)) diff --git a/service.py b/service.py index 64dfc5957..ccd53d0bf 100644 --- a/service.py +++ b/service.py @@ -16,8 +16,8 @@ __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') -__cache__ = xbmc.translatePath('special://temp/emby').decode('utf-8') +__pcache__ = xbmc.translatePath(os.path.join(__addon__.getAddonInfo('profile'), 'jellyfin')).decode('utf-8') +__cache__ = xbmc.translatePath('special://temp/jellyfin').decode('utf-8') sys.path.insert(0, __libraries__) @@ -38,7 +38,7 @@ ################################################################################################# -LOG = logging.getLogger("EMBY.service") +LOG = logging.getLogger("JELLYFIN.service") DELAY = int(settings('startupDelay') if settings('SyncInstallRunDone.bool') else 4 or 0) ################################################################################################# @@ -85,7 +85,7 @@ def run(self): while True: if not settings('enableAddon.bool'): - LOG.warn("Emby for Kodi is not enabled.") + LOG.warn("Jellyfin for Kodi is not enabled.") break