mistakes found removed

This commit is contained in:
Clasherzz
2024-09-24 17:33:13 +05:30
parent b602f73ed2
commit 32ed7db006

View File

@ -26,19 +26,25 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
"""; """;
final String kTemplateMethod = """ final String kTemplateMethod = """
let reqBuilder = Request::builder() let reqBuilder = Request::builder()
.method("{{ method }}") .method("{{ method }}")
.uri(url) .uri(url)
"""; """;
final String kTemplateMethodNoHeadersButForm = """
let reqBuilder = Request::builder()
.method("{{ method }}")
.uri(url);
""";
final String kTemplateHeaders = """ final String kTemplateHeaders = """
{% for key, val in headers %} {% for key, val in headers %}
.header("{{ key }}", "{{ val }}") .header("{{ key }}", "{{ val }}")
{% endfor %} {% endfor %}""";
""";
final String kTemplateHeadersFormData = """ final String kTemplateHeadersFormData = """
{% for key, val in headers %} {% for key, val in headers %}
@ -71,7 +77,7 @@ final String kTemplateFormData = """
let mut form = multipart::Form::default(); let mut form = multipart::Form::default();
{%- for field in fields_list %} {%- for field in fields_list %}
{%- if field.type == "file" %} {%- if field.type == "file" %}
form.add_file("{{ field.name }}", "{{ field.value }}").unwrap(); form.add_file("{{ field.name }}", r"{{ field.value }}").unwrap();
{%- else %} {%- else %}
form.add_text("{{ field.name }}", "{{ field.value }}"); form.add_text("{{ field.name }}", "{{ field.value }}");
{%- endif %} {%- endif %}
@ -128,20 +134,28 @@ final String kTemplateFormData = """
if (uri != null) { if (uri != null) {
var headers = requestModel.enabledHeadersMap;
result += jj.Template(kTemplateStart).render({ result += jj.Template(kTemplateStart).render({
"url": uri, "url": uri,
'hasJsonBody': requestModel.bodyContentType == ContentType.json, 'hasJsonBody': requestModel.bodyContentType == ContentType.json,
'hasForm': requestModel.hasFormData, 'hasForm': requestModel.hasFormData,
}); });
if(requestModel.hasFormData && headers.isEmpty){
print("hhh");
result += jj.Template(kTemplateMethodNoHeadersButForm).render({
"method": requestModel.method.name.toUpperCase(),
});
}else{
result += jj.Template(kTemplateMethod).render({ result += jj.Template(kTemplateMethod).render({
"method": requestModel.method.name.toUpperCase(), "method": requestModel.method.name.toUpperCase(),
}); });
}
// Add headers if available // Add headers if available
var headers = requestModel.enabledHeadersMap;
if (headers.isNotEmpty) { if (headers.isNotEmpty) {
if(requestModel.hasFormData){ if(requestModel.hasFormData){
result += jj.Template(kTemplateHeadersFormData).render({"headers": headers}); result += jj.Template(kTemplateHeadersFormData).render({"headers": headers});
@ -158,7 +172,7 @@ final String kTemplateFormData = """
result += jj.Template(kTemplateFormData).render({ result += jj.Template(kTemplateFormData).render({
"fields_list": requestModel.formDataMapList, "fields_list": requestModel.formDataMapList,
}); });
}else if (requestBody == "" || requestBody == null|| requestModel.method ==HTTPVerb.get) { }else if (requestBody == "" || requestBody == null|| requestModel.method ==HTTPVerb.get || requestModel.method == HTTPVerb.head) {
result += kTemplateEmptyBody; result += kTemplateEmptyBody;
}else if(requestModel.hasJsonData){ }else if(requestModel.hasJsonData){
result += jj.Template(kTemplateJsonBody).render({"body": requestBody}); result += jj.Template(kTemplateJsonBody).render({"body": requestBody});