Fijxu/invidious
4
4
Fork 2
Code Issues 25 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "Videos: Completly disable annotations due to archive.org being down"

Browse source 
This reverts commit cf5028d09a.
This commit is contained in:
Fijxu 2025-01-13 11:07:40 -03:00
parent 25c3153f4c
commit 61106da689
Signed by: Fijxu
GPG key ID: 32C1DDF333EDA6A4
1 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
src/invidious/routes/api/v1/videos.cr
View file

@ -263,61 +263,60 @@ module Invidious::Routes::API::V1::Videos
annotations = "" annotations = ""
# case source case source
# when "archive" when "archive"
# if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id)) if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id))
# annotations = cached_annotation.annotations annotations = cached_annotation.annotations
# else else
# index = CHARS_SAFE.index!(id[0]).to_s.rjust(2, '0') index = CHARS_SAFE.index!(id[0]).to_s.rjust(2, '0')
# # IA doesn't handle leading hyphens, # IA doesn't handle leading hyphens,
# # so we use https://archive.org/details/youtubeannotations_64 # so we use https://archive.org/details/youtubeannotations_64
# if index == "62" if index == "62"
# index = "64" index = "64"
# id = id.sub(/^-/, 'A') id = id.sub(/^-/, 'A')
# end end
# file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml") file = URI.encode_www_form("#{id[0, 3]}/#{id}.xml")
# location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}")) location = make_client(ARCHIVE_URL, &.get("/download/youtubeannotations_#{index}/#{id[0, 2]}.tar/#{file}"))
# if !location.headers["Location"]? if !location.headers["Location"]?
# env.response.status_code = location.status_code env.response.status_code = location.status_code
# end end
# response = make_client(URI.parse(location.headers["Location"]), &.get(location.headers["Location"])) response = make_client(URI.parse(location.headers["Location"]), &.get(location.headers["Location"]))
# if response.body.empty? if response.body.empty?
# haltf env, 404 haltf env, 404
# end end
# if response.status_code != 200 if response.status_code != 200
# haltf env, response.status_code haltf env, response.status_code
# end end
# annotations = response.body annotations = response.body
# cache_annotation(id, annotations) cache_annotation(id, annotations)
# end end
# else # "youtube" else # "youtube"
# response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}") response = YT_POOL.client &.get("/annotations_invideo?video_id=#{id}")
# if response.status_code != 200 if response.status_code != 200
# haltf env, response.status_code haltf env, response.status_code
# end end
# annotations = response.body annotations = response.body
# end end
# etag = sha256(annotations)[0, 16] etag = sha256(annotations)[0, 16]
# if env.request.headers["If-None-Match"]?.try &.== etag if env.request.headers["If-None-Match"]?.try &.== etag
# haltf env, 304 haltf env, 304
# else else
# env.response.headers["ETag"] = etag env.response.headers["ETag"] = etag
# annotations
# end
annotations annotations
end end
end
def self.comments(env) def self.comments(env)
locale = env.get("preferences").as(Preferences).locale locale = env.get("preferences").as(Preferences).locale