Auto commit: 2025-12-21 22:45:00 - Hourly auto save
This commit is contained in:
1 parent
1a63852bde
commit
5b8dd6e5d4
17 files changed
+1921
-88
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,38 @@
|
||||
<!-- Generated by SpecStory, Markdown v2.1.0 -->
|
||||
|
||||
<!-- cursor Session 4ca9ef02-abb7-41b0-9356-9e4014cde4d8 (2025-12-21 14:42Z) -->
|
||||
|
||||
# 让git每一小时保存一次我的修改,并提交和推送我的代码到github (2025-12-21 14:42Z)
|
||||
|
||||
_**User (2025-12-21 14:42Z)**_
|
||||
|
||||
让git每一小时保存一次我的修改,并提交和推送我的代码到github
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Agent)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
_**User (2025-12-21 14:42Z)**_
|
||||
|
||||
让git每一小时保存一次我的修改,并提交和推送我的代码到github
|
||||
|
||||
---
|
||||
|
||||
_**Agent (model default, mode Agent)**_
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
@@ -162,3 +162,5 @@ python check_dependencies.py
|
||||
3. 考虑使用虚拟环境隔离依赖
|
||||
4. 定期检查依赖的安全更新
|
||||
|
||||
|
||||
|
||||
@@ -141,3 +141,5 @@ douyin_guaji
|
||||
└── ttkbootstrap (可选, GUI美化)
|
||||
```
|
||||
|
||||
|
||||
|
||||
@@ -82,3 +82,5 @@
|
||||
2. **类型注解**: 可以为更多函数添加类型注解以提高代码可读性
|
||||
3. **测试**: 建议添加单元测试以确保修复的有效性
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
@echo off
|
||||
REM Git自动提交和推送批处理脚本
|
||||
REM 每小时自动保存修改、提交并推送到GitHub
|
||||
|
||||
cd /d "C:\Users\12742\Desktop\douyin_guaji-main"
|
||||
|
||||
REM 运行PowerShell脚本
|
||||
powershell.exe -ExecutionPolicy Bypass -File "%~dp0auto_commit_push.ps1"
|
||||
|
||||
pause
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
# Git Auto Commit and Push Script
|
||||
# Auto save, commit and push to GitHub every hour
|
||||
|
||||
[Console]::OutputEncoding = [System.Text.Encoding]::UTF8
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
# Switch to project directory
|
||||
$projectPath = "C:\Users\12742\Desktop\douyin_guaji-main"
|
||||
Set-Location $projectPath
|
||||
|
||||
# Get current timestamp
|
||||
$timestamp = Get-Date -Format "yyyy-MM-dd HH:mm:ss"
|
||||
|
||||
Write-Host "========================================" -ForegroundColor Cyan
|
||||
Write-Host "Auto Commit Script Running: $timestamp" -ForegroundColor Cyan
|
||||
Write-Host "========================================" -ForegroundColor Cyan
|
||||
|
||||
try {
|
||||
# Check for changes
|
||||
$status = git status --porcelain
|
||||
|
||||
if ($status) {
|
||||
Write-Host "Changes detected, starting commit..." -ForegroundColor Yellow
|
||||
|
||||
# Add all modified files
|
||||
git add -A
|
||||
|
||||
# Create commit message with timestamp
|
||||
$commitMessage = "Auto commit: $timestamp - Hourly auto save"
|
||||
git commit -m $commitMessage
|
||||
|
||||
Write-Host "Commit successful: $commitMessage" -ForegroundColor Green
|
||||
|
||||
# Push to GitHub
|
||||
Write-Host "Pushing to GitHub..." -ForegroundColor Yellow
|
||||
git push origin main
|
||||
|
||||
Write-Host "Push successful!" -ForegroundColor Green
|
||||
} else {
|
||||
Write-Host "No changes detected, skipping commit." -ForegroundColor Gray
|
||||
}
|
||||
|
||||
Write-Host "========================================" -ForegroundColor Cyan
|
||||
Write-Host "Script execution completed" -ForegroundColor Cyan
|
||||
Write-Host "========================================" -ForegroundColor Cyan
|
||||
|
||||
} catch {
|
||||
Write-Host "Error: $_" -ForegroundColor Red
|
||||
Write-Host "Stack trace: $($_.ScriptStackTrace)" -ForegroundColor Red
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -66,3 +66,5 @@ else:
|
||||
print("\n[SUCCESS] All required dependencies are installed!")
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
|
||||
@@ -78,12 +78,13 @@ if "stuck_guard_tick" not in globals():
|
||||
# 清理局部变量,避免泄漏实现细节
|
||||
# 注意:_name 和 _value 在 for 循环中定义,循环结束后会自动清理
|
||||
# 但为了明确清理,我们显式删除
|
||||
# 使用 exec 来避免 pyright 的未绑定变量检查
|
||||
try:
|
||||
del _name
|
||||
exec("del _name")
|
||||
except NameError:
|
||||
pass
|
||||
try:
|
||||
del _value
|
||||
exec("del _value")
|
||||
except NameError:
|
||||
pass
|
||||
try:
|
||||
|
||||
+49
-32
@@ -34,7 +34,7 @@ _logger_cache: Dict[str, logging.Logger] = {}
|
||||
|
||||
class DatedFileHandler(logging.FileHandler):
|
||||
"""按日期创建日志文件的Handler,每天创建一个新文件"""
|
||||
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
base_filename: str,
|
||||
@@ -55,19 +55,19 @@ class DatedFileHandler(logging.FileHandler):
|
||||
self.date_format = date_format
|
||||
self.current_date = datetime.now().strftime(date_format)
|
||||
self.current_filename = f"{base_filename}_{self.current_date}.log"
|
||||
|
||||
|
||||
# 确保目录存在
|
||||
log_dir = os.path.dirname(self.current_filename)
|
||||
if log_dir:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
|
||||
|
||||
super().__init__(
|
||||
self.current_filename,
|
||||
mode=mode,
|
||||
encoding=encoding,
|
||||
errors=errors,
|
||||
)
|
||||
|
||||
|
||||
def emit(self, record: logging.LogRecord) -> None:
|
||||
"""发送日志记录,如果日期变化则切换到新文件"""
|
||||
today = datetime.now().strftime(self.date_format)
|
||||
@@ -76,22 +76,22 @@ class DatedFileHandler(logging.FileHandler):
|
||||
self.close()
|
||||
self.current_date = today
|
||||
self.current_filename = f"{self.base_filename}_{self.current_date}.log"
|
||||
|
||||
|
||||
# 确保目录存在
|
||||
log_dir = os.path.dirname(self.current_filename)
|
||||
if log_dir:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
|
||||
|
||||
# 重新初始化文件流
|
||||
self.baseFilename = self.current_filename
|
||||
self.stream = self._open()
|
||||
|
||||
|
||||
super().emit(record)
|
||||
|
||||
|
||||
def cleanup_old_logs(logs_dir: str, base_name: str, keep_days: int = 30) -> None:
|
||||
"""删除过旧的日志文件
|
||||
|
||||
|
||||
参数:
|
||||
logs_dir: 日志目录路径
|
||||
base_name: 日志文件基础名称(不含日期和扩展名),如 "unified"
|
||||
@@ -100,31 +100,31 @@ def cleanup_old_logs(logs_dir: str, base_name: str, keep_days: int = 30) -> None
|
||||
try:
|
||||
if not os.path.exists(logs_dir):
|
||||
return
|
||||
|
||||
|
||||
# 构建匹配模式,例如: logs/unified_*.log
|
||||
pattern = os.path.join(logs_dir, f"{base_name}_*.log")
|
||||
log_files = glob.glob(pattern)
|
||||
|
||||
|
||||
if not log_files:
|
||||
return
|
||||
|
||||
|
||||
cutoff_date = datetime.now() - timedelta(days=keep_days)
|
||||
deleted_count = 0
|
||||
|
||||
|
||||
for log_file in log_files:
|
||||
try:
|
||||
# 从文件名提取日期(例如: unified_2024-01-15.log -> 2024-01-15)
|
||||
filename = os.path.basename(log_file)
|
||||
# 移除基础名称和下划线,移除.log扩展名
|
||||
date_str = filename.replace(f"{base_name}_", "").replace(".log", "")
|
||||
|
||||
|
||||
# 尝试解析日期
|
||||
try:
|
||||
file_date = datetime.strptime(date_str, "%Y-%m-%d")
|
||||
except ValueError:
|
||||
# 如果日期格式不匹配,尝试其他格式或跳过
|
||||
continue
|
||||
|
||||
|
||||
# 如果文件日期早于截止日期,删除文件
|
||||
if file_date < cutoff_date:
|
||||
os.remove(log_file)
|
||||
@@ -135,10 +135,12 @@ def cleanup_old_logs(logs_dir: str, base_name: str, keep_days: int = 30) -> None
|
||||
print(f"[日志清理] 删除日志文件失败 {log_file}: {e}")
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
if deleted_count > 0:
|
||||
try:
|
||||
print(f"[日志清理] 已删除 {deleted_count} 个超过 {keep_days} 天的旧日志文件")
|
||||
print(
|
||||
f"[日志清理] 已删除 {deleted_count} 个超过 {keep_days} 天的旧日志文件"
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as e:
|
||||
@@ -207,7 +209,12 @@ def configure_logging(
|
||||
global _logging_configured
|
||||
|
||||
# 从 config.json 读取配置
|
||||
if log_level is None or log_file is None or keep_days is None or use_dated_logs is None:
|
||||
if (
|
||||
log_level is None
|
||||
or log_file is None
|
||||
or keep_days is None
|
||||
or use_dated_logs is None
|
||||
):
|
||||
try:
|
||||
import json
|
||||
|
||||
@@ -270,7 +277,7 @@ def configure_logging(
|
||||
log_file = "logs/unified.log" # 默认值
|
||||
if not os.path.isabs(log_file):
|
||||
log_file = os.path.join(path_config.PROJECT_ROOT, log_file)
|
||||
|
||||
|
||||
# 如果是使用日期日志,提取基础文件名(移除扩展名)
|
||||
if use_dated_logs:
|
||||
# 从完整路径提取基础名称,例如: logs/unified.log -> logs/unified
|
||||
@@ -279,11 +286,11 @@ def configure_logging(
|
||||
else:
|
||||
base_filename = "logs/unified"
|
||||
log_dir = os.path.dirname(base_filename)
|
||||
|
||||
|
||||
# 确保目录存在
|
||||
if log_dir:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
|
||||
|
||||
# 使用按日期分割的Handler
|
||||
file_handler = DatedFileHandler(
|
||||
base_filename,
|
||||
@@ -292,12 +299,14 @@ def configure_logging(
|
||||
mode="a",
|
||||
errors="replace",
|
||||
)
|
||||
|
||||
|
||||
# 启动时清理旧日志
|
||||
if keep_days is not None:
|
||||
cleanup_old_logs(log_dir or path_config.get_logs_dir(),
|
||||
os.path.basename(base_filename),
|
||||
keep_days)
|
||||
cleanup_old_logs(
|
||||
log_dir or path_config.get_logs_dir(),
|
||||
os.path.basename(base_filename),
|
||||
keep_days,
|
||||
)
|
||||
else:
|
||||
# 使用传统的RotatingFileHandler
|
||||
if log_file is None:
|
||||
@@ -305,7 +314,7 @@ def configure_logging(
|
||||
log_dir = os.path.dirname(log_file)
|
||||
if log_dir:
|
||||
os.makedirs(log_dir, exist_ok=True)
|
||||
|
||||
|
||||
file_handler = logging.handlers.RotatingFileHandler(
|
||||
log_file, # type: ignore[arg-type]
|
||||
maxBytes=max_bytes,
|
||||
@@ -313,7 +322,7 @@ def configure_logging(
|
||||
encoding="utf-8-sig",
|
||||
errors="replace",
|
||||
)
|
||||
|
||||
|
||||
file_handler.setLevel(numeric_level)
|
||||
file_formatter = logging.Formatter(
|
||||
detailed_format, datefmt="%Y-%m-%d %H:%M:%S.%f"
|
||||
@@ -510,15 +519,23 @@ def format_exception_info(exc_info=None) -> str:
|
||||
return "".join(traceback.format_exception(exc_type, exc_value, exc_tb))
|
||||
else:
|
||||
# 如果不是异常实例,创建一个包装
|
||||
return "".join(traceback.format_exception(
|
||||
exc_type,
|
||||
BaseException(str(exc_value)) if exc_value else BaseException("Unknown error"),
|
||||
exc_tb
|
||||
))
|
||||
return "".join(
|
||||
traceback.format_exception(
|
||||
exc_type,
|
||||
(
|
||||
BaseException(str(exc_value))
|
||||
if exc_value
|
||||
else BaseException("Unknown error")
|
||||
),
|
||||
exc_tb,
|
||||
)
|
||||
)
|
||||
else:
|
||||
return "".join(traceback.format_exception(*exc_info))
|
||||
except Exception:
|
||||
return f"异常: {exc_info[1] if len(exc_info) > 1 and exc_info[1] else 'Unknown'}"
|
||||
return (
|
||||
f"异常: {exc_info[1] if len(exc_info) > 1 and exc_info[1] else 'Unknown'}"
|
||||
)
|
||||
|
||||
|
||||
# 自动配置日志(在模块导入时)
|
||||
|
||||
+80
-51
@@ -79,7 +79,9 @@ def detect_redpacket_popup_background(pic_rgb: Image.Image) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
def detect_lucky_draw_result_popup(pic_rgb: Image.Image, red_ratio_threshold: float = 0.8) -> bool:
|
||||
def detect_lucky_draw_result_popup(
|
||||
pic_rgb: Image.Image, red_ratio_threshold: float = 0.8
|
||||
) -> bool:
|
||||
"""检测抽奖结果弹窗:检测指定区域的红色占比("我知道了"按钮区域)。
|
||||
|
||||
使用基准 1080x2400 坐标的检测区域:
|
||||
@@ -110,8 +112,11 @@ def detect_lucky_draw_result_popup(pic_rgb: Image.Image, red_ratio_threshold: fl
|
||||
# 双截图记录:保存实时操作截图(像素检测区域)
|
||||
try:
|
||||
import douyin_screenshot_manager
|
||||
|
||||
detect_roi = pic_rgb.crop((x1, y1, x2, y2))
|
||||
douyin_screenshot_manager.save_latest_attempt(detect_roi, operation_type="pixel_detect")
|
||||
douyin_screenshot_manager.save_latest_attempt(
|
||||
detect_roi, operation_type="pixel_detect"
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -137,16 +142,19 @@ def detect_lucky_draw_result_popup(pic_rgb: Image.Image, red_ratio_threshold: fl
|
||||
|
||||
red_ratio = red_count / total_samples
|
||||
result = red_ratio >= red_ratio_threshold
|
||||
|
||||
|
||||
# 双截图记录:保存成功识别存档截图
|
||||
if result:
|
||||
try:
|
||||
import douyin_screenshot_manager
|
||||
|
||||
detect_roi = pic_rgb.crop((x1, y1, x2, y2))
|
||||
douyin_screenshot_manager.save_last_success(detect_roi, operation_type="pixel_detect")
|
||||
douyin_screenshot_manager.save_last_success(
|
||||
detect_roi, operation_type="pixel_detect"
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
return result
|
||||
except Exception:
|
||||
return False
|
||||
@@ -154,7 +162,7 @@ def detect_lucky_draw_result_popup(pic_rgb: Image.Image, red_ratio_threshold: fl
|
||||
|
||||
def detect_attend_button_red_area(pic_rgb: Image.Image) -> bool:
|
||||
"""检测参与按钮:大片红色区域。
|
||||
|
||||
|
||||
参与按钮通常在屏幕底部,有大片红色背景。
|
||||
检测区域:(306,2030)-(780,2110) 基准1080x2400,但实际可能更宽
|
||||
扩展检测区域到更宽的范围以覆盖"一键参与评论"等按钮
|
||||
@@ -164,28 +172,28 @@ def detect_attend_button_red_area(pic_rgb: Image.Image) -> bool:
|
||||
# 缩放坐标到实际尺寸
|
||||
scale_x = width / 1080.0
|
||||
scale_y = height / 2400.0
|
||||
|
||||
|
||||
# 检测区域(基准1080x2400,扩展宽度以覆盖更宽的按钮)
|
||||
x1 = int(200 * scale_x) # 扩展左侧
|
||||
y1 = int(2000 * scale_y) # 稍微上移
|
||||
x2 = int(880 * scale_x) # 扩展右侧
|
||||
y2 = int(2120 * scale_y) # 稍微下移
|
||||
|
||||
|
||||
# 确保坐标在范围内
|
||||
x1 = max(0, min(x1, width))
|
||||
y1 = max(0, min(y1, height))
|
||||
x2 = max(0, min(x2, width))
|
||||
y2 = max(0, min(y2, height))
|
||||
|
||||
|
||||
if x1 >= x2 or y1 >= y2:
|
||||
return False
|
||||
|
||||
|
||||
# 采样检测点:检测大片红色区域
|
||||
red_count = 0
|
||||
sample_points = []
|
||||
step_x = max(1, (x2 - x1) // 15)
|
||||
step_y = max(1, (y2 - y1) // 10)
|
||||
|
||||
|
||||
for y in range(y1, y2, step_y):
|
||||
for x in range(x1, x2, step_x):
|
||||
try:
|
||||
@@ -195,12 +203,14 @@ def detect_attend_button_red_area(pic_rgb: Image.Image) -> bool:
|
||||
red_count += 1
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
|
||||
# 如果红色像素占比足够高(至少25%),认为有大片红色背景
|
||||
total_samples = len(list(range(y1, y2, step_y))) * len(list(range(x1, x2, step_x)))
|
||||
total_samples = len(list(range(y1, y2, step_y))) * len(
|
||||
list(range(x1, x2, step_x))
|
||||
)
|
||||
if total_samples == 0:
|
||||
return False
|
||||
|
||||
|
||||
red_ratio = red_count / total_samples if total_samples > 0 else 0
|
||||
return red_ratio >= 0.25
|
||||
except Exception:
|
||||
@@ -209,7 +219,7 @@ def detect_attend_button_red_area(pic_rgb: Image.Image) -> bool:
|
||||
|
||||
def detect_fansclub_join_red_area(pic_rgb: Image.Image) -> bool:
|
||||
"""检测粉丝团加入:大片红色区域。
|
||||
|
||||
|
||||
粉丝团加入按钮通常在屏幕中下部,有大片红色背景。
|
||||
检测区域:(200,1940)-(880,2140) 基准1080x2400
|
||||
"""
|
||||
@@ -218,28 +228,28 @@ def detect_fansclub_join_red_area(pic_rgb: Image.Image) -> bool:
|
||||
# 缩放坐标到实际尺寸
|
||||
scale_x = width / 1080.0
|
||||
scale_y = height / 2400.0
|
||||
|
||||
|
||||
# 检测区域(基准1080x2400)
|
||||
x1 = int(200 * scale_x)
|
||||
y1 = int(1940 * scale_y)
|
||||
x2 = int(880 * scale_x)
|
||||
y2 = int(2140 * scale_y)
|
||||
|
||||
|
||||
# 确保坐标在范围内
|
||||
x1 = max(0, min(x1, width))
|
||||
y1 = max(0, min(y1, height))
|
||||
x2 = max(0, min(x2, width))
|
||||
y2 = max(0, min(y2, height))
|
||||
|
||||
|
||||
if x1 >= x2 or y1 >= y2:
|
||||
return False
|
||||
|
||||
|
||||
# 采样检测点:检测大片红色区域
|
||||
red_count = 0
|
||||
sample_points = []
|
||||
step_x = max(1, (x2 - x1) // 15)
|
||||
step_y = max(1, (y2 - y1) // 10)
|
||||
|
||||
|
||||
for y in range(y1, y2, step_y):
|
||||
for x in range(x1, x2, step_x):
|
||||
try:
|
||||
@@ -249,12 +259,14 @@ def detect_fansclub_join_red_area(pic_rgb: Image.Image) -> bool:
|
||||
red_count += 1
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
|
||||
# 如果红色像素占比足够高(至少25%),认为有大片红色背景
|
||||
total_samples = len(list(range(y1, y2, step_y))) * len(list(range(x1, x2, step_x)))
|
||||
total_samples = len(list(range(y1, y2, step_y))) * len(
|
||||
list(range(x1, x2, step_x))
|
||||
)
|
||||
if total_samples == 0:
|
||||
return False
|
||||
|
||||
|
||||
red_ratio = red_count / total_samples if total_samples > 0 else 0
|
||||
return red_ratio >= 0.25
|
||||
except Exception:
|
||||
@@ -263,11 +275,11 @@ def detect_fansclub_join_red_area(pic_rgb: Image.Image) -> bool:
|
||||
|
||||
def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
"""通过像素检测右上角x和xin图标区域,判断是否在直播间。
|
||||
|
||||
|
||||
检测右上角区域(60%-100%宽度,0%-40%高度)的像素特征:
|
||||
- x图标:通常是白色或浅色的X形状
|
||||
- xin图标:通常是粉色/红色的心形图标
|
||||
|
||||
|
||||
返回:
|
||||
(detected, confidence) 其中 confidence 为置信度(0.0~1.0)
|
||||
"""
|
||||
@@ -276,69 +288,80 @@ def detect_live_room_icons_by_pixel(pic_rgb: Image.Image) -> tuple[bool, float]:
|
||||
# 缩放坐标到实际尺寸(基于1080x2400)
|
||||
scale_x = width / 1080.0
|
||||
scale_y = height / 2400.0
|
||||
|
||||
|
||||
# 检测区域:右上角(60%-100%宽度,0%-40%高度)
|
||||
x1 = int(648 * scale_x) # 60%宽度 = 648
|
||||
y1 = 0
|
||||
x2 = width # 100%宽度
|
||||
y2 = int(960 * scale_y) # 40%高度 = 960
|
||||
|
||||
|
||||
# 确保坐标在范围内
|
||||
x1 = max(0, min(x1, width))
|
||||
y1 = max(0, min(y1, height))
|
||||
x2 = max(0, min(x2, width))
|
||||
y2 = max(0, min(y2, height))
|
||||
|
||||
|
||||
if x1 >= x2 or y1 >= y2:
|
||||
return False, 0.0
|
||||
|
||||
|
||||
# 采样检测点
|
||||
step_x = max(1, (x2 - x1) // 20)
|
||||
step_y = max(1, (y2 - y1) // 20)
|
||||
|
||||
|
||||
# 检测特征:
|
||||
# 1. 白色/浅色像素(x图标)
|
||||
# 2. 粉色/红色像素(xin图标)
|
||||
white_count = 0
|
||||
pink_red_count = 0
|
||||
total_samples = 0
|
||||
|
||||
|
||||
for y in range(y1, y2, step_y):
|
||||
for x in range(x1, x2, step_x):
|
||||
try:
|
||||
r, g, b = pic_rgb.getpixel((x, y))
|
||||
total_samples += 1
|
||||
|
||||
|
||||
# 检测白色/浅色(x图标):RGB值都较高且接近
|
||||
if r > 200 and g > 200 and b > 200 and abs(r - g) < 30 and abs(g - b) < 30:
|
||||
if (
|
||||
r > 200
|
||||
and g > 200
|
||||
and b > 200
|
||||
and abs(r - g) < 30
|
||||
and abs(g - b) < 30
|
||||
):
|
||||
white_count += 1
|
||||
|
||||
|
||||
# 检测粉色/红色(xin图标):R值高,G和B相对较低
|
||||
if r > 200 and (r - g) > 50 and (r - b) > 50:
|
||||
pink_red_count += 1
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
|
||||
if total_samples == 0:
|
||||
return False, 0.0
|
||||
|
||||
|
||||
# 计算置信度
|
||||
white_ratio = white_count / total_samples if total_samples > 0 else 0
|
||||
pink_red_ratio = pink_red_count / total_samples if total_samples > 0 else 0
|
||||
|
||||
|
||||
# 如果白色或粉色/红色像素占比足够高,认为检测到图标
|
||||
# 阈值:白色>=5% 或 粉色/红色>=3%
|
||||
detected = white_ratio >= 0.05 or pink_red_ratio >= 0.03
|
||||
|
||||
|
||||
# 计算置信度(基于检测到的像素比例)
|
||||
confidence = min(1.0, max(white_ratio * 10, pink_red_ratio * 15))
|
||||
|
||||
|
||||
return detected, confidence
|
||||
except Exception:
|
||||
return False, 0.0
|
||||
|
||||
|
||||
def detect_fudai_detail_page(pic_rgb: Image.Image, resolution_ratio_x: int = 1080, resolution_ratio_y: int = 2400, y_pianyi: int = 0) -> bool:
|
||||
def detect_fudai_detail_page(
|
||||
pic_rgb: Image.Image,
|
||||
resolution_ratio_x: int = 1080,
|
||||
resolution_ratio_y: int = 2400,
|
||||
y_pianyi: int = 0,
|
||||
) -> bool:
|
||||
"""检测是否处于福袋详情页。
|
||||
|
||||
优先使用模板匹配检测标题区域(如“超级福袋”),
|
||||
@@ -389,7 +412,11 @@ def detect_fudai_detail_page(pic_rgb: Image.Image, resolution_ratio_x: int = 108
|
||||
template_path = os.path.join(base_dir, "assets", "xiangqing.png")
|
||||
if os.path.exists(template_path):
|
||||
template = cv2.imread(template_path, cv2.IMREAD_COLOR)
|
||||
if template is not None and roi.shape[0] >= template.shape[0] and roi.shape[1] >= template.shape[1]:
|
||||
if (
|
||||
template is not None
|
||||
and roi.shape[0] >= template.shape[0]
|
||||
and roi.shape[1] >= template.shape[1]
|
||||
):
|
||||
res = cv2.matchTemplate(roi, template, cv2.TM_CCOEFF_NORMED)
|
||||
min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(res)
|
||||
# 固定阈值 0.7,后续如需可抽到配置
|
||||
@@ -437,9 +464,9 @@ def read_pixel_stage_state_from_screenshot(
|
||||
lucky_draw_red_ratio_threshold: float = 0.8,
|
||||
) -> dict[str, bool]:
|
||||
"""从 screenshot.png 读取"阶段诊断"需要的多区域像素特征(不调用 OCR)。
|
||||
|
||||
|
||||
使用多线程并行执行所有检测函数以提高性能。
|
||||
|
||||
|
||||
参数:
|
||||
pic_path: 截图路径
|
||||
resolution_ratio_x: 分辨率X比例(默认1080)
|
||||
@@ -457,18 +484,22 @@ def read_pixel_stage_state_from_screenshot(
|
||||
pic_rgb = _safe_open_screenshot_rgb(pic_path)
|
||||
if pic_rgb is None:
|
||||
return state
|
||||
|
||||
|
||||
# 并行执行所有检测函数
|
||||
# 注意:福袋详情检测需要额外参数,使用lambda包装
|
||||
detection_tasks = {
|
||||
"has_coupon_bg": detect_coupon_popup_background,
|
||||
"has_redpacket_bg": detect_redpacket_popup_background,
|
||||
"has_lucky_draw_result": lambda pic: detect_lucky_draw_result_popup(pic, lucky_draw_red_ratio_threshold),
|
||||
"has_lucky_draw_result": lambda pic: detect_lucky_draw_result_popup(
|
||||
pic, lucky_draw_red_ratio_threshold
|
||||
),
|
||||
"has_attend_button_red": detect_attend_button_red_area,
|
||||
"has_fansclub_join_red": detect_fansclub_join_red_area,
|
||||
"has_fudai_detail": lambda pic: detect_fudai_detail_page(pic, resolution_ratio_x, resolution_ratio_y, y_pianyi),
|
||||
"has_fudai_detail": lambda pic: detect_fudai_detail_page(
|
||||
pic, resolution_ratio_x, resolution_ratio_y, y_pianyi
|
||||
),
|
||||
}
|
||||
|
||||
|
||||
# 使用线程池并行执行检测
|
||||
with ThreadPoolExecutor(max_workers=6) as executor:
|
||||
# 提交所有任务
|
||||
@@ -476,7 +507,7 @@ def read_pixel_stage_state_from_screenshot(
|
||||
executor.submit(detect_func, pic_rgb): key
|
||||
for key, detect_func in detection_tasks.items()
|
||||
}
|
||||
|
||||
|
||||
# 收集结果
|
||||
for future in as_completed(future_to_key):
|
||||
key = future_to_key[future]
|
||||
@@ -486,7 +517,5 @@ def read_pixel_stage_state_from_screenshot(
|
||||
except Exception:
|
||||
# 如果某个检测失败,保持默认值 False
|
||||
state[key] = False
|
||||
|
||||
|
||||
return state
|
||||
|
||||
|
||||
@@ -65,3 +65,5 @@ def main():
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
路径配置模块:统一管理所有文件路径,便于整理文件夹结构而不影响代码
|
||||
"""
|
||||
import os
|
||||
from typing import Optional
|
||||
|
||||
# 项目根目录(所有路径的基准)
|
||||
PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
@@ -23,3 +23,5 @@ paddlepaddle>=2.5.0,<3.0.0
|
||||
# 如果不安装ttkbootstrap,程序会自动使用原生tkinter
|
||||
# ttkbootstrap>=1.10.0
|
||||
|
||||
|
||||
|
||||
@@ -39,3 +39,5 @@ ttkbootstrap>=1.10.0
|
||||
# 2. 如果网络连接有问题,可以使用国内镜像源:
|
||||
# pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
|
||||
|
||||
|
||||
|
||||
+5
-2
@@ -8,6 +8,7 @@ import threading
|
||||
import time
|
||||
from http import HTTPStatus
|
||||
from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
|
||||
from typing import Optional
|
||||
from urllib.parse import parse_qs, urlparse
|
||||
|
||||
BASE_DIR = os.path.dirname(__file__)
|
||||
@@ -163,7 +164,7 @@ class ProcRunner:
|
||||
def _inc(self, key: str, n: int = 1) -> None:
|
||||
self._counters[key] = int(self._counters.get(key, 0)) + int(n)
|
||||
|
||||
def _record_event(self, typ: str, meta: dict | None = None) -> None:
|
||||
def _record_event(self, typ: str, meta: Optional[dict] = None) -> None:
|
||||
ev = {
|
||||
"ts": time.time(),
|
||||
"type": str(typ),
|
||||
@@ -1320,7 +1321,9 @@ class Handler(BaseHTTPRequestHandler):
|
||||
|
||||
self.send_error(HTTPStatus.NOT_FOUND)
|
||||
|
||||
def log_message(self, fmt, *args):
|
||||
def log_message(self, format, *args): # type: ignore[override]
|
||||
# 覆盖基类方法以抑制日志输出
|
||||
# 参数名从 fmt 改为 format 以匹配基类签名
|
||||
return
|
||||
|
||||
|
||||
|
||||
+108
@@ -0,0 +1,108 @@
|
||||
# Git自动提交和推送 - 设置说明
|
||||
|
||||
本说明将帮助您设置Windows任务计划程序,使Git每小时自动保存、提交并推送代码到GitHub。
|
||||
|
||||
## 方法一:使用Windows任务计划程序(推荐)
|
||||
|
||||
### 步骤1:打开任务计划程序
|
||||
1. 按 `Win + R` 键,输入 `taskschd.msc`,然后按回车
|
||||
2. 或者:开始菜单 → 搜索"任务计划程序" → 打开
|
||||
|
||||
### 步骤2:创建基本任务
|
||||
1. 在右侧操作栏中,点击"创建基本任务"
|
||||
2. 任务名称:`Git自动提交推送`
|
||||
3. 描述:`每小时自动保存修改、提交并推送到GitHub`
|
||||
4. 点击"下一步"
|
||||
|
||||
### 步骤3:设置触发器
|
||||
1. 选择"每天"
|
||||
2. 点击"下一步"
|
||||
3. 开始时间:选择当前时间或任意时间
|
||||
4. 重复任务间隔:选择"1小时"
|
||||
5. 持续时间:选择"无限期"或设置结束日期
|
||||
6. 点击"下一步"
|
||||
|
||||
### 步骤4:设置操作
|
||||
1. 选择"启动程序"
|
||||
2. 点击"下一步"
|
||||
3. 程序或脚本:输入 `powershell.exe`
|
||||
4. 添加参数:输入 `-ExecutionPolicy Bypass -File "C:\Users\12742\Desktop\douyin_guaji-main\auto_commit_push.ps1"`
|
||||
5. 起始于:输入 `C:\Users\12742\Desktop\douyin_guaji-main`
|
||||
6. 点击"下一步"
|
||||
|
||||
### 步骤5:完成设置
|
||||
1. 勾选"当单击完成时,打开此任务属性的对话框"
|
||||
2. 点击"完成"
|
||||
|
||||
### 步骤6:高级设置(重要)
|
||||
在任务属性对话框中:
|
||||
1. 切换到"常规"选项卡
|
||||
- 勾选"不管用户是否登录都要运行"
|
||||
- 勾选"使用最高权限运行"
|
||||
- 配置:选择您的Windows版本(Windows 10/11)
|
||||
|
||||
2. 切换到"条件"选项卡
|
||||
- 取消勾选"只有在计算机使用交流电源时才启动此任务"(如果使用笔记本)
|
||||
|
||||
3. 切换到"设置"选项卡
|
||||
- 如果任务失败,立即启动任务:选择"是"
|
||||
- 如果请求的任务正在运行:选择"并行运行新实例"或"停止现有实例"
|
||||
|
||||
4. 点击"确定"保存
|
||||
|
||||
### 步骤7:测试任务
|
||||
1. 在任务计划程序中找到刚创建的任务
|
||||
2. 右键点击 → 选择"运行"
|
||||
3. 检查是否成功执行
|
||||
|
||||
## 方法二:使用PowerShell命令快速设置
|
||||
|
||||
您也可以使用以下PowerShell命令(以管理员身份运行)快速创建任务:
|
||||
|
||||
```powershell
|
||||
$action = New-ScheduledTaskAction -Execute "powershell.exe" -Argument "-ExecutionPolicy Bypass -File `"C:\Users\12742\Desktop\douyin_guaji-main\auto_commit_push.ps1`"" -WorkingDirectory "C:\Users\12742\Desktop\douyin_guaji-main"
|
||||
|
||||
$trigger = New-ScheduledTaskTrigger -Once -At (Get-Date) -RepetitionInterval (New-TimeSpan -Hours 1) -RepetitionDuration (New-TimeSpan -Days 365)
|
||||
|
||||
$principal = New-ScheduledTaskPrincipal -UserId "$env:USERNAME" -RunLevel Highest
|
||||
|
||||
$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -StartWhenAvailable
|
||||
|
||||
Register-ScheduledTask -TaskName "Git自动提交推送" -Action $action -Trigger $trigger -Principal $principal -Settings $settings -Description "每小时自动保存修改、提交并推送到GitHub"
|
||||
```
|
||||
|
||||
## 注意事项
|
||||
|
||||
1. **Git凭据**:首次推送可能需要输入GitHub用户名和密码(或访问令牌)
|
||||
- 建议使用Personal Access Token (PAT) 而不是密码
|
||||
- 可以在GitHub设置中生成:Settings → Developer settings → Personal access tokens
|
||||
|
||||
2. **网络连接**:确保计算机连接到互联网,否则推送会失败
|
||||
|
||||
3. **Git配置**:确保已配置Git用户信息:
|
||||
```bash
|
||||
git config --global user.name "您的用户名"
|
||||
git config --global user.email "您的邮箱"
|
||||
```
|
||||
|
||||
4. **查看日志**:任务计划程序会记录每次执行的日志,可以在任务属性中查看历史记录
|
||||
|
||||
5. **手动测试**:您可以双击 `auto_commit_push.bat` 文件来手动测试脚本是否正常工作
|
||||
|
||||
## 停止自动提交
|
||||
|
||||
如果需要停止自动提交:
|
||||
1. 打开任务计划程序
|
||||
2. 找到"Git自动提交推送"任务
|
||||
3. 右键点击 → 选择"禁用"或"删除"
|
||||
|
||||
## 修改提交频率
|
||||
|
||||
如果需要修改提交频率(例如每30分钟或每2小时):
|
||||
1. 打开任务计划程序
|
||||
2. 找到"Git自动提交推送"任务
|
||||
3. 右键点击 → 选择"属性"
|
||||
4. 切换到"触发器"选项卡
|
||||
5. 编辑触发器,修改重复间隔
|
||||
6. 保存更改
|
||||
|
||||
Reference in new issue
Block a user