midou/invidious
1
0
Fork 1
mirror of https://github.com/iv-org/invidious.git synced 2024-12-03 12:11:22 +05:30
Code Issues Packages Projects Releases Wiki Activity

Prevent autoplay breakage by vetting each change from top to compilation_video.ecr

Browse Source
This commit is contained in:
broquemonsieur 2023-08-03 00:37:21 -07:00
parent 0211d69f11
commit f05d38aa8e
10 changed files with 106 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/sql/compilations.sql
View File

@ -22,7 +22,8 @@ CREATE TABLE IF NOT EXISTS public.compilations
created timestamptz,
updated timestamptz,
privacy compilation_privacy,
index int8[]
index int8[],
first_video_id text
);
GRANT ALL ON public.compilations TO current_user;

1
locales/en-US.json
View File

@ -244,6 +244,7 @@
"Not a playlist.": "Not a playlist.",
"Playlist does not exist.": "Playlist does not exist.",
"Could not pull trending pages.": "Could not pull trending pages.",
"Compilation does not exist.": "Compilation does not exist.",
"Hidden field \"challenge\" is a required field": "Hidden field \"challenge\" is a required field",
"Hidden field \"token\" is a required field": "Hidden field \"token\" is a required field",
"Erroneous challenge": "Erroneous challenge",

53
src/invidious/compilations.cr
View File

@ -95,6 +95,7 @@ struct Compilation
property views : Int64
property updated : Time
property thumbnail : String?
property first_video_id : String
def to_json(offset, json : JSON::Builder, video_id : String? = nil)
json.object do
@ -169,6 +170,7 @@ struct InvidiousCompilation
@[DB::Field(converter: InvidiousCompilation::CompilationPrivacyConverter)]
property privacy : CompilationPrivacy = CompilationPrivacy::Private
property index : Array(Int64)
property first_video_id : String
@[DB::Field(ignore: true)]
property thumbnail_id : String?
@ -248,15 +250,16 @@ def create_compilation(title, privacy, user)
LOGGER.info("generated compilation id")
compilation = InvidiousCompilation.new({
title: title.byte_slice(0, 150),
id: compid,
author: user.email,
description: "", # Max 5000 characters
video_count: 0,
created: Time.utc,
updated: Time.utc,
privacy: privacy,
index: [] of Int64,
title: title.byte_slice(0, 150),
id: compid,
author: user.email,
description: "", # Max 5000 characters
video_count: 0,
created: Time.utc,
updated: Time.utc,
privacy: privacy,
index: [] of Int64,
first_video_id: ""
})
LOGGER.info("Creating compilation db")
@ -268,15 +271,16 @@ end
def subscribe_compilation(user, compilation)
compilation = InvidiousCompilation.new({
title: compilation.title.byte_slice(0, 150),
id: compilation.id,
author: user.email,
description: "", # Max 5000 characters
video_count: compilation.video_count,
created: Time.utc,
updated: compilation.updated,
privacy: CompilationPrivacy::Private,
index: [] of Int64,
title: compilation.title.byte_slice(0, 150),
id: compilation.id,
author: user.email,
description: "", # Max 5000 characters
video_count: compilation.video_count,
created: Time.utc,
updated: compilation.updated,
privacy: CompilationPrivacy::Private,
index: [] of Int64,
first_video_id: ""
})
Invidious::Database::Compilations.insert(compilation)
@ -329,6 +333,19 @@ def get_compilation(compid : String)
#end
end
def update_first_video_id(compid : String)
if compilation = Invidious::Database::Compilations.select(id: compid)
compilation_index_array = compilation.index
first_index = compilation_index_array[0]
first_id = Invidious::Database::CompilationVideos.select_id_from_index(first_index)
if !first_id.nil?
Invidious::Database::Compilations.update_first_video_id(compid, first_id)
end
else
raise NotFoundException.new("Compilation does not exist.")
end
end
def get_compilation_videos(compilation : InvidiousCompilation | Compilation, offset : Int32, video_id = nil)
LOGGER.info("1. get_compilation")
LOGGER.info("Getting compilation")

29
src/invidious/database/compilations.cr
View File

@ -90,6 +90,15 @@ module Invidious::Database::Compilations
PG_DB.exec(request, id, index)
end
def update_first_video_id(id : String, first_video_id : String)
request = <<-SQL
UPDATE compilations
SET first_video_id = $2
WHERE id = $1
SQL
PG_DB.exec(request, id, first_video_id)
end
# -------------------
# Select
# -------------------
@ -112,6 +121,16 @@ module Invidious::Database::Compilations
return PG_DB.query_all(request, author, as: InvidiousCompilation)
end
def select_index_array(id : String)
request = <<-SQL
SELECT index FROM compilations
WHERE id = $1
LIMIT 1
SQL
PG_DB.query_one?(request, id, as: String)
end
# -------------------
# Select (filtered)
# -------------------
@ -249,6 +268,16 @@ module Invidious::Database::CompilationVideos
return PG_DB.query_one?(request, order_index, as: String)
end
def select_id_from_index(index : Int64)
request = <<-SQL
SELECT id FROM compilation_videos
WHERE index = $1
LIMIT 1
SQL
return PG_DB.query_one?(request, index, as: String)
end
def select_index_from_order_index(order_index : Int32)
request = <<-SQL
SELECT index FROM compilation_videos

3
src/invidious/database/migrations/0011_create_compilations_table.cr
View File

@ -24,7 +24,8 @@ module Invidious::Database::Migrations
created timestamptz,
updated timestamptz,
privacy compilation_privacy,
index int8[]
index int8[],
first_video_id text
);
SQL

51
src/invidious/routes/compilations.cr
View File

@ -129,7 +129,7 @@ module Invidious::Routes::Compilations
sid = sid.as(String)
compid = env.params.query["list"]?
if !compid || !compid.starts_with?("IV")
if !compid || !compid.starts_with?("IVCMP")
return env.redirect referer
end
@ -238,50 +238,30 @@ module Invidious::Routes::Compilations
title = env.params.body["title"]?.try &.delete("<>") || ""
privacy = CompilationPrivacy.parse(env.params.body["privacy"]? || "Private")
#title = env.params.json["title"].try &.as(String).delete("<>").byte_slice(0, 150) || compilation.title
#privacy = env.params.json["privacy"]?.try { |p| CompilationPrivacy.parse(p.as(String).downcase) } || compilation.privacy
#if title != compilation.title ||
# privacy != compilation.privacy
# updated = Time.utc
#else
# updated = compilation.updated
#end
Invidious::Database::Compilations.update(compid, title, privacy, "", compilation.updated)
#{1...Invidious::Database::Compilations.count_owned_by(user.email)}.each do |index|
# start_timestamp = env.params.json["_start_timestamp"]?.try &.as(String).byte_slice(0, 150) || compilation.title
compilation_video_cardinality = Invidious::Database::CompilationVideos.select_ids(compid, compilation.index).size
(0..compilation.index.size - 1).each do |index|
compilation_video_index = compilation.index[index]
compilation_video = Invidious::Database::CompilationVideos.select_video(compid, compilation.index, compilation_video_index, 0, 1)
json_timestamp_query_start = compilation_video_index.to_s + "_start_timestamp"
(0..compilation_video_cardinality-1).each do |index|
LOGGER.info("for loop cycle #{index} of #{Invidious::Database::Compilations.count_owned_by(user.email)}")
compilation_video_id = Invidious::Database::CompilationVideos.select_id_from_order_index(order_index: index)
#compilation_video_index = Invidious::Database::CompilationVideos.select_index_from_order_index(order_index: index)
compilation_video = Invidious::Database::CompilationVideos.select(compid, compilation.index, 0, 1)
#numerical_string = index.to
json_timestamp_query = index.to_s + "_start_timestamp"
LOGGER.info("adjust #{json_timestamp_query} ")
start_timestamp = env.params.body[json_timestamp_query]?.try &.as(String).byte_slice(0, 8)
LOGGER.info("render #{env.params.body[json_timestamp_query]?} ")
if !start_timestamp.nil? && !compilation_video_id.nil?
LOGGER.info("adjust #{json_timestamp_query} which renders as #{start_timestamp}")
start_timestamp = env.params.body[json_timestamp_query_start]?.try &.as(String).byte_slice(0, 8)
if !start_timestamp.nil? && !compilation_video[0].id.nil?
start_timestamp_seconds = decode_length_seconds(start_timestamp)
if !start_timestamp_seconds.nil?
if start_timestamp_seconds >= 0 && start_timestamp_seconds <= compilation_video[0].length_seconds
LOGGER.info("adjusting timestamps to #{start_timestamp_seconds} which is #{start_timestamp_seconds.to_i}")
Invidious::Database::CompilationVideos.update_start_timestamp(compilation_video_id, start_timestamp_seconds.to_i)
Invidious::Database::CompilationVideos.update_start_timestamp(compilation_video[0].id, start_timestamp_seconds.to_i)
end
end
end
json_timestamp_query = index.to_s + "_end_timestamp"
end_timestamp = env.params.json[json_timestamp_query]?.try &.as(String).byte_slice(0, 8)
if !end_timestamp.nil? && !compilation_video_id.nil?
json_timestamp_query_end = compilation_video_index.to_s + "_end_timestamp"
end_timestamp = env.params.json[json_timestamp_query_end]?.try &.as(String).byte_slice(0, 8)
if !end_timestamp.nil? && !compilation_video[0].id.nil?
end_timestamp_seconds = decode_length_seconds(end_timestamp)
if !end_timestamp_seconds.nil?
if end_timestamp_seconds >= 0 && end_timestamp_seconds <= compilation_video[0].ending_timestamp_seconds
Invidious::Database::CompilationVideos.update_end_timestamp(compilation_video_id, end_timestamp_seconds)
if end_timestamp_seconds >= 0 && end_timestamp_seconds <= compilation_video[0].ending_timestamp_seconds && end_timestamp_seconds > compilation_video[0].starting_timestamp_seconds
Invidious::Database::CompilationVideos.update_end_timestamp(compilation_video[0].id, end_timestamp_seconds)
end
end
end
@ -309,7 +289,7 @@ module Invidious::Routes::Compilations
sid = sid.as(String)
compid = env.params.query["list"]?
if !compid || !compid.starts_with?("IV")
if !compid || !compid.starts_with?("IVCMP")
return env.redirect referer
end
@ -445,10 +425,12 @@ module Invidious::Routes::Compilations
Invidious::Database::CompilationVideos.insert(compilation_video)
Invidious::Database::Compilations.update_video_added(compilation_id, compilation_video.index)
update_first_video_id(compilation_id)
when "action_remove_video"
index = env.params.query["set_video_id"]
Invidious::Database::CompilationVideos.delete(index)
Invidious::Database::Compilations.update_video_removed(compilation_id, index)
update_first_video_id(compilation_id)
when "action_move_video_before"
# TODO: Compilation stub
#video_index = compilation.index
@ -473,6 +455,7 @@ module Invidious::Routes::Compilations
compilation_index_array.insert(compilation_index_array_position-1,compilation_video[0].index)
Invidious::Database::Compilations.move_video_before(compilation_id, compilation_index_array)
end
update_first_video_id(compilation_id)
else
return error_json(400, "Unsupported action #{action}")
end

9
src/invidious/routes/watch.cr
View File

@ -39,8 +39,13 @@ module Invidious::Routes::Watch
embed_link += embed_params.to_s
end
plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
continuation = process_continuation(env.params.query, plid, id)
if env.params.query["list"]?.try &.starts_with? "IVPL"
plid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
continuation = process_continuation(env.params.query, plid, id)
elsif env.params.query["list"]?.try &.starts_with? "IVCMP"
compid = env.params.query["list"]?.try &.gsub(/[^a-zA-Z0-9_-]/, "")
continuation = process_continuation(env.params.query, compid, id)
end
nojs = env.params.query["nojs"]?

4
src/invidious/videos.cr
View File

@ -410,9 +410,9 @@ def fetch_video(id, region)
return video
end
def process_continuation(query, plid, id)
def process_continuation(query, list_id, id)
continuation = nil
if plid
if list_id
if index = query["index"]?.try &.to_i?
continuation = index
else

12
src/invidious/views/compilation.ecr
View File

@ -11,11 +11,13 @@
<div class="flex-right button-container">
<%- if compilation.is_a?(InvidiousCompilation) && compilation.author == user.try &.email -%>
<div class="pure-u">
<a class="pure-button pure-button-secondary low-profile" dir="auto" href="/play_compilation?list=<%= compid %>">
<i class="icon ion-md-play"></i>&nbsp;<%= translate(locale, "compilation_button_play") %>
</a>
</div>
<%- if compilation.index.size > 0 -%>
<div class="pure-u">
<a class="pure-button pure-button-secondary low-profile" dir="auto" href="/watch?v=<%= compilation.first_video_id %>&list=<%= compid %>&index=<%= compilation.index[0] %>">
<i class="icon ion-md-play"></i>&nbsp;<%= translate(locale, "compilation_button_play") %>
</a>
</div>
<%- end -%>
<div class="pure-u">
<a class="pure-button pure-button-secondary low-profile" dir="auto" href="/add_compilation_items?list=<%= compid %>">
<i class="icon ion-md-add"></i>&nbsp;<%= translate(locale, "compilation_button_add_items") %>

8
src/invidious/views/components/compilation_video.ecr
View File

@ -38,16 +38,16 @@
<% if compid_form = env.get?("remove_compilation_items") %>
<div class="compilation-video-timestamp-set">
<p style="margin-right:10px;">from</p>
<input class="compilation-video-timestamp" placeholder="0:00" disabled type="text">
<input class="compilation-video-timestamp" value="<%= recode_length_seconds(compilation_video.starting_timestamp_seconds) %>" disabled type="text">
<p style="margin-right:10px; margin-left:10px">to</p>
<input class="compilation-video-timestamp" placeholder="<%= recode_length_seconds(compilation_video.length_seconds) %>" disabled type="text">
<input class="compilation-video-timestamp" value="<%= recode_length_seconds(compilation_video.ending_timestamp_seconds) %>" disabled type="text">
</div>
<% else %>
<div class="compilation-video-timestamp-set">
<p style="margin-right:10px;">from</p>
<input maxlength="8" name="<%= compilation_video.order_index %>_start_timestamp" class="compilation-video-timestamp" placeholder="0:00" type="text">
<input maxlength="8" name="<%= compilation_video.index %>_start_timestamp" class="compilation-video-timestamp" value="<%= recode_length_seconds(compilation_video.starting_timestamp_seconds) %>" type="text">
<p style="margin-right:10px; margin-left:10px">to</p>
<input maxlength="8" name="<%= compilation_video.order_index %>_end_timestamp" class="compilation-video-timestamp" placeholder="<%= recode_length_seconds(compilation_video.length_seconds) %>" type="text">
<input maxlength="8" name="<%= compilation_video.index %>_end_timestamp" class="compilation-video-timestamp" value="<%= recode_length_seconds(compilation_video.ending_timestamp_seconds) %>" type="text">
</div>
<% end %>
</div>