mirror of https://github.com/iv-org/invidious.git
Pull description into seperate function
This commit is contained in:
parent
09d4d46fcd
commit
9a78b55c53
|
@ -1860,11 +1860,9 @@ get "/api/v1/videos/:id" do |env|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
description = video.description.gsub("<br>", "\n")
|
description = html_to_description(video.description)
|
||||||
description = description.gsub("<br/>", "\n")
|
|
||||||
description = XML.parse_html(description)
|
|
||||||
|
|
||||||
json.field "description", description.content
|
json.field "description", description
|
||||||
json.field "descriptionHtml", video.description
|
json.field "descriptionHtml", video.description
|
||||||
json.field "published", video.published.epoch
|
json.field "published", video.published.epoch
|
||||||
json.field "keywords" do
|
json.field "keywords" do
|
||||||
|
@ -2057,16 +2055,8 @@ get "/api/v1/trending" do |env|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
descriptionHtml = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
||||||
if !descriptionHtml
|
description, description_html = html_to_description(description_html)
|
||||||
description = ""
|
|
||||||
descriptionHtml = ""
|
|
||||||
else
|
|
||||||
descriptionHtml = descriptionHtml.to_s
|
|
||||||
description = descriptionHtml.gsub("<br>", "\n")
|
|
||||||
description = description.gsub("<br/>", "\n")
|
|
||||||
description = XML.parse_html(description).content.strip("\n ")
|
|
||||||
end
|
|
||||||
|
|
||||||
length_seconds = decode_length_seconds(node.xpath_node(%q(.//span[@class="video-time"])).not_nil!.content)
|
length_seconds = decode_length_seconds(node.xpath_node(%q(.//span[@class="video-time"])).not_nil!.content)
|
||||||
|
|
||||||
|
@ -2098,7 +2088,7 @@ get "/api/v1/trending" do |env|
|
||||||
|
|
||||||
json.field "published", published.epoch
|
json.field "published", published.epoch
|
||||||
json.field "description", description
|
json.field "description", description
|
||||||
json.field "descriptionHtml", descriptionHtml
|
json.field "descriptionHtml", description_html
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -2339,16 +2329,8 @@ get "/api/v1/channels/:ucid/videos" do |env|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
descriptionHtml = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
||||||
if !descriptionHtml
|
description, description_html = html_to_description(description_html)
|
||||||
description = ""
|
|
||||||
descriptionHtml = ""
|
|
||||||
else
|
|
||||||
descriptionHtml = descriptionHtml.to_s
|
|
||||||
description = descriptionHtml.gsub("<br>", "\n")
|
|
||||||
description = description.gsub("<br/>", "\n")
|
|
||||||
description = XML.parse_html(description).content.strip("\n ")
|
|
||||||
end
|
|
||||||
|
|
||||||
length_seconds = decode_length_seconds(node.xpath_node(%q(.//span[@class="video-time"])).not_nil!.content)
|
length_seconds = decode_length_seconds(node.xpath_node(%q(.//span[@class="video-time"])).not_nil!.content)
|
||||||
|
|
||||||
|
@ -2374,7 +2356,7 @@ get "/api/v1/channels/:ucid/videos" do |env|
|
||||||
end
|
end
|
||||||
|
|
||||||
json.field "description", description
|
json.field "description", description
|
||||||
json.field "descriptionHtml", descriptionHtml
|
json.field "descriptionHtml", description_html
|
||||||
|
|
||||||
json.field "viewCount", view_count
|
json.field "viewCount", view_count
|
||||||
json.field "published", published.epoch
|
json.field "published", published.epoch
|
||||||
|
|
|
@ -164,7 +164,7 @@ def extract_channel_videos(document, author, ucid)
|
||||||
end
|
end
|
||||||
|
|
||||||
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
||||||
description = description_html_to_description(description_html)
|
description, description_html = html_to_description(description_html)
|
||||||
|
|
||||||
length_seconds = node.xpath_node(%q(.//span[@class="video-time"]))
|
length_seconds = node.xpath_node(%q(.//span[@class="video-time"]))
|
||||||
if length_seconds
|
if length_seconds
|
||||||
|
|
|
@ -273,7 +273,7 @@ def generate_captcha(key)
|
||||||
return {challenge: challenge, token: token}
|
return {challenge: challenge, token: token}
|
||||||
end
|
end
|
||||||
|
|
||||||
def description_html_to_description(description_html)
|
def html_to_description(description_html)
|
||||||
if !description_html
|
if !description_html
|
||||||
description = ""
|
description = ""
|
||||||
description_html = ""
|
description_html = ""
|
||||||
|
@ -284,5 +284,5 @@ def description_html_to_description(description_html)
|
||||||
description = XML.parse_html(description).content.strip("\n ")
|
description = XML.parse_html(description).content.strip("\n ")
|
||||||
end
|
end
|
||||||
|
|
||||||
return description
|
return description, description_html
|
||||||
end
|
end
|
||||||
|
|
|
@ -81,15 +81,7 @@ def search(query, page = 1, search_params = build_search_params(content_type: "v
|
||||||
end
|
end
|
||||||
|
|
||||||
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
description_html = node.xpath_node(%q(.//div[contains(@class, "yt-lockup-description")]))
|
||||||
if !description_html
|
description, description_html = html_to_description(description_html)
|
||||||
description = ""
|
|
||||||
description_html = ""
|
|
||||||
else
|
|
||||||
description_html = description_html.to_s
|
|
||||||
description = description_html.gsub("<br>", "\n")
|
|
||||||
description = description.gsub("<br/>", "\n")
|
|
||||||
description = XML.parse_html(description).content.strip("\n ")
|
|
||||||
end
|
|
||||||
|
|
||||||
length_seconds = node.xpath_node(%q(.//span[@class="video-time"]))
|
length_seconds = node.xpath_node(%q(.//span[@class="video-time"]))
|
||||||
if length_seconds
|
if length_seconds
|
||||||
|
|
Loading…
Reference in New Issue