ramforth/pytchat-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved livechat_json part

Browse Source
This commit is contained in:
taizan-hokuto
2020-01-02 20:51:59 +09:00
parent f4dc5e9d4a
commit fc5979c025
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pytchat/core_async/livechat.py
View File

@@ -158,11 +158,9 @@ class LiveChatAsync:
self._pauser.put_nowait(None) self._pauser.put_nowait(None)
if self._parser.mode == 'LIVE': if self._parser.mode == 'LIVE':
continuation = liveparam.getparam(self.video_id,3) continuation = liveparam.getparam(self.video_id,3)
livechat_json = (await contents = await self._get_contents(
self._get_livechat_json(continuation, session, headers) continuation, session, headers)
) metadata, chatdata = self._parser.parse(contents)
contents = await self._get_contents(livechat_json, session, headers)
metadata, chatdata = self._parser.parse( contents )
timeout = metadata['timeoutMs']/1000 timeout = metadata['timeoutMs']/1000
chat_component = { chat_component = {
@@ -192,7 +190,7 @@ class LiveChatAsync:
logger.debug(f"[{self.video_id}]チャット取得を終了しました。") logger.debug(f"[{self.video_id}]チャット取得を終了しました。")
self.terminate() self.terminate()
async def _get_contents(self, livechat_json, session, headers): async def _get_contents(self, continuation, session, headers):
'''Get 'contents' dict from livechat json. '''Get 'contents' dict from livechat json.
If contents is None at first fetching, If contents is None at first fetching,
try to fetch archive chat data. try to fetch archive chat data.
@@ -201,6 +199,10 @@ class LiveChatAsync:
------- -------
'contents' dict which includes metadata & chatdata. 'contents' dict which includes metadata & chatdata.
''' '''
livechat_json = (await
self._get_livechat_json(continuation, session, headers)
)
contents = self._parser.get_contents(livechat_json) contents = self._parser.get_contents(livechat_json)
if self._first_fetch: if self._first_fetch:
if contents is None: if contents is None: