xbase-util 0.2.6__tar.gz → 0.2.8__tar.gz

{xbase_util-0.2.6 → xbase_util-0.2.8}/PKG-INFO

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

{xbase_util-0.2.6 → xbase_util-0.2.8}/setup.py

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

xbase_util-0.2.8/xbase_util/es_db_util.py

@@ -0,0 +1,32 @@
+import os.path
+
+
+class EsDb:
+    def __init__(self, req, manager):
+        self.req = req
+        self.internals = manager.dict()
+        print("初始化:Elasticsearch DB")
+
+    def get_file_by_file_id(self, node, num, prefix=None):
+        key = f'{node}!{num}'
+        if key in self.internals:
+            return self.internals[key]
+        res = self.req.search_file(f"{node}-{num}")
+        try:
+            hits = res.json()['hits']['hits']
+            if len(hits) > 0:
+                self.internals[key] = hits[0]['_source']
+                file = hits[0]['_source']
+                if prefix is None:
+                    return file
+                prefix_res = prefix
+                if not prefix.endswith('/'):
+                    prefix_res = f"{prefix}/"
+                origin_path = file['name']
+                basename = os.path.basename(origin_path)
+                result_path = f"{prefix_res}{basename}"
+                file['name'] = result_path
+                return file
+        except Exception as e:
+            print(f"获取es文件失败：{node}-{num}\n\n{res.text}获取es文件失败")
+        return None

{xbase_util-0.2.6 → xbase_util-0.2.8}/xbase_util.egg-info/PKG-INFO

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

xbase_util-0.2.6/xbase_util/es_db_util.py

@@ -1,29 +0,0 @@
-import os.path
-
-
-class EsDb:
-    def __init__(self, req):
-        self.req = req
-        self.internals = {}
-        print("初始化:Elasticsearch DB")
-
-    def get_file_by_file_id(self, node, num, prefix=None):
-        key = f'{node}!{num}'
-        if key in self.internals:
-            return self.internals[key]
-        res = self.req.search_file(f"{node}-{num}").json()
-        hits = res['hits']['hits']
-        if len(hits) > 0:
-            self.internals[key] = hits[0]['_source']
-            file = hits[0]['_source']
-            if prefix is None:
-                return file
-            prefix_res = prefix
-            if not prefix.endswith('/'):
-                prefix_res = f"{prefix}/"
-            origin_path = file['name']
-            basename = os.path.basename(origin_path)
-            result_path = f"{prefix_res}{basename}"
-            file['name'] = result_path
-            return file
-        return None