Skip to content

Commit c78f84d

Browse files
committed
DB: Move integrity check to the base.cr file
1 parent a6c9b26 commit c78f84d

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

src/invidious.cr

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -112,22 +112,7 @@ OUTPUT = CONFIG.output.upcase == "STDOUT" ? STDOUT : File.open(CONFIG.output, mo
112112
LOGGER = Invidious::LogHandler.new(OUTPUT, CONFIG.log_level)
113113

114114
# Check table integrity
115-
if CONFIG.check_tables
116-
Invidious::Database.check_enum("privacy", PlaylistPrivacy)
117-
118-
Invidious::Database.check_table("channels", InvidiousChannel)
119-
Invidious::Database.check_table("channel_videos", ChannelVideo)
120-
Invidious::Database.check_table("playlists", InvidiousPlaylist)
121-
Invidious::Database.check_table("playlist_videos", PlaylistVideo)
122-
Invidious::Database.check_table("nonces", Nonce)
123-
Invidious::Database.check_table("session_ids", SessionId)
124-
Invidious::Database.check_table("users", User)
125-
Invidious::Database.check_table("videos", Video)
126-
127-
if CONFIG.cache_annotations
128-
Invidious::Database.check_table("annotations", Annotation)
129-
end
130-
end
115+
Invidious::Database.check_integrity(CONFIG)
131116

132117
# Start jobs
133118

src/invidious/database/base.cr

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@ require "pg"
33
module Invidious::Database
44
extend self
55

6+
# Checks table integrity
7+
#
8+
# Note: config is passed as a parameter to avoid complex
9+
# dependencies between different parts of the software.
10+
def check_integrity(cfg)
11+
return if !cfg.check_tables
12+
Invidious::Database.check_enum("privacy", PlaylistPrivacy)
13+
14+
Invidious::Database.check_table("channels", InvidiousChannel)
15+
Invidious::Database.check_table("channel_videos", ChannelVideo)
16+
Invidious::Database.check_table("playlists", InvidiousPlaylist)
17+
Invidious::Database.check_table("playlist_videos", PlaylistVideo)
18+
Invidious::Database.check_table("nonces", Nonce)
19+
Invidious::Database.check_table("session_ids", SessionId)
20+
Invidious::Database.check_table("users", User)
21+
Invidious::Database.check_table("videos", Video)
22+
23+
if cfg.cache_annotations
24+
Invidious::Database.check_table("annotations", Annotation)
25+
end
26+
end
27+
28+
#
29+
# Table/enum integrity checks
30+
#
31+
632
def check_enum(enum_name, struct_type = nil)
733
return # TODO
834

0 commit comments

Comments
 (0)