Merge tag 'not_quit' into develop
v0.2.3
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
pytchat is a lightweight python library to browse youtube livechat without Selenium or BeautifulSoup.
|
pytchat is a lightweight python library to browse youtube livechat without Selenium or BeautifulSoup.
|
||||||
"""
|
"""
|
||||||
__copyright__ = 'Copyright (C) 2019 taizan-hokuto'
|
__copyright__ = 'Copyright (C) 2019 taizan-hokuto'
|
||||||
__version__ = '0.2.2'
|
__version__ = '0.2.3'
|
||||||
__license__ = 'MIT'
|
__license__ = 'MIT'
|
||||||
__author__ = 'taizan-hokuto'
|
__author__ = 'taizan-hokuto'
|
||||||
__author_email__ = '55448286+taizan-hokuto@users.noreply.github.com'
|
__author_email__ = '55448286+taizan-hokuto@users.noreply.github.com'
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ def main():
|
|||||||
else:
|
else:
|
||||||
raise FileNotFoundError
|
raise FileNotFoundError
|
||||||
err = None
|
err = None
|
||||||
for _ in range(3): # retry 3 times
|
for _ in range(3): # retry 3 times
|
||||||
try:
|
try:
|
||||||
info = VideoInfo(video_id)
|
info = VideoInfo(video_id)
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ class InvalidVideoIdException(Exception):
|
|||||||
self.doc = doc
|
self.doc = doc
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class UnknownConnectionError(Exception):
|
class UnknownConnectionError(Exception):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ REPLAY_URL = "https://www.youtube.com/live_chat_replay/" \
|
|||||||
"get_live_chat_replay?continuation="
|
"get_live_chat_replay?continuation="
|
||||||
MAX_RETRY_COUNT = 3
|
MAX_RETRY_COUNT = 3
|
||||||
|
|
||||||
|
# Set to avoid duplicate parameters
|
||||||
|
param_set = set()
|
||||||
|
|
||||||
|
|
||||||
def _split(start, end, count, min_interval_sec=120):
|
def _split(start, end, count, min_interval_sec=120):
|
||||||
"""
|
"""
|
||||||
@@ -64,6 +67,10 @@ def ready_blocks(video_id, duration, div, callback):
|
|||||||
url = f"{REPLAY_URL}{quote(continuation)}&pbj=1"
|
url = f"{REPLAY_URL}{quote(continuation)}&pbj=1"
|
||||||
for _ in range(MAX_RETRY_COUNT):
|
for _ in range(MAX_RETRY_COUNT):
|
||||||
try:
|
try:
|
||||||
|
if continuation in param_set:
|
||||||
|
next_continuation, actions = None, []
|
||||||
|
break
|
||||||
|
param_set.add(continuation)
|
||||||
resp = await session.get(url, headers=headers)
|
resp = await session.get(url, headers=headers)
|
||||||
next_continuation, actions = parser.parse(resp.json())
|
next_continuation, actions = parser.parse(resp.json())
|
||||||
break
|
break
|
||||||
@@ -112,6 +119,10 @@ def fetch_patch(callback, blocks, video_id):
|
|||||||
url = f"{REPLAY_URL}{quote(continuation)}&pbj=1"
|
url = f"{REPLAY_URL}{quote(continuation)}&pbj=1"
|
||||||
for _ in range(MAX_RETRY_COUNT):
|
for _ in range(MAX_RETRY_COUNT):
|
||||||
try:
|
try:
|
||||||
|
if continuation in param_set:
|
||||||
|
continuation, actions = None, []
|
||||||
|
break
|
||||||
|
param_set.add(continuation)
|
||||||
resp = await session.get(url, headers=config.headers)
|
resp = await session.get(url, headers=config.headers)
|
||||||
continuation, actions = parser.parse(resp.json())
|
continuation, actions = parser.parse(resp.json())
|
||||||
break
|
break
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ from typing import Tuple
|
|||||||
class ExtractWorker:
|
class ExtractWorker:
|
||||||
"""
|
"""
|
||||||
ExtractWorker associates a download session with a block.
|
ExtractWorker associates a download session with a block.
|
||||||
|
|
||||||
When the worker finishes fetching, the block
|
When the worker finishes fetching, the block
|
||||||
being fetched is splitted and assigned the free worker.
|
being fetched is splitted and assigned the free worker.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user