mirror of
https://github.com/KenanZhu/AutoLibrary.git
synced 2026-06-18 23:43:02 +08:00
Compare commits
8 Commits
v1.2.0
...
1c88d3db7b
| Author | SHA1 | Date | |
|---|---|---|---|
| 1c88d3db7b | |||
| 3880f90916 | |||
| d3d146b1b3 | |||
| 0f74a3b0ec | |||
| 9305c559cd | |||
| f56945f29e | |||
| 37132de4fc | |||
| ac5385bcfe |
Binary file not shown.
@@ -56,9 +56,8 @@ def initializeWebDriverManager(
|
|||||||
|
|
||||||
app_dir = QStandardPaths.writableLocation(QStandardPaths.StandardLocation.AppDataLocation)
|
app_dir = QStandardPaths.writableLocation(QStandardPaths.StandardLocation.AppDataLocation)
|
||||||
driver_dir = os.path.join(app_dir, "drivers")
|
driver_dir = os.path.join(app_dir, "drivers")
|
||||||
logger.info("初始化驱动目录 %s", driver_dir)
|
|
||||||
if not QDir(driver_dir).exists():
|
if not QDir(driver_dir).exists():
|
||||||
logger.error("创建驱动目录 %s 失败", driver_dir)
|
logger.info("初始化驱动目录 %s", driver_dir)
|
||||||
if not QDir().mkpath(driver_dir):
|
if not QDir().mkpath(driver_dir):
|
||||||
logger.error("创建驱动目录 %s 失败", driver_dir)
|
logger.error("创建驱动目录 %s 失败", driver_dir)
|
||||||
return False
|
return False
|
||||||
|
|||||||
@@ -383,12 +383,17 @@ class ALTimerTaskManageWidget(QWidget, Ui_ALTimerTaskManageWidget):
|
|||||||
timer_task: dict
|
timer_task: dict
|
||||||
):
|
):
|
||||||
|
|
||||||
|
if "history" not in timer_task:
|
||||||
|
history = []
|
||||||
|
else:
|
||||||
|
history = timer_task["history"]
|
||||||
|
history_count = len(history)
|
||||||
return (
|
return (
|
||||||
f"任务名称:{timer_task["name"]}\n"
|
f"任务名称:{timer_task["name"]}\n"
|
||||||
f"添加时间:{timer_task["added_time"]}\n"
|
f"添加时间:{timer_task["added_time"]}\n"
|
||||||
f"当前状态:{timer_task["status"].value}\n"
|
f"当前状态:{timer_task["status"].value}\n"
|
||||||
f"下次执行时间:{datetime.strftime(timer_task["execute_time"], "%Y-%m-%d %H:%M:%S")}\n"
|
f"下次执行时间:{datetime.strftime(timer_task["execute_time"], "%Y-%m-%d %H:%M:%S")}\n"
|
||||||
f"已记录次数:{len(timer_task['history'] if 'history' in timer_task else 0)}"
|
f"已记录次数:{history_count}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,11 +5,11 @@
|
|||||||
workflow process. Do not edit manually.
|
workflow process. Do not edit manually.
|
||||||
|
|
||||||
This file is auto-generated during the workflow process.
|
This file is auto-generated during the workflow process.
|
||||||
Last updated: 2026-03-21 10:54:51 UTC
|
Last updated: 2026-03-22 14:14:19 UTC
|
||||||
"""
|
"""
|
||||||
|
|
||||||
AL_VERSION = "1.2.0"
|
AL_VERSION = "1.2.1"
|
||||||
AL_TAG = "v1.2.0"
|
AL_TAG = "v1.2.1"
|
||||||
AL_COMMIT_SHA = "local"
|
AL_COMMIT_SHA = "local"
|
||||||
AL_COMMIT_DATE = "null" # time zone : UTC
|
AL_COMMIT_DATE = "null" # time zone : UTC
|
||||||
AL_BUILD_DATE = "null" # time zone : UTC
|
AL_BUILD_DATE = "null" # time zone : UTC
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import platform
|
import platform
|
||||||
import installed_browsers
|
import browsers
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
@@ -128,7 +128,7 @@ class WebBrowserDetector:
|
|||||||
|
|
||||||
self.browser_infos = []
|
self.browser_infos = []
|
||||||
try:
|
try:
|
||||||
all_browsers = installed_browsers.browsers()
|
all_browsers = list(browsers.browsers())
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.browser_infos = []
|
self.browser_infos = []
|
||||||
return self.browser_infos
|
return self.browser_infos
|
||||||
@@ -140,14 +140,14 @@ class WebBrowserDetector:
|
|||||||
'msedge': WebBrowserType.EDGE,
|
'msedge': WebBrowserType.EDGE,
|
||||||
}
|
}
|
||||||
for browser in all_browsers:
|
for browser in all_browsers:
|
||||||
internal_name = browser.get('name', '').lower()
|
internal_name = browser.get("browser_type", "").lower()
|
||||||
if internal_name not in type_map:
|
if internal_name not in type_map:
|
||||||
continue # Not one of the browsers we care about
|
continue # Not one of the browsers we care about
|
||||||
version = browser.get('version')
|
version = browser.get("version", "")
|
||||||
if not version:
|
if not version:
|
||||||
# Skip browsers with no version info (unlikely, but defensive)
|
# Skip browsers with no version info (unlikely, but defensive)
|
||||||
continue
|
continue
|
||||||
exe_path = browser.get('location')
|
exe_path = browser.get("path", "")
|
||||||
if not exe_path:
|
if not exe_path:
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
@@ -163,4 +163,13 @@ class WebBrowserDetector:
|
|||||||
browser_path=path,
|
browser_path=path,
|
||||||
)
|
)
|
||||||
self.browser_infos.append(info)
|
self.browser_infos.append(info)
|
||||||
|
# Deduplicate: keep only one entry per (type, version)
|
||||||
|
seen = set()
|
||||||
|
unique = []
|
||||||
|
for info in self.browser_infos:
|
||||||
|
key = (info.browser_type, info.browser_version)
|
||||||
|
if key not in seen:
|
||||||
|
seen.add(key)
|
||||||
|
unique.append(info)
|
||||||
|
self.browser_infos = unique
|
||||||
return self.browser_infos
|
return self.browser_infos
|
||||||
Reference in New Issue
Block a user