From d6ea673f98b4523d224d326095193db569138121 Mon Sep 17 00:00:00 2001
From: taizan-hokuto <55448286+taizan-hokuto@users.noreply.github.com>
Date: Thu, 2 Jan 2020 15:12:48 +0900
Subject: [PATCH] Fix getting arcparam when resume

---
 pytchat/core_async/livechat.py   |  4 ++--
 pytchat/core_async/replaychat.py | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/pytchat/core_async/livechat.py b/pytchat/core_async/livechat.py
index 172a96d..19aadd3 100644
--- a/pytchat/core_async/livechat.py
+++ b/pytchat/core_async/livechat.py
@@ -154,7 +154,7 @@ class LiveChatAsync:
                           prohibit from blocking by putting None into _pauser.
                         '''
                         self._pauser.put_nowait(None)
-                        continuation= liveparam.getparam(self.video_id)
+                        continuation= liveparam.getparam(self.video_id,3)
                     livechat_json = (await 
                       self._get_livechat_json(continuation, session, headers)
                     )
@@ -185,6 +185,7 @@ class LiveChatAsync:
             return
         
         logger.debug(f"[{self.video_id}]チャット取得を終了しました。")
+        self.terminate()
 
     async def _get_livechat_json(self, continuation, session, headers):
         '''
@@ -209,7 +210,6 @@ class LiveChatAsync:
         else:
             logger.error(f"[{self.video_id}]"
                     f"Exceeded retry count. status_code={status_code}")
-            self.terminate()
             return None
         return livechat_json
 
diff --git a/pytchat/core_async/replaychat.py b/pytchat/core_async/replaychat.py
index d66a2f6..ab5fd5b 100644
--- a/pytchat/core_async/replaychat.py
+++ b/pytchat/core_async/replaychat.py
@@ -8,7 +8,7 @@ import traceback
 import urllib.parse
 from aiohttp.client_exceptions import ClientConnectorError
 from concurrent.futures import CancelledError
-from queue import Queue
+from asyncio import Queue
 from .buffer import Buffer
 from ..parser.replay import Parser
 from .. import config
@@ -153,11 +153,13 @@ class ReplayChatAsync:
             async with aiohttp.ClientSession() as session:
                 while(continuation and self._is_alive):
                     if self._pauser.empty():
-                        #pause
+                        '''pause'''
                         await self._pauser.get()
-                        #resume
-                        #prohibit from blocking by putting None into _pauser.
+                        '''resume:
+                          prohibit from blocking by putting None into _pauser.
+                        '''
                         self._pauser.put_nowait(None)
+                        #continuation= arcparam.get(self.video_id)
                     livechat_json = (await
                       self._get_livechat_json(continuation, session, headers)
                     )
@@ -244,14 +246,17 @@ class ReplayChatAsync:
             "既にcallbackを登録済みのため、get()は実行できません。")
 
     def pause(self):
+        if self._callback is None:
+            return
         if not self._pauser.empty():
-            self._pauser.get()
+            self._pauser.get_nowait()
 
     def resume(self):
+        if self._callback is None:
+            return
         if self._pauser.empty():
             self._pauser.put_nowait(None)
         
-
     def is_alive(self):
         return self._is_alive
 
@@ -275,12 +280,10 @@ class ReplayChatAsync:
     @classmethod
     def _set_exception_handler(cls, handler):
         loop = asyncio.get_event_loop()
-        #default handler: cls._handle_exception
         loop.set_exception_handler(handler)
     
     @classmethod
     def _handle_exception(cls, loop, context):
-        #msg = context.get("exception", context["message"])
         if not isinstance(context["exception"],CancelledError):
             logger.error(f"Caught exception: {context}")
         loop= asyncio.get_event_loop()