From efc185b8cf20b4ace48cab0007dc6b1273e84a39 Mon Sep 17 00:00:00 2001 From: 4Aiur <14359997+4Aiur@users.noreply.github.com> Date: Sun, 15 Sep 2024 09:38:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9EMacOS=20zbar=E6=9C=AA?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- util/LoginUtil.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/util/LoginUtil.py b/util/LoginUtil.py index 590328f..1631e1d 100644 --- a/util/LoginUtil.py +++ b/util/LoginUtil.py @@ -1,8 +1,10 @@ +import platform import sys + +import qrcode import requests from PIL import Image -import qrcode -import platform + try: from pyzbar.pyzbar import decode except Exception as e: @@ -10,8 +12,13 @@ except Exception as e: if platform.system() == "Linux": print("对于基于 RPM 的系统（如 Fedora), 您可以运行以下命令:") print("sudo dnf install -y zbar") + elif platform.system() == "Darwin": + print("MacOS 安装 zbar 请参考:") + print("https://github.com/LibraHp/GetQzonehistory/issues/23#issuecomment-2349269027") + sys.exit(1) print("有关更多安装指南，请参考 zbar 的官方文档或您的发行版文档。") sys.exit(1) + import time import re import util.ConfigUtil as Config From d3e7aa2e6056c1a77df50801234c3cd2a5e2b4bd Mon Sep 17 00:00:00 2001 From: 4Aiur <14359997+4Aiur@users.noreply.github.com> Date: Sun, 15 Sep 2024 10:20:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=97=A0=E6=B3=95=E5=85=A8=E9=83=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fetch_all_message.py | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/fetch_all_message.py b/fetch_all_message.py index 15afacf..4e50829 100644 --- a/fetch_all_message.py +++ b/fetch_all_message.py @@ -1,4 +1,5 @@ import json +import math import os import re import sys @@ -12,16 +13,15 @@ WORKDIR = "./resource/fetch-all/" MESSAGE_SAMPLE = 'msg-one.json' MESSAGE_ALL = 'msg-all.json' - # 获取所有可见的未删除的说说+高清图片（包含2014年之前） def get_visible_msg_list(): # 1. 获取说说总条数 try: msgSample = read_txt_file(MESSAGE_SAMPLE) except FileNotFoundError as e: - print("样本缓存未找到，开始请求获取样本") + # 样本缓存未找到，开始请求获取样本 qqResponse = get_msg_list(1) - print("创建缓存文件并写入") + # 创建缓存文件并写入 write_txt_file(MESSAGE_SAMPLE, qqResponse) msgSample = read_txt_file(MESSAGE_SAMPLE) @@ -34,14 +34,27 @@ def get_visible_msg_list(): sys.exit(1) # 2. 获取所有说说数据 - print('开始不分页获取所有未删除说说') try: msgAll = read_txt_file(MESSAGE_ALL) except FileNotFoundError as e: - print("缓存未找到，开始请求获取所有未删除说说") - qqResponse = get_msg_list(totalCount) - write_txt_file(MESSAGE_ALL, qqResponse) - msgAll = read_txt_file(MESSAGE_ALL) + # 缓存未找到，准备分页获取所有未删除说说" + # 一页20条 + defaultPageSize = 30 + # 总页数 + totalPageNum = math.ceil(totalCount / defaultPageSize) + # 用于存储所有页的数据 + allPageData = [] + print(f"一共{totalPageNum}页") + for currentPageNum in range(0, totalPageNum): + # 数据偏移量 + pos = currentPageNum * defaultPageSize + print( + f"=========一页{defaultPageSize}条, 获取第{currentPageNum + 1}页, 需要再次选择账号(再次输入1即可)=========") + qqResponse = get_msg_list(defaultPageSize, pos) + currentPageData = json.loads(qqResponse)["msglist"] + allPageData.extend(currentPageData) + msgAll = json.dumps({"msglist": allPageData}, ensure_ascii=False, indent=2) + write_txt_file(MESSAGE_ALL, msgAll) try: json_dict = json.loads(msgAll) @@ -96,7 +109,7 @@ def get_visible_msg_list(): write_txt_file("所有可见说说.md", markdown_content) -def get_msg_list(num): +def get_msg_list(pageSize, offset=0): url = 'https://user.qzone.qq.com/proxy/domain/taotao.qq.com/cgi-bin/emotion_cgi_msglist_v6' cookies = LoginUtil.cookie() g_tk = LoginUtil.bkn(cookies.get('p_skey')) @@ -124,8 +137,8 @@ def get_msg_list(num): 'uin': f'{qqNumber}', 'ftype': '0', 'sort': '0', - 'pos': '0', - 'num': f'{num}', + 'pos': f'{offset}', + 'num': f'{pageSize}', 'replynum': '100', 'g_tk': f'{g_tk}', 'callback': '_preloadCallback', @@ -159,7 +172,6 @@ def write_txt_file(file_name, data): def read_txt_file(file_name): base_path_file_name = os.path.join(WORKDIR, file_name) if os.path.exists(base_path_file_name): - print("读取缓存文件") with open(base_path_file_name, 'r', encoding='utf-8') as file: return file.read() else: From 3806e7ff076d203b7667066fb5b1e4142ce7764d Mon Sep 17 00:00:00 2001 From: 4Aiur <14359997+4Aiur@users.noreply.github.com> Date: Sun, 15 Sep 2024 10:55:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fetch_all_message.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fetch_all_message.py b/fetch_all_message.py index 4e50829..6efe267 100644 --- a/fetch_all_message.py +++ b/fetch_all_message.py @@ -12,9 +12,12 @@ from util import LoginUtil WORKDIR = "./resource/fetch-all/" MESSAGE_SAMPLE = 'msg-one.json' MESSAGE_ALL = 'msg-all.json' - +cookies = None # 获取所有可见的未删除的说说+高清图片（包含2014年之前） def get_visible_msg_list(): + global cookies + if cookies is None: + cookies = LoginUtil.cookie() # 1. 获取说说总条数 try: msgSample = read_txt_file(MESSAGE_SAMPLE) @@ -49,7 +52,7 @@ def get_visible_msg_list(): # 数据偏移量 pos = currentPageNum * defaultPageSize print( - f"=========一页{defaultPageSize}条, 获取第{currentPageNum + 1}页, 需要再次选择账号(再次输入1即可)=========") + f"一页{defaultPageSize}条, 获取第{currentPageNum + 1}页") qqResponse = get_msg_list(defaultPageSize, pos) currentPageData = json.loads(qqResponse)["msglist"] allPageData.extend(currentPageData) @@ -111,7 +114,6 @@ def get_visible_msg_list(): def get_msg_list(pageSize, offset=0): url = 'https://user.qzone.qq.com/proxy/domain/taotao.qq.com/cgi-bin/emotion_cgi_msglist_v6' - cookies = LoginUtil.cookie() g_tk = LoginUtil.bkn(cookies.get('p_skey')) qqNumber = re.sub(r'o0*', '', cookies.get('uin')) skey = cookies.get('skey')