Skip to content

Commit f109d81

Browse files
committed
Move TimeSpanConverter with another Converters
Follow indications : #2915 (comment)
1 parent 5d2f269 commit f109d81

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/invidious/config.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class Config
5959
# Number of threads to use for crawling videos from channels (for updating subscriptions)
6060
property channel_threads : Int32 = 1
6161
# Time between two jobs for crawling videos from channels
62-
@[YAML::Field(converter: TimeSpanConverter)]
62+
@[YAML::Field(converter: Preferences::TimeSpanConverter)]
6363
property channel_refresh_interval : Time::Span = 30.minutes
6464
# Number of threads to use for updating feeds
6565
property feed_threads : Int32 = 1

src/invidious/helpers/utils.cr

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,6 @@ def elapsed_text(elapsed)
1818
"#{(millis * 1000).round(2)}µs"
1919
end
2020

21-
module TimeSpanConverter
22-
def self.to_yaml(value : Time::Span, yaml : YAML::Nodes::Builder)
23-
return yaml.scalar recode_length_seconds(value.total_seconds.to_i32)
24-
end
25-
26-
def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Time::Span
27-
if node.is_a?(YAML::Nodes::Scalar)
28-
return decode_time_span(node.value)
29-
else
30-
node.raise "Expected scalar, not #{node.class}"
31-
end
32-
end
33-
end
34-
3521
def decode_time_span(string : String) : Time::Span
3622
time_span = string.gsub(/[^0-9:]/, "")
3723
return Time::Span.new(seconds: 0) if time_span.empty?

src/invidious/user/preferences.cr

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,4 +256,18 @@ struct Preferences
256256
cookies
257257
end
258258
end
259-
end
259+
260+
module TimeSpanConverter
261+
def self.to_yaml(value : Time::Span, yaml : YAML::Nodes::Builder)
262+
return yaml.scalar recode_length_seconds(value.total_seconds.to_i32)
263+
end
264+
265+
def self.from_yaml(ctx : YAML::ParseContext, node : YAML::Nodes::Node) : Time::Span
266+
if node.is_a?(YAML::Nodes::Scalar)
267+
return decode_time_span(node.value)
268+
else
269+
node.raise "Expected scalar, not #{node.class}"
270+
end
271+
end
272+
end
273+
end

0 commit comments

Comments
 (0)