mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2023-06-08.git
synced 2024-08-15 00:53:38 +00:00
search: Fix short text parsing
This commit is contained in:
parent
516efd2df3
commit
afc0ec3c30
3 changed files with 15 additions and 16 deletions
|
@ -130,8 +130,9 @@ def get_about_info(ucid, locale) : AboutChannel
|
||||||
tabs = tabs_json.reject { |node| node["tabRenderer"]?.nil? }.map(&.["tabRenderer"]["title"].as_s.downcase)
|
tabs = tabs_json.reject { |node| node["tabRenderer"]?.nil? }.map(&.["tabRenderer"]["title"].as_s.downcase)
|
||||||
end
|
end
|
||||||
|
|
||||||
sub_count = initdata["header"]["c4TabbedHeaderRenderer"]?.try &.["subscriberCountText"]?.try &.["simpleText"]?.try &.as_s?
|
sub_count = initdata
|
||||||
.try { |text| short_text_to_number(text.split(" ")[0]) } || 0
|
.dig?("header", "c4TabbedHeaderRenderer", "subscriberCountText", "simpleText").try &.as_s?
|
||||||
|
.try { |text| short_text_to_number(text.split(" ")[0]).to_i32 } || 0
|
||||||
|
|
||||||
AboutChannel.new(
|
AboutChannel.new(
|
||||||
ucid: ucid,
|
ucid: ucid,
|
||||||
|
|
|
@ -161,21 +161,19 @@ def number_with_separator(number)
|
||||||
number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1,").reverse
|
number.to_s.reverse.gsub(/(\d{3})(?=\d)/, "\\1,").reverse
|
||||||
end
|
end
|
||||||
|
|
||||||
def short_text_to_number(short_text : String) : Int32
|
def short_text_to_number(short_text : String) : Int64
|
||||||
case short_text
|
matches = /(?<number>\d+(\.\d+)?)\s?(?<suffix>[mMkKbB])?/.match(short_text)
|
||||||
when .ends_with? "M"
|
number = matches.try &.["number"].to_f || 0.0
|
||||||
number = short_text.rstrip(" mM").to_f
|
|
||||||
number *= 1000000
|
case matches.try &.["suffix"].downcase
|
||||||
when .ends_with? "K"
|
when "k" then number *= 1_000
|
||||||
number = short_text.rstrip(" kK").to_f
|
when "m" then number *= 1_000_000
|
||||||
number *= 1000
|
when "b" then number *= 1_000_000_000
|
||||||
else
|
|
||||||
number = short_text.rstrip(" ")
|
|
||||||
end
|
end
|
||||||
|
|
||||||
number = number.to_i
|
return number.to_i64
|
||||||
|
rescue ex
|
||||||
return number
|
return 0_i64
|
||||||
end
|
end
|
||||||
|
|
||||||
def number_to_short_text(number)
|
def number_to_short_text(number)
|
||||||
|
|
|
@ -170,7 +170,7 @@ private module Parsers
|
||||||
# Always simpleText
|
# Always simpleText
|
||||||
# TODO change default value to nil
|
# TODO change default value to nil
|
||||||
subscriber_count = item_contents.dig?("subscriberCountText", "simpleText")
|
subscriber_count = item_contents.dig?("subscriberCountText", "simpleText")
|
||||||
.try { |s| short_text_to_number(s.as_s.split(" ")[0]) } || 0
|
.try { |s| short_text_to_number(s.as_s.split(" ")[0]).to_i32 } || 0
|
||||||
|
|
||||||
# Auto-generated channels doesn't have videoCountText
|
# Auto-generated channels doesn't have videoCountText
|
||||||
# Taken from: https://github.com/iv-org/invidious/pull/2228#discussion_r717620922
|
# Taken from: https://github.com/iv-org/invidious/pull/2228#discussion_r717620922
|
||||||
|
|
Loading…
Reference in a new issue