re-common 10.0.22__py3-none-any.whl → 10.0.24__py3-none-any.whl

re_common/baselibrary/tools/all_requests/requests_request.py

@@ -1,81 +1,81 @@
-import requests
-from urllib3 import disable_warnings
-from urllib3.exceptions import InsecureRequestWarning
-
-from re_common.baselibrary.tools.all_requests.mrequest import MRequest
-from re_common.baselibrary.utils.baseurl import BaseUrl
-from re_common.baselibrary.utils.core.mdeprecated import request_try_except
-
-from re_common.baselibrary.utils.core.requests_core import set_proxy
-
-disable_warnings(InsecureRequestWarning)
-
-
-class RequestsRequest(MRequest):
-
-    def __init__(self, logger=None):
-        if logger is None:
-            from re_common.baselibrary import MLogger
-            logger = MLogger().streamlogger
-        super().__init__(logger=logger)
-        self.kwargs = {}
-
-    def builder(self):
-        if self.refer:
-            self.header["refer"] = self.refer
-        self.kwargs["headers"] = self.header
-        self.kwargs["proxies"] = set_proxy(self.proxy)
-        if BaseUrl.urlScheme(self.url) == "https":
-            self.kwargs["verify"] = False
-        self.kwargs["timeout"] = self.timeout
-        self.kwargs["allow_redirects"] = self.allow_redirects
-        self.kwargs["params"] = self.params
-        return self
-
-    @request_try_except
-    def get(self):
-        if self.sn:
-            r = self.sn.get(url=self.url, **self.kwargs)
-        else:
-            r = requests.get(url=self.url, **self.kwargs)
-
-        self.resp = r
-        self.set_status_code(r.status_code)
-        r.encoding = r.apparent_encoding
-        self.html = r.text.strip()
-        return True, {"code": self.status_code, "msg": ""}
-
-    @request_try_except
-    def post(self):
-        if self.sn:
-            r = self.sn.post(url=self.url, data=self.data, **self.kwargs)
-        else:
-            r = requests.post(url=self.url, data=self.data, **self.kwargs)
-
-        self.resp = r
-        self.set_status_code(r.status_code)
-        r.encoding = r.apparent_encoding
-        self.html = r.text.strip()
-        return True, {"code": self.status_code, "msg": ""}
-
-    def all_middlerwares(self):
-        bools, dicts = True, {}
-        for item in self.middler_list:
-            bools, dicts = item()
-            if not bools:
-                return bools, dicts
-        return bools, dicts
-
-    def run(self, moths="get"):
-        self.builder()
-        self.on_request_start()
-        if moths == MRequest.GET:
-            bools, dicts = self.get()
-        elif moths == MRequest.POST:
-            bools, dicts = self.post()
-        else:
-            bools, dicts = False, {}
-        self.on_request_end()
-        if bools:
-            return self.all_middlerwares()
-        return bools, dicts
+import requests
+from urllib3 import disable_warnings
+from urllib3.exceptions import InsecureRequestWarning
+
+from re_common.baselibrary.tools.all_requests.mrequest import MRequest
+from re_common.baselibrary.utils.baseurl import BaseUrl
+from re_common.baselibrary.utils.core.mdeprecated import request_try_except
+
+from re_common.baselibrary.utils.core.requests_core import set_proxy
+
+disable_warnings(InsecureRequestWarning)
+
+
+class RequestsRequest(MRequest):
+
+    def __init__(self, logger=None):
+        if logger is None:
+            from re_common.baselibrary import MLogger
+            logger = MLogger().streamlogger
+        super().__init__(logger=logger)
+        self.kwargs = {}
+
+    def builder(self):
+        if self.refer:
+            self.header["refer"] = self.refer
+        self.kwargs["headers"] = self.header
+        self.kwargs["proxies"] = set_proxy(self.proxy)
+        if BaseUrl.urlScheme(self.url) == "https":
+            self.kwargs["verify"] = False
+        self.kwargs["timeout"] = self.timeout
+        self.kwargs["allow_redirects"] = self.allow_redirects
+        self.kwargs["params"] = self.params
+        return self
+
+    @request_try_except
+    def get(self):
+        if self.sn:
+            r = self.sn.get(url=self.url, **self.kwargs)
+        else:
+            r = requests.get(url=self.url, **self.kwargs)
+
+        self.resp = r
+        self.set_status_code(r.status_code)
+        r.encoding = r.apparent_encoding
+        self.html = r.text.strip()
+        return True, {"code": self.status_code, "msg": ""}
+
+    @request_try_except
+    def post(self):
+        if self.sn:
+            r = self.sn.post(url=self.url, data=self.data, **self.kwargs)
+        else:
+            r = requests.post(url=self.url, data=self.data, **self.kwargs)
+
+        self.resp = r
+        self.set_status_code(r.status_code)
+        r.encoding = r.apparent_encoding
+        self.html = r.text.strip()
+        return True, {"code": self.status_code, "msg": ""}
+
+    def all_middlerwares(self):
+        bools, dicts = True, {}
+        for item in self.middler_list:
+            bools, dicts = item()
+            if not bools:
+                return bools, dicts
+        return bools, dicts
+
+    def run(self, moths="get"):
+        self.builder()
+        self.on_request_start()
+        if moths == MRequest.GET:
+            bools, dicts = self.get()
+        elif moths == MRequest.POST:
+            bools, dicts = self.post()
+        else:
+            bools, dicts = False, {}
+        self.on_request_end()
+        if bools:
+            return self.all_middlerwares()
+        return bools, dicts

re_common/baselibrary/tools/batch_compre/bijiao_batch.py

@@ -1,31 +1,31 @@
-# 同项目调用基础包
-import os
-import sys
-
-filepath = os.path.abspath(__file__)
-pathlist = filepath.split(os.sep)
-pathlist = pathlist[:-5]
-TopPath = os.sep.join(pathlist)
-sys.path.insert(0, TopPath)
-
-#################
-
-from re_common.baselibrary.utils.basefile import BaseFile
-"""
-通过rawid 和batch 找出一组中batch比另一组大的数据
-"""
-
-
-dicts1 = {}
-dicts2 = {}
-
-for line in BaseFile.read_file_r_mode_yield("./files/part-1"):
-    lists = line.split(";")
-    dicts1[lists[0]] = lists[1]
-
-count = 0
-for line in BaseFile.read_file_r_mode_yield("./files/part-2"):
-    lists = line.split(";")
-    if lists[0] in dicts1.keys():
-        if not lists[1] == dicts1[lists[0]]:
-            BaseFile.single_add_file("./test.txt", line + "\n")
+# 同项目调用基础包
+import os
+import sys
+
+filepath = os.path.abspath(__file__)
+pathlist = filepath.split(os.sep)
+pathlist = pathlist[:-5]
+TopPath = os.sep.join(pathlist)
+sys.path.insert(0, TopPath)
+
+#################
+
+from re_common.baselibrary.utils.basefile import BaseFile
+"""
+通过rawid 和batch 找出一组中batch比另一组大的数据
+"""
+
+
+dicts1 = {}
+dicts2 = {}
+
+for line in BaseFile.read_file_r_mode_yield("./files/part-1"):
+    lists = line.split(";")
+    dicts1[lists[0]] = lists[1]
+
+count = 0
+for line in BaseFile.read_file_r_mode_yield("./files/part-2"):
+    lists = line.split(";")
+    if lists[0] in dicts1.keys():
+        if not lists[1] == dicts1[lists[0]]:
+            BaseFile.single_add_file("./test.txt", line + "\n")

re_common/baselibrary/tools/contrast_db3.py

@@ -1,123 +1,123 @@
-"""
-对比两个db3的主键个数及内容是否相同
-以及主键下所有信息的差异
-输出对应关系不同的数据保存文件
-如果两个db3全字段相同则不输出文件
-"""
-import sqlite3
-import time
-
-from re_common.baselibrary.utils.basedir import BaseDir
-
-
-class Constrast(object):
-    def __init__(self):
-        self.curPath = BaseDir.get_file_dir_absolute(__file__)
-        self.set_old = set()
-        self.set_new = set()
-
-
-    def read_primary_key(self):
-        """
-        取出主键，对照其内容，old参照new的rawid
-        :return:
-        """
-        print("对照主键")
-        old_path = r'\\192.168.31.177\down_data\cnkiwanfang\zt_wf_qk_20200323\db3\zt_wf_qk_20200323_0001.db3'
-        new_path = r'E:\更新数据\db3\zt_wf_qk.20200331_000.db3'
-        old = sqlite3.connect(old_path)
-        new = sqlite3.connect(new_path)
-        sql = "select rawid from modify_title_info_zt"
-        old_cur = old.cursor()
-        old_cur.execute(sql)
-        for item in old_cur.fetchall():
-            rawid = item[0]
-            self.set_old.add(rawid)
-        new_cur = new.cursor()
-        new_cur.execute(sql)
-        for item in new_cur.fetchall():
-            rawid = item[0]
-            self.set_new.add(rawid)
-        print(len(self.set_new - self.set_old))
-
-
-    def read_content(self):
-        """
-        判断主键相同的，内容是否相同，new参照old的内容
-        输出content_contrast.txt
-        :return:
-        """
-        def dict_factory(cursor, row):
-            d = {}
-            for idx, col in enumerate(cursor.description):
-                d[col[0]] = row[idx]
-            return d
-
-        print("对照内容")
-        old_path = r'\\192.168.31.177\down_data\cnkiwanfang\zt_wf_qk_20200323\db3\zt_wf_qk_20200323_0001.db3'
-        new_path = r'E:\更新数据\db3\zt_wf_qk.20200331_000.db3'
-        old = sqlite3.connect(old_path)
-        old.row_factory = dict_factory
-        new = sqlite3.connect(new_path)
-        new.row_factory = dict_factory
-
-        sql = "select rawid from modify_title_info_zt"
-        old_cur = old.cursor()
-        new_cur = new.cursor()
-        old_cur.execute(sql)
-        rawidlist = []
-
-        for item in old_cur.fetchall():
-
-            rawid = item['rawid']
-            rawidlist.append(rawid)
-            if len(rawidlist) <= 10000:
-                continue
-            sql = "select * from modify_title_info_zt where rawid in {}".format(tuple(rawidlist))
-            # print(sql)
-            old_cur.execute(sql)
-            new_cur.execute(sql)
-            old_message = old_cur.fetchall()
-            new_mesaage = new_cur.fetchall()
-            dicts_old ={}
-            dicts_new = {}
-            for itemss in old_message:
-                dicts_old[itemss["rawid"]] = itemss
-            for items in new_mesaage:
-                dicts_new[items["rawid"]] = items
-
-            for k,v in dicts_old.items():
-                for kk,vv in v.items():
-                    if kk != "batch" and kk != 'gch' and kk != 'subject_clc':
-                        if vv != dicts_new[k][kk]:
-                            print("rawid:{}".format(k))
-                            print("字段名:{}".format(kk))
-                            print("old_message:{}".format(vv))
-                            print("new_message:{}".format(dicts_new[k][kk]))
-                            time.sleep(100)
-                    if kk == 'gch' or kk == 'subject_clc':
-                        if vv != dicts_new[k][kk] and (vv == "" or dicts_new[k][kk]==""):
-                            print("rawid:{}".format(k))
-                            print("字段名:{}".format(kk))
-                            print("old_message:{}".format(vv))
-                            print("new_message:{}".format(dicts_new[k][kk]))
-                            time.sleep(100)
-            print("*************************************")
-            rawidlist.clear()
-
-
-
-
-
-    def run(self):
-        """
-        启动程序
-        :return:
-        """
-        # self.read_primary_key()
-        self.read_content()
-
-if __name__ == '__main__':
-    c = Constrast()
-    c.run()
-
+"""
+对比两个db3的主键个数及内容是否相同
+以及主键下所有信息的差异
+输出对应关系不同的数据保存文件
+如果两个db3全字段相同则不输出文件
+"""
+import sqlite3
+import time
+
+from re_common.baselibrary.utils.basedir import BaseDir
+
+
+class Constrast(object):
+    def __init__(self):
+        self.curPath = BaseDir.get_file_dir_absolute(__file__)
+        self.set_old = set()
+        self.set_new = set()
+
+
+    def read_primary_key(self):
+        """
+        取出主键，对照其内容，old参照new的rawid
+        :return:
+        """
+        print("对照主键")
+        old_path = r'\\192.168.31.177\down_data\cnkiwanfang\zt_wf_qk_20200323\db3\zt_wf_qk_20200323_0001.db3'
+        new_path = r'E:\更新数据\db3\zt_wf_qk.20200331_000.db3'
+        old = sqlite3.connect(old_path)
+        new = sqlite3.connect(new_path)
+        sql = "select rawid from modify_title_info_zt"
+        old_cur = old.cursor()
+        old_cur.execute(sql)
+        for item in old_cur.fetchall():
+            rawid = item[0]
+            self.set_old.add(rawid)
+        new_cur = new.cursor()
+        new_cur.execute(sql)
+        for item in new_cur.fetchall():
+            rawid = item[0]
+            self.set_new.add(rawid)
+        print(len(self.set_new - self.set_old))
+
+
+    def read_content(self):
+        """
+        判断主键相同的，内容是否相同，new参照old的内容
+        输出content_contrast.txt
+        :return:
+        """
+        def dict_factory(cursor, row):
+            d = {}
+            for idx, col in enumerate(cursor.description):
+                d[col[0]] = row[idx]
+            return d
+
+        print("对照内容")
+        old_path = r'\\192.168.31.177\down_data\cnkiwanfang\zt_wf_qk_20200323\db3\zt_wf_qk_20200323_0001.db3'
+        new_path = r'E:\更新数据\db3\zt_wf_qk.20200331_000.db3'
+        old = sqlite3.connect(old_path)
+        old.row_factory = dict_factory
+        new = sqlite3.connect(new_path)
+        new.row_factory = dict_factory
+
+        sql = "select rawid from modify_title_info_zt"
+        old_cur = old.cursor()
+        new_cur = new.cursor()
+        old_cur.execute(sql)
+        rawidlist = []
+
+        for item in old_cur.fetchall():
+
+            rawid = item['rawid']
+            rawidlist.append(rawid)
+            if len(rawidlist) <= 10000:
+                continue
+            sql = "select * from modify_title_info_zt where rawid in {}".format(tuple(rawidlist))
+            # print(sql)
+            old_cur.execute(sql)
+            new_cur.execute(sql)
+            old_message = old_cur.fetchall()
+            new_mesaage = new_cur.fetchall()
+            dicts_old ={}
+            dicts_new = {}
+            for itemss in old_message:
+                dicts_old[itemss["rawid"]] = itemss
+            for items in new_mesaage:
+                dicts_new[items["rawid"]] = items
+
+            for k,v in dicts_old.items():
+                for kk,vv in v.items():
+                    if kk != "batch" and kk != 'gch' and kk != 'subject_clc':
+                        if vv != dicts_new[k][kk]:
+                            print("rawid:{}".format(k))
+                            print("字段名:{}".format(kk))
+                            print("old_message:{}".format(vv))
+                            print("new_message:{}".format(dicts_new[k][kk]))
+                            time.sleep(100)
+                    if kk == 'gch' or kk == 'subject_clc':
+                        if vv != dicts_new[k][kk] and (vv == "" or dicts_new[k][kk]==""):
+                            print("rawid:{}".format(k))
+                            print("字段名:{}".format(kk))
+                            print("old_message:{}".format(vv))
+                            print("new_message:{}".format(dicts_new[k][kk]))
+                            time.sleep(100)
+            print("*************************************")
+            rawidlist.clear()
+
+
+
+
+
+    def run(self):
+        """
+        启动程序
+        :return:
+        """
+        # self.read_primary_key()
+        self.read_content()
+
+if __name__ == '__main__':
+    c = Constrast()
+    c.run()
+

re_common/baselibrary/tools/copy_file.py

@@ -1,39 +1,39 @@
-###########################################
-# 同项目调用基础包
-import os
-import shutil
-import sys
-
-filepath = os.path.abspath(__file__)
-pathlist = filepath.split(os.sep)
-pathlist = pathlist[:-4]
-TopPath = os.sep.join(pathlist)
-sys.path.insert(0, TopPath)
-print(TopPath)
-############################################
-
-from re_common.baselibrary.utils.basedir import BaseDir
-from re_common.baselibrary.utils.basefile import BaseFile
-
-source_dir = r"\\192.168.31.169\down_data\cnki_hy_quanwen\20200530\vcode"
-dst_dir = r"F:\fun2\jpg"
-BaseDir.create_dir(dst_dir)
-log_path = r"F:\fun2\log.txt"
-count = 0
-for file in BaseDir.get_dir_all_files(source_dir):
-    print(file)
-    count = count + 1
-    try:
-        filename = BaseFile.get_file_name(file)
-        filepath = BaseDir.get_file_dir_absolute(file)
-        new_sub_dir = filepath.replace(source_dir, "")
-        new_dir = dst_dir + new_sub_dir
-        BaseDir.create_dir(new_dir)
-        new_path = new_dir + "\\" + filename
-        shutil.copyfile(file, new_path)
-    except:
-        print("err:" + file)
-        BaseFile.single_add_file(log_path, file)
-    # if count % 10000 == 1:
-    #     print(count)
-    print(count)
+###########################################
+# 同项目调用基础包
+import os
+import shutil
+import sys
+
+filepath = os.path.abspath(__file__)
+pathlist = filepath.split(os.sep)
+pathlist = pathlist[:-4]
+TopPath = os.sep.join(pathlist)
+sys.path.insert(0, TopPath)
+print(TopPath)
+############################################
+
+from re_common.baselibrary.utils.basedir import BaseDir
+from re_common.baselibrary.utils.basefile import BaseFile
+
+source_dir = r"\\192.168.31.169\down_data\cnki_hy_quanwen\20200530\vcode"
+dst_dir = r"F:\fun2\jpg"
+BaseDir.create_dir(dst_dir)
+log_path = r"F:\fun2\log.txt"
+count = 0
+for file in BaseDir.get_dir_all_files(source_dir):
+    print(file)
+    count = count + 1
+    try:
+        filename = BaseFile.get_file_name(file)
+        filepath = BaseDir.get_file_dir_absolute(file)
+        new_sub_dir = filepath.replace(source_dir, "")
+        new_dir = dst_dir + new_sub_dir
+        BaseDir.create_dir(new_dir)
+        new_path = new_dir + "\\" + filename
+        shutil.copyfile(file, new_path)
+    except:
+        print("err:" + file)
+        BaseFile.single_add_file(log_path, file)
+    # if count % 10000 == 1:
+    #     print(count)
+    print(count)