Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-10-01 01:25:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

add support for new hashtag header format

Browse Source
This commit is contained in:
ChunkyProgrammer 2024-03-07 21:41:22 -05:00
parent c10fc9474c
commit 14592eef58
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/invidious/yt_backend/extractors.cr
View File

@ -221,31 +221,28 @@ private module Parsers
# A `hashtagHeaderRenderer` is displayed on the first page of the hashtag page. # A `hashtagHeaderRenderer` is displayed on the first page of the hashtag page.
module HashtagRendererParser module HashtagRendererParser
def self.process(item : JSON::Any, author_fallback : AuthorFallback) def self.process(item : JSON::Any, author_fallback : AuthorFallback)
if item_contents = (item["hashtagTileRenderer"]? || item["hashtagHeaderRenderer"]?) if item_contents = (item["hashtagTileRenderer"]? || item["hashtagHeaderRenderer"]? || item["pageHeaderRenderer"]?)
return self.parse(item_contents) return self.parse(item_contents)
end end
end end
private def self.parse(item_contents) private def self.parse(item_contents)
title = extract_text(item_contents["hashtag"]).not_nil! # E.g "#hi" title = item_contents.dig?("pageTitle").try &.as_s
title ||= extract_text(item_contents["hashtag"]).not_nil! # E.g "#hi"
# E.g "/hashtag/hi" # E.g "/hashtag/hi"
url = item_contents.dig?("onTapCommand", "commandMetadata", "webCommandMetadata", "url").try &.as_s url = item_contents.dig?("onTapCommand", "commandMetadata", "webCommandMetadata", "url").try &.as_s
url ||= URI.encode_path("/hashtag/#{title.lchop('#')}") url ||= URI.encode_path("/hashtag/#{title.lchop('#')}")
if info = extract_text(item_contents.dig?("hashtagInfoText")) video_count_txt = extract_text(item_contents["hashtagVideoCount"]?) # E.g "203K videos"
regex_match = /(?<videos>\d+\S)\D+(?<channels>\d+\S)/.match(info) channel_count_txt = extract_text(item_contents["hashtagChannelCount"]?) # E.g "81K channels"
videos = regex_match.try &.["videos"]?.try &.to_s
channels = regex_match.try &.["channels"]?.try &.to_s
else
video_count_txt = extract_text(item_contents["hashtagVideoCount"]?) # E.g "203K videos"
channel_count_txt = extract_text(item_contents["hashtagChannelCount"]?) # E.g "81K channels"
end
# Fallback for video/channel counts # Fallback for video/channel counts
if channel_count_txt.nil? || video_count_txt.nil? if channel_count_txt.nil? || video_count_txt.nil?
info_text = (item_contents.dig?("content", "pageHeaderViewModel", "metadata", "contentMetadataViewModel", "metadataRows", 0, "metadataParts", 0, "text", "content").try &.as_s ||
extract_text(item_contents.dig?("hashtagInfoText"))).try &.split(" • ")
# E.g: "203K videos • 81K channels" # E.g: "203K videos • 81K channels"
info_text = extract_text(item_contents["hashtagInfoText"]?).try &.split(" • ")
if info_text && info_text.size == 2 if info_text && info_text.size == 2
video_count_txt ||= info_text[0] video_count_txt ||= info_text[0]