From fb938f38aa7a08235c212322bb7a409412544acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=B0=E5=AE=9A=E4=B8=8D=E7=A6=BB=E6=89=8B?= <12640033+msz-006@user.noreply.gitee.com> Date: Mon, 14 Jul 2025 03:36:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=90=84=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0store=20SQL=E6=96=87=E4=BB=B6=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81SQLite\n\n-=20=E6=9B=B4=E6=96=B0=20store/kuaishou/kuai?= =?UTF-8?q?shou=5Fstore=5Fsql.py:=20=E5=BF=AB=E6=89=8B=E5=B9=B3=E5=8F=B0SQ?= =?UTF-8?q?Lite=E9=80=82=E9=85=8D\n-=20=E6=9B=B4=E6=96=B0=20store/tieba/ti?= =?UTF-8?q?eba=5Fstore=5Fsql.py:=20=E8=B4=B4=E5=90=A7=E5=B9=B3=E5=8F=B0SQL?= =?UTF-8?q?ite=E9=80=82=E9=85=8D\n-=20=E6=9B=B4=E6=96=B0=20store/weibo/wei?= =?UTF-8?q?bo=5Fstore=5Fsql.py:=20=E5=BE=AE=E5=8D=9A=E5=B9=B3=E5=8F=B0SQLi?= =?UTF-8?q?te=E9=80=82=E9=85=8D\n-=20=E6=9B=B4=E6=96=B0=20store/xhs/xhs=5F?= =?UTF-8?q?store=5Fsql.py:=20=E5=B0=8F=E7=BA=A2=E4=B9=A6=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?SQLite=E9=80=82=E9=85=8D\n-=20=E6=9B=B4=E6=96=B0=20store/zhihu/?= =?UTF-8?q?zhihu=5Fstore=5Fsql.py:=20=E7=9F=A5=E4=B9=8E=E5=B9=B3=E5=8F=B0S?= =?UTF-8?q?QLite=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/kuaishou/kuaishou_store_sql.py | 17 +++++++++-------- store/tieba/tieba_store_sql.py | 23 ++++++++++++----------- store/weibo/weibo_store_sql.py | 23 ++++++++++++----------- store/xhs/xhs_store_sql.py | 23 ++++++++++++----------- store/zhihu/zhihu_store_sql.py | 23 ++++++++++++----------- 5 files changed, 57 insertions(+), 52 deletions(-) diff --git a/store/kuaishou/kuaishou_store_sql.py b/store/kuaishou/kuaishou_store_sql.py index 410a91c..953f00f 100644 --- a/store/kuaishou/kuaishou_store_sql.py +++ b/store/kuaishou/kuaishou_store_sql.py @@ -14,9 +14,10 @@ # @Time : 2024/4/6 15:30 # @Desc : sql接口集合 -from typing import Dict, List +from typing import Dict, List, Union -from db import AsyncMysqlDB +from async_db import AsyncMysqlDB +from async_sqlite_db import AsyncSqliteDB from var import media_crawler_db_var @@ -29,7 +30,7 @@ async def query_content_by_content_id(content_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from kuaishou_video where video_id = '{content_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -46,7 +47,7 @@ async def add_new_content(content_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("kuaishou_video", content_item) return last_row_id @@ -61,7 +62,7 @@ async def update_content_by_content_id(content_id: str, content_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("kuaishou_video", content_item, "video_id", content_id) return effect_row @@ -76,7 +77,7 @@ async def query_comment_by_comment_id(comment_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from kuaishou_video_comment where comment_id = '{comment_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -93,7 +94,7 @@ async def add_new_comment(comment_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("kuaishou_video_comment", comment_item) return last_row_id @@ -108,6 +109,6 @@ async def update_comment_by_comment_id(comment_id: str, comment_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("kuaishou_video_comment", comment_item, "comment_id", comment_id) return effect_row diff --git a/store/tieba/tieba_store_sql.py b/store/tieba/tieba_store_sql.py index 404d0fb..702ddac 100644 --- a/store/tieba/tieba_store_sql.py +++ b/store/tieba/tieba_store_sql.py @@ -10,9 +10,10 @@ # -*- coding: utf-8 -*- -from typing import Dict, List +from typing import Dict, List, Union -from db import AsyncMysqlDB +from async_db import AsyncMysqlDB +from async_sqlite_db import AsyncSqliteDB from var import media_crawler_db_var @@ -25,7 +26,7 @@ async def query_content_by_content_id(content_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from tieba_note where note_id = '{content_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -42,7 +43,7 @@ async def add_new_content(content_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("tieba_note", content_item) return last_row_id @@ -57,7 +58,7 @@ async def update_content_by_content_id(content_id: str, content_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("tieba_note", content_item, "note_id", content_id) return effect_row @@ -72,7 +73,7 @@ async def query_comment_by_comment_id(comment_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from tieba_comment where comment_id = '{comment_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -89,7 +90,7 @@ async def add_new_comment(comment_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("tieba_comment", comment_item) return last_row_id @@ -104,7 +105,7 @@ async def update_comment_by_comment_id(comment_id: str, comment_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("tieba_comment", comment_item, "comment_id", comment_id) return effect_row @@ -118,7 +119,7 @@ async def query_creator_by_user_id(user_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from tieba_creator where user_id = '{user_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -135,7 +136,7 @@ async def add_new_creator(creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("tieba_creator", creator_item) return last_row_id @@ -150,6 +151,6 @@ async def update_creator_by_user_id(user_id: str, creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("tieba_creator", creator_item, "user_id", user_id) return effect_row \ No newline at end of file diff --git a/store/weibo/weibo_store_sql.py b/store/weibo/weibo_store_sql.py index ed957ee..e6c7767 100644 --- a/store/weibo/weibo_store_sql.py +++ b/store/weibo/weibo_store_sql.py @@ -14,9 +14,10 @@ # @Time : 2024/4/6 15:30 # @Desc : sql接口集合 -from typing import Dict, List +from typing import Dict, List, Union -from db import AsyncMysqlDB +from async_db import AsyncMysqlDB +from async_sqlite_db import AsyncSqliteDB from var import media_crawler_db_var @@ -29,7 +30,7 @@ async def query_content_by_content_id(content_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from weibo_note where note_id = '{content_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -46,7 +47,7 @@ async def add_new_content(content_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("weibo_note", content_item) return last_row_id @@ -61,7 +62,7 @@ async def update_content_by_content_id(content_id: str, content_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("weibo_note", content_item, "note_id", content_id) return effect_row @@ -76,7 +77,7 @@ async def query_comment_by_comment_id(comment_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from weibo_note_comment where comment_id = '{comment_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -93,7 +94,7 @@ async def add_new_comment(comment_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("weibo_note_comment", comment_item) return last_row_id @@ -108,7 +109,7 @@ async def update_comment_by_comment_id(comment_id: str, comment_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("weibo_note_comment", comment_item, "comment_id", comment_id) return effect_row @@ -122,7 +123,7 @@ async def query_creator_by_user_id(user_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from weibo_creator where user_id = '{user_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -139,7 +140,7 @@ async def add_new_creator(creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("weibo_creator", creator_item) return last_row_id @@ -154,6 +155,6 @@ async def update_creator_by_user_id(user_id: str, creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("weibo_creator", creator_item, "user_id", user_id) return effect_row \ No newline at end of file diff --git a/store/xhs/xhs_store_sql.py b/store/xhs/xhs_store_sql.py index 772f2c8..3da130e 100644 --- a/store/xhs/xhs_store_sql.py +++ b/store/xhs/xhs_store_sql.py @@ -14,9 +14,10 @@ # @Time : 2024/4/6 15:30 # @Desc : sql接口集合 -from typing import Dict, List +from typing import Dict, List, Union -from db import AsyncMysqlDB +from async_db import AsyncMysqlDB +from async_sqlite_db import AsyncSqliteDB from var import media_crawler_db_var @@ -29,7 +30,7 @@ async def query_content_by_content_id(content_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from xhs_note where note_id = '{content_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -46,7 +47,7 @@ async def add_new_content(content_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("xhs_note", content_item) return last_row_id @@ -61,7 +62,7 @@ async def update_content_by_content_id(content_id: str, content_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("xhs_note", content_item, "note_id", content_id) return effect_row @@ -76,7 +77,7 @@ async def query_comment_by_comment_id(comment_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from xhs_note_comment where comment_id = '{comment_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -93,7 +94,7 @@ async def add_new_comment(comment_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("xhs_note_comment", comment_item) return last_row_id @@ -108,7 +109,7 @@ async def update_comment_by_comment_id(comment_id: str, comment_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("xhs_note_comment", comment_item, "comment_id", comment_id) return effect_row @@ -122,7 +123,7 @@ async def query_creator_by_user_id(user_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from xhs_creator where user_id = '{user_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -139,7 +140,7 @@ async def add_new_creator(creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("xhs_creator", creator_item) return last_row_id @@ -154,6 +155,6 @@ async def update_creator_by_user_id(user_id: str, creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("xhs_creator", creator_item, "user_id", user_id) return effect_row \ No newline at end of file diff --git a/store/zhihu/zhihu_store_sql.py b/store/zhihu/zhihu_store_sql.py index 9a9443a..5c0ef89 100644 --- a/store/zhihu/zhihu_store_sql.py +++ b/store/zhihu/zhihu_store_sql.py @@ -10,9 +10,10 @@ # -*- coding: utf-8 -*- -from typing import Dict, List +from typing import Dict, List, Union -from db import AsyncMysqlDB +from async_db import AsyncMysqlDB +from async_sqlite_db import AsyncSqliteDB from var import media_crawler_db_var @@ -25,7 +26,7 @@ async def query_content_by_content_id(content_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from zhihu_content where content_id = '{content_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -42,7 +43,7 @@ async def add_new_content(content_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("zhihu_content", content_item) return last_row_id @@ -57,7 +58,7 @@ async def update_content_by_content_id(content_id: str, content_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("zhihu_content", content_item, "content_id", content_id) return effect_row @@ -72,7 +73,7 @@ async def query_comment_by_comment_id(comment_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from zhihu_comment where comment_id = '{comment_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -89,7 +90,7 @@ async def add_new_comment(comment_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("zhihu_comment", comment_item) return last_row_id @@ -104,7 +105,7 @@ async def update_comment_by_comment_id(comment_id: str, comment_item: Dict) -> i Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("zhihu_comment", comment_item, "comment_id", comment_id) return effect_row @@ -118,7 +119,7 @@ async def query_creator_by_user_id(user_id: str) -> Dict: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() sql: str = f"select * from zhihu_creator where user_id = '{user_id}'" rows: List[Dict] = await async_db_conn.query(sql) if len(rows) > 0: @@ -135,7 +136,7 @@ async def add_new_creator(creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() last_row_id: int = await async_db_conn.item_to_table("zhihu_creator", creator_item) return last_row_id @@ -150,6 +151,6 @@ async def update_creator_by_user_id(user_id: str, creator_item: Dict) -> int: Returns: """ - async_db_conn: AsyncMysqlDB = media_crawler_db_var.get() + async_db_conn: Union[AsyncMysqlDB, AsyncSqliteDB] = media_crawler_db_var.get() effect_row: int = await async_db_conn.update_table("zhihu_creator", creator_item, "user_id", user_id) return effect_row \ No newline at end of file