xbase-util 0.1.9__tar.gz → 0.2.1__tar.gz

{xbase_util-0.1.9 → xbase_util-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase_util
-Version: 0.1.9
+Version: 0.2.1
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

{xbase_util-0.1.9 → xbase_util-0.2.1}/setup.py

@@ -3,7 +3,7 @@ from distutils.core import setup
 from setuptools import find_packages
 
 setup(name="xbase_util",
-      version="0.1.9",
+      version="0.2.1",
       description="网络安全基础工具",
       long_description="包含提取，预测，训练的基础工具",
       author="xyt",

{xbase_util-0.1.9 → xbase_util-0.2.1}/xbase_util/esreq.py

@@ -13,8 +13,10 @@ class EsReq:
     def search(self, body):
         return requests.post(self.es_url + "/_search", timeout=self.timeout, json=body)
 
-    def start_scroll(self, exp, scroll):
-        return requests.post(self.es_url + f"/_search?scroll={scroll}", timeout=self.timeout,
+    def start_scroll(self, exp, scroll,index=""):
+        if not index.startswith("/"):
+            index = "/" + index
+        return requests.post(self.es_url + f"{index}/_search?scroll={scroll}", timeout=self.timeout,
                              json=exp)
 
     def scroll_by_id(self, scroll_id, scroll):

{xbase_util-0.1.9 → xbase_util-0.2.1}/xbase_util/xbase_util.py

@@ -10,6 +10,17 @@ from scapy.layers.dns import DNS
 from xbase_util.xbase_constant import parse_path, dns_domain_list
 
 
+def process_origin_pos(originPos):
+    temres = (f"{originPos}"
+              .replace("]", "")
+              .replace("[", "")
+              .replace("\\", "")
+              .replace("\"", "")
+              .replace(" ","")
+              .split(","))
+    return [int(f"{i}") for i in temres]
+
+
 def parse_expression(expression):
     if expression:
         with open(parse_path, "r") as f:

{xbase_util-0.1.9 → xbase_util-0.2.1}/xbase_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase-util
-Version: 0.1.9
+Version: 0.2.1
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt