Move functions

pytchat/core_multithread/livechat.py

@@ -3,7 +3,6 @@ import json
 import signal
 import time
 import traceback
-import urllib.parse
 from concurrent.futures import CancelledError, ThreadPoolExecutor
 from queue import Queue
 from threading import Event
@@ -11,10 +10,10 @@ from .buffer import Buffer
 from ..parser.live import Parser
 from .. import config
 from .. import exceptions
+from .. import util
 from ..paramgen import liveparam, arcparam
 from ..processors.default.processor import DefaultProcessor
 from ..processors.combinator import Combinator
-from ..util.extract_video_id import extract_video_id
 
 headers = config.headers
 MAX_RETRY = 10
@@ -84,7 +83,7 @@ class LiveChat:
                  topchat_only=False,
                  logger=config.logger(__name__)
                  ):
-        self._video_id = extract_video_id(video_id)
+        self._video_id = util.extract_video_id(video_id)
         self.seektime = seektime
         if isinstance(processor, tuple):
             self.processor = Combinator(processor)
@@ -101,8 +100,10 @@ class LiveChat:
         self._pauser = Queue()
         self._pauser.put_nowait(None)
         self._first_fetch = True
-        self._fetch_url = "live_chat/get_live_chat?continuation="
+        self._fetch_url = config._sml
         self._topchat_only = topchat_only
+        self._dat = ''
+        self._last_offset_ms = 0
         self._event = Event()
         self._logger = logger
         self.exception = None
@@ -176,6 +177,7 @@ class LiveChat:
                     diff_time = timeout - (time.time() - time_mark)
                     self._event.wait(diff_time if diff_time > 0 else 0)
                     continuation = metadata.get('continuation')
+                    self._last_offset_ms = metadata.get('last_offset_ms', 0)
         except exceptions.ChatParseException as e:
             self._logger.debug(f"[{self._video_id}]{str(e)}")
             raise
@@ -185,7 +187,6 @@ class LiveChat:
 
         self._logger.debug(f"[{self._video_id}] finished fetching chat.")
 
-
     def _check_pause(self, continuation):
         if self._pauser.empty():
             '''pause'''
@@ -207,43 +208,46 @@ class LiveChat:
           -------
             'continuationContents' which includes metadata & chat data.
         '''
-        livechat_json = (
-            self._get_livechat_json(continuation, client, headers)
-        )
-        contents = self._parser.get_contents(livechat_json)
+        livechat_json = self._get_livechat_json(continuation, client, headers)
+        contents, dat = self._parser.get_contents(livechat_json)
+        if self._dat == '' and dat:
+            self._dat = dat
         if self._first_fetch:
             if contents is None or self._is_replay:
                 '''Try to fetch archive chat data.'''
                 self._parser.is_replay = True
-                self._fetch_url = "live_chat_replay/get_live_chat_replay?continuation="
+                self._fetch_url = config._smr
                 continuation = arcparam.getparam(
                     self._video_id, self.seektime, self._topchat_only)
-                livechat_json = (self._get_livechat_json(continuation, client, headers))
+                livechat_json = (self._get_livechat_json(
+                                 continuation, client, replay=True, offset_ms=self.seektime * 1000))
                 reload_continuation = self._parser.reload_continuation(
-                    self._parser.get_contents(livechat_json))
+                    self._parser.get_contents(livechat_json)[0])
                 if reload_continuation:
                     livechat_json = (self._get_livechat_json(
                         reload_continuation, client, headers))
-                contents = self._parser.get_contents(livechat_json)
+                contents, _ = self._parser.get_contents(livechat_json)
                 self._is_replay = True
             self._first_fetch = False
         return contents
 
-    def _get_livechat_json(self, continuation, client, headers):
+    def _get_livechat_json(self, continuation, client, replay: bool, offset_ms: int = 0):
         '''
         Get json which includes chat data.
         '''
-        continuation = urllib.parse.quote(continuation)
+        # continuation = urllib.parse.quote(continuation)
         livechat_json = None
-        url = f"https://www.youtube.com/{self._fetch_url}{continuation}&pbj=1"
+        if offset_ms < 0:
+            offset_ms = 0
+        param = util.get_param(continuation, dat=self._dat, replay=replay, offsetms=offset_ms)
         for _ in range(MAX_RETRY + 1):
-            with client:
-                try:
-                    livechat_json = client.get(url, headers=headers).json()
-                    break
-                except (json.JSONDecodeError, httpx.HTTPError):
-                    time.sleep(2)
-                    continue
+            try:
+                resp = client.post(self._fetch_url, json=param)
+                livechat_json = resp.json()
+                break
+            except (json.JSONDecodeError, httpx.HTTPError):
+                time.sleep(2)
+                continue
         else:
             self._logger.error(f"[{self._video_id}]"
                                f"Exceeded retry count.")
@@ -312,9 +316,6 @@ class LiveChat:
             self._logger.debug(f'[{self._video_id}] cancelled:{sender}')
 
     def terminate(self):
-        '''
-        Terminate fetching chats.
-        '''
         if self._pauser.empty():
             self._pauser.put_nowait(None)
         self._is_alive = False