aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2020-06-27 22:52:20 +0200
committerdec05eba <dec05eba@protonmail.com>2020-06-27 22:52:20 +0200
commitdd7f669c797d8bf844140001a094f87f28188351 (patch)
treeb32e03bbc0f34d705f00c2db57b3e42528bd8817 /src/plugins
parent74ce5e43e75fdc874bd108cf9015660bc1e886f6 (diff)
Fix search result broken if contains curly braces
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/Youtube.cpp65
1 files changed, 35 insertions, 30 deletions
diff --git a/src/plugins/Youtube.cpp b/src/plugins/Youtube.cpp
index 3d7e4fb..c82fdbe 100644
--- a/src/plugins/Youtube.cpp
+++ b/src/plugins/Youtube.cpp
@@ -25,6 +25,37 @@ namespace QuickMedia {
}
}
+ static size_t find_end_of_json(const std::string &website_data, size_t data_start) {
+ int brace_count = 0;
+ char string_char = '\0';
+ bool escape = false;
+ for(size_t i = data_start; i < website_data.size(); ++i) {
+ char c = website_data[i];
+ if(c == '{' && string_char == '\0') {
+ escape = false;
+ ++brace_count;
+ } else if(c == '}' && string_char == '\0') {
+ escape = false;
+ --brace_count;
+ if(brace_count == 0) {
+ return i + 1;
+ }
+ } else if(c == '"' || c == '\'') {
+ if(string_char == '\0') {
+ string_char = c;
+ } else if(c == string_char && !escape) {
+ string_char = '\0';
+ }
+ escape = false;
+ } else if(c == '\\' && string_char) {
+ escape = !escape;
+ } else if(string_char) {
+ escape = false;
+ }
+ }
+ return std::string::npos;
+ }
+
// TODO: Speed this up by using string.find instead of parsing html
SuggestionResult Youtube::update_search_suggestions(const std::string &text, BodyItems &result_items) {
// Keep this for backup. This is using search suggestion the same way youtube does it, but the results
@@ -138,22 +169,9 @@ namespace QuickMedia {
return SuggestionResult::ERR;
data_start = data_start + 26;
- size_t data_end = 0;
- int brace_count = 0;
- for(size_t i = data_start; i < website_data.size(); ++i) {
- char c = website_data[i];
- if(c == '{')
- ++brace_count;
- else if(c == '}') {
- --brace_count;
- if(brace_count == 0) {
- data_end = i + 1;
- break;
- }
- }
- }
+ size_t data_end = find_end_of_json(website_data, data_start);
- if(data_end == 0)
+ if(data_end == std::string::npos)
return SuggestionResult::ERR;
Json::Value json_root;
@@ -389,22 +407,9 @@ namespace QuickMedia {
return result_items;
data_start = data_start + 26;
- size_t data_end = 0;
- int brace_count = 0;
- for(size_t i = data_start; i < website_data.size(); ++i) {
- char c = website_data[i];
- if(c == '{')
- ++brace_count;
- else if(c == '}') {
- --brace_count;
- if(brace_count == 0) {
- data_end = i + 1;
- break;
- }
- }
- }
+ size_t data_end = find_end_of_json(website_data, data_start);
- if(data_end == 0)
+ if(data_end == std::string::npos)
return result_items;
Json::Value json_root;