Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

YouTube_DL: Minor Fixes

Browse Source
This commit is contained in:
Andreas Bielawski 2016-08-13 20:38:27 +02:00
parent 2065f9a12c
commit f71cec9f54
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
otouto/plugins/youtube_dl.lua
View File

@ -51,6 +51,8 @@ function youtube_dl:get_availabe_formats(id, hash)
local url = data.formats[n].url local url = data.formats[n].url
local headers = get_http_header(url) local headers = get_http_header(url)
local full_url = headers.location local full_url = headers.location
if not full_url then return end
local headers = get_http_header(full_url) -- first was for 302, this get's use the size local headers = get_http_header(full_url) -- first was for 302, this get's use the size
if headers.location then -- There are some videos where there is a "chain" of 302... repeat this, until we get the LAST url! if headers.location then -- There are some videos where there is a "chain" of 302... repeat this, until we get the LAST url!
repeat repeat
@ -58,6 +60,7 @@ function youtube_dl:get_availabe_formats(id, hash)
until not headers.location until not headers.location
end end
format_info.url = full_url format_info.url = full_url
local size = tonumber(headers["content-length"]) local size = tonumber(headers["content-length"])
format_info.size = size format_info.size = size
@ -96,10 +99,12 @@ function youtube_dl:callback(callback, msg, self, config, input)
youtube_dl:get_availabe_formats(video_id, hash) youtube_dl:get_availabe_formats(video_id, hash)
end end
local keyboard = redis:hget(hash, 'keyboard')
local duration = redis:hget(hash, 'duration') local duration = redis:hget(hash, 'duration')
local format_info = redis:hgetall(format_hash) local format_info = redis:hgetall(format_hash)
local full_url = format_info.url local full_url = format_info.url
local width = format_info.width local width = format_info.width
local height = format_info.height local height = format_info.height
local ext = format_info.ext local ext = format_info.ext
@ -109,7 +114,7 @@ function youtube_dl:callback(callback, msg, self, config, input)
local file = format_info.file_id local file = format_info.file_id
if size > 52420000 then if size > 52420000 then
utilities.edit_message(self, msg.chat.id, msg.message_id, '<a href="'..full_url..'">Direktlink zum Video</a> ('..format..', '..pretty_size..')', nil, 'HTML') utilities.edit_message(self, msg.chat.id, msg.message_id, '<a href="'..full_url..'">Direktlink zum Video</a> ('..format..', '..pretty_size..')', nil, 'HTML', keyboard)
return return
end end
@ -120,8 +125,8 @@ function youtube_dl:callback(callback, msg, self, config, input)
file = download_to_file(full_url, video_id..'.'..ext) file = download_to_file(full_url, video_id..'.'..ext)
end end
if not file then return end if not file then return end
local result = utilities.send_video(self, msg.chat.id, file, nil, msg.message_id, duration, width, height) local result = utilities.send_video(self, msg.chat.id, file, '('..format..')', msg.message_id, duration, width, height)
utilities.edit_message(self, msg.chat.id, msg.message_id, '<a href="'..full_url..'">Direktlink zum Video</a> ('..format..', '..pretty_size..')', nil, 'HTML') utilities.edit_message(self, msg.chat.id, msg.message_id, '<a href="'..full_url..'">Direktlink zum Video</a> ('..format..', '..pretty_size..')', nil, 'HTML', keyboard)
if not result then return end if not result then return end
local file_id = result.result.video.file_id local file_id = result.result.video.file_id
redis:hset(format_hash, 'file_id', file_id) redis:hset(format_hash, 'file_id', file_id)