mdbq 3.7.2__py3-none-any.whl → 3.7.3__py3-none-any.whl

mdbq/log/spider_logging.py

@@ -5,7 +5,10 @@ import os
 import getpass
 
 
-def setup_logging():
+def setup_logging(reMoveOldHandler=True):
+    """
+    reMoveOldHandler: 替换根日志记录器的所有现有处理器
+    """
     if platform.system() == 'Windows':
         from mdbq.pbix import refresh_all
         D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
@@ -38,6 +41,10 @@ def setup_logging():
 
     # 获取根日志记录器并添加Handler
     logger = logging.getLogger()
+    if reMoveOldHandler:
+        # 移除根日志记录器的所有现有处理器
+        for handler in logger.handlers[:]:  # 使用[:]来创建handlers列表的一个副本，因为我们在迭代时修改列表
+            logger.removeHandler(handler)
     logger.addHandler(file_handler)
     logger.addHandler(stream_handler)
     logger.setLevel(logging.INFO)  # 设置根日志级别

mdbq/spider/aikucun.py

@@ -19,7 +19,8 @@ from mdbq.config import set_support
 from selenium.webdriver.common.keys import Keys
 from mdbq.other import ua_sj
 from mdbq.mysql import mysql
-from mdbq.config import myconfig
+from mdbq.mysql import s_query
+from mdbq.config import default
 import socket
 
 warnings.filterwarnings('ignore')
@@ -37,6 +38,9 @@ else:
 upload_path = os.path.join(D_PATH, '数据上传中心', '爱库存')  # 此目录位于下载文件夹
 
 m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
+print(username, password, host, port)
+# 实例化一个数据查询类，用来获取 cookies 表数据
+download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
 
 
 def get_cookie_aikucun():
@@ -118,6 +122,40 @@ def get_cookie_aikucun():
             continue
         else:
             new_cookies_list.append(cookie)
+
+    ######### 新增 写入 mysql #########
+    set_typ = {
+        '日期': 'date',
+        'domain': 'varchar(100)',
+        'expiry': 'int',
+        'httpOnly': 'varchar(20)',
+        'name': 'varchar(50)',
+        'path': 'varchar(50)',
+        'sameSite': 'varchar(50)',
+        'secure': 'varchar(50)',
+        'value': 'text',
+        '更新时间': 'timestamp'
+    }
+    _cookies_list = []
+    for item in cookies_list:
+        new_dict = {'日期': datetime.datetime.today().strftime('%Y-%m-%d'), }
+        for k, v in item.items():
+            if v is None:
+                v = 'None'
+            new_dict.update({k: v})
+        if 'expiry' not in new_dict:
+            new_dict.update({'expiry': 0})
+        new_dict.update({'更新时间': datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')})
+        _cookies_list.append(new_dict)
+    m_engine.insert_many_dict(
+        db_name='cookie文件',
+        table_name='main_aikucun',
+        dict_data_list=_cookies_list,
+        set_typ=set_typ,
+        allow_not_null=True,  # 允许插入空值
+    )
+    #############################################
+
     json_file = os.path.join(cookie_path, filename_aikucun)
     with open(json_file, 'w', encoding='utf-8') as f:
         json.dump(new_cookies_list, f, ensure_ascii=False, sort_keys=True, indent=4)
@@ -219,6 +257,38 @@ class AikuCun:
                     cookies_list = json.load(f)  # 使用json读取cookies 注意读取的是文件 所以用load而不是loads
                     for cookie in cookies_list:
                         _driver.add_cookie(cookie)  # 添加cookies信息
+                        # print(cookie)
+        db_name = 'cookie文件'
+        table_name = f'main_{shop_name}'
+        df = download.data_to_df(
+            db_name=db_name,
+            table_name=table_name,
+            start_date='2025-01-01',
+            end_date='2030-12-11',
+            projection={
+                'domain': 1,
+                'expiry': 1,
+                'httpOnly': 1,
+                'name': 1,
+                'path': 1,
+                'sameSite': 1,
+                'secure': 1,
+                'value': 1,
+                '更新时间': 1
+            },
+        )
+        # 仅保留最新日期的数据
+        idx = df.groupby('name')['更新时间'].idxmax()
+        df = df.loc[idx]
+        df.pop('更新时间')
+        for item in df.to_dict('records'):
+            new_dict = {}
+            for k, v in item.items():
+                if v == 'False':
+                    v = False
+                new_dict.update({k: v})
+            # _driver.add_cookie(new_dict)  # 添加cookies信息
+
         _driver.refresh()
         time.sleep(3)
         return _driver
@@ -417,8 +487,8 @@ class AikuCunNew:
 
 
 if __name__ == '__main__':
-    get_cookie_aikucun()  # 登录并获取 cookies
-    akucun(date_num=10, headless=True)  # 下载数据
+    # get_cookie_aikucun()  # 登录并获取 cookies
+    akucun(date_num=30, headless=True)  # 下载数据
 
     # a = AikuCunNew(shop_name='aikucun')
     # a.akc()

{mdbq-3.7.2.dist-info → mdbq-3.7.3.dist-info}/METADATA

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

{mdbq-3.7.2.dist-info → mdbq-3.7.3.dist-info}/RECORD

@@ -16,7 +16,7 @@ mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
 mdbq/dataframe/converter.py,sha256=lETYhT7KXlWzWwqguqhk6vI6kj4rnOBEW1lhqKy2Abc,5035
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
-mdbq/log/spider_logging.py,sha256=EBy3_49RWs1qLO8QM6jB3rk9n35VvpJn65AoET46Ro0,1601
+mdbq/log/spider_logging.py,sha256=CzQIflfbMSBSBjHSO3fEhcG9Oiyj6cR-YU0tObMMyxM,1975
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=M9DUeUCMPDngkwn9-ui0uTiFrvfNU1kLs22s5SmoNm0,31899
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
@@ -36,8 +36,8 @@ mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=oyFwE-8c6uErSGYNIO0z2ng93mH0zstRLD86MWqF6M8,25636
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=1gAEwCUmhCSpOSRPD2EEcbH3bFGn4sUQnQUAsJb5-qM,19391
-mdbq-3.7.2.dist-info/METADATA,sha256=8R-WnzR5mVYftpJ8JekalK3kHRDLqom2RM22uV8QMTI,243
-mdbq-3.7.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-3.7.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.7.2.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=qMU29gb72OK8GLBD-zENo1EmxuojRnuPyEdk5S2KDKw,21767
+mdbq-3.7.3.dist-info/METADATA,sha256=p1jDAm3j6h9URD3CFONyKgTu0lFAgpy3dxWkn0Q5tnA,243
+mdbq-3.7.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.7.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.7.3.dist-info/RECORD,,