From dc72e253df77c9126c720e7ff5dad7f8c72bd117 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Mon, 13 Jul 2020 13:48:30 +0200 Subject: Temporary disable youtube recommendations, fix youtube related videos --- src/plugins/Youtube.cpp | 110 +++++++++++++++--------------------------------- 1 file changed, 34 insertions(+), 76 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Youtube.cpp b/src/plugins/Youtube.cpp index 95ee8e3..b68e513 100644 --- a/src/plugins/Youtube.cpp +++ b/src/plugins/Youtube.cpp @@ -2,20 +2,9 @@ #include "../../include/Storage.hpp" #include #include -#include #include namespace QuickMedia { - const int VISITOR_ID_SIZE = 12; - const char visitor_id_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQSTUVWXYZ0123456789-_"; - static void generate_visitor_id(char visitor_id[VISITOR_ID_SIZE]) { - uuid_t uuid_num; - uuid_generate_random(uuid_num); - for(int i = 0; i < VISITOR_ID_SIZE; ++i) { - visitor_id[i] = visitor_id_chars[uuid_num[i] % (sizeof(visitor_id_chars) - 1)]; - } - } - static void iterate_suggestion_result(const Json::Value &value, std::vector &result_items, int &iterate_count) { ++iterate_count; if(value.isArray()) { @@ -27,23 +16,6 @@ namespace QuickMedia { } } - static bool json_read_cookies(const Json::Value &json_cookies, std::string &visitor_info_live, std::string &ysc) { - if(!json_cookies.isObject()) - return false; - - const Json::Value &visitor_info_live_json = json_cookies["visitor_info_live"]; - if(!visitor_info_live_json.isString()) - return false; - - const Json::Value &ysc_json = json_cookies["ysc"]; - if(!ysc_json.isString()) - return false; - - visitor_info_live = visitor_info_live_json.asString(); - ysc = ysc_json.asString(); - return true; - } - static std::unique_ptr parse_content_video_renderer(const Json::Value &content_item_json) { if(!content_item_json.isObject()) return nullptr; @@ -83,42 +55,14 @@ namespace QuickMedia { } Youtube::Youtube() : Plugin("youtube") { - Path youtube_config_dir = get_storage_dir().join("youtube"); - if(create_directory_recursive(youtube_config_dir) == 0) { - Path cookie_path = youtube_config_dir; - cookie_path.join("cookies.json"); - - bool cookies_read_from_file = false; - std::string cookie_file_content; - if(file_get_content(cookie_path, cookie_file_content) == 0) { - Json::Value json_root; - Json::CharReaderBuilder json_builder; - std::unique_ptr json_reader(json_builder.newCharReader()); - std::string json_errors; - if(json_reader->parse(&cookie_file_content[0], &cookie_file_content[cookie_file_content.size()], &json_root, &json_errors) && json_read_cookies(json_root, visitor_info_live, ysc)) { - cookies_read_from_file = true; - } else { - fprintf(stderr, "Youtube failed to read cookies: %s\n", json_errors.c_str()); - } - } - - if(!cookies_read_from_file) { - visitor_info_live.resize(VISITOR_ID_SIZE); - ysc.resize(VISITOR_ID_SIZE); - generate_visitor_id(&visitor_info_live[0]); - generate_visitor_id(&ysc[0]); - - Json::Value json_cookies(Json::objectValue); - json_cookies["visitor_info_live"] = visitor_info_live; - json_cookies["ysc"] = ysc; - - Json::StreamWriterBuilder json_builder; - file_overwrite(cookie_path, Json::writeString(json_builder, json_cookies)); - } - } + } PluginResult Youtube::get_front_page(BodyItems &result_items) { + bool disabled = true; + if(disabled) + return PluginResult::OK; + std::string url = "https://youtube.com/"; std::vector additional_args = { @@ -128,9 +72,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::optional cookies = get_cookies(); - if(cookies) - additional_args.push_back(cookies.value()); + std::vector cookies = get_cookies(); + additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(url + "?pbj=1", website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -325,9 +268,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::optional cookies = get_cookies(); - if(cookies) - additional_args.push_back(cookies.value()); + std::vector cookies = get_cookies(); + additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(url + "&pbj=1", website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -405,9 +347,8 @@ namespace QuickMedia { { "-H", "referer: " + url } }; - std::optional cookies = get_cookies(); - if(cookies) - additional_args.push_back(cookies.value()); + std::vector cookies = get_cookies(); + additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; if(download_to_string(next_url, website_data, additional_args, use_tor, true) != DownloadResult::OK) @@ -448,10 +389,17 @@ namespace QuickMedia { } } - std::optional Youtube::get_cookies() const { - if(!visitor_info_live.empty() && !ysc.empty()) - return CommandArg { "-H", "cookie: VISITOR_INFO1_LIVE=" + visitor_info_live + "; YSC=" + ysc + "; wide=1; PREF=; GPS=0" }; - return std::nullopt; + std::vector Youtube::get_cookies() const { + Path cookies_filepath; + if(get_cookies_filepath(cookies_filepath, name) != 0) { + fprintf(stderr, "Warning: Failed to create youtube cookies file\n"); + return {}; + } + + return { + CommandArg{ "-b", cookies_filepath.data }, + CommandArg{ "-c", cookies_filepath.data } + }; } static std::string remove_index_from_playlist_url(const std::string &url) { @@ -498,9 +446,19 @@ namespace QuickMedia { BodyItems result_items; std::string modified_url = remove_index_from_playlist_url(url); + std::vector additional_args = { + { "-H", "x-spf-referer: " + url }, + { "-H", "x-youtube-client-name: 1" }, + { "-H", "x-spf-previous: " + url }, + { "-H", "x-youtube-client-version: 2.20200626.03.00" }, + { "-H", "referer: " + url } + }; + + std::vector cookies = get_cookies(); + additional_args.insert(additional_args.end(), cookies.begin(), cookies.end()); std::string website_data; - if(download_to_string(modified_url, website_data, {}, use_tor, true) != DownloadResult::OK) + if(download_to_string(modified_url, website_data, additional_args, use_tor, true) != DownloadResult::OK) return result_items; size_t data_start = website_data.find("window[\"ytInitialData\"] = {"); @@ -518,7 +476,7 @@ namespace QuickMedia { std::unique_ptr json_reader(json_builder.newCharReader()); std::string json_errors; if(!json_reader->parse(&website_data[data_start], &website_data[data_end], &json_root, &json_errors)) { - fprintf(stderr, "Youtube search json error: %s\n", json_errors.c_str()); + fprintf(stderr, "Youtube related media error: %s\n", json_errors.c_str()); return result_items; } -- cgit v1.2.3