Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add complex xquery support #28

Merged
merged 5 commits into from
Sep 30, 2023
Merged

feat: add complex xquery support #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75a199c
feat: add complex xquery support
TinkoLiu Sep 28, 2023
6a00c83
bump v0.1.1
TinkoLiu Sep 28, 2023
d018719
chore: revert lint
TinkoLiu Sep 28, 2023
6a16cdc
chore: update settings save method
TinkoLiu Sep 29, 2023
f9ab2e4
chore: add "XPath" to old XML output type text
TinkoLiu Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}
},
"name": "obs-urlsource",
"version": "0.1.0",
"version": "0.1.1",
"author": "Roy Shilkrot",
"website": "https://github.com/royshil/obs-urlsource",
"email": "[email protected]",
Expand All @@ -54,4 +54,4 @@
"macosInstaller": "00000000-0000-0000-0000-000000000000",
"windowsApp": "00000000-0000-0000-0000-000000000000"
}
}
}
34 changes: 33 additions & 1 deletion src/request-data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,33 @@ struct request_data_handler_response parse_xml(struct request_data_handler_respo
return response;
}

struct request_data_handler_response
parse_xml_by_xquery(struct request_data_handler_response response,
url_source_request_data *request_data)
{
// Parse the response as XML using pugixml
pugi::xml_document doc;
pugi::xml_parse_result result = doc.load_string(response.body.c_str());
if (!result) {
obs_log(LOG_INFO, "Failed to parse XML response: %s", result.description());
// Return an error response
struct request_data_handler_response responseFail;
responseFail.error_message = result.description();
responseFail.status_code = URL_SOURCE_REQUEST_PARSING_ERROR_CODE;
return responseFail;
}
// Get the output value
if (request_data->output_xquery != "") {
pugi::xpath_query query_entity(request_data->output_xquery.c_str());
std::string s = query_entity.evaluate_string(doc);
response.body_parsed = s;
} else {
// Return the whole XML object
response.body_parsed = response.body;
}
return response;
}

struct request_data_handler_response parse_json(struct request_data_handler_response response,
url_source_request_data *request_data)
{
Expand Down Expand Up @@ -276,8 +303,11 @@ struct request_data_handler_response request_data_handler(url_source_request_dat
// Parse the response
if (request_data->output_type == "JSON") {
response = parse_json(response, request_data);
} else if (request_data->output_type == "XML" || request_data->output_type == "HTML") {
} else if (request_data->output_type == "XML (XPath)" ||
request_data->output_type == "HTML") {
response = parse_xml(response, request_data);
} else if (request_data->output_type == "XML (XQuery)") {
response = parse_xml_by_xquery(response, request_data);
} else if (request_data->output_type == "Text") {
response = parse_regex(response, request_data);
} else {
Expand Down Expand Up @@ -312,6 +342,7 @@ std::string serialize_request_data(url_source_request_data *request_data)
json["output_type"] = request_data->output_type;
json["output_json_path"] = request_data->output_json_path;
json["output_xpath"] = request_data->output_xpath;
json["output_xquery"] = request_data->output_xquery;
json["output_regex"] = request_data->output_regex;
json["output_regex_flags"] = request_data->output_regex_flags;
json["output_regex_group"] = request_data->output_regex_group;
Expand Down Expand Up @@ -381,6 +412,7 @@ url_source_request_data unserialize_request_data(std::string serialized_request_
request_data.output_type = json["output_type"].get<std::string>();
request_data.output_json_path = json["output_json_path"].get<std::string>();
request_data.output_xpath = json["output_xpath"].get<std::string>();
request_data.output_xquery = json["output_xquery"].get<std::string>();
request_data.output_regex = json["output_regex"].get<std::string>();
request_data.output_regex_flags = json["output_regex_flags"].get<std::string>();
request_data.output_regex_group = json["output_regex_group"].get<std::string>();
Expand Down
4 changes: 4 additions & 0 deletions src/request-data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ struct url_source_request_data {
std::string output_type;
std::string output_json_path;
std::string output_xpath;
std::string output_xquery;
std::string output_regex;
std::string output_regex_flags;
std::string output_regex_group;
Expand All @@ -48,6 +49,7 @@ struct url_source_request_data {
output_type = std::string("text");
output_json_path = std::string("");
output_xpath = std::string("");
output_xquery = std::string("");
output_regex = std::string("");
output_regex_flags = std::string("");
output_regex_group = std::string("0");
Expand All @@ -68,6 +70,7 @@ struct url_source_request_data {
output_type = std::string(other.output_type);
output_json_path = std::string(other.output_json_path);
output_xpath = std::string(other.output_xpath);
output_xquery = std::string(other.output_xquery);
output_regex = std::string(other.output_regex);
output_regex_flags = std::string(other.output_regex_flags);
output_regex_group = std::string(other.output_regex_group);
Expand All @@ -88,6 +91,7 @@ struct url_source_request_data {
output_type = std::string(other.output_type);
output_json_path = std::string(other.output_json_path);
output_xpath = std::string(other.output_xpath);
output_xquery = std::string(other.output_xquery);
output_regex = std::string(other.output_regex);
output_regex_flags = std::string(other.output_regex_flags);
output_regex_group = std::string(other.output_regex_group);
Expand Down
13 changes: 11 additions & 2 deletions src/ui/RequestBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ RequestBuilder::RequestBuilder(url_source_request_data *request_data,
QComboBox *outputTypeComboBox = new QComboBox;
outputTypeComboBox->addItem("Text");
outputTypeComboBox->addItem("JSON");
outputTypeComboBox->addItem("XML");
outputTypeComboBox->addItem("XML (XPath)");
outputTypeComboBox->addItem("XML (XQuery)");
outputTypeComboBox->addItem("HTML");
outputTypeComboBox->setCurrentIndex(
outputTypeComboBox->findText(QString::fromStdString(request_data->output_type)));
Expand All @@ -345,6 +346,10 @@ RequestBuilder::RequestBuilder(url_source_request_data *request_data,
outputXPathLineEdit->setText(QString::fromStdString(request_data->output_xpath));
outputXPathLineEdit->setPlaceholderText("XPath");
formOutputParsing->addRow("XPath", outputXPathLineEdit);
QLineEdit *outputXQueryLineEdit = new QLineEdit;
outputXQueryLineEdit->setText(QString::fromStdString(request_data->output_xquery));
outputXQueryLineEdit->setPlaceholderText("XQuery");
formOutputParsing->addRow("XQuery", outputXQueryLineEdit);
QLineEdit *outputRegexLineEdit = new QLineEdit;
outputRegexLineEdit->setText(QString::fromStdString(request_data->output_regex));
outputRegexLineEdit->setPlaceholderText("Regex");
Expand All @@ -362,16 +367,19 @@ RequestBuilder::RequestBuilder(url_source_request_data *request_data,
// Hide all output parsing options
set_form_row_visibility(formOutputParsing, outputJSONPathLineEdit, false);
set_form_row_visibility(formOutputParsing, outputXPathLineEdit, false);
set_form_row_visibility(formOutputParsing, outputXQueryLineEdit, false);
set_form_row_visibility(formOutputParsing, outputRegexLineEdit, false);
set_form_row_visibility(formOutputParsing, outputRegexFlagsLineEdit, false);
set_form_row_visibility(formOutputParsing, outputRegexGroupLineEdit, false);

// Show the output parsing options for the selected output type
if (outputTypeComboBox->currentText() == "JSON") {
set_form_row_visibility(formOutputParsing, outputJSONPathLineEdit, true);
} else if (outputTypeComboBox->currentText() == "XML" ||
} else if (outputTypeComboBox->currentText() == "XML (XPath)" ||
outputTypeComboBox->currentText() == "HTML") {
set_form_row_visibility(formOutputParsing, outputXPathLineEdit, true);
} else if (outputTypeComboBox->currentText() == "XML (XQuery)") {
set_form_row_visibility(formOutputParsing, outputXQueryLineEdit, true);
} else if (outputTypeComboBox->currentText() == "Text") {
set_form_row_visibility(formOutputParsing, outputRegexLineEdit, true);
set_form_row_visibility(formOutputParsing, outputRegexFlagsLineEdit, true);
Expand Down Expand Up @@ -434,6 +442,7 @@ RequestBuilder::RequestBuilder(url_source_request_data *request_data,
request_data_for_saving->output_json_path =
outputJSONPathLineEdit->text().toStdString();
request_data_for_saving->output_xpath = outputXPathLineEdit->text().toStdString();
request_data_for_saving->output_xquery = outputXQueryLineEdit->text().toStdString();
request_data_for_saving->output_regex = outputRegexLineEdit->text().toStdString();
request_data_for_saving->output_regex_flags =
outputRegexFlagsLineEdit->text().toStdString();
Expand Down