Merge branch 'hotfix/cli_handle_live'

Fix videoinfo.py and CLI download

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 taizan-hokuto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

pytchat/__init__.py

@@ -2,7 +2,7 @@
 pytchat is a lightweight python library to browse youtube livechat without Selenium or BeautifulSoup.
 """
 __copyright__    = 'Copyright (C) 2019 taizan-hokuto'
-__version__      = '0.1.1'
+__version__      = '0.1.4'
 __license__      = 'MIT'
 __author__       = 'taizan-hokuto'
 __author_email__ = '55448286+taizan-hokuto@users.noreply.github.com'

pytchat/cli/__init__.py

@@ -1,8 +1,9 @@
 import argparse
+import os
 from pathlib import Path
 from pytchat.util.extract_video_id import extract_video_id
 from .arguments import Arguments
-from .. exceptions import InvalidVideoIdException, NoContents
+from .. exceptions import InvalidVideoIdException, NoContents, VideoInfoParseException
 from .. processors.html_archiver import HTMLArchiver
 from .. tool.extract.extractor import Extractor
 from .. tool.videoinfo import VideoInfo
@@ -21,7 +22,8 @@ def main():
     # Arguments
     parser = argparse.ArgumentParser(description=f'pytchat v{__version__}')
     parser.add_argument('-v', f'--{Arguments.Name.VIDEO_IDS}', type=str,
-                        help='Video ID (or URL that includes Video ID). You can specify multiple video IDs by separating them with commas without spaces.\n'
+                        help='Video ID (or URL that includes Video ID). You can specify multiple video IDs by '
+                        'separating them with commas without spaces.\n'
                         'If ID starts with a hyphen (-), enclose the ID in square brackets.')
     parser.add_argument('-o', f'--{Arguments.Name.OUTPUT}', type=str,
                         help='Output directory (end with "/"). default="./"', default='./')
@@ -39,12 +41,16 @@ def main():
                 video_id = video_id.replace('[', '').replace(']', '')
             try:
                 video_id = extract_video_id(video_id)
+                if os.path.exists(Arguments().output):
+                    path = Path(Arguments().output + video_id + '.html')
+                else:
+                    raise FileNotFoundError
                 info = VideoInfo(video_id)
                 print(f"Extracting...\n"
                       f" video_id: {video_id}\n"
                       f" channel:  {info.get_channel_name()}\n"
                       f" title:    {info.get_title()}")
-                path = Path(Arguments().output + video_id + '.html')
+
                 print(f" output path: {path.resolve()}")
                 Extractor(video_id,
                           processor=HTMLArchiver(
@@ -56,6 +62,10 @@ def main():
                 print("Invalid Video ID or URL:", video_id)
             except (TypeError, NoContents) as e:
                 print(e)
+            except FileNotFoundError:
+                print("The specified directory does not exist.:{}".format(Arguments().output))
+            except VideoInfoParseException:
+                print("Cannot parse video information.:{}".format(video_id))
         return
     parser.print_help()
 

pytchat/exceptions.py

@@ -62,3 +62,9 @@ class ReceivedUnknownContinuation(ChatParseException):
 
 class FailedExtractContinuation(ChatDataFinished):
     pass
+
+
+class VideoInfoParseException(Exception):
+    '''
+    thrown when failed to parse video info
+    '''

pytchat/processors/default/renderer/paidsticker.py

@@ -21,7 +21,7 @@ class LiveChatPaidStickerRenderer(BaseRenderer):
         self.amountString = amountDisplayString
         self.currency = currency.symbols[symbol]["fxtext"] if currency.symbols.get(
             symbol) else symbol
-        self.bgColor = self.renderer.get("moneyChipBackgroundColor", 0)
+        self.bgColor = self.renderer.get("backgroundColor", 0)
         self.sticker = "".join(("https:",
             self.renderer["sticker"]["thumbnails"][0]["url"]))
         self.colors = self.get_colors()

pytchat/tool/extract/extractor.py

@@ -79,7 +79,7 @@ class Extractor:
 
     def extract(self):
         if self.duration == 0:
-            print("video is not archived.")
+            print("\nCannot extract chat data:\n The specified video has not yet been archived.")
             return []
         data = self._execute_extract_operations()
         if self.processor is None:

pytchat/tool/videoinfo.py

@@ -7,7 +7,7 @@ from ..util.extract_video_id import extract_video_id
 
 headers = config.headers
 
-pattern = re.compile(r"yt\.setConfig\({'PLAYER_CONFIG': ({.*})}\);")
+pattern = re.compile(r"'PLAYER_CONFIG': ({.*}}})")
 
 item_channel_id = [
     "videoDetails",
@@ -91,7 +91,7 @@ class VideoInfo:
 
     def _parse(self, text):
         result = re.search(pattern, text)
-        res = json.loads(result.group(1))
+        res = json.loads(result.group(1)[:-1])
         response = self._get_item(res, item_response)
         if response is None:
             self._check_video_is_private(res.get("args"))

tests/test_default_processor.py

@@ -136,7 +136,7 @@ def test_supersticker(mocker):
     assert ret.amountValue == 200
     assert ret.amountString == "￥200"
     assert ret.currency == "JPY"
-    assert ret.bgColor == 4278248959
+    assert ret.bgColor == 4278237396
     assert ret.sticker == "https://lh3.googleusercontent.com/param_s=s72-rp"
     assert ret.author.name == "author_name"
     assert ret.author.channelId == "author_channel_id"