Merge pull request #854 from oddstr13/fix-852-1

Add version gate to strHdrType field
jellyfin · Apr 9, 2024 · 64d8ebc · 64d8ebc
2 parents b585377 + 842729b
commit 64d8ebc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/jellyfin_kodi/objects/kodi/kodi.py b/jellyfin_kodi/objects/kodi/kodi.py
@@ -3,7 +3,7 @@
 
 ##################################################################################################
 
-from ...helper import values, LazyLogger
+from ...helper import values, LazyLogger, kodi_version
 
 from . import artwork
 from . import queries as QU
@@ -241,7 +241,10 @@ def add_streams(self, file_id, streams, runtime):
 
                 track['FileId'] = file_id
                 track['Runtime'] = runtime
-                self.add_stream_video(*values(track, QU.add_stream_video_obj))
+                if kodi_version() < 20:
+                    self.add_stream_video(*values(track, QU.add_stream_video_obj_19))
+                else:
+                    self.add_stream_video(*values(track, QU.add_stream_video_obj))
 
             for track in streams['audio']:
 
@@ -252,7 +255,10 @@ def add_streams(self, file_id, streams, runtime):
                 self.add_stream_sub(*values({'language': track, 'FileId': file_id}, QU.add_stream_sub_obj))
 
     def add_stream_video(self, *args):
-        self.cursor.execute(QU.add_stream_video, args)
+        if kodi_version() < 20:
+            self.cursor.execute(QU.add_stream_video_19, args)
+        else:
+            self.cursor.execute(QU.add_stream_video, args)
 
     def add_stream_audio(self, *args):
         self.cursor.execute(QU.add_stream_audio, args)

diff --git a/jellyfin_kodi/objects/kodi/queries.py b/jellyfin_kodi/objects/kodi/queries.py
@@ -262,6 +262,13 @@
 VALUES          (?, ?, ?, ?, ?, ?, ?, ?, ?)
 """
 add_stream_video_obj = ["{FileId}", 0, "{codec}", "{aspect}", "{width}", "{height}", "{Runtime}", "{3d}", "{hdrtype}"]
+# strHdrType is new to Kodi 20
+add_stream_video_19 = """
+INSERT INTO     streamdetails(idFile, iStreamType, strVideoCodec, fVideoAspect, iVideoWidth,
+                iVideoHeight, iVideoDuration, strStereoMode)
+VALUES          (?, ?, ?, ?, ?, ?, ?, ?)
+"""
+add_stream_video_obj_19 = ["{FileId}", 0, "{codec}", "{aspect}", "{width}", "{height}", "{Runtime}", "{3d}"]
 add_stream_audio = """
 INSERT INTO     streamdetails(idFile, iStreamType, strAudioCodec, iAudioChannels, strAudioLanguage)
 VALUES          (?, ?, ?, ?, ?)