9.4.21, review changelog for details

MediaBrowser · Apr 21, 2024 · b1f9dd8 · b1f9dd8
1 parent a6372ad
commit b1f9dd8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' standalone="yes"?>
-<addon id="plugin.video.emby-next-gen" name="Emby for Kodi Next Gen" version="9.4.20" provider-name="quickmic, angelblue05, sualfred">
+<addon id="plugin.video.emby-next-gen" name="Emby for Kodi Next Gen" version="9.4.21" provider-name="quickmic, angelblue05, sualfred">
     <requires>
         <import addon="xbmc.python" version="3.0.1"/>
         <import addon="script.module.requests" version="2.22.0" />

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,10 @@
+9.4.21
+=============
+fix multiversion episode delete issue
+fix strm file issue
+fix websocket close issue
+
+
 9.4.20
 =============
 fix 'FreeTypeFont' object has no attribute 'getsize' -> python pillow api change

diff --git a/core/common.py b/core/common.py
@@ -171,6 +171,7 @@ def get_path(Item, ServerId):
     ForceNativeMode = False
     KodiPathLower = Item['KodiPath'].lower()
     Container = Item.get('Container', "")
+    Item['KodiFilteredFilename'] = utils.PathToFilenameReplaceSpecialCharecters(Item['KodiPath']).replace("-", "_").replace(" ", "_")
 
     if Container == 'dvd':
         Item['KodiPath'] += "/VIDEO_TS/"
@@ -251,10 +252,8 @@ def get_filename(Item, API):
         if int(Item['SpecialFeatureCount']):
             HasSpecials = "s"
 
-    FilteredFilename = utils.PathToFilenameReplaceSpecialCharecters(Item['Path']).replace("-", "_").replace(" ", "_")
-
     if Item['Type'] == "Audio":
-        Item['KodiFilename'] = f"a-{Item['Id']}-{FilteredFilename}"
+        Item['KodiFilename'] = f"a-{Item['Id']}-{Item['KodiFilteredFilename']}"
         return
 
     VideoBitrate, VideoCodec = get_Bitrate_Codec(Item, "Video")
@@ -266,7 +265,7 @@ def get_filename(Item, API):
     else:
         IsRemote = "0"
 
-    Item['KodiFilename'] = f"{MediaID}-{Item['Id']}-{Item['MediaSources'][0]['Id']}-{Item['KodiItemId']}-{Item['KodiFileId']}-{Item['Streams'][0]['HasExternalSubtitle']}-{len(Item['MediaSources'])}-{Item['IntroStartPositionTicks']}-{Item['IntroEndPositionTicks']}-{Item['CreditsPositionTicks']}-{IsRemote}-{VideoCodec}-{VideoBitrate}-{AudioCodec}-{AudioBitrate}-{HasSpecials}-{FilteredFilename}"
+    Item['KodiFilename'] = f"{MediaID}-{Item['Id']}-{Item['MediaSources'][0]['Id']}-{Item['KodiItemId']}-{Item['KodiFileId']}-{Item['Streams'][0]['HasExternalSubtitle']}-{len(Item['MediaSources'])}-{Item['IntroStartPositionTicks']}-{Item['IntroEndPositionTicks']}-{Item['CreditsPositionTicks']}-{IsRemote}-{VideoCodec}-{VideoBitrate}-{AudioCodec}-{AudioBitrate}-{HasSpecials}-{Item['KodiFilteredFilename']}"
     set_multipart(Item, API, MediaID)
 
 # Detect Multipart videos

diff --git a/database/emby_db.py b/database/emby_db.py
@@ -975,6 +975,8 @@ def add_multiversion(self, item, EmbyType, API, SQLs):
                     xbmc.log(f"EMBY.database.emby_db: Multiversion video detected, referenced item not found: {DataSource['Id']}", 0) # LOGDEBUG
                     continue
 
+                common.get_PresentationUniqueKey(ItemReferenced)
+
                 if item['Id'] != ItemReferenced['Id']:
                     KodiIds = self.get_item_by_id(ItemReferenced['Id'], None)
 

diff --git a/hooks/websocket.py b/hooks/websocket.py
@@ -56,16 +56,16 @@ def close(self, Terminate=True):
 
         if self.sock:
             xbmc.log(f"Emby.hooks.websocket: Close connection {self.EmbyServer.ServerData['ServerId']} / {self.EmbyServer.ServerData['ServerName']}", 1) # LOGINFO
-            self.sock.settimeout(1)
-            self.sendCommands(struct.pack('!H', 1000), 0x8)
 
             try:
+                self.sock.settimeout(1)
+                self.sendCommands(struct.pack('!H', 1000), 0x8)
                 self.sock.shutdown(_socket.SHUT_RDWR)
+                self.sock.close()
+                self.sock = None
             except Exception as error:
                 xbmc.log(f"Emby.hooks.websocket: {error}", 3) # LOGERROR
 
-            self.sock.close()
-            self.sock = None
             self._recv_buffer = ()
             self._frame_header = None
             self._frame_length = None