helix
/
invidious
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2845 from SamantazFox/more-db-improvements

Browse Source 
More db improvements
pull/2849/head
Samantaz Fox 3 years ago committed by GitHub
parent be92bfd4af 67dd2b419a
commit d546f1870e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 87 additions and 79 deletions
Show Stats Download Patch File Download Diff File

17
src/invidious.cr
Unescape Escape View File

@ -112,22 +112,7 @@ OUTPUT = CONFIG.output.upcase == "STDOUT" ? STDOUT : File.open(CONFIG.output, mo
LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level) LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level)
# Check table integrity # Check table integrity
if CONFIG.check_tables Invidious::Database.check_integrity(CONFIG)
Invidious::Database.check_enum(PG_DB, "privacy", PlaylistPrivacy)
Invidious::Database.check_table(PG_DB, "channels", InvidiousChannel)
Invidious::Database.check_table(PG_DB, "channel_videos", ChannelVideo)
Invidious::Database.check_table(PG_DB, "playlists", InvidiousPlaylist)
Invidious::Database.check_table(PG_DB, "playlist_videos", PlaylistVideo)
Invidious::Database.check_table(PG_DB, "nonces", Nonce)
Invidious::Database.check_table(PG_DB, "session_ids", SessionId)
Invidious::Database.check_table(PG_DB, "users", User)
Invidious::Database.check_table(PG_DB, "videos", Video)
if CONFIG.cache_annotations
Invidious::Database.check_table(PG_DB, "annotations", Annotation)
end
end
# Resolve player dependencies. This is done at compile time. # Resolve player dependencies. This is done at compile time.
# #

64
src/invidious/database/base.cr
Unescape Escape View File

@ -3,26 +3,52 @@ require "pg"
module Invidious::Database module Invidious::Database
extend self extend self
def check_enum(db, enum_name, struct_type = nil) # Checks table integrity
#
# Note: config is passed as a parameter to avoid complex
# dependencies between different parts of the software.
def check_integrity(cfg)
return if !cfg.check_tables
Invidious::Database.check_enum("privacy", PlaylistPrivacy)
Invidious::Database.check_table("channels", InvidiousChannel)
Invidious::Database.check_table("channel_videos", ChannelVideo)
Invidious::Database.check_table("playlists", InvidiousPlaylist)
Invidious::Database.check_table("playlist_videos", PlaylistVideo)
Invidious::Database.check_table("nonces", Nonce)
Invidious::Database.check_table("session_ids", SessionId)
Invidious::Database.check_table("users", User)
Invidious::Database.check_table("videos", Video)
if cfg.cache_annotations
Invidious::Database.check_table("annotations", Annotation)
end
end
#
# Table/enum integrity checks
#
def check_enum(enum_name, struct_type = nil)
return # TODO return # TODO
if !db.query_one?("SELECT true FROM pg_type WHERE typname = $1", enum_name, as: Bool) if !PG_DB.query_one?("SELECT true FROM pg_type WHERE typname = $1", enum_name, as: Bool)
LOGGER.info("check_enum: CREATE TYPE #{enum_name}") LOGGER.info("check_enum: CREATE TYPE #{enum_name}")
db.using_connection do |conn| PG_DB.using_connection do |conn|
conn.as(PG::Connection).exec_all(File.read("config/sql/#{enum_name}.sql")) conn.as(PG::Connection).exec_all(File.read("config/sql/#{enum_name}.sql"))
end end
end end
end end
def check_table(db, table_name, struct_type = nil) def check_table(table_name, struct_type = nil)
# Create table if it doesn't exist # Create table if it doesn't exist
begin begin
db.exec("SELECT * FROM #{table_name} LIMIT 0") PG_DB.exec("SELECT * FROM #{table_name} LIMIT 0")
rescue ex rescue ex
LOGGER.info("check_table: check_table: CREATE TABLE #{table_name}") LOGGER.info("check_table: check_table: CREATE TABLE #{table_name}")
db.using_connection do |conn| PG_DB.using_connection do |conn|
conn.as(PG::Connection).exec_all(File.read("config/sql/#{table_name}.sql")) conn.as(PG::Connection).exec_all(File.read("config/sql/#{table_name}.sql"))
end end
end end
@ -30,7 +56,7 @@ module Invidious::Database
return if !struct_type return if !struct_type
struct_array = struct_type.type_array struct_array = struct_type.type_array
column_array = get_column_array(db, table_name) column_array = get_column_array(PG_DB, table_name)
column_types = File.read("config/sql/#{table_name}.sql").match(/CREATE TABLE public\.#{table_name}\n\((?<types>[\d\D]*?)\);/) column_types = File.read("config/sql/#{table_name}.sql").match(/CREATE TABLE public\.#{table_name}\n\((?<types>[\d\D]*?)\);/)
.try &.["types"].split(",").map(&.strip).reject &.starts_with?("CONSTRAINT") .try &.["types"].split(",").map(&.strip).reject &.starts_with?("CONSTRAINT")
@ -41,14 +67,14 @@ module Invidious::Database
if !column_array[i]? if !column_array[i]?
new_column = column_types.select(&.starts_with?(name))[0] new_column = column_types.select(&.starts_with?(name))[0]
LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}") LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}") PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
next next
end end
# Column doesn't exist # Column doesn't exist
if !column_array.includes? name if !column_array.includes? name
new_column = column_types.select(&.starts_with?(name))[0] new_column = column_types.select(&.starts_with?(name))[0]
db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}") PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
end end
# Column exists but in the wrong position, rotate # Column exists but in the wrong position, rotate
@ -59,29 +85,29 @@ module Invidious::Database
# There's a column we didn't expect # There's a column we didn't expect
if !new_column if !new_column
LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]}") LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]}")
db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE") PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
column_array = get_column_array(db, table_name) column_array = get_column_array(PG_DB, table_name)
next next
end end
LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}") LOGGER.info("check_table: ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
db.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}") PG_DB.exec("ALTER TABLE #{table_name} ADD COLUMN #{new_column}")
LOGGER.info("check_table: UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}") LOGGER.info("check_table: UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
db.exec("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}") PG_DB.exec("UPDATE #{table_name} SET #{column_array[i]}_new=#{column_array[i]}")
LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE") LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE") PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
LOGGER.info("check_table: ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}") LOGGER.info("check_table: ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
db.exec("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}") PG_DB.exec("ALTER TABLE #{table_name} RENAME COLUMN #{column_array[i]}_new TO #{column_array[i]}")
column_array = get_column_array(db, table_name) column_array = get_column_array(PG_DB, table_name)
end end
else else
LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE") LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE") PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column_array[i]} CASCADE")
end end
end end
end end
@ -91,14 +117,14 @@ module Invidious::Database
column_array.each do |column| column_array.each do |column|
if !struct_array.includes? column if !struct_array.includes? column
LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE") LOGGER.info("check_table: ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE")
db.exec("ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE") PG_DB.exec("ALTER TABLE #{table_name} DROP COLUMN #{column} CASCADE")
end end
end end
end end
def get_column_array(db, table_name) def get_column_array(db, table_name)
column_array = [] of String column_array = [] of String
db.query("SELECT * FROM #{table_name} LIMIT 0") do |rs| PG_DB.query("SELECT * FROM #{table_name} LIMIT 0") do |rs|
rs.column_count.times do |i| rs.column_count.times do |i|
column = rs.as(PG::ResultSet).field(i) column = rs.as(PG::ResultSet).field(i)
column_array << column.name column_array << column.name

31
src/invidious/database/channels.cr
Unescape Escape View File

@ -35,21 +35,31 @@ module Invidious::Database::Channels
def update_author(id : String, author : String) def update_author(id : String, author : String)
request = <<-SQL request = <<-SQL
UPDATE channels UPDATE channels
SET updated = $1, author = $2, deleted = false SET updated = now(), author = $1, deleted = false
WHERE id = $3 WHERE id = $2
SQL
PG_DB.exec(request, author, id)
end
def update_subscription_time(id : String)
request = <<-SQL
UPDATE channels
SET subscribed = now()
WHERE id = $1
SQL SQL
PG_DB.exec(request, Time.utc, author, id) PG_DB.exec(request, id)
end end
def update_mark_deleted(id : String) def update_mark_deleted(id : String)
request = <<-SQL request = <<-SQL
UPDATE channels UPDATE channels
SET updated = $1, deleted = true SET updated = now(), deleted = true
WHERE id = $2 WHERE id = $1
SQL SQL
PG_DB.exec(request, Time.utc, id) PG_DB.exec(request, id)
end end
# ------------------- # -------------------
@ -67,14 +77,13 @@ module Invidious::Database::Channels
def select(ids : Array(String)) : Array(InvidiousChannel)? def select(ids : Array(String)) : Array(InvidiousChannel)?
return [] of InvidiousChannel if ids.empty? return [] of InvidiousChannel if ids.empty?
values = ids.map { |id| %(('#{id}')) }.join(",")
request = <<-SQL request = <<-SQL
SELECT * FROM channels SELECT * FROM channels
WHERE id = ANY(VALUES #{values}) WHERE id = ANY($1)
SQL SQL
return PG_DB.query_all(request, as: InvidiousChannel) return PG_DB.query_all(request, ids, as: InvidiousChannel)
end end
end end
@ -117,11 +126,11 @@ module Invidious::Database::ChannelVideos
request = <<-SQL request = <<-SQL
SELECT * FROM channel_videos SELECT * FROM channel_videos
WHERE id IN (#{arg_array(ids)}) WHERE id = ANY($1)
ORDER BY published DESC ORDER BY published DESC
SQL SQL
return PG_DB.query_all(request, args: ids, as: ChannelVideo) return PG_DB.query_all(request, ids, as: ChannelVideo)
end end
def select_notfications(ucid : String, since : Time) : Array(ChannelVideo) def select_notfications(ucid : String, since : Time) : Array(ChannelVideo)

24
src/invidious/database/playlists.cr
Unescape Escape View File

@ -59,11 +59,11 @@ module Invidious::Database::Playlists
def update_subscription_time(id : String) def update_subscription_time(id : String)
request = <<-SQL request = <<-SQL
UPDATE playlists UPDATE playlists
SET subscribed = $1 SET subscribed = now()
WHERE id = $2 WHERE id = $1
SQL SQL
PG_DB.exec(request, Time.utc, id) PG_DB.exec(request, id)
end end
def update_video_added(id : String, index : String | Int64) def update_video_added(id : String, index : String | Int64)
@ -71,11 +71,11 @@ module Invidious::Database::Playlists
UPDATE playlists UPDATE playlists
SET index = array_append(index, $1), SET index = array_append(index, $1),
video_count = cardinality(index) + 1, video_count = cardinality(index) + 1,
updated = $2 updated = now()
WHERE id = $3 WHERE id = $2
SQL SQL
PG_DB.exec(request, index, Time.utc, id) PG_DB.exec(request, index, id)
end end
def update_video_removed(id : String, index : String | Int64) def update_video_removed(id : String, index : String | Int64)
@ -83,29 +83,25 @@ module Invidious::Database::Playlists
UPDATE playlists UPDATE playlists
SET index = array_remove(index, $1), SET index = array_remove(index, $1),
video_count = cardinality(index) - 1, video_count = cardinality(index) - 1,
updated = $2 updated = now()
WHERE id = $3 WHERE id = $2
SQL SQL
PG_DB.exec(request, index, Time.utc, id) PG_DB.exec(request, index, id)
end end
# ------------------- # -------------------
# Salect # Salect
# ------------------- # -------------------
def select(*, id : String, raise_on_fail : Bool = false) : InvidiousPlaylist? def select(*, id : String) : InvidiousPlaylist?
request = <<-SQL request = <<-SQL
SELECT * FROM playlists SELECT * FROM playlists
WHERE id = $1 WHERE id = $1
SQL SQL
if raise_on_fail
return PG_DB.query_one(request, id, as: InvidiousPlaylist)
else
return PG_DB.query_one?(request, id, as: InvidiousPlaylist) return PG_DB.query_one?(request, id, as: InvidiousPlaylist)
end end
end
def select_all(*, author : String) : Array(InvidiousPlaylist) def select_all(*, author : String) : Array(InvidiousPlaylist)
request = <<-SQL request = <<-SQL

4
src/invidious/database/sessions.cr
Unescape Escape View File

@ -10,12 +10,12 @@ module Invidious::Database::SessionIDs
def insert(sid : String, email : String, handle_conflicts : Bool = false) def insert(sid : String, email : String, handle_conflicts : Bool = false)
request = <<-SQL request = <<-SQL
INSERT INTO session_ids INSERT INTO session_ids
VALUES ($1, $2, $3) VALUES ($1, $2, now())
SQL SQL
request += " ON CONFLICT (id) DO NOTHING" if handle_conflicts request += " ON CONFLICT (id) DO NOTHING" if handle_conflicts
PG_DB.exec(request, sid, email, Time.utc) PG_DB.exec(request, sid, email)
end end
# ------------------- # -------------------

6
src/invidious/database/users.cr
Unescape Escape View File

@ -143,11 +143,11 @@ module Invidious::Database::Users
def clear_notifications(user : User) def clear_notifications(user : User)
request = <<-SQL request = <<-SQL
UPDATE users UPDATE users
SET notifications = '{}', updated = $1 SET notifications = '{}', updated = now()
WHERE email = $2 WHERE email = $1
SQL SQL
PG_DB.exec(request, Time.utc, user.email) PG_DB.exec(request, user.email)
end end
# ------------------- # -------------------

2
src/invidious/routes/feeds.cr
Unescape Escape View File

@ -362,7 +362,7 @@ module Invidious::Routes::Feeds
end end
if ucid = HTTP::Params.parse(URI.parse(topic).query.not_nil!)["channel_id"]? if ucid = HTTP::Params.parse(URI.parse(topic).query.not_nil!)["channel_id"]?
PG_DB.exec("UPDATE channels SET subscribed = $1 WHERE id = $2", Time.utc, ucid) Invidious::Database::Channels.update_subscription_time(ucid)
elsif plid = HTTP::Params.parse(URI.parse(topic).query.not_nil!)["playlist_id"]? elsif plid = HTTP::Params.parse(URI.parse(topic).query.not_nil!)["playlist_id"]?
Invidious::Database::Playlists.update_subscription_time(plid) Invidious::Database::Playlists.update_subscription_time(plid)
else else

12
src/invidious/routes/playlists.cr
Unescape Escape View File

@ -151,14 +151,10 @@ module Invidious::Routes::Playlists
page = env.params.query["page"]?.try &.to_i? page = env.params.query["page"]?.try &.to_i?
page ||= 1 page ||= 1
begin playlist = Invidious::Database::Playlists.select(id: plid)
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
if !playlist || playlist.author != user.email if !playlist || playlist.author != user.email
return env.redirect referer return env.redirect referer
end end
rescue ex
return env.redirect referer
end
begin begin
videos = get_playlist_videos(playlist, offset: (page - 1) * 100, locale: locale) videos = get_playlist_videos(playlist, offset: (page - 1) * 100, locale: locale)
@ -235,14 +231,10 @@ module Invidious::Routes::Playlists
page = env.params.query["page"]?.try &.to_i? page = env.params.query["page"]?.try &.to_i?
page ||= 1 page ||= 1
begin playlist = Invidious::Database::Playlists.select(id: plid)
playlist = Invidious::Database::Playlists.select(id: plid, raise_on_fail: true)
if !playlist || playlist.author != user.email if !playlist || playlist.author != user.email
return env.redirect referer return env.redirect referer
end end
rescue ex
return env.redirect referer
end
query = env.params.query["q"]? query = env.params.query["q"]?
if query if query

Write Preview
Loading…
Cancel
Save