iv-org-mirror/invidious-copy-2023-06-08
1
0
Fork 0
mirror of https://gitea.invidious.io/iv-org/invidious-copy-2023-06-08.git synced 2024-08-15 00:53:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

extractors: Fix ReelItemRendererParser

Browse source
This commit is contained in:
Samantaz Fox 2022-12-01 23:01:31 +01:00
parent 52ef89f02d
commit 5d6abd5301
No known key found for this signature in database
GPG key ID: F42821059186176E
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/invidious/yt_backend/extractors.cr
View file

@ -382,7 +382,9 @@ private module Parsers
end end
private def self.parse(item_contents, author_fallback) private def self.parse(item_contents, author_fallback)
return VideoRendererParser.process(item_contents, author_fallback) child = VideoRendererParser.process(item_contents, author_fallback)
child ||= ReelItemRendererParser.process(item_contents, author_fallback)
return child
end end
def self.parser_name def self.parser_name
@ -406,12 +408,18 @@ private module Parsers
private def self.parse(item_contents, author_fallback) private def self.parse(item_contents, author_fallback)
video_id = item_contents["videoId"].as_s video_id = item_contents["videoId"].as_s
video_details_container = item_contents.dig( begin
"navigationEndpoint", "reelWatchEndpoint", video_details_container = item_contents.dig(
"overlay", "reelPlayerOverlayRenderer", "navigationEndpoint", "reelWatchEndpoint",
"reelPlayerHeaderSupportedRenderers", "overlay", "reelPlayerOverlayRenderer",
"reelPlayerHeaderRenderer" "reelPlayerHeaderSupportedRenderers",
) "reelPlayerHeaderRenderer"
)
rescue ex : KeyError
# Extract key name from original message
key = /"([^"]+)"/.match(ex.message || "").try &.[1]?
raise BrokenTubeException.new(key || "reelPlayerOverlayRenderer")
end
# Author infos # Author infos
@ -434,9 +442,9 @@ private module Parsers
# View count # View count
view_count_text = video_details_container.dig?("viewCountText", "simpleText") # View count used to be in the reelWatchEndpoint, but that changed?
view_count_text ||= video_details_container view_count_text = item_contents.dig?("viewCountText", "simpleText")
.dig?("viewCountText", "accessibility", "accessibilityData", "label") view_count_text ||= video_details_container.dig?("viewCountText", "simpleText")
view_count = view_count_text.try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64 view_count = view_count_text.try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64
@ -448,8 +456,8 @@ private module Parsers
regex_match = /- (?<min>\d+ minutes? )?(?<sec>\d+ seconds?)+ -/.match(a11y_data) regex_match = /- (?<min>\d+ minutes? )?(?<sec>\d+ seconds?)+ -/.match(a11y_data)
minutes = regex_match.try &.["min"].to_i(strict: false) || 0 minutes = regex_match.try &.["min"]?.try &.to_i(strict: false) || 0
seconds = regex_match.try &.["sec"].to_i(strict: false) || 0 seconds = regex_match.try &.["sec"]?.try &.to_i(strict: false) || 0
duration = (minutes*60 + seconds) duration = (minutes*60 + seconds)