http-content-parser 0.0.11__tar.gz → 0.0.13__tar.gz

{http_content_parser-0.0.11 → http_content_parser-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: http_content_parser
-Version: 0.0.11
+Version: 0.0.13
 Summary: parse http's payload and response
 Author-email: max su <suleiabc@gmail.com>
 License-File: LICENSE
@@ -13,3 +13,15 @@ Description-Content-Type: text/markdown
 # HttpParser Package
 
 This is a http content parser package.
+
+## package
+
+```bash
+
+```
+
+## upload to pypi
+
+```bash
+ python3 -m twine upload dist/*
+```

http_content_parser-0.0.13/README.md

@@ -0,0 +1,15 @@
+# HttpParser Package
+
+This is a http content parser package.
+
+## package
+
+```bash
+
+```
+
+## upload to pypi
+
+```bash
+ python3 -m twine upload dist/*
+```

{http_content_parser-0.0.11 → http_content_parser-0.0.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "http_content_parser"
-version = "0.0.11"
+version = "0.0.13"
 authors = [
   { name="max su", email="suleiabc@gmail.com" },
 ]

{http_content_parser-0.0.11 → http_content_parser-0.0.13}/src/http_content_parser/curl_parser.py

@@ -1,4 +1,5 @@
 # -*- coding: UTF-8 -*-
+import re
 from urllib.parse import urlparse, parse_qs
 
 
@@ -26,7 +27,7 @@ class CurlParser(object):
         new_i = -1
         for i in range(s, e):
             new_line = lines[i]
-            if "--data " in lines[i]:
+            if "--data " in lines[i] or "--data-raw " in lines[i]:
                 # 判断请求的body是否完整,根据''单引号是否是两个
                 char_count = lines[i].count("'")
                 if char_count == 1:
@@ -94,10 +95,7 @@ class CurlParser(object):
                 line_i_list = lines_i_str.split(" '")
                 subs = str(line_i_list[1]).split(":")
                 if len(subs) > 1:
-                    # TODO 空格区分有用和无用，目前cookie的value中会有包含空格的情况, 不删除
-                    header[subs[0]] = (
-                        subs[1].replace("'", "").replace("\\\n", "").replace(" ", "")
-                    )
+                    header[subs[0]] = subs[1][1:].replace("'", "").replace(" \\\n", "")
                 else:
                     header[subs[0]] = ""
             elif "--data-raw" in lines_i_str or "--data" in lines_i_str:
@@ -108,11 +106,8 @@ class CurlParser(object):
                     curl_data = line_i_list[1]
                 else:
                     curl_data = line_i_list[0]
-                req_data["body"] = (
-                    curl_data.replace("'", "")
-                    .replace(" ", "")
-                    .replace("\\\n", "")
-                    .replace("\n", "")
+                req_data["body"] = re.sub(
+                    r"\n\s*", "", curl_data.replace(" \\\n", "")[:-1]
                 )
 
                 if not req_data.get("method"):

{http_content_parser-0.0.11 → http_content_parser-0.0.13}/tests/test_curl.py

@@ -2,7 +2,7 @@ import json
 import sys
 from os.path import abspath, join, dirname
 
-# sys.path.insert(0, join(abspath(dirname(__file__)), "src"))
+sys.path.insert(0, join(abspath(dirname(__file__)), "src"))
 print(sys.path)
 from http_content_parser.generate_api_file import GenerateApiFile
 
@@ -10,9 +10,17 @@ from http_content_parser.generate_api_file import GenerateApiFile
 class TestCases:
     def test_curl(self):
         gaf = GenerateApiFile()
-        with open("./postman.json", "r") as f:
-            json_dict = json.load(f)
-        gaf.produce_api_yaml_for_postman(json_dict, "./test.yaml")
+        # with open("./postman.json", "r") as f:
+        #     json_dict = json.load(f)
+        # gaf.produce_api_yaml_for_postman(json_dict, "./test.yaml")
+        curl_file = '/Users/lei.susl/Desktop/test1/iac-dispatcher/tmp'
+        res = gaf.convert_curl_data_to_model(curl_file_path=curl_file)
+        for r in res:
+            print('body is: \n')
+            print(r.body)
+            print('header is: \n')
+            print(r.header)
+
 
     def test_for(self):
         # c = 1

http_content_parser-0.0.11/README.md

@@ -1,3 +0,0 @@
-# HttpParser Package
-
-This is a http content parser package.