mirror of
				https://github.com/iv-org/invidious.git
				synced 2025-11-03 22:21:55 +00:00 
			
		
		
		
	Catch errors in 'fetch_video' fibers
This commit is contained in:
		@@ -412,8 +412,7 @@ get "/captions/:id" do |env|
 | 
			
		||||
  begin
 | 
			
		||||
    video = get_video(id, client, PG_DB)
 | 
			
		||||
  rescue ex
 | 
			
		||||
    error_message = ex.message
 | 
			
		||||
    next templated "error"
 | 
			
		||||
    halt env, status_code: 403
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  env.response.content_type = "application/json"
 | 
			
		||||
 
 | 
			
		||||
@@ -241,9 +241,6 @@ def fetch_video(id, client)
 | 
			
		||||
    if info["reason"]?
 | 
			
		||||
      info = client.get("/get_video_info?video_id=#{id}&ps=default&eurl=&gl=US&hl=en&disable_polymer=1").body
 | 
			
		||||
      info = HTTP::Params.parse(info)
 | 
			
		||||
      if info["reason"]?
 | 
			
		||||
        raise info["reason"]
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    info_channel.send(info)
 | 
			
		||||
@@ -252,6 +249,10 @@ def fetch_video(id, client)
 | 
			
		||||
  html = html_channel.receive
 | 
			
		||||
  info = info_channel.receive
 | 
			
		||||
 | 
			
		||||
  if info["reson"]?
 | 
			
		||||
    raise info["reason"]
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  title = info["title"]
 | 
			
		||||
  views = info["view_count"].to_i64
 | 
			
		||||
  author = info["author"]
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user