mirrors/irs
1
1
Fork 0
mirror of https://github.com/cooperhammond/irs.git synced 2024-12-22 17:35:28 +00:00
Code Issues Projects Releases Wiki Activity

fix youtube urls validation

Browse source
This commit is contained in:
imsamuka 2022-01-02 17:20:37 -03:00
parent bdc63b4c35
commit ac7bc02ec5
No known key found for this signature in database
GPG key ID: AF9ACFEF1FD372EE
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/search/youtube.cr
View file

@ -57,7 +57,7 @@ module Youtube
root = "https://youtube.com" root = "https://youtube.com"
if download_first if download_first
return root + yt_metadata[0]["href"] return root + yt_metadata[0]["href"]
end end
ranked = Ranker.rank_videos(spotify_metadata, yt_metadata, human_query) ranked = Ranker.rank_videos(spotify_metadata, yt_metadata, human_query)
@ -75,12 +75,12 @@ module Youtube
exit 1 exit 1
end end
# Presents a menu with song info for the user to choose which url they want to download # Presents a menu with song info for the user to choose which url they want to download
private def select_link_menu(spotify_metadata : JSON::Any, private def select_link_menu(spotify_metadata : JSON::Any,
yt_metadata : YT_METADATA_CLASS) : String yt_metadata : YT_METADATA_CLASS) : String
puts Style.dim(" Spotify info: ") + puts Style.dim(" Spotify info: ") +
Style.bold("\"" + spotify_metadata["name"].to_s) + "\" by \"" + Style.bold("\"" + spotify_metadata["name"].to_s) + "\" by \"" +
Style.bold(spotify_metadata["artists"][0]["name"].to_s + "\"") + Style.bold(spotify_metadata["artists"][0]["name"].to_s + "\"") +
" @ " + Style.blue((spotify_metadata["duration_ms"].as_i / 1000).to_i.to_s) + "s" " @ " + Style.blue((spotify_metadata["duration_ms"].as_i / 1000).to_i.to_s) + "s"
puts " Choose video to download:" puts " Choose video to download:"
@ -111,7 +111,7 @@ module Youtube
end end
# Finds valid video links from a `HTTP::Client.get` request # Finds valid video links from a `HTTP::Client.get` request
# Returns an `Array` of `NODES_CLASS` containing additional metadata from Youtube # Returns an `Array` of `NODES_CLASS` containing additional metadata from Youtube
private def get_yt_search_metadata(response_body : String) : YT_METADATA_CLASS private def get_yt_search_metadata(response_body : String) : YT_METADATA_CLASS
yt_initial_data : JSON::Any = JSON.parse("{}") yt_initial_data : JSON::Any = JSON.parse("{}")
@ -181,7 +181,9 @@ module Youtube
# is it a video on youtube, with a query # is it a video on youtube, with a query
query = uri.query query = uri.query
if uri.host != "www.youtube.com" || uri.path != "/watch" || !query
if !uri || !query || !uri.host || uri.path != "/watch" ||
!uri.host.not_nil!.ends_with?("youtube.com")
return false return false
end end
@ -204,8 +206,9 @@ module Youtube
# this is an internal endpoint to validate the video ID # this is an internal endpoint to validate the video ID
response = HTTP::Client.get "https://www.youtube.com/get_video_info?video_id=#{vID}"
return response.body.includes?("status=ok") response = HTTP::Client.get "https://www.youtube.com/oembed?format=json&url=#{url}"
return response.success?
end end
end end