iv-org-mirror/invidious-copy-2022-03-16
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious-copy-2022-03-16.git synced 2024-08-15 00:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keep using the existing logic where it already works correctly.

Browse source 
These states are:
* All pages when sorted by 'newest'.
* All pages when sorted by 'popular'
* Page 1 when sorted by 'oldest'.

If not in either of these three states, e.g. page 2 when sorted by 
'oldest', fallback to using the new db/iteration logic.
This commit is contained in:
0x24d 2021-11-20 12:10:59 +00:00
parent dce70e2d93
commit 8e3b8da285
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/invidious/channels/videos.cr
View file

@ -61,8 +61,9 @@ def get_channel_videos_response(ucid, page = 1, auto_generated = nil, sort_by =
continuation = ""
initial_data = Hash(String, JSON::Any).new
if page == 1
# Always manually create the continuation for page 1 as this is likely faster than a db lookup.
# Manually generating the continuation works correctly for both 'newest' and 'popular' sort modes,
# and for page 1 when sorting by 'oldest'. So only fallback to using the db if not in either of these states.
if sort_by != "oldest" || page == 1
continuation = produce_channel_videos_continuation(ucid, page, auto_generated: auto_generated, sort_by: sort_by, v2: true)
elsif channel_continuation = PG_DB.query_one?("SELECT * FROM channel_continuations WHERE id = $1 AND page = $2 AND sort_by = $3", ucid, page, sort_by, as: ChannelContinuation)
continuation = channel_continuation.continuation
@ -111,18 +112,22 @@ def get_channel_videos_response(ucid, page = 1, auto_generated = nil, sort_by =
# Get the wanted page and store the returned continuation for the next page,
# if there is one, so that it can be used the next time this function is called requesting that page.
initial_data = YoutubeAPI.browse(continuation)
continuation = fetch_continuation_token(initial_data)
if !continuation.nil? && !continuation.empty?
channel_continuation = ChannelContinuation.new({
id: ucid,
page: page + 1,
sort_by: sort_by,
continuation: continuation
})
PG_DB.exec("INSERT INTO channel_continuations VALUES ($1, $2, $3, $4) \
ON CONFLICT (id, page, sort_by) DO UPDATE SET continuation = $4", *channel_continuation.to_tuple)
end
# Only get the continuation and store it if the sort mode is 'oldest'.
if sort_by == "oldest"
continuation = fetch_continuation_token(initial_data)
if !continuation.nil? && !continuation.empty?
channel_continuation = ChannelContinuation.new({
id: ucid,
page: page + 1,
sort_by: sort_by,
continuation: continuation
})
PG_DB.exec("INSERT INTO channel_continuations VALUES ($1, $2, $3, $4) \
ON CONFLICT (id, page, sort_by) DO UPDATE SET continuation = $4", *channel_continuation.to_tuple)
end
end
end
return initial_data