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

Author: Berfre

src/vsmetaCodec/vsmetaBase.py

@@ -84,9 +84,6 @@ def _writeEncodedContent(self):
 
         return
 
-    def contentHashMd5Hex(self) -> str:
-        return self.encContent.hashMd5Hex()
-
     def writeVsMetaFile(self, file_path: str):
         self.encContent.writeToFile(file_path)
 
@@ -184,7 +181,7 @@ def _writeGroup2(self):
         if len(self.info.tvshowSummary) > 0:
             grp2_content.writeTag(self.TAG2_TVSHOW_SUMMARY, self.info.tvshowSummary)
 
-        image_bytes = None if self.info.posterImage is None else self.info.posterImage.image
+        image_bytes = None if self.info.posterImageInfo is None else self.info.posterImageInfo.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, self.calcMD5(image_bytes))

src/vsmetaCodec/vsmetaCode.py

@@ -1,5 +1,4 @@
-from datetime import date   # , datetime,  timezone
-import hashlib
+from datetime import date
 import base64
 
 
@@ -14,9 +13,6 @@ def __len__(self) -> int:
     def data(self) -> bytes:
         return self._data
 
-    def hashMd5Hex(self) -> str:
-        return hashlib.md5(self._data).hexdigest()
-
     def writeToFile(self, file_path: str):
         if len(self._data) > 0:
             with open(file_path, "wb") as f_vsmeta:
@@ -96,7 +92,7 @@ def writeTag(self, tag: bytes, value=None):  # , int_bytes: int = 0, signed: boo
             return
         # write content
         if type(value) is int:
-            self._data += self.calcSpecialInt(value)
+            self._data += self.specialInt(value)
         elif type(value) is str:
             self.writeStr(value)
         elif type(value) is date:
@@ -114,7 +110,7 @@ def writeStr(self, text: str, with_bom: bool = False):
         # byteOrderMark \xEF\xBB\xBF is written automatically when using utf-8-sig.
         encoding = 'utf-8-sig' if with_bom else 'utf-8'
         text_bytes = bytes(text, encoding)
-        self._data += self.calcSpecialInt(len(text_bytes)) + text_bytes
+        self._data += self.specialInt(len(text_bytes)) + text_bytes
 
     def _writeDate(self, date_value: date):
         # length of date string: x0a = 10
@@ -127,11 +123,11 @@ def _writeBytes(self, byte_value: bytes):
         self._data += byte_value
 
     def _writeContent(self, value):
-        self._data += self.calcSpecialInt(len(value)) + value.data()
+        self._data += self.specialInt(len(value)) + value.data()
 
     # --------------- public methods which don't access self._data as of here ----------------
     @staticmethod
-    def calcSpecialInt(num: int) -> bytes:
+    def specialInt(num: int) -> bytes:
         if num < 0:
             return b'\x00'          # may be better to raise an exception here ?!
         return_value = b''

src/vsmetaCodec/vsmetaDecoder.py

@@ -100,7 +100,7 @@ def _readGroup1(self, code: VsMetaCode) -> int:
         return code.byteCountAhead()
 
     def _readGroup2(self, code: VsMetaCode) -> int:
-        self.info.posterImage = VsMetaImageInfo()
+        self.info.posterImageInfo = VsMetaImageInfo()
         while code.byteCountAhead() > 0:
             tag = code.readTag()
             if tag == self.TAG2_SEASON:
@@ -116,10 +116,10 @@ def _readGroup2(self, code: VsMetaCode) -> int:
             elif tag == self.TAG2_TVSHOW_SUMMARY:
                 self.info.tvshowSummary = code.readString()
             elif tag == self.TAG2_POSTER_DATA:
-                (self.info.posterImage.image,
-                 self.info.posterImage.b64LastCharIsNewLine) = code.readImage()
+                (self.info.posterImageInfo.image,
+                 self.info.posterImageInfo.b64LastCharIsNewLine) = code.readImage()
             elif tag == self.TAG2_POSTER_MD5:
-                self.info.posterImage.md5str = code.readString()
+                self.info.posterImageInfo.md5str = code.readString()
             elif tag == self.TAG2_TVSHOW_META_JSON:
                 self.info.tvshowMetaJson = code.readString()
             elif tag == self.TAG2_GROUP3:

src/vsmetaCodec/vsmetaInfo.py

@@ -1,5 +1,6 @@
 import textwrap
 import json
+import hashlib
 from datetime import date, datetime
 
 
@@ -9,6 +10,10 @@ def __init__(self):
         self.md5str = ""
         self.b64LastCharIsNewLine = False
 
+    def calcHashMd5Hex(self) -> str:
+        self.md5str = hashlib.md5(self.image).hexdigest()
+        return self.md5str
+
 
 class VsMetaListInfo:
     def __init__(self):
@@ -48,7 +53,7 @@ def __init__(self):
         self.tvshowReleaseDate = date(1900, 1, 1)
         self.tvshowLocked = True
         self.tvshowSummary = ""
-        self.posterImage = VsMetaImageInfo()
+        self.posterImageInfo = VsMetaImageInfo()
         self.tvshowMetaJson = "null"
 
         # Group3 Information: