diff --git a/curl_to_code_converter/generators.py b/curl_to_code_converter/generators.py index 33317d8..e4ccffa 100644 --- a/curl_to_code_converter/generators.py +++ b/curl_to_code_converter/generators.py @@ -53,8 +53,8 @@ class CodeGenerators: code.append(f" auth={parsed.auth}\n") code.append(")\n") - code.append("\nprint(response.status_code)") - code.append("\nprint(response.text)") + code.append(f"\nprint(response.status_code)") + code.append(f"\nprint(response.text)") return ''.join(code) @@ -125,7 +125,7 @@ class CodeGenerators: code.append("\n") if parsed.auth: - code.append(f' req.SetBasicAuth(\"{parsed.auth[0]}\", \"{parsed.auth[1]}\")\n\n') + code.append(f' req.SetBasicAuth(\"{parsed.auth[0]}\", \"{parsed.auth[1]}\")\n\n") code.append(" client := &http.Client{}\n") code.append(" resp, err := client.Do(req)\n") @@ -193,7 +193,7 @@ class CodeGenerators: code.append("$ch = curl_init();\n\n") code.append("curl_setopt($ch, CURLOPT_URL, $url);\n") - code.append("curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);\n") + code.append(f"curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);\n") if parsed.method == "POST": code.append("curl_setopt($ch, CURLOPT_POST, true);\n") @@ -218,11 +218,9 @@ class CodeGenerators: code.append(f'curl_setopt($ch, CURLOPT_USERPWD, \"{parsed.auth[0]}:{parsed.auth[1]}\");\n\n') code.append("$response = curl_exec($ch);\n\n") - code.append("if (curl_errno($ch)) {\n") code.append(" echo 'Error:' . curl_error($ch);\n") code.append("}\n\n") - code.append("curl_close($ch);\n\n") code.append("echo $response;\n") code.append("?>\n") @@ -256,7 +254,7 @@ class CodeGenerators: if parsed.data: code.append("\n String urlParameters = ") data_str = parsed.data.replace('"', '\\"') - code.append(f'\"{data_str}\";\n') + code.append(f'"{data_str}";\n') code.append("\n con.setDoOutput(true);\n") code.append(" try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {\n") code.append(" wr.writeBytes(urlParameters);\n")