re-common 10.0.39__py3-none-any.whl → 10.0.40__py3-none-any.whl

re_common/baselibrary/tools/myparsel.py

@@ -1,104 +1,104 @@
-# -*- coding: utf-8 -*-
-# @Time    : 2020/9/16 13:18
-# @Author  : suhong
-# @File    : mcss.py
-# @Software: PyCharm
-import jsonpath as jsonpath
-from parsel import Selector
-
-
-class MParsel(object):
-    def __init__(self, html="", logger=None):
-        if logger is None:
-            from re_common.baselibrary import MLogger
-            logger = MLogger().streamlogger
-        self.logger = logger
-        self.html = html
-        if self.html:
-            self.set_sel(self.html)
-
-    def set_sel(self, html):
-        self.html = html
-        self.sel = Selector(html)
-
-    def css_parsel(self, sel, css_selector={}):
-        assert self.html, '解析html时html不能为空'
-        dicts = {}
-        parent = None
-        if css_selector:
-            # 保证 parent 存在时优先解析
-            if "parent" in css_selector.keys():
-                parent = sel.css(css_selector["parent"])
-            for key, value in css_selector.items():
-                if isinstance(value, dict):
-                    if key == "children":
-                        # assert parent, "parent 不存在"
-                        list_c = []
-                        for p_item in parent:
-                            list_c.append(self.css_parsel(p_item, value))
-                        dicts[key] = list_c
-                    else:
-                        dicts[key] = self.css_parsel(sel, value)
-                    continue
-                if key == "parent":
-                    continue
-                dicts[key] = sel.css(value).getall()
-        return dicts
-
-    def css_parsel_html(self, css_selector={}):
-        if self.html != "" and css_selector:
-            dict_ = dict()
-            for key, value in css_selector.items():
-                dict_[key] = self.sel.css(value).getall()
-            return True, dict_
-        else:
-            return False, ""
-
-    def xpath_parsel(self, sel, xpath_selector={}):
-        assert self.html, '解析html时html不能为空'
-        dicts = {}
-        parent = None
-        if xpath_selector:
-            # 保证 parent 存在时优先解析
-            if "parent" in xpath_selector.keys():
-                parent = sel.xpath(xpath_selector["parent"])
-            for key, value in xpath_selector.items():
-                if isinstance(value, dict):
-                    if key == "children":
-                        # assert parent, "parent 不存在"
-                        list_c = []
-                        for p_item in parent:
-                            list_c.append(self.xpath_parsel(p_item, value))
-                        dicts[key] = list_c
-                    else:
-                        dicts[key] = self.xpath_parsel(sel, value)
-                    continue
-                if key == "parent":
-                    continue
-                dicts[key] = sel.xpath(value).getall()
-        return dicts
-
-    def xpath_parsel_html(self, html="", xpath_selector={}):
-        if html != "" and xpath_selector:
-            sel = Selector(html)
-            dict_ = dict()
-            for key, value in xpath_selector.items():
-                dict_[key] = sel.xpath(value).getall()
-            return True, dict_
-        else:
-            return False, ""
-
-    def json_parsel(self, sel_json, json_selector={}):
-        assert self.html, '解析html时html不能为空'
-        re_dict = {}
-        if json_selector:
-            for key, value in json_selector.items():
-                re_dict[key] = jsonpath(sel_json, value)
-        dicts = {
-            "json_raw":sel_json,
-            "data":re_dict
-        }
-        return dicts
-
-    def asd(self):
-        pass
+# -*- coding: utf-8 -*-
+# @Time    : 2020/9/16 13:18
+# @Author  : suhong
+# @File    : mcss.py
+# @Software: PyCharm
+import jsonpath as jsonpath
+from parsel import Selector
+
+
+class MParsel(object):
+    def __init__(self, html="", logger=None):
+        if logger is None:
+            from re_common.baselibrary import MLogger
+            logger = MLogger().streamlogger
+        self.logger = logger
+        self.html = html
+        if self.html:
+            self.set_sel(self.html)
+
+    def set_sel(self, html):
+        self.html = html
+        self.sel = Selector(html)
+
+    def css_parsel(self, sel, css_selector={}):
+        assert self.html, '解析html时html不能为空'
+        dicts = {}
+        parent = None
+        if css_selector:
+            # 保证 parent 存在时优先解析
+            if "parent" in css_selector.keys():
+                parent = sel.css(css_selector["parent"])
+            for key, value in css_selector.items():
+                if isinstance(value, dict):
+                    if key == "children":
+                        # assert parent, "parent 不存在"
+                        list_c = []
+                        for p_item in parent:
+                            list_c.append(self.css_parsel(p_item, value))
+                        dicts[key] = list_c
+                    else:
+                        dicts[key] = self.css_parsel(sel, value)
+                    continue
+                if key == "parent":
+                    continue
+                dicts[key] = sel.css(value).getall()
+        return dicts
+
+    def css_parsel_html(self, css_selector={}):
+        if self.html != "" and css_selector:
+            dict_ = dict()
+            for key, value in css_selector.items():
+                dict_[key] = self.sel.css(value).getall()
+            return True, dict_
+        else:
+            return False, ""
+
+    def xpath_parsel(self, sel, xpath_selector={}):
+        assert self.html, '解析html时html不能为空'
+        dicts = {}
+        parent = None
+        if xpath_selector:
+            # 保证 parent 存在时优先解析
+            if "parent" in xpath_selector.keys():
+                parent = sel.xpath(xpath_selector["parent"])
+            for key, value in xpath_selector.items():
+                if isinstance(value, dict):
+                    if key == "children":
+                        # assert parent, "parent 不存在"
+                        list_c = []
+                        for p_item in parent:
+                            list_c.append(self.xpath_parsel(p_item, value))
+                        dicts[key] = list_c
+                    else:
+                        dicts[key] = self.xpath_parsel(sel, value)
+                    continue
+                if key == "parent":
+                    continue
+                dicts[key] = sel.xpath(value).getall()
+        return dicts
+
+    def xpath_parsel_html(self, html="", xpath_selector={}):
+        if html != "" and xpath_selector:
+            sel = Selector(html)
+            dict_ = dict()
+            for key, value in xpath_selector.items():
+                dict_[key] = sel.xpath(value).getall()
+            return True, dict_
+        else:
+            return False, ""
+
+    def json_parsel(self, sel_json, json_selector={}):
+        assert self.html, '解析html时html不能为空'
+        re_dict = {}
+        if json_selector:
+            for key, value in json_selector.items():
+                re_dict[key] = jsonpath(sel_json, value)
+        dicts = {
+            "json_raw":sel_json,
+            "data":re_dict
+        }
+        return dicts
+
+    def asd(self):
+        pass

re_common/baselibrary/tools/rename_dir_file.py

@@ -1,37 +1,37 @@
-"""
-重命名目录下的文件
-"""
-from re_common.baselibrary.utils.basedir import BaseDir
-from re_common.baselibrary.utils.basefile import BaseFile
-
-
-def get_next_suffix(num):
-    num = num + 1
-    return "_" + str(num).zfill(4)
-
-
-def rename_db3(dirpath, rename, start=0):
-    """
-    重命名db3　文件　以后缀_001 或者　_000 开始
-    :param rename:
-    :param start: 1 代表_001　0代表_000
-    :return:
-    """
-    """
-    
-    :param dirpath: 
-    :param rename: 
-    :param start: 
-    :return: 
-    """
-
-    for file in BaseDir.get_dir_all_files(dirpath):
-        if file.endswith(".db3"):
-            BaseDir.get_upper_dir(file, -1)
-            renamepath = BaseFile.get_new_path(dirpath, rename + get_next_suffix(start) + ".db3")
-            BaseFile.rename_file(file, renamepath)
-            start = start + 1
-
-
-rename_db3(r"\\192.168.31.65\d$\zt_data_db3\zt_normal_grx\zt_cnki_qk_20200323", "zt_cnki_qk_20200323")
-rename_db3(r"\\192.168.31.65\d$\zt_data_db3\zt_normal_grx\zt_wf_qk_20200323", "zt_wf_qk_20200323")
+"""
+重命名目录下的文件
+"""
+from re_common.baselibrary.utils.basedir import BaseDir
+from re_common.baselibrary.utils.basefile import BaseFile
+
+
+def get_next_suffix(num):
+    num = num + 1
+    return "_" + str(num).zfill(4)
+
+
+def rename_db3(dirpath, rename, start=0):
+    """
+    重命名db3　文件　以后缀_001 或者　_000 开始
+    :param rename:
+    :param start: 1 代表_001　0代表_000
+    :return:
+    """
+    """
+    
+    :param dirpath: 
+    :param rename: 
+    :param start: 
+    :return: 
+    """
+
+    for file in BaseDir.get_dir_all_files(dirpath):
+        if file.endswith(".db3"):
+            BaseDir.get_upper_dir(file, -1)
+            renamepath = BaseFile.get_new_path(dirpath, rename + get_next_suffix(start) + ".db3")
+            BaseFile.rename_file(file, renamepath)
+            start = start + 1
+
+
+rename_db3(r"\\192.168.31.65\d$\zt_data_db3\zt_normal_grx\zt_cnki_qk_20200323", "zt_cnki_qk_20200323")
+rename_db3(r"\\192.168.31.65\d$\zt_data_db3\zt_normal_grx\zt_wf_qk_20200323", "zt_wf_qk_20200323")