xbase-util 0.2.2__tar.gz → 0.2.4__tar.gz

{xbase_util-0.2.2 → xbase_util-0.2.4}/PKG-INFO

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

{xbase_util-0.2.2 → xbase_util-0.2.4}/setup.py

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

{xbase_util-0.2.2 → xbase_util-0.2.4}/xbase_util/esreq.py

@@ -10,10 +10,12 @@ class EsReq:
     def clear_all_scroll(self):
         return requests.delete(self.es_url + "/_search/scroll", timeout=self.timeout, json={'scroll_id': '_all'})
 
-    def search(self, body):
-        return requests.post(self.es_url + "/_search", timeout=self.timeout, json=body)
+    def search(self, body, index=""):
+        if not index.startswith("/"):
+            index = "/" + index
+        return requests.post(self.es_url + f"{index}/_search", timeout=self.timeout, json=body)
 
-    def start_scroll(self, exp, scroll,index=""):
+    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,

{xbase_util-0.2.2 → xbase_util-0.2.4}/xbase_util/xbase_util.py

@@ -1,4 +1,5 @@
 import json
+import os
 import re
 from urllib.parse import urlparse, parse_qs
 
@@ -16,7 +17,7 @@ def process_origin_pos(originPos):
               .replace("[", "")
               .replace("\\", "")
               .replace("\"", "")
-              .replace(" ","")
+              .replace(" ", "")
               .split(","))
     return [int(f"{i}") for i in temres]
 
@@ -403,3 +404,10 @@ def get_dns_domain_suffix(domain, dns_lock):
             return extracted.suffix
         except Exception as e:
             return ""
+
+
+def check_path(file_path: str):
+    directory = os.path.dirname(file_path)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+    return file_path

{xbase_util-0.2.2 → xbase_util-0.2.4}/xbase_util.egg-info/PKG-INFO

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