Merge remote-tracking branch 'origin/encoder-decoder' into encoder-decoder

Author: Berfre

src/vsmetaCodec/vsmetaBase.py

@@ -162,7 +162,7 @@ def _writePoster(self):
             image_str = self.b64encodeImage(episode_img.image, episode_img.b64LastCharIsNewLine)
             self.encContent.writeTag(int(index + 1).to_bytes(1, 'big'), image_str)
             self.encContent.writeTag(self.TAG_EPISODE_THUMB_MD5)
-            self.encContent.writeTag(int(index + 1).to_bytes(1, 'big'), episode_img.calcHashMd5Hex())
+            self.encContent.writeTag(int(index + 1).to_bytes(1, 'big'), episode_img.md5str)
 
     def _writeGroup1(self):
         # group 1 payload
@@ -200,7 +200,7 @@ def _writeGroup2(self):
         image_bytes = None if img_info is None else img_info.image
         if image_bytes is not None and len(image_bytes) > 0:
             grp2_content.writeTag(self.TAG2_POSTER_DATA, self.b64encodeImage(image_bytes))
-            grp2_content.writeTag(self.TAG2_POSTER_MD5, img_info.calcHashMd5Hex())
+            grp2_content.writeTag(self.TAG2_POSTER_MD5, img_info.md5str)
 
         if len(self.info.tvshowMetaJson) > 0:
             grp2_content.writeTag(self.TAG2_TVSHOW_META_JSON, self.info.tvshowMetaJson)
@@ -226,7 +226,7 @@ def _writeGroup3(self) -> VsMetaCode:
             # group 3 payload = backdrop_data, backdrop_MD5, timestamp
             image_str = self.b64encodeImage(img_info.image, img_info.b64LastCharIsNewLine)
             grp3_content.writeTag(self.TAG3_BACKDROP_DATA, image_str)
-            grp3_content.writeTag(self.TAG3_BACKDROP_MD5, img_info.calcHashMd5Hex())
+            grp3_content.writeTag(self.TAG3_BACKDROP_MD5, img_info.md5str)
             grp3_content.writeTag(self.TAG3_TIMESTAMP, int(self.info.timestamp))
 
         return grp3_content     # return the grp3_content (it might be empty!)

src/vsmetaCodec/vsmetaDecoder.py

@@ -62,9 +62,9 @@ def _readVsMetaEncoded(self, code: VsMetaCode) -> int:
                 (episode_img.image,
                  episode_img.b64LastCharIsNewLine) = code.readImage()
             elif tag == self.TAG_EPISODE_THUMB_MD5:
-                if code.readInt(1) != 1:    # index value, not used and not stored
-                    raise Exception("Index of episode_thumb_md5 is not \\x01 !")
-                episode_img.md5str = code.readString()
+                code.readInt(1)             # index value, not used and not stored
+                if code.readString() != episode_img.md5str:
+                    raise Exception("vsmeta md5-hash for episodeImage doesn't match with image byte-string!")
                 self.info.episodeImageInfo.append(episode_img)
             else:
                 code.dumpData(32)
@@ -111,7 +111,8 @@ def _readGroup2(self, code: VsMetaCode) -> int:
                 (self.info.posterImageInfo.image,
                  self.info.posterImageInfo.b64LastCharIsNewLine) = code.readImage()
             elif tag == self.TAG2_POSTER_MD5:
-                self.info.posterImageInfo.md5str = code.readString()
+                if code.readString() != self.info.posterImageInfo.md5str:
+                    raise Exception("vsmeta md5-hash for poster image doesn't match with image byte-string!")
             elif tag == self.TAG2_TVSHOW_META_JSON:
                 self.info.tvshowMetaJson = code.readString()
             elif tag == self.TAG2_GROUP3:
@@ -131,7 +132,8 @@ def _readGroup3(self, code: VsMetaCode) -> int:
                 (self.info.backdropImageInfo.image,
                  self.info.backdropImageInfo.b64LastCharIsNewLine) = code.readImage()
             elif tag == self.TAG3_BACKDROP_MD5:
-                self.info.backdropImageInfo.md5str = code.readString()
+                if code.readString() != self.info.backdropImageInfo.md5str:
+                    raise Exception("vsmeta md5-hash for backdrop image doesn't match with image byte-string!")
             elif tag == self.TAG3_TIMESTAMP:
                 self.info.timestamp = code.readTimeStamp()
             else:

src/vsmetaCodec/vsmetaInfo.py

@@ -6,13 +6,18 @@
 
 class VsMetaImageInfo:
     def __init__(self):
+        self.md5str = ""      # assign before self.image is assigned, because of @image.setter assignment
         self.image = bytes()  # ByteString
-        self.md5str = ""
         self.b64LastCharIsNewLine = False
 
-    def calcHashMd5Hex(self) -> str:
-        self.md5str = hashlib.md5(self.image).hexdigest()
-        return self.md5str
+    @property
+    def image(self) -> bytes:
+        return self._image
+
+    @image.setter
+    def image(self, new_image: bytes):
+        self._image = new_image
+        self.md5str = hashlib.md5(new_image).hexdigest()
 
 
 class VsMetaListInfo: