mdbq 2.4.9__py3-none-any.whl → 2.5.1__py3-none-any.whl

mdbq/mysql/mysql.py

@@ -684,13 +684,16 @@ class OptimizeDatas:
         duplicate_id = []  # 出现重复的 id
         all_datas = []  # 迭代器
         for data in datas:
-            delete_id = data['id']
-            del data['id']
-            data = re.sub(r'\.0+\', ', '\', ', str(data))  # 统一移除小数点后面的 0
-            if data in all_datas:  # 数据出现重复时
-                duplicate_id.append(delete_id)  # 添加 id 到 duplicate_id
-                continue
-            all_datas.append(data)  # 数据没有重复
+            try:
+                delete_id = data['id']
+                del data['id']
+                data = re.sub(r'\.0+\', ', '\', ', str(data))  # 统一移除小数点后面的 0
+                if data in all_datas:  # 数据出现重复时
+                    duplicate_id.append(delete_id)  # 添加 id 到 duplicate_id
+                    continue
+                all_datas.append(data)  # 数据没有重复
+            except Exception as e:
+                print(f'{table_name} 函数: mysql - > OptimizeDatas -> delete_duplicate -> {e}')
         del all_datas
 
         if not duplicate_id:  # 如果没有重复数据，则跳过该数据表

mdbq/spider/aikucun.py

@@ -48,7 +48,7 @@ def get_cookie_aikucun():
     """
     _url = 'https://gray-merc.aikucun.com/index.html'
     cookie_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'cookies')
-    filename_aikucun = 'cookie_aikucun.txt'
+    filename_aikucun = 'cookie_aikucun.json'
     print(_url)
 
     option = webdriver.ChromeOptions()  # 浏览器启动选项
@@ -90,20 +90,27 @@ def get_cookie_aikucun():
     print(f'{d_time} 登录成功，正在获取cookie...')
     time.sleep(0.1)
 
-
-    _file = os.path.join(cookie_path, filename_aikucun)
-    with open(_file, 'w') as f:
-        # 将cookies保存为json格式
-        cookies_list = _driver.get_cookies()
-        # for cookie in cookies_list:
-        #     # 该字段有问题所以删除就可以
-        #     if 'expiry' in cookie:
-        #         del cookie['expiry']
-        #     # if 'domain' in cookie:
-        #     #     cookie['domain'] = '.taobao.com'
-        cookies_list = json.dumps(cookies_list)
-        f.write(cookies_list)
-        print(f'cookie已保存: {_file}')
+    # 将cookies保存为json格式
+    cookies_list = _driver.get_cookies()
+
+    json_file = os.path.join(cookie_path, filename_aikucun)
+    with open(json_file, 'w', encoding='utf-8') as f:
+        json.dump(cookies_list, f, ensure_ascii=False, sort_keys=True, indent=4)
+    print(f'cookie已保存: {json_file}')
+
+    # _file = os.path.join(cookie_path, filename_aikucun)
+    # with open(_file, 'w') as f:
+    #     # 将cookies保存为json格式
+    #     cookies_list = _driver.get_cookies()
+    #     # for cookie in cookies_list:
+    #     #     # 该字段有问题所以删除就可以
+    #     #     if 'expiry' in cookie:
+    #     #         del cookie['expiry']
+    #     #     # if 'domain' in cookie:
+    #     #     #     cookie['domain'] = '.taobao.com'
+    #     cookies_list = json.dumps(cookies_list)
+    #     f.write(cookies_list)
+    #     print(f'cookie已保存: {_file}')
     _driver.quit()
 
 
@@ -178,7 +185,7 @@ class AikuCun:
         _driver.delete_all_cookies()  # 首先清除浏览器打开已有的cookies
         name_lists = os.listdir(self.cookie_path)  # cookie 放在主目录下的 cookies 文件夹
         for name in name_lists:
-            if shop_name in name and name.endswith('.txt') and '~' not in name and '.DS' not in name:
+            if shop_name in name and name.endswith('.json') and '~' not in name and '.DS' not in name:
                 with open(os.path.join(self.cookie_path, name), 'r') as f:
                     cookies_list = json.load(f)  # 使用json读取cookies 注意读取的是文件 所以用load而不是loads
                     for cookie in cookies_list:

{mdbq-2.4.9.dist-info → mdbq-2.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 2.4.9
+Version: 2.5.1
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-2.4.9.dist-info → mdbq-2.5.1.dist-info}/RECORD

@@ -25,7 +25,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=ZJ5hrwB-oJgvfcTI9Y2E_vwmCNgbxmiU0AJLeCfQFJ8,46850
+mdbq/mysql/mysql.py,sha256=39323KfZxN5DRyXhBEv5Hgw4TkzBs0wm0lMN1uYsE9A,47028
 mdbq/mysql/s_query.py,sha256=37GGHzRpycfUjsYEoQgDpdEs9JwjW-LxFXnGwwP2b2Q,8403
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -40,8 +40,8 @@ mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,
 mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=Olq7IJP9itM4wuNxZeHOG-Q3i8wWyB4hY8TUGGwCvQ0,14104
-mdbq-2.4.9.dist-info/METADATA,sha256=3T_hJJlZ-85YZuX4DRP1CNLotuJkISvL4TbTuPJA6BE,245
-mdbq-2.4.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.4.9.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.4.9.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=KdihSB3q44jsXUQAldfWRVfCSrEw2MNbM-_BhP_29g4,14448
+mdbq-2.5.1.dist-info/METADATA,sha256=jazgEXlxIaY4qkOGCU1Gj_wRumfQQx9oQ9qnFzHr28g,245
+mdbq-2.5.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.5.1.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.5.1.dist-info/RECORD,,