Merge pull request #176 from angelblue05/develop

Version bump 3.1.46

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.emby"
         name="Emby" 
-        version="3.1.45a"
+        version="3.1.46a"
         provider-name="angelblue05">
   <requires>
     <import addon="xbmc.python" version="2.25.0"/>
@@ -37,9 +37,10 @@
     <summary lang="en"></summary>
     <description lang="en">Welcome to Emby for Kodi A whole new way to manage and view your media library. The Emby addon for Kodi combines the best of Kodi - ultra smooth navigation, beautiful UIs and playback of any file under the sun, and Emby - the most powerful fully open source multi-client media metadata indexer and server.&#10;&#10;Emby for Kodi is the absolute best way to enjoy the incredible Kodi playback engine combined with the power of Emby's centralized database. Features: Direct integration with the Kodi library for native Kodi speed Instant synchronization with the Emby server Full support for Movie, TV and Music collections Emby Server direct stream and transcoding support - use Kodi when you are away from home!</description>
     <news>
-      - Move to strm in effect, please repair your movies, series, music video libraries or reset your local database.
+      Fastly approaching stable, please report on the Emby for Kodi forums if you experience issues with this version!
-      - All library options have to moved under Manage libraries to declutter the main listing.
+      - Rework database discovery
-      - Fix some playback issues, if you are having difficulties, try repairing your library once more to be safe.
+      - Fix special seasons
+      - Fix playback
     </news>
   </extension>
 </addon>

resources/language/resource.language.nl_nl/strings.po

@@ -280,7 +280,7 @@ msgstr "Bevestigen verwijderen overslaan (gebruik op eigen risico)"
 
 msgctxt "#30521"
 msgid "Jump back on resume (in seconds)"
-msgstr ""
+msgstr "Bij hervatten kort terug spoelen (in seconden)"
 
 msgctxt "#30522"
 msgid "Transcode H265/HEVC"
@@ -486,7 +486,7 @@ msgstr "Add-on (standaard)"
 
 msgctxt "#33037"
 msgid "Native (direct paths)"
-msgstr ""
+msgstr "Native (direct paths)"
 
 msgctxt "#33039"
 msgid "Enable music library?"
@@ -609,6 +609,8 @@ msgid ""
 "Since you are using native playback mode with music enabled, do you want to "
 "import music rating from files?"
 msgstr ""
+"Aangezien u native afspeel modus gebruikt met muziek ingeschakeld, wilt u de"
+" muziek rating van bestanden importeren?"
 
 msgctxt "#33102"
 msgid "Resume the previous sync?"
@@ -628,7 +630,7 @@ msgstr ""
 
 msgctxt "#33105"
 msgid "Enable the context menu"
-msgstr ""
+msgstr "Context menu inschakelen"
 
 msgctxt "#33106"
 msgid "Enable the option to transcode"
@@ -658,14 +660,15 @@ msgstr "Start Kodi opnieuw op."
 msgctxt "#33111"
 msgid "Reset the local database to apply the playback mode change."
 msgstr ""
+"Reset de lokale databank om de wissel van afspeel modus toe te passen."
 
 msgctxt "#33112"
 msgid "Applies to Native and Add-on playback mode"
-msgstr ""
+msgstr "Is van toepassing op Native en add-on afspeel modus"
 
 msgctxt "#33113"
 msgid "Applies to Add-on playback mode only"
-msgstr ""
+msgstr "Wordt alleen toegepast op Add-on afspeel modus"
 
 msgctxt "#33114"
 msgid "Enable external subtitles"
@@ -673,7 +676,7 @@ msgstr "Schakel externe ondertitels in"
 
 msgctxt "#33115"
 msgid "Adjust for remote connection"
-msgstr ""
+msgstr "Pas aan voor verbindingen op afstand"
 
 msgctxt "#33116"
 msgid "Compress artwork (reduces quality)"
@@ -684,12 +687,15 @@ msgid ""
 "Enable artwork caching? If not, Kodi will still cache your artwork at a "
 "slower pace."
 msgstr ""
+"Artwork caching inschakelen? Uitgeschakeld cached Kodi uw artwork langzamer."
 
 msgctxt "#33118"
 msgid ""
 "You've change the playback mode. Kodi needs to be reset to apply the change,"
 " would you like to do this now?"
 msgstr ""
+"u heeft de afspeel modus gewijzigd. Kodi opnieuw opstarten om de verandering"
+" toe te passen. Wilt u nu opnieuw opstarten?"
 
 msgctxt "#33119"
 msgid ""
@@ -697,6 +703,9 @@ msgid ""
 "when restarting Kodi. If the problem persists, please report on the Emby 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."
 
 msgctxt "#33120"
 msgid "Select the libraries to add"
@@ -708,21 +717,23 @@ msgstr "Alle"
 
 msgctxt "#33122"
 msgid "Restart Kodi to resume where you left off."
-msgstr ""
+msgstr "Start Kodi opnieuw op om verder te gaan waar u gebleven was."
 
 msgctxt "#33123"
 msgid "Sync library to Kodi"
-msgstr ""
+msgstr "Synchroniseer bibliotheek naar Kodi"
 
 msgctxt "#33124"
 msgid "Include people (slow)"
-msgstr ""
+msgstr "Mensen meerekenen (langzaam)"
 
 msgctxt "#33125"
 msgid ""
 "Choose the Emby 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 "
+"bibliotheken optioneel synchroniseren."
 
 msgctxt "#33126"
 msgid "Sync later"
@@ -738,10 +749,15 @@ msgid ""
 "applied until Kodi is restarted. If this issue persists, please report on "
 "the Emby 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."
 
 msgctxt "#33129"
 msgid "You can sync libraries by launching the Emby add-on > Add libraries."
 msgstr ""
+"U kunt bibliotheken synchroniseren door de Emby add-on > bibliotheken "
+"toevoegen te starten."
 
 msgctxt "#33130"
 msgid "Select the source"
@@ -749,7 +765,7 @@ msgstr "Bron selecteren"
 
 msgctxt "#33131"
 msgid "Refreshing boxsets"
-msgstr ""
+msgstr "Boxsets vernieuwen"
 
 msgctxt "#33132"
 msgid "Repair library"
@@ -783,6 +799,9 @@ msgid ""
 "Kodi companion. Launch the add-on and update libraries (or per library). To "
 "remove content, you'll need to repair the library."
 msgstr ""
+"U kunt uw bibliotheek manueel updaten in plaats van op de server plugin Kodi"
+" companion te vertrouwen. Start de add-on en update bibliotheken (of per "
+"bibliotheek). Om inhoud te verwijderen moet u de blibliotheek repareren."
 
 msgctxt "#33139"
 msgid "Update libraries"
@@ -814,6 +833,9 @@ msgid ""
 " 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"
+" 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."
@@ -847,7 +869,7 @@ msgstr ""
 
 msgctxt "#33152"
 msgid "Unable to locate TV Tunes in Kodi."
-msgstr ""
+msgstr "Niet in staat om TV Tunes in Kodi te vinden."
 
 msgctxt "#33153"
 msgid "Your Emby theme media has been synced to Kodi"
@@ -863,6 +885,9 @@ msgid ""
 "the Emby 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 "
+"snel als mogelijk verholpen worden."
 
 msgctxt "#33156"
 msgid "A patch has been applied!"
@@ -899,6 +924,7 @@ msgstr "Dit project ondersteunen"
 msgctxt "#33164"
 msgid "Mask sensitive information in log (does not apply to kodi logging)"
 msgstr ""
+"Gevoelige informatie in log verbergen (wordt niet toegepast op Kodi log)"
 
 msgctxt "#33165"
 msgid "Failed to create backup"
@@ -918,7 +944,7 @@ msgstr "Favorieten"
 
 msgctxt "#33169"
 msgid "In Progress"
-msgstr ""
+msgstr "In bewerking"
 
 msgctxt "#33170"
 msgid "Unwatched"
@@ -926,7 +952,7 @@ msgstr "Niet bekeken"
 
 msgctxt "#33171"
 msgid "By first letter"
-msgstr ""
+msgstr "Op eerste letter"
 
 msgctxt "#33172"
 msgid ""
@@ -934,28 +960,35 @@ msgid ""
 "seeing new content. It might be faster to update your libraries via "
 "launching the Emby 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?"
 
 msgctxt "#33173"
 msgid "Forget about the previous sync? This is not recommended."
-msgstr ""
+msgstr "Vorige synchronisatie vergeten? Dit is niet aanbevolen."
 
 msgctxt "#33174"
 msgid "Paging - download threads (default: 3)"
-msgstr ""
+msgstr "Paging - download threads (standaard: 3)"
 
 msgctxt "#33175"
 msgid ""
 "Paging tip: Each download thread requests your max items value from Emby at "
 "the same time."
 msgstr ""
+"Paging tip: Elke download thread vraagt naar uw maximum items waarde by Emby"
+" op hetzelfde moment."
 
 msgctxt "#33176"
 msgid "Update or repair your libraries to apply the changes below."
 msgstr ""
+"Update of herstel uw bibliotheken om onderstaande veranderingen toe te "
+"passen."
 
 msgctxt "#33177"
 msgid "Display the progress bar if update count greater than"
-msgstr ""
+msgstr "Toon de voortgangsbalk als het aantal updates groter is dan"
 
 msgctxt "#33178"
 msgid "Processing updates"
@@ -971,7 +1004,7 @@ msgstr "Emby for Kodi opnieuw starten"
 
 msgctxt "#33181"
 msgid "Restarting to apply the patch"
-msgstr ""
+msgstr "Er wordt opnieuw opgestart om de patch toe te passen"
 
 msgctxt "#33182"
 msgid "Play with cinema mode"
@@ -994,6 +1027,8 @@ msgid ""
 "The Kodi companion speeds up the start up sync. Other syncs are triggered by"
 " server events."
 msgstr ""
+"De Kodi companion maakt het opstarten van de synchronisatie sneller. Andere "
+"synchronisaties worden aangeroepen door server voorvallen."
 
 msgctxt "#33187"
 msgid "Sync Rotten Tomatoes ratings"
@@ -1005,7 +1040,7 @@ msgstr "Rotten Tomatoes ratings synchroniseren?"
 
 msgctxt "#33191"
 msgid "Restart Emby for Kodi to apply this change?"
-msgstr ""
+msgstr "Emby for Kodi opnieuw opstarten om de wijziging toe te passen?"
 
 msgctxt "#33192"
 msgid "Restart Emby for Kodi"
@@ -1013,4 +1048,16 @@ msgstr "Emby for Kodi opnieuw starten"
 
 msgctxt "#33193"
 msgid "Restarting..."
+msgstr "Opnieuw opstarten..."
+
+msgctxt "#33194"
+msgid "Manage libraries"
+msgstr "Bibliotheken beheren"
+
+msgctxt "#33195"
+msgid "Enable Emby for Kodi"
+msgstr ""
+
+msgctxt "#33196"
+msgid "Advanced options"
 msgstr ""

resources/language/resource.language.pl_pl/strings.po

@@ -360,7 +360,7 @@ msgstr "Hasło"
 
 msgctxt "#30605"
 msgid "Sign in"
-msgstr "Zalogu"
+msgstr "Zaloguj"
 
 msgctxt "#30606"
 msgid "Cancel"
@@ -461,6 +461,8 @@ msgstr ""
 msgctxt "#33023"
 msgid "Emby 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 "
+"zresetowana."
 
 msgctxt "#33025"
 msgid "Completed in:"
@@ -1033,7 +1035,7 @@ msgstr "Czy synchronizować ocenę z Rotten Tomatoes?"
 
 msgctxt "#33191"
 msgid "Restart Emby for Kodi to apply this change?"
-msgstr ""
+msgstr "Zrestartować Emby dla Kodi by zaaplikować tę zmianę?"
 
 msgctxt "#33192"
 msgid "Restart Emby for Kodi"
@@ -1041,4 +1043,16 @@ msgstr "Zrestartuj Emby dla Kodi"
 
 msgctxt "#33193"
 msgid "Restarting..."
+msgstr "Restartowanie..."
+
+msgctxt "#33194"
+msgid "Manage libraries"
+msgstr "Zarządzaj bibliotekami"
+
+msgctxt "#33195"
+msgid "Enable Emby for Kodi"
+msgstr ""
+
+msgctxt "#33196"
+msgid "Advanced options"
 msgstr ""

resources/lib/objects/__init__.py

@@ -1,4 +1,4 @@
-version = "171076027"
+version = "171076028"
 
 from movies import Movies
 from musicvideos import MusicVideos

resources/lib/objects/actions.py

@@ -253,7 +253,7 @@ class Actions(object):
             if intro:
                 obj['Artwork']['Primary'] = "&KodiCinemaMode=true"
 
-            self.listitem_video(obj, listitem, item, seektime)
+            self.listitem_video(obj, listitem, item, seektime, intro)
 
             if 'PlaybackInfo' in item:
 
@@ -278,7 +278,7 @@ class Actions(object):
 
         listitem.setContentLookup(False)
 
-    def listitem_video(self, obj, listitem, item, seektime=None):
+    def listitem_video(self, obj, listitem, item, seektime=None, intro=False):
 
         ''' Set listitem for video content. That also include streams.
         '''
@@ -311,7 +311,7 @@ class Actions(object):
         obj['Artwork']['Backdrop'] = obj['Artwork']['Backdrop'] or []
         obj['Artwork']['Thumb'] = obj['Artwork']['Thumb'] or ""
 
-        if obj['Type'] == 'Video' and not obj['Type'] == 'Trailer':
+        if not intro and not obj['Type'] == 'Trailer':
             obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or "special://home/addons/plugin.video.emby/icon.png"
         else:
             obj['Artwork']['Primary'] = obj['Artwork']['Primary'] or obj['Artwork']['Thumb'] or (obj['Artwork']['Backdrop'][0] if len(obj['Artwork']['Backdrop']) else "special://home/addons/plugin.video.emby/fanart.jpg")
@@ -320,7 +320,7 @@ class Actions(object):
 
         self.set_artwork(obj['Artwork'], listitem, obj['Type'])
 
-        if obj['Type'] == 'Video' or obj['Type'] == 'Trailer':
+        if intro or obj['Type'] == 'Trailer':
             listitem.setArt({'poster': ""}) # Clear the poster value for intros / trailers to prevent issues in skins
 
         listitem.setIconImage('DefaultVideo.png')

resources/lib/objects/obj.py

@@ -100,7 +100,7 @@ class Objects(object):
                     if not self.__filters__(obj, obj_filters):
                         obj = None
 
-                if not obj and len(params) != params.index(param):
+                if obj is None and len(params) != params.index(param):
                     continue
 
                 if obj_key: