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

Author: Berfre

src/vsmetaCodec/vsmetaBase.py

@@ -202,7 +202,7 @@ def _writeGroup2(self):
             grp2_content.writeTag(self.TAG2_POSTER_DATA, self.b64encodeImage(image_bytes))
             grp2_content.writeTag(self.TAG2_POSTER_MD5, img_info.md5str)
 
-        if len(self.info.tvshowMetaJson) > 0:
+        if self.info.tvshowMetaJson is not None and len(self.info.tvshowMetaJson) > 0:
             grp2_content.writeTag(self.TAG2_TVSHOW_META_JSON, self.info.tvshowMetaJson)
 
         grp3_content = VsMetaBase._writeGroup3(self)    # call the base-class implementation directly, because

src/vsmetaCodec/vsmetaCode.py

@@ -76,7 +76,7 @@ def readVsData(self) -> 'VsMetaCode':
 
     def readImage(self) -> (bytes, bool):
         image_str = self._readData(self.readSpecialInt())
-        last_char_is_newline = (image_str[-1] == b'\n')
+        last_char_is_newline = (image_str[-1] == b'\n'[0])    # 10 represents '\n'
         return base64.decodebytes(image_str), last_char_is_newline
 
     def dumpData(self, num_bytes: int) -> None:

src/vsmetaCodec/vsmetaInfo.py

@@ -41,7 +41,7 @@ def __init__(self):
         self.episodeLocked = True
 
         self.chapterSummary = ""
-        self.episodeMetaJson = "null"       # Berfre: correct initialization for an 'empty json string'
+        self.episodeMetaJson = "null"       # VsMetaInfo internally stores serialized json string
         self.tmdbReference = {}             # convenience dictionary to access tmdb-id and imdb-id
 
         self.classification = ""
@@ -82,6 +82,17 @@ def episodeReleaseDate(self, release_date: str | date):
     def setEpisodeDate(self, episode_date: str | date):
         self.episodeReleaseDate = episode_date
 
+    @property
+    def episodeMetaJson(self) -> str:
+        return self._episodeMetaJson
+
+    @episodeMetaJson.setter
+    def episodeMetaJson(self, meta_json: dict | str):
+        if type(meta_json) is dict:
+            self._episodeMetaJson = json.dumps(meta_json, separators=(',', ':'))
+        elif type(meta_json) is str:
+            self._episodeMetaJson = meta_json
+
     @property
     def tvshowReleaseDate(self) -> date:
         return self._tvshowReleaseDate
@@ -100,6 +111,17 @@ def tvshowReleaseDate(self, release_date: str | date):
     def setShowDate(self, show_date: str | date):
         self.tvshowReleaseDate = show_date
 
+    @property
+    def tvshowMetaJson(self) -> str:
+        return self._tvshowMetaJson
+
+    @tvshowMetaJson.setter
+    def tvshowMetaJson(self, meta_json: dict | str):
+        if type(meta_json) is dict:
+            self._tvshowMetaJson = json.dumps(meta_json, separators=(',', ':'))
+        elif type(meta_json) is str:
+            self._tvshowMetaJson = meta_json
+
     @property
     def timestamp(self) -> int:
         return self._timestamp               # timestamps are stored internally as integer without milliseconds