Skip to content

Commit

Permalink
[ie/tiktok:user] Fix extraction loop (yt-dlp#10035)
Browse files Browse the repository at this point in the history
Closes yt-dlp#10033
Authored by: bashonly
  • Loading branch information
bashonly authored May 27, 2024
1 parent ae2194e commit c53c2e4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions yt_dlp/extractor/tiktok.py
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,7 @@ def _build_web_query(self, sec_uid, cursor):

def _entries(self, sec_uid, user_name):
display_id = user_name or sec_uid
seen_ids = set()

cursor = int(time.time() * 1E3)
for page in itertools.count(1):
Expand All @@ -949,15 +950,18 @@ def _entries(self, sec_uid, user_name):

for video in traverse_obj(response, ('itemList', lambda _, v: v['id'])):
video_id = video['id']
if video_id in seen_ids:
continue
seen_ids.add(video_id)
webpage_url = self._create_url(display_id, video_id)
yield self.url_result(
webpage_url, TikTokIE,
**self._parse_aweme_video_web(video, webpage_url, video_id, extract_flat=True))

old_cursor = cursor
cursor = traverse_obj(
response, ('itemList', -1, 'createTime', {functools.partial(int_or_none, invscale=1E3)}))
if not cursor:
response, ('itemList', -1, 'createTime', {lambda x: int(x * 1E3)}))
if not cursor or old_cursor == cursor:
# User may not have posted within this ~1 week lookback, so manually adjust cursor
cursor = old_cursor - 7 * 86_400_000
# In case 'hasMorePrevious' is wrong, break if we have gone back before TikTok existed
Expand Down

0 comments on commit c53c2e4

Please sign in to comment.