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

videos: Fix some bugs

Browse Source
This commit is contained in:
Samantaz Fox 2022-09-14 20:08:36 +02:00
parent 83795c245a
commit db91d3af66
No known key found for this signature in database
GPG Key ID: F42821059186176E
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/invidious/jsonify/api_v1/video_json.cr
View File

@ -93,7 +93,16 @@ module Invidious::JSONify::APIv1
json.field "itag", fmt["itag"].as_i.to_s json.field "itag", fmt["itag"].as_i.to_s
json.field "type", fmt["mimeType"] json.field "type", fmt["mimeType"]
json.field "clen", fmt["contentLength"]? || "-1" json.field "clen", fmt["contentLength"]? || "-1"
json.field "lmt", fmt["lastModified"]
# Last modified is a unix timestamp with µS, with the dot omitted.
# E.g: 1638056732(.)141582
#
# On livestreams, it's not present, so always fall back to the
# current unix timestamp (up to mS precision) for compatibility.
last_modified = fmt["lastModified"]?
last_modified ||= "#{Time.utc.to_unix_ms.to_s}000"
json.field "lmt", last_modified
json.field "projectionType", fmt["projectionType"] json.field "projectionType", fmt["projectionType"]
if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"]) if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])

8
src/invidious/videos/parser.cr
View File

@ -159,10 +159,10 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
# We have to try to extract viewCount from videoPrimaryInfoRenderer first, # We have to try to extract viewCount from videoPrimaryInfoRenderer first,
# then from videoDetails, as the latter is "0" for livestreams (we want # then from videoDetails, as the latter is "0" for livestreams (we want
# to get the amount of viewers watching). # to get the amount of viewers watching).
views = video_primary_renderer views_txt = video_primary_renderer
.try &.dig?("viewCount", "videoViewCountRenderer", "viewCount", "runs", 0, "text") .try &.dig?("viewCount", "videoViewCountRenderer", "viewCount", "runs", 0, "text")
.try &.as_s.to_i64 views_txt ||= video_details["viewCount"]?
views ||= video_details["viewCount"]?.try &.as_s.to_i64 views = views_txt.try &.as_s.gsub(/\D/, "").to_i64?
length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"]) length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"])
.try &.as_s.to_i64 .try &.as_s.to_i64
@ -270,7 +270,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
license = nil license = nil
metadata.try &.each do |row| metadata.try &.each do |row|
metadata_title = row.dig?("metadataRowRenderer", "title", "simpleText").try &.as_s metadata_title = extract_text(row.dig?("metadataRowRenderer", "title"))
contents = row.dig?("metadataRowRenderer", "contents", 0) contents = row.dig?("metadataRowRenderer", "contents", 0)
if metadata_title == "Category" if metadata_title == "Category"