From c39da6e77d4e995299a6df62f9fa565a6dd46807 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 12:13:32 +0800 Subject: [PATCH 01/82] feat(ci): implement semantic-release with three-branch strategy (#89) Implement a clean semantic-release configuration using dedicated branches for different release types: - main: stable releases (v1.0.0) - beta: beta prereleases (v1.0.0-beta.1) - alpha: alpha prereleases (v1.0.0-alpha.1) This replaces the complex environment variable approach with a simple and reliable branch-based strategy that eliminates configuration errors and makes the release process more predictable. Resolves the issue where specified version numbers like v1.0.0-alpha.1 were being ignored in favor of package.json versions. --- .releaserc.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.releaserc.js b/.releaserc.js index 414c16e6..1dc458fd 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -1,5 +1,12 @@ module.exports = { - branches: ['main', { name: 'beta', prerelease: true }, { name: 'alpha', prerelease: true }], + branches: [ + // main 分支：稳定版本 (v1.0.0) + 'main', + // beta 分支：测试版本 (v1.0.0-beta.1) + { name: 'beta', prerelease: true }, + // alpha 分支：开发版本 (v1.0.0-alpha.1) + { name: 'alpha', prerelease: true } + ], plugins: [ '@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', From 4c8dab674ef9618a3df5363cba2e19b91696cc45 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 8 Sep 2025 04:23:57 +0000 Subject: [PATCH 02/82] chore(release): 1.0.0-alpha.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # 1.0.0-alpha.1 (2025-09-08) ### Bug Fixes * **build:** correct alpha channel update file naming ([#79](https://github.com/mkdir700/EchoPlayer/issues/79)) ([95e2ed2](https://github.com/mkdir700/EchoPlayer/commit/95e2ed262d6f29d2a645033089afe36a24afd56f)) * **build:** 修复 Linux 构建产物架构命名转换问题 ([1f732ba](https://github.com/mkdir700/EchoPlayer/commit/1f732ba84ed69c803c6795c19ae7b5a2e11c3b70)) * **ci:** resolve GitHub Release creation issue with always publish strategy ([#85](https://github.com/mkdir700/EchoPlayer/issues/85)) ([712f0e8](https://github.com/mkdir700/EchoPlayer/commit/712f0e8cc8c11241678334c80e95f778055f57b2)) * **ci:** resolve semantic-release configuration issues ([#88](https://github.com/mkdir700/EchoPlayer/issues/88)) ([0a9e4a3](https://github.com/mkdir700/EchoPlayer/commit/0a9e4a3eb4501ade7aa25f377baab627de27b872)) * **ci:** resolve Windows build shell syntax compatibility issue ([#84](https://github.com/mkdir700/EchoPlayer/issues/84)) ([59b8460](https://github.com/mkdir700/EchoPlayer/commit/59b846044060a4c6ddd82c490c3c8706fe9daac7)) * fix type check ([eae1e37](https://github.com/mkdir700/EchoPlayer/commit/eae1e378262d1f9162fd630cbb6dd867df933fb3)) * Fix TypeScript build errors and improve type safety ([#77](https://github.com/mkdir700/EchoPlayer/issues/77)) ([7861279](https://github.com/mkdir700/EchoPlayer/commit/7861279d8d5fd8c8e3bd5d5639f8e4b8f999b0ca)) * **player:** integrate volume state in player engine context ([5ff32d9](https://github.com/mkdir700/EchoPlayer/commit/5ff32d91ce39d9499ae762ee433e61461e926c46)) * remove cheerio dependency to resolve Electron packaging issues - Remove cheerio and @types/cheerio from package.json dependencies - Replace cheerio-based HTML parsing with native regex implementation - Refactor parseEudicHtml() to parseEudicHtmlWithRegex() in dictionaryHandlers.ts - Support multiple HTML formats: list items, phonetics, examples, translations - Delete related test files that depend on cheerio - Fix TypeScript type errors for regex variables - Improve Electron runtime compatibility and reduce bundle size Fixes [#50](https://github.com/mkdir700/EchoPlayer/issues/50) ([b01fe4e](https://github.com/mkdir700/EchoPlayer/commit/b01fe4e33a0027d3c4fc6fdbb7e5577fb7f4165b)) * **renderer:** resolve subsrt dynamic require issue in production build ([#78](https://github.com/mkdir700/EchoPlayer/issues/78)) ([028a8fb](https://github.com/mkdir700/EchoPlayer/commit/028a8fb9a9446ebb8dc7b25fb4a70fadc02fb085)) * resolve dead links in documentation and add missing pages ([fc36263](https://github.com/mkdir700/EchoPlayer/commit/fc3626305bdbf96c0efc70ae9d989ba02a0ededa)) * **test:** resolve SubtitleLibraryDAO schema validation and test framework improvements ([#80](https://github.com/mkdir700/EchoPlayer/issues/80)) ([4be2b8a](https://github.com/mkdir700/EchoPlayer/commit/4be2b8a390c454dc1b0287e352d15ceedb4ed67b)) * **titlebar:** keep title bar fixed at top during page scroll ([b3ff5c2](https://github.com/mkdir700/EchoPlayer/commit/b3ff5c2c6b5a8bea67da69b8e82c9200d5eb05fd)) * 优化文件路径处理逻辑以支持不同平台 ([dc4e1e3](https://github.com/mkdir700/EchoPlayer/commit/dc4e1e384588dac7e1aacc27eccf165fe2e43e4d)) * 修复 settings 相关组件找不到的问题 ([08f88ba](https://github.com/mkdir700/EchoPlayer/commit/08f88bad7099ac110a0bae109b3501a0348f0b78)) * 修复全屏模式下速度选择窗口溢出的问题 ([6309046](https://github.com/mkdir700/EchoPlayer/commit/63090466881d8df3e5dc062c0f235995dfe4134e)) * 修复在 Windows 上的 FFmpeg 文件下载和 ZIP 解压 ([6347b4e](https://github.com/mkdir700/EchoPlayer/commit/6347b4e62207dc104a1fa44f27af08667ff893a2)) * 修复在启用单句循环模式下，无法调整到下一句的问题 ([ec479be](https://github.com/mkdir700/EchoPlayer/commit/ec479beeff5c931821eed5aaffeaa054226b13c2)) * 修复文件路径处理逻辑以支持不同的 file URL 前缀 ([740015d](https://github.com/mkdir700/EchoPlayer/commit/740015d955f8266b96d2aa49bdc244d084937355)) * 修复方向键冲突检测问题 ([4a466c7](https://github.com/mkdir700/EchoPlayer/commit/4a466c7367860120d9a4ccc6f23ab5e79a2d8cae)) * 修复无法通过按钮退出全屏模式的问题 ([e69562b](https://github.com/mkdir700/EchoPlayer/commit/e69562b9ead8ea66c0933ad21b5cbeae3d88142f)) * 修复构建产物架构冲突问题 ([2398bd7](https://github.com/mkdir700/EchoPlayer/commit/2398bd78be4526a9f3f636c8f945df644bbc3d5b)) * 修复组件导出语句和优化字幕加载逻辑，移除未使用的状态 ([39708ce](https://github.com/mkdir700/EchoPlayer/commit/39708ce48bd6652488abce7d21752a2afe994d99)) * 删除上传到 cos 的步骤，因为网络波动问题上传失败 ([1cac918](https://github.com/mkdir700/EchoPlayer/commit/1cac918f21ad3198827138512ee61d770bd1367f)) * 在 UpdateNotification 组件中添加关闭对话框的逻辑，确保用户在操作后能够顺利关闭对话框 ([845a070](https://github.com/mkdir700/EchoPlayer/commit/845a070ac74b513ce5bda3cdc3d3e7a803a3b8d1)) * 始终在脚本直接执行时运行主函数，确保功能正常 ([a15378a](https://github.com/mkdir700/EchoPlayer/commit/a15378a914e54967f50642e04a111af184255344)) * 忽略依赖项警告 ([fc3f038](https://github.com/mkdir700/EchoPlayer/commit/fc3f038bb7d9b7e6962a5346bee00c858998ade0)) * 更新主题样式，使用 token 中的 zIndex 替代硬编码值 ([3940caf](https://github.com/mkdir700/EchoPlayer/commit/3940caf3b768efcba2043b3734bc7c7962f8c5a8)) * 更新测试文件中的 useTheme 和 useVideoPlaybackHooks 的路径 ([4fa9758](https://github.com/mkdir700/EchoPlayer/commit/4fa9758ae7bcb26789e8a458312ef23d577a34e6)) * 移除构建和发布工作流中的空选项，始终将草稿发布设置为 true，以确保发布过程的一致性 ([171028a](https://github.com/mkdir700/EchoPlayer/commit/171028adff214b3c696b7aaacb617c7c41b0302b)) ### Features * add API communication type definitions and unified export ([ea9f1c0](https://github.com/mkdir700/EchoPlayer/commit/ea9f1c0690d3b7fe5f6a2e2406b5fb88817aa8d1)) * add common base type definitions and interfaces for application ([73bd604](https://github.com/mkdir700/EchoPlayer/commit/73bd6046239341716eea727d95b316e9a3652ec8)) * add debounce hooks and corresponding tests ([7646088](https://github.com/mkdir700/EchoPlayer/commit/7646088b78106e40f00ff15a3cdd86b44aa541cc)) * add domain type definitions and constants for video, subtitle, playback, and UI ([a1c3209](https://github.com/mkdir700/EchoPlayer/commit/a1c3209271336891e0e9dbde444abc8c4e7d8e4b)) * add git hooks with lint-staged for automated code quality checks ([1311af9](https://github.com/mkdir700/EchoPlayer/commit/1311af96159b7e7b5d31f43f27f479cc9035d5a5)) * add handler to read directory contents ([6ce1d9e](https://github.com/mkdir700/EchoPlayer/commit/6ce1d9eff64968cef3a5673a67f8753de582d501)) * add IPC Client Service implementation with integration tests ([fe4400f](https://github.com/mkdir700/EchoPlayer/commit/fe4400ff63ff0640f32ca94f0b4d0d4c47b246ed)) * add performance optimization hooks and corresponding tests ([d7e1d0f](https://github.com/mkdir700/EchoPlayer/commit/d7e1d0f006dfe8c6c58a20bb0305621a657c9a65)) * add selectors for subtitle, UI, and video states with computed properties and hooks ([c64f41d](https://github.com/mkdir700/EchoPlayer/commit/c64f41dd27496bd311ff588474041e4ebacbd3a9)) * Add service layer type definitions for storage, video, subtitle, and dictionary services ([c658217](https://github.com/mkdir700/EchoPlayer/commit/c658217a5acc7e8a066004e6d7c1cd103be43a3b)) * add subtitle, UI, and video state actions for V2 ([1a4042a](https://github.com/mkdir700/EchoPlayer/commit/1a4042af3e1e917d6303a560c49e4aa8d52300ab)) * add unified export for V2 infrastructure layer type system ([ad94ea8](https://github.com/mkdir700/EchoPlayer/commit/ad94ea849bc17b5e569bd2296cf73c30ca06747d)) * add V2 state stores with type-safe validation and comprehensive documentation ([264cc66](https://github.com/mkdir700/EchoPlayer/commit/264cc661c2be83c9d886ba673d104b499ade0729)) * **api:** add request and response type definitions for video, subtitle, file operations, and playback settings ([c0e9324](https://github.com/mkdir700/EchoPlayer/commit/c0e9324642d6920def8dcb79a97c92ab0f552397)) * **AutoResumeCountdown:** add auto-dismissal when playback manually resumed ([3852bca](https://github.com/mkdir700/EchoPlayer/commit/3852bca30af23c203698bc413e0b482a595c96d6)) * **ci:** implement semantic-release with three-branch strategy ([#89](https://github.com/mkdir700/EchoPlayer/issues/89)) ([c39da6e](https://github.com/mkdir700/EchoPlayer/commit/c39da6e77d4e995299a6df62f9fa565a6dd46807)) * **ci:** integrate semantic-release automation with GitHub workflow ([#87](https://github.com/mkdir700/EchoPlayer/issues/87)) ([874bd5a](https://github.com/mkdir700/EchoPlayer/commit/874bd5a0987c5944c14926230b32a49b4886158b)) * **ci:** migrate from action-gh-release to native electron-builder publishing ([#82](https://github.com/mkdir700/EchoPlayer/issues/82)) ([eab9ba1](https://github.com/mkdir700/EchoPlayer/commit/eab9ba1f1d8cc55d4cf6e7e6c3c8633b02938715)) * comprehensive auto-update system implementation ([#73](https://github.com/mkdir700/EchoPlayer/issues/73)) ([0dac065](https://github.com/mkdir700/EchoPlayer/commit/0dac065d54643bc761c741bae914057b9784e419)) * **ControllerPanel:** add disabled state for Loop and AutoPause controls when subtitles are empty ([a35f3e6](https://github.com/mkdir700/EchoPlayer/commit/a35f3e6cbf5c33ee4ebc6ca21dfb31a5b2b1b1a6)) * **ControllerPanel:** implement centralized menu management system for player controls ([1523758](https://github.com/mkdir700/EchoPlayer/commit/152375846dc6d5acf84d07a0d182160e29de4358)) * **db:** implement complete SQLite3 database layer with migrations and DAOs ([0a8a7dd](https://github.com/mkdir700/EchoPlayer/commit/0a8a7ddb5a240c6d6c145b4cfa0790e2292d3697)) * **db:** migrate from Dexie to Kysely with better-sqlite3 backend ([6b75cd8](https://github.com/mkdir700/EchoPlayer/commit/6b75cd877bd117b84d6205eb1c680450042b6eaa)) * define domain types for video, subtitle, and UI, and refactor RecentPlayItem interface imports ([f632beb](https://github.com/mkdir700/EchoPlayer/commit/f632beba5f9b20afb2ec6fc8e6df7dcba6fd29f0)) * enhance macOS build configuration with additional entitlements and notarization support ([d6e8ced](https://github.com/mkdir700/EchoPlayer/commit/d6e8ced7611b9f09743bc29344c6a0020ed0b19d)) * **home:** implement empty state with video file selection integration ([b6f6e40](https://github.com/mkdir700/EchoPlayer/commit/b6f6e401f622f1390926eb154f47fad812d5d0a7)) * Implement dictionary engine framework ([0d74a83](https://github.com/mkdir700/EchoPlayer/commit/0d74a8315f86209c530ad2f306b6099e97328c1f)) * implement useThrottle hooks and corresponding tests ([da30344](https://github.com/mkdir700/EchoPlayer/commit/da303443b6847fe049be9c4592c98418aeea9785)) * implement version parsing and channel mapping logic ([8c95a2f](https://github.com/mkdir700/EchoPlayer/commit/8c95a2feeef1d066fb46f246724d8a94014fa627)) * **infrastructure:** add entry points for constants and shared modules, and refine video playback rate type ([94da255](https://github.com/mkdir700/EchoPlayer/commit/94da2556dd6909eec75d4edfe2b549e3858e2629)) * **logger:** export logger instance for easier access in modules ([5328152](https://github.com/mkdir700/EchoPlayer/commit/5328152999408cbec0515e501aea9f393032b933)) * **persistence:** add V2 state persistence manager and configuration files ([a545020](https://github.com/mkdir700/EchoPlayer/commit/a545020f3f676b526b3f3bf3ecff6d23c4c1a471)) * **playback:** update playback rate label for clarity and add storage type definitions ([5c40b98](https://github.com/mkdir700/EchoPlayer/commit/5c40b983ea22c1e57e5e678922c5d6492a39359c)) * player page ([aa79279](https://github.com/mkdir700/EchoPlayer/commit/aa792799580524ac65c8bf7e4d9bc7e13988a716)) * **player,logging,state:** orchestrated player engine with intent strategies and new controller panel ([73d7cfd](https://github.com/mkdir700/EchoPlayer/commit/73d7cfdc4b58f190afe8981eddadbca54c6763b0)) * **player:** add Ctrl+] shortcut for subtitle panel toggle ([#69](https://github.com/mkdir700/EchoPlayer/issues/69)) ([e1628f2](https://github.com/mkdir700/EchoPlayer/commit/e1628f2d04ea03cac20893960a3a9fec2dd9fdb2)) * **player:** hide sidebar and optimize navbar for player page ([#70](https://github.com/mkdir700/EchoPlayer/issues/70)) ([5bb71e4](https://github.com/mkdir700/EchoPlayer/commit/5bb71e4465721c3b1f0dc326f9a92e879e1c048b)) * **player:** implement auto-resume countdown with UI notification ([5468f65](https://github.com/mkdir700/EchoPlayer/commit/5468f6531c3e2f3d8aaf94f631ec4f760d04241f)) * **player:** reposition progress bar between video and controls ([#71](https://github.com/mkdir700/EchoPlayer/issues/71)) ([248feed](https://github.com/mkdir700/EchoPlayer/commit/248feed534974b6c05ef2918a3758ae5fed1f42d)) * refine RecentPlayItem interface with detailed video info and playback metrics ([81679b6](https://github.com/mkdir700/EchoPlayer/commit/81679b6eb54f7a8f07a33065c743fa51d1eecc5d)) * setup GitHub Pages deployment for documentation ([b8a42b9](https://github.com/mkdir700/EchoPlayer/commit/b8a42b974d7490ddddb4292608315a58df14a24b)) * **sidebar:** 禁用收藏按钮并添加开发中提示 ([#81](https://github.com/mkdir700/EchoPlayer/issues/81)) ([76e9b54](https://github.com/mkdir700/EchoPlayer/commit/76e9b5418ec5f07f4d3052d8130163d108965f47)) * **SplashScreen:** add animated splash screen with typewriter effect and smooth transitions ([31cfeca](https://github.com/mkdir700/EchoPlayer/commit/31cfeca9f0773db12b9a7b299820a32c309d9daf)) * **state.store:** 新增多个 store ([54e7ff5](https://github.com/mkdir700/EchoPlayer/commit/54e7ff5993631c6133e21948c2697bcd13919df6)) * **state:** implement V2 state management infrastructure with storage engine, middleware, and utility functions ([e225746](https://github.com/mkdir700/EchoPlayer/commit/e22574659d1ec63fbc622152fec2371323b4fe53)) * **storage:** implement application configuration storage service ([1209b56](https://github.com/mkdir700/EchoPlayer/commit/1209b56fae690a9876440faa679f072cb2ebc6da)) * **subtitle-library:** Add subtitle data caching for improved loading performance ([#86](https://github.com/mkdir700/EchoPlayer/issues/86)) ([40be325](https://github.com/mkdir700/EchoPlayer/commit/40be325f09f9f70e702260dfe29e354c6c7435b6)) * **SubtitleContent:** implement word-level tokenization and interactive text selection ([10c0cdf](https://github.com/mkdir700/EchoPlayer/commit/10c0cdf38fdbad53bfba4b82148b635e45657b11)) * **types:** add Serializable interface for flexible data structures ([32981df](https://github.com/mkdir700/EchoPlayer/commit/32981df183af23d9153ae65765b9d1c8a533540e)) * update macOS notarization configuration to enable automatic notarization ([6630e79](https://github.com/mkdir700/EchoPlayer/commit/6630e79975a5d39eea83bec44ef1ff0271c984da)) * **video.store:** add format property to CurrentVideoState and update video loading simulation ([0349a63](https://github.com/mkdir700/EchoPlayer/commit/0349a6351ba8fa2a1235a48b268825ad18ea37ff)) * **VolumeControl:** change volume popup from horizontal to vertical layout ([d4d435b](https://github.com/mkdir700/EchoPlayer/commit/d4d435b93a72b8bb8e1f9d4fe356fa41632d8993)) * **wsl:** add WSL detection and hardware acceleration optimization ([c99403e](https://github.com/mkdir700/EchoPlayer/commit/c99403efa8af9fa9ebf106edcbdc4a0d21b31b2e)) * 为字幕组件新增右键菜单功能 ([62334d5](https://github.com/mkdir700/EchoPlayer/commit/62334d56bb0956b28582d5d70e7ea0a3c2f9e42d)) * 为音量控制组件添加音量调节快捷键 ([144d49c](https://github.com/mkdir700/EchoPlayer/commit/144d49c314688c6b7b0abbdd0c21f57c98f3084d)) * 优化 PlayPage 组件性能，减少不必要的重新渲染；重构播放状态管理逻辑，提升用户体验 ([24a2ebc](https://github.com/mkdir700/EchoPlayer/commit/24a2ebc6d7c040ffce5ffc1a404f338ad77a6791)) * 优化最近观看记录加载状态显示 ([e5f7e11](https://github.com/mkdir700/EchoPlayer/commit/e5f7e11498d52028cf20765ea2fe486cca49f3d1)) * 优化单词查询逻辑，增加超时处理和取消请求功能，提升用户体验和性能 ([c98dc4b](https://github.com/mkdir700/EchoPlayer/commit/c98dc4b5d65bdc7c68d82f6e0c1bcda248929503)) * 优化字幕列表滚动体验 ([63807c5](https://github.com/mkdir700/EchoPlayer/commit/63807c5a4a668d5000c7c920dcae5eb96623314e)) * 优化字幕控制功能，新增字幕模式选择器，提升用户交互体验；重构相关组件，移除不必要的代码，简化逻辑 ([559aada](https://github.com/mkdir700/EchoPlayer/commit/559aada0c7d224bdbc941b30aa9da71b08d84636)) * 优化字幕文本分段逻辑 ([33e591c](https://github.com/mkdir700/EchoPlayer/commit/33e591c08ac1d520886b20b2b0219e15eeea1d0d)) * 优化字幕模式选择器组件，增强用户体验和视觉一致性，添加响应式设计和毛玻璃效果 ([4b59a1b](https://github.com/mkdir700/EchoPlayer/commit/4b59a1b0ac1d3a66dfd0c129177f2820722f2416)) * 优化快捷键设置界面，增强输入状态反馈，更新样式以提升用户体验和一致性 ([64db31c](https://github.com/mkdir700/EchoPlayer/commit/64db31cd8112b08f509e16ef653f687381f5f636)) * 优化日志记录功能，新增组件渲染节流和数据简化处理，提升性能和可读性 ([a6e8480](https://github.com/mkdir700/EchoPlayer/commit/a6e8480ecb2458eefd899d0828af3955f3cbef6e)) * 优化标题栏平台信息处理 ([fb5a470](https://github.com/mkdir700/EchoPlayer/commit/fb5a470084ed46f6f662e060d4cbca89fca1736e)) * 优化视频卡片和视频网格组件的样式与布局 ([af59b44](https://github.com/mkdir700/EchoPlayer/commit/af59b44aa7cefeb06dfd87656532af3652013574)) * 优化词典查询逻辑，增加未找到释义时的警告提示，并调整相关代码结构 ([9f528bd](https://github.com/mkdir700/EchoPlayer/commit/9f528bd89e905af2490c9c1b2db3d9a00b19e1f8)) * 优化进度条handler显示和对齐 ([77d0496](https://github.com/mkdir700/EchoPlayer/commit/77d04965d4ac4aa2bfff965fe2852c82d9e4c91e)) * 在 FullscreenTestInfo 组件中新增折叠功能 ([b2eac46](https://github.com/mkdir700/EchoPlayer/commit/b2eac461e616b3da6be84ceabaffd08c583d1b59)) * 在 HomePage 组件中新增音频兼容性诊断功能，优化视频播放体验；更新视频兼容性报告以支持音频编解码器检测；重构相关逻辑以提升代码可读性和维护性 ([3cac307](https://github.com/mkdir700/EchoPlayer/commit/3cac307f50c791b2f4f76b3e0aec7571d4e30a98)) * 在 SubtitleListContent 组件中引入 rc-virtual-list 以优化字幕列表渲染性能，增强自动滚动功能 ([30165dc](https://github.com/mkdir700/EchoPlayer/commit/30165dcf42f2770be23392f6c6d07a8d1786f95f)) * 在 UpdatePromptDialog 组件中添加内容展开/折叠功能 ([96d9b1f](https://github.com/mkdir700/EchoPlayer/commit/96d9b1f32b15abea3661836a684e177e774b80e5)) * 在构建和发布工作流中添加Windows、Mac和Linux平台的上传步骤，优化版本变量设置和上传路径逻辑 ([3cfacb9](https://github.com/mkdir700/EchoPlayer/commit/3cfacb91cd3c60428af09bdb1b1ed74be1538e29)) * 在构建和发布工作流中添加更新 package.json 版本的步骤，确保版本号自动更新；优化草稿发布条件以支持预发布版本 ([a78fbc7](https://github.com/mkdir700/EchoPlayer/commit/a78fbc72166e08eeec641c0970eebf83763aba39)) * 在构建和发布工作流中添加测试构建选项，更新版本变量设置和上传路径逻辑 ([2848f92](https://github.com/mkdir700/EchoPlayer/commit/2848f92f7216dee720d84608ffce2840f5f67bcd)) * 在视频上传时重置字幕控制状态，新增重置状态功能；更新快捷键设置以支持单句循环功能，优化用户体验 ([688dcd6](https://github.com/mkdir700/EchoPlayer/commit/688dcd6e7ddfe43499035fd828bcf26f04e08d79)) * 增强全屏模式下的样式支持 ([94a77b1](https://github.com/mkdir700/EchoPlayer/commit/94a77b1166173b73789d14daaba12d0b7de2790a)) * 增强全屏模式的快捷键支持 ([218882c](https://github.com/mkdir700/EchoPlayer/commit/218882cdbdd597dff7cf41df3dac9e0587b43dd0)) * 增强字幕显示组件，新增中文字符检测和智能文本分割功能，优化用户交互体验 ([8cd50d9](https://github.com/mkdir700/EchoPlayer/commit/8cd50d9df0e2884f27187bb0df66a2f0f3c232b2)) * 增强字幕空状态组件，支持拖拽文件导入 ([db1f608](https://github.com/mkdir700/EchoPlayer/commit/db1f60833f27b75594790387c0382cc30abd28fe)) * 增强字幕组件交互功能 ([3e7e8c7](https://github.com/mkdir700/EchoPlayer/commit/3e7e8c74651da43cbcd5e525ba76324e6c403fd8)) * 增强字幕组件和文本选择功能 ([36c44aa](https://github.com/mkdir700/EchoPlayer/commit/36c44aae0884e22030aae37db7424ac92e3f2c60)) * 增强快捷键设置功能，新增快捷键冲突检查和平台特定符号显示，优化用户输入体验和界面样式 ([bde034b](https://github.com/mkdir700/EchoPlayer/commit/bde034bccab0dec6dbeb305fd5c4b7aca76caa91)) * 增强更新通知系统，添加红点提示和用户交互逻辑 ([fdf4c81](https://github.com/mkdir700/EchoPlayer/commit/fdf4c811e2cf2611319adc6b706e12b5510fe5c8)) * 增强版本比较逻辑，优化更新通知系统 ([f29a25f](https://github.com/mkdir700/EchoPlayer/commit/f29a25fc4d9859375654c8c3e1f532224e8e3049)) * 增强视频兼容性模态框功能，支持初始步骤和分析结果 ([3aba45c](https://github.com/mkdir700/EchoPlayer/commit/3aba45c3464151598c1b8400c8e14d2c612f53bf)) * 多平台构建和发布 ([cc521ea](https://github.com/mkdir700/EchoPlayer/commit/cc521ea8befde2b839810292e93475a806db4dd1)) * 实现动态 electron-updater 渠道配置 ([28d2836](https://github.com/mkdir700/EchoPlayer/commit/28d28360a4e5cee11603cd68f959098d4e40ca0b)), closes [#3](https://github.com/mkdir700/EchoPlayer/issues/3) * 将发布提供者从 generic 更改为 github，更新仓库和所有者信息，以支持自动更新功能 ([b6d4076](https://github.com/mkdir700/EchoPlayer/commit/b6d4076ff094f31d5f4eedf08e6b943f41f5fed6)) * 引入常量以支持视频容器格式检查 ([da68183](https://github.com/mkdir700/EchoPlayer/commit/da681831b60f4655b72731fd1ba34e5550149543)) * 新增 AimButton 组件以支持手动定位当前字幕并启用自动滚动；更新 SubtitleListContent 组件以集成 AimButton，优化用户滚动体验与字幕自动滚动逻辑 ([3c8a092](https://github.com/mkdir700/EchoPlayer/commit/3c8a09208d773f7a7e5d86bfb6a7ef26cfadf444)) * 新增 AppHeader 组件并更新样式，调整导航菜单布局以提升用户体验 ([94e35c3](https://github.com/mkdir700/EchoPlayer/commit/94e35c30ff96b534046190cbd654097f0b960095)) * 新增 cmd-reason.mdc 文件并更新 cmd-refactor-theme.mdc 规则 ([43d2222](https://github.com/mkdir700/EchoPlayer/commit/43d22225b7dd3546a90aec05ee5efb2dd158c8f6)) * 新增 E2E 测试用例和文件选择器助手 ([9928349](https://github.com/mkdir700/EchoPlayer/commit/99283494eddf4612fa0d9434473974337045b052)) * 新增 git commit 内容生成规则文件 ([6e0ee23](https://github.com/mkdir700/EchoPlayer/commit/6e0ee238be5d22aed2e23bf8cb4f51d5918d2a51)) * 新增主题系统 ([369d828](https://github.com/mkdir700/EchoPlayer/commit/369d828232f0e07d1212e750b961871fe8024a3f)) * 新增全屏模式支持 ([e8c9542](https://github.com/mkdir700/EchoPlayer/commit/e8c9542fef5766a048bd1fa65f11858cf1a44e7e)) * 新增全屏视频进度条组件并重构视频控制逻辑 ([7fc587f](https://github.com/mkdir700/EchoPlayer/commit/7fc587f93312c6d34869543ffab8153a20aa2975)) * 新增划词选中和快捷复制功能 ([9e22b44](https://github.com/mkdir700/EchoPlayer/commit/9e22b44a921ddea67f1ee95931c65116c619a9c2)) * 新增单词卡片组件，支持单词点击后显示详细信息和发音功能；优化字幕显示样式，提升用户交互体验 ([c6a4ab6](https://github.com/mkdir700/EchoPlayer/commit/c6a4ab6446e9ebc9e55d46b52d84e93987673706)) * 新增字幕列表上下文及相关钩子，重构播放页面以使用新的字幕管理逻辑，提升代码可读性与功能性 ([7766b74](https://github.com/mkdir700/EchoPlayer/commit/7766b74f5b7d472c94e78678f685ae1934e9c617)) * 新增字幕列表项样式并禁用焦点样式 ([654a0d1](https://github.com/mkdir700/EchoPlayer/commit/654a0d1d6581749a8c651d322444df60252dff38)) * 新增字幕布局锁定功能 ([82e75dc](https://github.com/mkdir700/EchoPlayer/commit/82e75dcb0741f6275fcf2863fccb6244383c75b2)) * 新增字幕模式覆盖层组件及相关逻辑 ([e75740c](https://github.com/mkdir700/EchoPlayer/commit/e75740cd20e588ae2542ece91acebd4f86206b51)) * 新增字幕空状态组件和外部链接打开功能 ([5bd4bd6](https://github.com/mkdir700/EchoPlayer/commit/5bd4bd6cb5f283114c83188c15301afe50b5d3c6)) * 新增字幕组件样式，重构相关组件以支持主题系统，提升视觉一致性和用户体验 ([822cb74](https://github.com/mkdir700/EchoPlayer/commit/822cb74a9348d89527f3871ba7d37f92952e3165)) * 新增字幕重置功能，优化字幕设置管理；重构相关组件以提升用户体验和代码可维护性 ([f4702a5](https://github.com/mkdir700/EchoPlayer/commit/f4702a5f59b77e36a8301c856c1ab81c3d8e26b5)) * 新增存储管理功能，添加最近播放项的增删改查接口，优化用户体验；重构相关组件，提升代码结构与可维护性 ([a746ed3](https://github.com/mkdir700/EchoPlayer/commit/a746ed388e2476c8a84f45ec13f7e5ab6af8ad82)) * 新增当前字幕显示上下文管理，优化字幕点击交互逻辑，确保用户体验流畅；重构相关组件以提升代码可维护性 ([91a215d](https://github.com/mkdir700/EchoPlayer/commit/91a215d0fa116f04c8f88403123574f0d6d7dd6f)) * 新增快捷键设置模态框和快捷键显示组件，优化用户输入体验 ([b605257](https://github.com/mkdir700/EchoPlayer/commit/b605257cd97fec50e58143eba479e39defe449b6)) * 新增控制弹窗样式并优化字幕模式选择器的交互体验；重构相关组件以提升代码可读性和用户体验 ([79eabdf](https://github.com/mkdir700/EchoPlayer/commit/79eabdfc684ba172425afc80dc61bb47ea95c78d)) * 新增播放设置上下文，重构相关组件以支持播放设置的管理；更新播放页面以使用新的播放设置上下文，提升代码可读性与功能性 ([6fe8b4f](https://github.com/mkdir700/EchoPlayer/commit/6fe8b4fed2d3ea0bf9b2487f48fe7bf98d293ba6)) * 新增播放速度覆盖层和相关功能 [#1](https://github.com/mkdir700/EchoPlayer/issues/1) ([d8637eb](https://github.com/mkdir700/EchoPlayer/commit/d8637eb6046ce8f24b0e4e08794681bf59a93ba9)) * 新增数据清理功能，优化日志记录中的数据序列化，确保记录的日志信息更为准确和安全 ([8ada21a](https://github.com/mkdir700/EchoPlayer/commit/8ada21a07acc9dcb06a59b205f9b42c326d6472f)) * 新增数据目录管理功能 ([2c93e19](https://github.com/mkdir700/EchoPlayer/commit/2c93e19e51efadcf0a91e55ae07b40c0589f2f2a)) * 新增日志系统，集成 electron-log 以支持主进程和渲染进程的日志记录；更新相关 API 以便于日志管理和调试 ([1f621d4](https://github.com/mkdir700/EchoPlayer/commit/1f621d42eaa8cce3ca13a1eec4c6fb5235a2d671)) * 新增智能分段功能及相关测试 ([f5b8f5c](https://github.com/mkdir700/EchoPlayer/commit/f5b8f5c96a00b64bc820335a3ed16083a7e44ce0)) * 新增视频UI配置管理功能 ([eaf7e41](https://github.com/mkdir700/EchoPlayer/commit/eaf7e418bf8d6ea7169f243e3afef5d2b8cb542a)) * 新增视频管理组件和确认模态框 ([4263c67](https://github.com/mkdir700/EchoPlayer/commit/4263c672a1bba108b83d80a1cfa78d71b6c6edb9)) * 新增视频转码功能及兼容性警告模态框 ([4fc86a2](https://github.com/mkdir700/EchoPlayer/commit/4fc86a28338e9814fb1b2c98780645cf23f35cda)) * 新增第三方服务配置组件，整合 OpenAI 和词典服务设置，优化用户界面和交互体验；引入模块化样式，提升整体一致性 ([3e45359](https://github.com/mkdir700/EchoPlayer/commit/3e45359efb188e7108ee4eb9663768b18b444678)) * 新增获取所有字幕的功能，优化字幕查找逻辑以支持根据当前时间查找上下句字幕，提升用户体验 ([04c5155](https://github.com/mkdir700/EchoPlayer/commit/04c5155f1276968967591acbaedb36200915a5cc)) * 新增词典服务相关的 IPC 处理器，支持有道和欧陆词典的 API 请求；实现 SHA256 哈希计算功能，增强应用的词典查询能力 ([707ee97](https://github.com/mkdir700/EchoPlayer/commit/707ee97b2680efcf9057acfd802e6113d4f89d8d)) * 新增边距验证逻辑，优化字幕拖拽和调整大小功能，确保字幕区域不超出容器边界 ([2294bcf](https://github.com/mkdir700/EchoPlayer/commit/2294bcffac6fc83e4d21e543c276cceaea0189ff)) * 更新 AppHeader 组件，增加背景装饰、应用图标和名称，优化导航按钮和辅助功能按钮的样式，提升用户体验 ([651c8d7](https://github.com/mkdir700/EchoPlayer/commit/651c8d79acf0649f24a30acc4a7a714f112ec85a)) * 更新 AppHeader 组件，调整文本样式和名称，提升视觉效果 ([f208d66](https://github.com/mkdir700/EchoPlayer/commit/f208d66199d33de47c8b3f885c6f95ca655081ac)) * 更新 GitHub Actions 工作流和文档，支持更多发布文件 ([c4bf6f7](https://github.com/mkdir700/EchoPlayer/commit/c4bf6f7a00d332a3e71f0796dbbdcf3c397ef175)) * 更新 index.html 文件，修改内容安全策略以支持新的脚本源，添加本地开发服务器的支持，优化页面加载逻辑 ([8c11edf](https://github.com/mkdir700/EchoPlayer/commit/8c11edfc841058448c24be872d641b98beda52ec)) * 更新 PlaybackRateSelector 组件样式和文本 ([034e758](https://github.com/mkdir700/EchoPlayer/commit/034e7581ec6facdffbd7cafc276449f7733c231b)) * 更新 SubtitleListContent 组件，替换 rc-virtual-list 为 react-virtualized，优化字幕列表渲染性能与用户体验；调整样式以适配虚拟列表，增强滚动效果与响应式设计 ([63d9ef4](https://github.com/mkdir700/EchoPlayer/commit/63d9ef4229b9e159b0da5ae272229d192cc27a25)) * 更新 SubtitleListContent 组件，添加激活字幕索引状态以优化渲染逻辑；重构字幕项组件以减少不必要的重渲染并提升性能；增强自动滚动逻辑，确保用户体验流畅 ([c997109](https://github.com/mkdir700/EchoPlayer/commit/c997109154faf0a92186bb94a8d2a019d85086e2)) * 更新E2E测试，移除冗余测试用例并优化测试ID使用 ([51fd721](https://github.com/mkdir700/EchoPlayer/commit/51fd721ecd84bf54472f18298e0541d20d0d1cb8)) * 更新E2E测试配置，添加Linux虚拟显示器支持并检查构建输出 ([ac1999f](https://github.com/mkdir700/EchoPlayer/commit/ac1999f8b30cf8cf48f9528b93b3fcb68b1c1b79)) * 更新主题系统，新增字体粗细、间距、圆角等设计令牌，优化组件样式一致性 ([62f87dd](https://github.com/mkdir700/EchoPlayer/commit/62f87dd4fc868eefaf7d26008204edde9e778bb4)) * 更新侧边栏导航功能和禁用状态提示 ([d41b25f](https://github.com/mkdir700/EchoPlayer/commit/d41b25f88d5a5b428b3a159db432fa951178a469)) * 更新最近播放项管理，使用文件ID替代原有ID，新增根据文件ID获取最近播放项的功能，优化播放设置管理，提升代码可维护性 ([920856c](https://github.com/mkdir700/EchoPlayer/commit/920856c095a8ac4d5d41dab635390493c13774ad)) * 更新图标文件，替换Mac和Windows平台的图标，优化SVG图标文件结构 ([bfe456f](https://github.com/mkdir700/EchoPlayer/commit/bfe456f9109fd99022796d8be8c533ba31c1fd9f)) * 更新图标资源，替换 PNG 格式图标并新增 SVG 格式图标，提升图标的可扩展性与清晰度 ([8eaf560](https://github.com/mkdir700/EchoPlayer/commit/8eaf5600cff468fceb1d36bca6416a52e43f9aa9)) * 更新字典引擎设置，默认选择为 'eudic-html'，提升用户体验 ([ebaa5d2](https://github.com/mkdir700/EchoPlayer/commit/ebaa5d290cbbfcd1c2a5f5d7b8ed99ce9bbad449)) * 更新字幕上下文菜单，优化重置按钮状态和样式 ([cc542f2](https://github.com/mkdir700/EchoPlayer/commit/cc542f27e241c920e80272cc2c68d2aaa7ba00da)) * 更新字幕列表项组件，添加注释以说明仅展示学习语言，优化双语字幕显示逻辑 ([89e2b33](https://github.com/mkdir700/EchoPlayer/commit/89e2b33e65f7565ee4b89a329963c66b29a78df6)) * 更新字幕加载功能，新增对 ASS/SSA 格式的支持；优化字幕文件扩展名和解析逻辑，提升用户体验 ([9cab843](https://github.com/mkdir700/EchoPlayer/commit/9cab843eeb33c3429ce1c2a9e78f33eeee743191)) * 更新字幕加载模态框样式，新增加载状态提示与取消功能；重构相关逻辑以提升用户体验与代码可读性 ([1f8442a](https://github.com/mkdir700/EchoPlayer/commit/1f8442a0f6eec1afd4421f520774b4132528a3a2)) * 更新字幕展示组件样式，添加浮动控制按钮及其样式，优化响应式设计 ([ac586e2](https://github.com/mkdir700/EchoPlayer/commit/ac586e2cd1e7670855b0b92bc3dc887ec9586658)) * 更新字幕控制功能，添加自动暂停选项，修改快捷键设置，优化相关逻辑和组件交互 ([428e4cf](https://github.com/mkdir700/EchoPlayer/commit/428e4cfc1ba2f3856e604dd82614388c1e2d09a0)) * 更新字幕模式选择器，整合字幕显示模式的获取逻辑，优化状态管理，增强调试信息 ([c2d3c90](https://github.com/mkdir700/EchoPlayer/commit/c2d3c90cfa07c64fbd4a21ef0ee962cc389b121f)) * 更新循环播放设置，支持无限循环和自定义次数 ([e6c5d2e](https://github.com/mkdir700/EchoPlayer/commit/e6c5d2e3b291b3e5e4c562e43da278673c51ae23)) * 更新快捷键设置，修改单句循环和字幕导航的快捷键，优化用户体验 ([ce66e62](https://github.com/mkdir700/EchoPlayer/commit/ce66e6208e920bc6d75a1750c06de27c2958f7cd)) * 更新总结规则，启用始终应用选项；新增指令处理逻辑以提取项目开发指导内容并编写开发文档，确保文档规范性 ([d627e2e](https://github.com/mkdir700/EchoPlayer/commit/d627e2ec7676413f96950f580a6cddc73c9ff325)) * 更新构建产物处理逻辑，支持多架构文件重命名和 YAML 文件引用更新 ([e206e1d](https://github.com/mkdir700/EchoPlayer/commit/e206e1d5386855e5819ce6b74000487d51aa2d77)) * 更新构建配置，支持多架构构建和文件重命名 ([17b862d](https://github.com/mkdir700/EchoPlayer/commit/17b862d57bde74e4cff8c4f89ae423b183b1e9ed)) * 更新样式文件，优化警告框和卡片组件的视觉效果，增强响应式设计支持 ([ea6b4ab](https://github.com/mkdir700/EchoPlayer/commit/ea6b4ab9142e5cade134113e613c69b109b86889)) * 更新滚动条样式以支持 WebKit 规范 ([224f41d](https://github.com/mkdir700/EchoPlayer/commit/224f41d853a274324d5d1bbbf4ac7d07214cca96)) * 更新视频上传钩子，使用日志系统记录视频DAR信息和错误警告，提升调试能力 ([2392b38](https://github.com/mkdir700/EchoPlayer/commit/2392b3806dfdf8134555a6b006ea833065459a09)) * 更新视频兼容性模态框样式，提升用户体验 ([f5c1ba5](https://github.com/mkdir700/EchoPlayer/commit/f5c1ba5e42d44d65b5c0df55c70e9e2f44cbb855)) * 更新视频播放器和播放状态管理逻辑，重构字幕处理方式，统一使用 subtitleItems 以提升代码一致性与可读性；优化播放状态保存与恢复机制，确保更流畅的用户体验 ([0cbe11d](https://github.com/mkdir700/EchoPlayer/commit/0cbe11d4324806dbdab67dd181ac28acd5e45c06)) * 更新视频播放器的时间跳转逻辑，支持来源标记 ([f170ff1](https://github.com/mkdir700/EchoPlayer/commit/f170ff1b508c40bb122a20262ba436e4132c77da)) * 更新视频文件信息样式，添加文件名截断功能，优化头部布局以提升用户体验 ([a6639f1](https://github.com/mkdir700/EchoPlayer/commit/a6639f1494862620bc0fec6f7e140e6bd773335f)) * 更新窗口管理和标题栏组件，优化样式和功能 ([a1b50f6](https://github.com/mkdir700/EchoPlayer/commit/a1b50f6c52142a9cc2c2df12b98644e1e11ddfa6)) * 更新窗口管理器的窗口尺寸和最小尺寸，优化用户界面；移除不必要的响应式设计样式，简化 CSS 结构 ([dd561cf](https://github.com/mkdir700/EchoPlayer/commit/dd561cf35995ebd504553a26d2c83b73da06e3f1)) * 更新第三方服务配置组件，修改标签和提示文本为中文，增强用户友好性；新增申请应用ID和密钥的链接提示，提升信息获取便利性 ([5e68e85](https://github.com/mkdir700/EchoPlayer/commit/5e68e8507f1d5509cdcb2fb3459a570d92287aa9)) * 更新设置导航组件样式和功能 ([535f267](https://github.com/mkdir700/EchoPlayer/commit/535f267b140bc918672fdadaae6445b9eda0707f)) * 更新设置页面，移除视频转换相关功能 ([0d96fac](https://github.com/mkdir700/EchoPlayer/commit/0d96facf476cd73aa64fd023fb01c3a2442d0dbe)) * 更新设置页面，简化快捷键和数据管理部分的渲染逻辑，新增存储设置选项，优化用户界面和交互体验 ([9942740](https://github.com/mkdir700/EchoPlayer/commit/9942740d9bca7ba55cd4f730ed2214ed405ed867)) * 更新设置页面样式和主题支持 ([816ca6d](https://github.com/mkdir700/EchoPlayer/commit/816ca6d3d747ace1a18cf5f01523ee56ab8cb120)) * 更新设置页面的按钮样式和移除音频兼容性警告 ([f0be1e2](https://github.com/mkdir700/EchoPlayer/commit/f0be1e206fb69f3a75ad292dc8c3a90f02fced14)) * 更新通知系统优化，增强用户交互体验 ([6df4374](https://github.com/mkdir700/EchoPlayer/commit/6df4374ceb90b401799107c344211b164f7a0164)) * 更新页面渲染逻辑，添加页面冻结功能，确保首页始终挂载并优化其他页面的条件渲染，提升用户体验 ([7a4b2ba](https://github.com/mkdir700/EchoPlayer/commit/7a4b2ba5d72a83f3765b003384d09295e70403e5)) * 替换应用头部为侧边栏组件 ([0e621fc](https://github.com/mkdir700/EchoPlayer/commit/0e621fca1703f7461a101d2899ce7d85626156ff)) * 沉浸式标题栏 ([9c7c7d9](https://github.com/mkdir700/EchoPlayer/commit/9c7c7d9b91ba0c505d72cc3cf2d11b9049bd62a3)) * 添加 @ant-design/v5-patch-for-react-19 支持 React19 ([95d1019](https://github.com/mkdir700/EchoPlayer/commit/95d1019a02fb244e558f8819e4c52e3a7b0bc1bf)) * 添加 Stagewise 工具栏支持，仅在开发模式下初始化，更新 CSP 设置以允许外部样式源 ([ededb64](https://github.com/mkdir700/EchoPlayer/commit/ededb643573969a41ebc57a9666fbfd928e44e7c)) * 添加Codecov配置文件，更新测试配置以支持覆盖率报告上传 ([d9ec00d](https://github.com/mkdir700/EchoPlayer/commit/d9ec00d895792eca2c9ad6ea455f5b1eaadb2078)) * 添加E2E测试支持，更新Playwright配置和相关脚本 ([247b851](https://github.com/mkdir700/EchoPlayer/commit/247b85122ab88b05e789388e18b696769256e226)) * 添加全屏功能支持，优化视频播放器组件，更新样式以移除不必要的自定义样式，提升用户体验 ([a7d4b1c](https://github.com/mkdir700/EchoPlayer/commit/a7d4b1c1408ec6177ec07c60280993f23af8c605)) * 添加字幕控制组件，支持单句循环和自动循环功能，更新快捷键设置，优化样式和响应式设计 ([2902f2d](https://github.com/mkdir700/EchoPlayer/commit/2902f2d54e929b433ba7dfa2ed9ebe32dc8b2d58)) * 添加应用图标 ([b86e142](https://github.com/mkdir700/EchoPlayer/commit/b86e1420b4ca8701354d644b45653ac039845db2)) * 添加应用图标并优化代码中的事件监听和清理逻辑 ([c39da08](https://github.com/mkdir700/EchoPlayer/commit/c39da08c7ab5a17ed4fb718bcfc10df4a2b94cb9)) * 添加当前字幕展示组件，支持多种字幕显示模式及单词hover交互，优化视频控制区样式和响应式设计 ([df4b74a](https://github.com/mkdir700/EchoPlayer/commit/df4b74a98c5ae66e6c2d3be24e25c7e4261fc70e)) * 添加循环播放功能，支持自定义循环次数设置 ([1dbccfa](https://github.com/mkdir700/EchoPlayer/commit/1dbccfae97c22ac49a08e78287211f89ccf3aa46)) * 添加文件系统相关的 IPC 处理器，支持文件存在性检查、读取文件内容、获取文件 URL、文件信息获取及文件完整性验证；更新 preload 和 renderer 逻辑以支持视频和字幕文件的选择与恢复功能，优化用户体验 ([6d361eb](https://github.com/mkdir700/EchoPlayer/commit/6d361eb0ec1e8f8aa2eaca5167736bd1373d93bb)) * 添加更新通知和提示对话框组件 ([38df4d2](https://github.com/mkdir700/EchoPlayer/commit/38df4d2b55af83f3007f1b242da19eb02cca8a11)) * 添加更新通知跳过版本功能，优化用户体验 ([165adb6](https://github.com/mkdir700/EchoPlayer/commit/165adb69c7a4dae1d2749592b01f1561580c58ec)) * 添加本地更新测试环境脚本和相关功能 ([00aa019](https://github.com/mkdir700/EchoPlayer/commit/00aa01940583ec30e79034495fe804febe4479ab)) * 添加构建产物重命名和验证脚本 - 新增 rename-artifacts.ts 用于重命名构建产物以符合发布要求 - 新增 verify-build-artifacts.ts 用于验证构建产物的存在性和完整性 ([696cedc](https://github.com/mkdir700/EchoPlayer/commit/696cedc090caaa56b3f2c4921022d9e131d361ac)) * 添加构建和发布工作流，更新测试和发布脚本 ([2744005](https://github.com/mkdir700/EchoPlayer/commit/2744005aefb85874651d7e7937e5af1f9ead8b35)) * 添加欧陆词典HTML解析服务和单元测试框架 ([52ace3e](https://github.com/mkdir700/EchoPlayer/commit/52ace3ef0ba4aa0b58d000996d1f933365c093ce)) * 添加测试Electron CDP连接的脚本 ([9982514](https://github.com/mkdir700/EchoPlayer/commit/9982514f56ccbb6b048d0a4d961f8a5b7b29eea0)) * 添加版本管理脚本，支持版本类型检测和版本号递增功能；更新构建和发布工作流，优化版本变量设置和上传路径逻辑；新增发布指南文档，详细说明版本管理和发布流程 ([282bde8](https://github.com/mkdir700/EchoPlayer/commit/282bde883d4c8ae965963e555feb1cd4a011ab88)) * 添加视频播放器点击事件处理，优化用户交互体验 ([69c378f](https://github.com/mkdir700/EchoPlayer/commit/69c378fad8aa8c15b29833e668fd150775c477e3)) * 添加视频文件选择加载状态和清空确认模态框 ([ca95a7d](https://github.com/mkdir700/EchoPlayer/commit/ca95a7d5f2cae1e42423dbe7cfe3c7d09352e16c)) * 添加视频格式转换功能，新增视频兼容性检测与转换指南，优化视频播放器与文件上传逻辑，提升用户体验；重构相关组件，简化代码结构 ([5fd89fe](https://github.com/mkdir700/EchoPlayer/commit/5fd89fed2b346efbb4d0e5c0d029af51e60f07a1)) * 添加腾讯云COS上传功能，支持发布文件和自动更新文件的上传 ([e79e5a9](https://github.com/mkdir700/EchoPlayer/commit/e79e5a9c5b5e29f2092d50aa9af58dafa6297612)) * 添加自动更新功能，整合更新处理器，更新设置界面，支持版本检查和下载 ([5e5a03e](https://github.com/mkdir700/EchoPlayer/commit/5e5a03e5966e3978ba16d76ed202ce943903e3a1)) * 添加页面切换过渡效果，优化播放页面与性能监控功能；重构相关组件，提升用户交互体验与代码结构 ([e583ecc](https://github.com/mkdir700/EchoPlayer/commit/e583ecc78836dc241392039c76092833ca354695)) * 添加页面导航功能，重构 App 组件以支持多页面切换，新增关于、收藏、设置等页面，优化样式和用户体验 ([51f4263](https://github.com/mkdir700/EchoPlayer/commit/51f426365c12474091e8581211da3e7e36d29749)) * 添加高效测试标识符管理指南及相关工具函数，优化E2E测试中的测试ID使用 ([2dcfe5e](https://github.com/mkdir700/EchoPlayer/commit/2dcfe5e7443095890acc7034a5b919059dcad2bc)) * 现代化视频控制组件，优化样式和交互逻辑，增强用户体验；添加音量和设置控制，支持自动隐藏功能 ([dc45b83](https://github.com/mkdir700/EchoPlayer/commit/dc45b83bbaf02f90ccde2559f203520b172a0388)) * 移除 HomePage 组件中的 subtitleIndex 属性，优化视频播放状态管理逻辑；调整视频网格布局以提升用户界面的一致性与可读性 ([8f54e7f](https://github.com/mkdir700/EchoPlayer/commit/8f54e7fb54574552a308c7af5188f5f46d5a37ce)) * 移除 PlayPageHeader 的 CSS 模块，改为使用主题系统样式管理，提升组件的可维护性和一致性 ([52cedbc](https://github.com/mkdir700/EchoPlayer/commit/52cedbc09e95d3fe91308e1bdc70a38d1c988315)) * 移除 useSidebarResize 钩子及相关样式，改用 Ant Design 的 Splitter 组件实现侧边栏调整功能，优化播放页面布局与用户体验 ([bead645](https://github.com/mkdir700/EchoPlayer/commit/bead645f2680363621a7cc7dd6139aa990aa7750)) * 移除字幕位置控制相关组件及其逻辑，简化视频控制界面以提升用户体验 ([1edc857](https://github.com/mkdir700/EchoPlayer/commit/1edc857e3ef1f8ac87c35e6c62f1bdfcd4b545c6)) * 移除字幕设置相关功能和组件 ([32f0138](https://github.com/mkdir700/EchoPlayer/commit/32f0138c6285b6a5805720c9306dad2d4cfd7783)) * 移除推荐视频假数据，更新欢迎信息，优化首页布局和用户体验 ([78b000f](https://github.com/mkdir700/EchoPlayer/commit/78b000fcf2bd8511ef35e79f5a03114dfed297d4)) * 移除视频播放器和播放控制钩子，简化代码结构以提升可维护性 ([513ba3c](https://github.com/mkdir700/EchoPlayer/commit/513ba3c21f67fbc76fc3a61ac5b128506cca68db)) * 移除视频播放器的响应式设计中不必要的内边距，简化 CSS 结构 ([f8c8c28](https://github.com/mkdir700/EchoPlayer/commit/f8c8c2899d8545486a23421d882ecfd1c186446c)) * 调整 HomePage 组件的响应式布局，优化列宽设置以提升用户体验 ([3c435bf](https://github.com/mkdir700/EchoPlayer/commit/3c435bfee87ab529333a2dcf3fe51553b089cc45)) * 调整主题样式宽度 ([2fe9ff2](https://github.com/mkdir700/EchoPlayer/commit/2fe9ff24d2f35791712b3bf5b848fc7464b08fef)) * 调整全屏视频控制组件的进度条位置和样式 ([679521f](https://github.com/mkdir700/EchoPlayer/commit/679521f2f92c1c04646a89866944b20d22d6a917)) * 调整字幕覆盖层样式，修改底部位置为0%，移除移动端特定样式，简化 CSS 结构 ([515151d](https://github.com/mkdir700/EchoPlayer/commit/515151d022fc16d886471aad43aeda43f482214c)) * 重命名视频控制组件为 VideoControlsFullScreen，更新相关导入，提升代码可读性 ([0fe7954](https://github.com/mkdir700/EchoPlayer/commit/0fe795404702dd1a9b68c32a21fec5ad003dcf8d)) * 重构 SidebarSection 和 SubtitleListContent 组件，简化属性传递，增强字幕索引处理逻辑，优化自动滚动功能；新增获取指定时间点字幕索引的功能，提升用户体验与代码可读性 ([dabcbeb](https://github.com/mkdir700/EchoPlayer/commit/dabcbeb0718e2f8d6923a223d3c57e79453366a9)) * 重构字幕控制组件样式，使用主题系统优化按钮和图标样式，提升视觉一致性和用户体验 ([12e38f2](https://github.com/mkdir700/EchoPlayer/commit/12e38f2f260467e297ad11831ff1a44eea08c317)) * 重构字幕状态管理，新增视频特定字幕设置 ([ff5b5de](https://github.com/mkdir700/EchoPlayer/commit/ff5b5def52690c082eae9f26029f6d139d80cd47)) * 重构字幕组件，新增字幕覆盖层和文本组件，优化字幕显示逻辑和性能；移除旧版字幕组件，提升代码可维护性 ([4fbef84](https://github.com/mkdir700/EchoPlayer/commit/4fbef8419f703f398593043932f07a14a78e170c)) * 重构存储处理器模块，优化应用配置和通用存储功能 ([065c30d](https://github.com/mkdir700/EchoPlayer/commit/065c30d7cbc8fc5b01f3f3b59211e6548d679cdc)) * 重构存储管理功能，更新最近播放项的类型定义，优化播放设置管理，增强用户体验；新增播放设置的深度合并逻辑，提升代码可维护性 ([3f928d4](https://github.com/mkdir700/EchoPlayer/commit/3f928d4c84df465574fde222fcb1dccf72c3dfc6)) * 重构应用布局与样式，新增主页与播放页面组件，优化用户交互体验；整合最近文件管理功能，提升视频文件选择与加载逻辑 ([f3fefad](https://github.com/mkdir700/EchoPlayer/commit/f3fefadd3643f20e2935d2d72eeea1e56a65a1d1)) * 重构循环切换功能，简化状态管理和播放逻辑 ([fe11037](https://github.com/mkdir700/EchoPlayer/commit/fe11037cb82119f3ff3e74c825a44e80022158f7)) * 重构播放状态管理，替换为使用最近播放列表钩子，简化参数传递并优化代码逻辑；新增最近播放列表钩子以支持播放项的增删改查功能 ([1ec2cac](https://github.com/mkdir700/EchoPlayer/commit/1ec2cac7f2a84f11b1ff4ddd2d482a45c8eae1bd)) * 重构播放页面，整合视频播放器与字幕控制逻辑，新增 VideoPlayerProvider 以管理视频播放状态，优化组件结构与性能；移除不再使用的 SubtitleControls 组件，简化属性传递，提升代码可读性 ([e4111c9](https://github.com/mkdir700/EchoPlayer/commit/e4111c9274cb6b6dd112c5dd7f629b244450f802)) * 重构视频控制组件，新增全屏控制样式与逻辑，优化播放控制体验；更新相关类型定义，提升代码可读性与功能性 ([5c72a1b](https://github.com/mkdir700/EchoPlayer/commit/5c72a1b0ce481c63b0d9c03f048b527f612052e0)) * 重构视频播放上下文，新增视频文件上传和选择功能；更新相关组件以支持新的上下文逻辑，提升代码可读性与功能性 ([37e128e](https://github.com/mkdir700/EchoPlayer/commit/37e128eede0ad02f70ee7dc2aa2aab7d49a121df)) * 重构视频播放器组件，移除 CSS Modules，采用主题系统样式管理，提升代码可维护性和一致性 ([b3981bc](https://github.com/mkdir700/EchoPlayer/commit/b3981bc2d86a7ea7d343f1e068f404b46af509f0)) * 重构视频播放器逻辑，整合视频播放状态管理，优化组件结构；移除不再使用的 usePlayingVideoContext 钩子，新增多个视频控制钩子以提升性能与可读性 ([b1a6dc2](https://github.com/mkdir700/EchoPlayer/commit/b1a6dc29acb83fbdf4a167c9ded069f2e53d0491)) * 重构视频播放设置管理，整合字幕显示设置，优化状态管理逻辑，提升用户体验和代码可维护性 ([6c3d852](https://github.com/mkdir700/EchoPlayer/commit/6c3d852fbb8d66e5f07942fdf792b661327b3a4a)) * 重构设置页面，新增快捷键、数据管理和占位符组件，优化用户界面和交互体验；引入快捷键上下文管理，支持自定义快捷键功能 ([a498905](https://github.com/mkdir700/EchoPlayer/commit/a4989050d3a747b6a66d7deb2da21a1cf9a2a0be)) ### Reverts * Revert "build: 在构建和发布工作流中添加调试步骤，列出下载的文件并检查Windows、Mac和Linux平台的自动更新配置文件是否存在" ([d0f8fc4](https://github.com/mkdir700/EchoPlayer/commit/d0f8fc4be0f3b976df0752a57437eb3cd16321ef)) * Revert "chore: 更新 Linux 构建环境配置" ([cc179a0](https://github.com/mkdir700/EchoPlayer/commit/cc179a072721fd508662924073cf03bdfa684611)) * Revert "feat: 在构建和发布工作流中添加更新 package.json 版本的步骤，确保版本号自动更新；优化草稿发布条件以支持预发布版本" ([be1cf26](https://github.com/mkdir700/EchoPlayer/commit/be1cf2668cf7ad777739bdb40e5b75e145775386)) ### BREAKING CHANGES * **player,logging,state:** - Removed TransportBar and deprecated hooks (usePlayerControls/useVideoEvents/useSubtitleSync). Migrate to ControllerPanel with usePlayerEngine/usePlayerCommandsOrchestrated. - Player store control actions are engine-only; components should send commands via the orchestrator instead of mutating store directly. --- CHANGELOG.md | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7219a54..e2030d3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,280 @@ +# 1.0.0-alpha.1 (2025-09-08) + +### Bug Fixes + +- **build:** correct alpha channel update file naming ([#79](https://github.com/mkdir700/EchoPlayer/issues/79)) ([95e2ed2](https://github.com/mkdir700/EchoPlayer/commit/95e2ed262d6f29d2a645033089afe36a24afd56f)) +- **build:** 修复 Linux 构建产物架构命名转换问题 ([1f732ba](https://github.com/mkdir700/EchoPlayer/commit/1f732ba84ed69c803c6795c19ae7b5a2e11c3b70)) +- **ci:** resolve GitHub Release creation issue with always publish strategy ([#85](https://github.com/mkdir700/EchoPlayer/issues/85)) ([712f0e8](https://github.com/mkdir700/EchoPlayer/commit/712f0e8cc8c11241678334c80e95f778055f57b2)) +- **ci:** resolve semantic-release configuration issues ([#88](https://github.com/mkdir700/EchoPlayer/issues/88)) ([0a9e4a3](https://github.com/mkdir700/EchoPlayer/commit/0a9e4a3eb4501ade7aa25f377baab627de27b872)) +- **ci:** resolve Windows build shell syntax compatibility issue ([#84](https://github.com/mkdir700/EchoPlayer/issues/84)) ([59b8460](https://github.com/mkdir700/EchoPlayer/commit/59b846044060a4c6ddd82c490c3c8706fe9daac7)) +- fix type check ([eae1e37](https://github.com/mkdir700/EchoPlayer/commit/eae1e378262d1f9162fd630cbb6dd867df933fb3)) +- Fix TypeScript build errors and improve type safety ([#77](https://github.com/mkdir700/EchoPlayer/issues/77)) ([7861279](https://github.com/mkdir700/EchoPlayer/commit/7861279d8d5fd8c8e3bd5d5639f8e4b8f999b0ca)) +- **player:** integrate volume state in player engine context ([5ff32d9](https://github.com/mkdir700/EchoPlayer/commit/5ff32d91ce39d9499ae762ee433e61461e926c46)) +- remove cheerio dependency to resolve Electron packaging issues - Remove cheerio and @types/cheerio from package.json dependencies - Replace cheerio-based HTML parsing with native regex implementation - Refactor parseEudicHtml() to parseEudicHtmlWithRegex() in dictionaryHandlers.ts - Support multiple HTML formats: list items, phonetics, examples, translations - Delete related test files that depend on cheerio - Fix TypeScript type errors for regex variables - Improve Electron runtime compatibility and reduce bundle size Fixes [#50](https://github.com/mkdir700/EchoPlayer/issues/50) ([b01fe4e](https://github.com/mkdir700/EchoPlayer/commit/b01fe4e33a0027d3c4fc6fdbb7e5577fb7f4165b)) +- **renderer:** resolve subsrt dynamic require issue in production build ([#78](https://github.com/mkdir700/EchoPlayer/issues/78)) ([028a8fb](https://github.com/mkdir700/EchoPlayer/commit/028a8fb9a9446ebb8dc7b25fb4a70fadc02fb085)) +- resolve dead links in documentation and add missing pages ([fc36263](https://github.com/mkdir700/EchoPlayer/commit/fc3626305bdbf96c0efc70ae9d989ba02a0ededa)) +- **test:** resolve SubtitleLibraryDAO schema validation and test framework improvements ([#80](https://github.com/mkdir700/EchoPlayer/issues/80)) ([4be2b8a](https://github.com/mkdir700/EchoPlayer/commit/4be2b8a390c454dc1b0287e352d15ceedb4ed67b)) +- **titlebar:** keep title bar fixed at top during page scroll ([b3ff5c2](https://github.com/mkdir700/EchoPlayer/commit/b3ff5c2c6b5a8bea67da69b8e82c9200d5eb05fd)) +- 优化文件路径处理逻辑以支持不同平台 ([dc4e1e3](https://github.com/mkdir700/EchoPlayer/commit/dc4e1e384588dac7e1aacc27eccf165fe2e43e4d)) +- 修复 settings 相关组件找不到的问题 ([08f88ba](https://github.com/mkdir700/EchoPlayer/commit/08f88bad7099ac110a0bae109b3501a0348f0b78)) +- 修复全屏模式下速度选择窗口溢出的问题 ([6309046](https://github.com/mkdir700/EchoPlayer/commit/63090466881d8df3e5dc062c0f235995dfe4134e)) +- 修复在 Windows 上的 FFmpeg 文件下载和 ZIP 解压 ([6347b4e](https://github.com/mkdir700/EchoPlayer/commit/6347b4e62207dc104a1fa44f27af08667ff893a2)) +- 修复在启用单句循环模式下，无法调整到下一句的问题 ([ec479be](https://github.com/mkdir700/EchoPlayer/commit/ec479beeff5c931821eed5aaffeaa054226b13c2)) +- 修复文件路径处理逻辑以支持不同的 file URL 前缀 ([740015d](https://github.com/mkdir700/EchoPlayer/commit/740015d955f8266b96d2aa49bdc244d084937355)) +- 修复方向键冲突检测问题 ([4a466c7](https://github.com/mkdir700/EchoPlayer/commit/4a466c7367860120d9a4ccc6f23ab5e79a2d8cae)) +- 修复无法通过按钮退出全屏模式的问题 ([e69562b](https://github.com/mkdir700/EchoPlayer/commit/e69562b9ead8ea66c0933ad21b5cbeae3d88142f)) +- 修复构建产物架构冲突问题 ([2398bd7](https://github.com/mkdir700/EchoPlayer/commit/2398bd78be4526a9f3f636c8f945df644bbc3d5b)) +- 修复组件导出语句和优化字幕加载逻辑，移除未使用的状态 ([39708ce](https://github.com/mkdir700/EchoPlayer/commit/39708ce48bd6652488abce7d21752a2afe994d99)) +- 删除上传到 cos 的步骤，因为网络波动问题上传失败 ([1cac918](https://github.com/mkdir700/EchoPlayer/commit/1cac918f21ad3198827138512ee61d770bd1367f)) +- 在 UpdateNotification 组件中添加关闭对话框的逻辑，确保用户在操作后能够顺利关闭对话框 ([845a070](https://github.com/mkdir700/EchoPlayer/commit/845a070ac74b513ce5bda3cdc3d3e7a803a3b8d1)) +- 始终在脚本直接执行时运行主函数，确保功能正常 ([a15378a](https://github.com/mkdir700/EchoPlayer/commit/a15378a914e54967f50642e04a111af184255344)) +- 忽略依赖项警告 ([fc3f038](https://github.com/mkdir700/EchoPlayer/commit/fc3f038bb7d9b7e6962a5346bee00c858998ade0)) +- 更新主题样式，使用 token 中的 zIndex 替代硬编码值 ([3940caf](https://github.com/mkdir700/EchoPlayer/commit/3940caf3b768efcba2043b3734bc7c7962f8c5a8)) +- 更新测试文件中的 useTheme 和 useVideoPlaybackHooks 的路径 ([4fa9758](https://github.com/mkdir700/EchoPlayer/commit/4fa9758ae7bcb26789e8a458312ef23d577a34e6)) +- 移除构建和发布工作流中的空选项，始终将草稿发布设置为 true，以确保发布过程的一致性 ([171028a](https://github.com/mkdir700/EchoPlayer/commit/171028adff214b3c696b7aaacb617c7c41b0302b)) + +### Features + +- add API communication type definitions and unified export ([ea9f1c0](https://github.com/mkdir700/EchoPlayer/commit/ea9f1c0690d3b7fe5f6a2e2406b5fb88817aa8d1)) +- add common base type definitions and interfaces for application ([73bd604](https://github.com/mkdir700/EchoPlayer/commit/73bd6046239341716eea727d95b316e9a3652ec8)) +- add debounce hooks and corresponding tests ([7646088](https://github.com/mkdir700/EchoPlayer/commit/7646088b78106e40f00ff15a3cdd86b44aa541cc)) +- add domain type definitions and constants for video, subtitle, playback, and UI ([a1c3209](https://github.com/mkdir700/EchoPlayer/commit/a1c3209271336891e0e9dbde444abc8c4e7d8e4b)) +- add git hooks with lint-staged for automated code quality checks ([1311af9](https://github.com/mkdir700/EchoPlayer/commit/1311af96159b7e7b5d31f43f27f479cc9035d5a5)) +- add handler to read directory contents ([6ce1d9e](https://github.com/mkdir700/EchoPlayer/commit/6ce1d9eff64968cef3a5673a67f8753de582d501)) +- add IPC Client Service implementation with integration tests ([fe4400f](https://github.com/mkdir700/EchoPlayer/commit/fe4400ff63ff0640f32ca94f0b4d0d4c47b246ed)) +- add performance optimization hooks and corresponding tests ([d7e1d0f](https://github.com/mkdir700/EchoPlayer/commit/d7e1d0f006dfe8c6c58a20bb0305621a657c9a65)) +- add selectors for subtitle, UI, and video states with computed properties and hooks ([c64f41d](https://github.com/mkdir700/EchoPlayer/commit/c64f41dd27496bd311ff588474041e4ebacbd3a9)) +- Add service layer type definitions for storage, video, subtitle, and dictionary services ([c658217](https://github.com/mkdir700/EchoPlayer/commit/c658217a5acc7e8a066004e6d7c1cd103be43a3b)) +- add subtitle, UI, and video state actions for V2 ([1a4042a](https://github.com/mkdir700/EchoPlayer/commit/1a4042af3e1e917d6303a560c49e4aa8d52300ab)) +- add unified export for V2 infrastructure layer type system ([ad94ea8](https://github.com/mkdir700/EchoPlayer/commit/ad94ea849bc17b5e569bd2296cf73c30ca06747d)) +- add V2 state stores with type-safe validation and comprehensive documentation ([264cc66](https://github.com/mkdir700/EchoPlayer/commit/264cc661c2be83c9d886ba673d104b499ade0729)) +- **api:** add request and response type definitions for video, subtitle, file operations, and playback settings ([c0e9324](https://github.com/mkdir700/EchoPlayer/commit/c0e9324642d6920def8dcb79a97c92ab0f552397)) +- **AutoResumeCountdown:** add auto-dismissal when playback manually resumed ([3852bca](https://github.com/mkdir700/EchoPlayer/commit/3852bca30af23c203698bc413e0b482a595c96d6)) +- **ci:** implement semantic-release with three-branch strategy ([#89](https://github.com/mkdir700/EchoPlayer/issues/89)) ([c39da6e](https://github.com/mkdir700/EchoPlayer/commit/c39da6e77d4e995299a6df62f9fa565a6dd46807)) +- **ci:** integrate semantic-release automation with GitHub workflow ([#87](https://github.com/mkdir700/EchoPlayer/issues/87)) ([874bd5a](https://github.com/mkdir700/EchoPlayer/commit/874bd5a0987c5944c14926230b32a49b4886158b)) +- **ci:** migrate from action-gh-release to native electron-builder publishing ([#82](https://github.com/mkdir700/EchoPlayer/issues/82)) ([eab9ba1](https://github.com/mkdir700/EchoPlayer/commit/eab9ba1f1d8cc55d4cf6e7e6c3c8633b02938715)) +- comprehensive auto-update system implementation ([#73](https://github.com/mkdir700/EchoPlayer/issues/73)) ([0dac065](https://github.com/mkdir700/EchoPlayer/commit/0dac065d54643bc761c741bae914057b9784e419)) +- **ControllerPanel:** add disabled state for Loop and AutoPause controls when subtitles are empty ([a35f3e6](https://github.com/mkdir700/EchoPlayer/commit/a35f3e6cbf5c33ee4ebc6ca21dfb31a5b2b1b1a6)) +- **ControllerPanel:** implement centralized menu management system for player controls ([1523758](https://github.com/mkdir700/EchoPlayer/commit/152375846dc6d5acf84d07a0d182160e29de4358)) +- **db:** implement complete SQLite3 database layer with migrations and DAOs ([0a8a7dd](https://github.com/mkdir700/EchoPlayer/commit/0a8a7ddb5a240c6d6c145b4cfa0790e2292d3697)) +- **db:** migrate from Dexie to Kysely with better-sqlite3 backend ([6b75cd8](https://github.com/mkdir700/EchoPlayer/commit/6b75cd877bd117b84d6205eb1c680450042b6eaa)) +- define domain types for video, subtitle, and UI, and refactor RecentPlayItem interface imports ([f632beb](https://github.com/mkdir700/EchoPlayer/commit/f632beba5f9b20afb2ec6fc8e6df7dcba6fd29f0)) +- enhance macOS build configuration with additional entitlements and notarization support ([d6e8ced](https://github.com/mkdir700/EchoPlayer/commit/d6e8ced7611b9f09743bc29344c6a0020ed0b19d)) +- **home:** implement empty state with video file selection integration ([b6f6e40](https://github.com/mkdir700/EchoPlayer/commit/b6f6e401f622f1390926eb154f47fad812d5d0a7)) +- Implement dictionary engine framework ([0d74a83](https://github.com/mkdir700/EchoPlayer/commit/0d74a8315f86209c530ad2f306b6099e97328c1f)) +- implement useThrottle hooks and corresponding tests ([da30344](https://github.com/mkdir700/EchoPlayer/commit/da303443b6847fe049be9c4592c98418aeea9785)) +- implement version parsing and channel mapping logic ([8c95a2f](https://github.com/mkdir700/EchoPlayer/commit/8c95a2feeef1d066fb46f246724d8a94014fa627)) +- **infrastructure:** add entry points for constants and shared modules, and refine video playback rate type ([94da255](https://github.com/mkdir700/EchoPlayer/commit/94da2556dd6909eec75d4edfe2b549e3858e2629)) +- **logger:** export logger instance for easier access in modules ([5328152](https://github.com/mkdir700/EchoPlayer/commit/5328152999408cbec0515e501aea9f393032b933)) +- **persistence:** add V2 state persistence manager and configuration files ([a545020](https://github.com/mkdir700/EchoPlayer/commit/a545020f3f676b526b3f3bf3ecff6d23c4c1a471)) +- **playback:** update playback rate label for clarity and add storage type definitions ([5c40b98](https://github.com/mkdir700/EchoPlayer/commit/5c40b983ea22c1e57e5e678922c5d6492a39359c)) +- player page ([aa79279](https://github.com/mkdir700/EchoPlayer/commit/aa792799580524ac65c8bf7e4d9bc7e13988a716)) +- **player,logging,state:** orchestrated player engine with intent strategies and new controller panel ([73d7cfd](https://github.com/mkdir700/EchoPlayer/commit/73d7cfdc4b58f190afe8981eddadbca54c6763b0)) +- **player:** add Ctrl+] shortcut for subtitle panel toggle ([#69](https://github.com/mkdir700/EchoPlayer/issues/69)) ([e1628f2](https://github.com/mkdir700/EchoPlayer/commit/e1628f2d04ea03cac20893960a3a9fec2dd9fdb2)) +- **player:** hide sidebar and optimize navbar for player page ([#70](https://github.com/mkdir700/EchoPlayer/issues/70)) ([5bb71e4](https://github.com/mkdir700/EchoPlayer/commit/5bb71e4465721c3b1f0dc326f9a92e879e1c048b)) +- **player:** implement auto-resume countdown with UI notification ([5468f65](https://github.com/mkdir700/EchoPlayer/commit/5468f6531c3e2f3d8aaf94f631ec4f760d04241f)) +- **player:** reposition progress bar between video and controls ([#71](https://github.com/mkdir700/EchoPlayer/issues/71)) ([248feed](https://github.com/mkdir700/EchoPlayer/commit/248feed534974b6c05ef2918a3758ae5fed1f42d)) +- refine RecentPlayItem interface with detailed video info and playback metrics ([81679b6](https://github.com/mkdir700/EchoPlayer/commit/81679b6eb54f7a8f07a33065c743fa51d1eecc5d)) +- setup GitHub Pages deployment for documentation ([b8a42b9](https://github.com/mkdir700/EchoPlayer/commit/b8a42b974d7490ddddb4292608315a58df14a24b)) +- **sidebar:** 禁用收藏按钮并添加开发中提示 ([#81](https://github.com/mkdir700/EchoPlayer/issues/81)) ([76e9b54](https://github.com/mkdir700/EchoPlayer/commit/76e9b5418ec5f07f4d3052d8130163d108965f47)) +- **SplashScreen:** add animated splash screen with typewriter effect and smooth transitions ([31cfeca](https://github.com/mkdir700/EchoPlayer/commit/31cfeca9f0773db12b9a7b299820a32c309d9daf)) +- **state.store:** 新增多个 store ([54e7ff5](https://github.com/mkdir700/EchoPlayer/commit/54e7ff5993631c6133e21948c2697bcd13919df6)) +- **state:** implement V2 state management infrastructure with storage engine, middleware, and utility functions ([e225746](https://github.com/mkdir700/EchoPlayer/commit/e22574659d1ec63fbc622152fec2371323b4fe53)) +- **storage:** implement application configuration storage service ([1209b56](https://github.com/mkdir700/EchoPlayer/commit/1209b56fae690a9876440faa679f072cb2ebc6da)) +- **subtitle-library:** Add subtitle data caching for improved loading performance ([#86](https://github.com/mkdir700/EchoPlayer/issues/86)) ([40be325](https://github.com/mkdir700/EchoPlayer/commit/40be325f09f9f70e702260dfe29e354c6c7435b6)) +- **SubtitleContent:** implement word-level tokenization and interactive text selection ([10c0cdf](https://github.com/mkdir700/EchoPlayer/commit/10c0cdf38fdbad53bfba4b82148b635e45657b11)) +- **types:** add Serializable interface for flexible data structures ([32981df](https://github.com/mkdir700/EchoPlayer/commit/32981df183af23d9153ae65765b9d1c8a533540e)) +- update macOS notarization configuration to enable automatic notarization ([6630e79](https://github.com/mkdir700/EchoPlayer/commit/6630e79975a5d39eea83bec44ef1ff0271c984da)) +- **video.store:** add format property to CurrentVideoState and update video loading simulation ([0349a63](https://github.com/mkdir700/EchoPlayer/commit/0349a6351ba8fa2a1235a48b268825ad18ea37ff)) +- **VolumeControl:** change volume popup from horizontal to vertical layout ([d4d435b](https://github.com/mkdir700/EchoPlayer/commit/d4d435b93a72b8bb8e1f9d4fe356fa41632d8993)) +- **wsl:** add WSL detection and hardware acceleration optimization ([c99403e](https://github.com/mkdir700/EchoPlayer/commit/c99403efa8af9fa9ebf106edcbdc4a0d21b31b2e)) +- 为字幕组件新增右键菜单功能 ([62334d5](https://github.com/mkdir700/EchoPlayer/commit/62334d56bb0956b28582d5d70e7ea0a3c2f9e42d)) +- 为音量控制组件添加音量调节快捷键 ([144d49c](https://github.com/mkdir700/EchoPlayer/commit/144d49c314688c6b7b0abbdd0c21f57c98f3084d)) +- 优化 PlayPage 组件性能，减少不必要的重新渲染；重构播放状态管理逻辑，提升用户体验 ([24a2ebc](https://github.com/mkdir700/EchoPlayer/commit/24a2ebc6d7c040ffce5ffc1a404f338ad77a6791)) +- 优化最近观看记录加载状态显示 ([e5f7e11](https://github.com/mkdir700/EchoPlayer/commit/e5f7e11498d52028cf20765ea2fe486cca49f3d1)) +- 优化单词查询逻辑，增加超时处理和取消请求功能，提升用户体验和性能 ([c98dc4b](https://github.com/mkdir700/EchoPlayer/commit/c98dc4b5d65bdc7c68d82f6e0c1bcda248929503)) +- 优化字幕列表滚动体验 ([63807c5](https://github.com/mkdir700/EchoPlayer/commit/63807c5a4a668d5000c7c920dcae5eb96623314e)) +- 优化字幕控制功能，新增字幕模式选择器，提升用户交互体验；重构相关组件，移除不必要的代码，简化逻辑 ([559aada](https://github.com/mkdir700/EchoPlayer/commit/559aada0c7d224bdbc941b30aa9da71b08d84636)) +- 优化字幕文本分段逻辑 ([33e591c](https://github.com/mkdir700/EchoPlayer/commit/33e591c08ac1d520886b20b2b0219e15eeea1d0d)) +- 优化字幕模式选择器组件，增强用户体验和视觉一致性，添加响应式设计和毛玻璃效果 ([4b59a1b](https://github.com/mkdir700/EchoPlayer/commit/4b59a1b0ac1d3a66dfd0c129177f2820722f2416)) +- 优化快捷键设置界面，增强输入状态反馈，更新样式以提升用户体验和一致性 ([64db31c](https://github.com/mkdir700/EchoPlayer/commit/64db31cd8112b08f509e16ef653f687381f5f636)) +- 优化日志记录功能，新增组件渲染节流和数据简化处理，提升性能和可读性 ([a6e8480](https://github.com/mkdir700/EchoPlayer/commit/a6e8480ecb2458eefd899d0828af3955f3cbef6e)) +- 优化标题栏平台信息处理 ([fb5a470](https://github.com/mkdir700/EchoPlayer/commit/fb5a470084ed46f6f662e060d4cbca89fca1736e)) +- 优化视频卡片和视频网格组件的样式与布局 ([af59b44](https://github.com/mkdir700/EchoPlayer/commit/af59b44aa7cefeb06dfd87656532af3652013574)) +- 优化词典查询逻辑，增加未找到释义时的警告提示，并调整相关代码结构 ([9f528bd](https://github.com/mkdir700/EchoPlayer/commit/9f528bd89e905af2490c9c1b2db3d9a00b19e1f8)) +- 优化进度条handler显示和对齐 ([77d0496](https://github.com/mkdir700/EchoPlayer/commit/77d04965d4ac4aa2bfff965fe2852c82d9e4c91e)) +- 在 FullscreenTestInfo 组件中新增折叠功能 ([b2eac46](https://github.com/mkdir700/EchoPlayer/commit/b2eac461e616b3da6be84ceabaffd08c583d1b59)) +- 在 HomePage 组件中新增音频兼容性诊断功能，优化视频播放体验；更新视频兼容性报告以支持音频编解码器检测；重构相关逻辑以提升代码可读性和维护性 ([3cac307](https://github.com/mkdir700/EchoPlayer/commit/3cac307f50c791b2f4f76b3e0aec7571d4e30a98)) +- 在 SubtitleListContent 组件中引入 rc-virtual-list 以优化字幕列表渲染性能，增强自动滚动功能 ([30165dc](https://github.com/mkdir700/EchoPlayer/commit/30165dcf42f2770be23392f6c6d07a8d1786f95f)) +- 在 UpdatePromptDialog 组件中添加内容展开/折叠功能 ([96d9b1f](https://github.com/mkdir700/EchoPlayer/commit/96d9b1f32b15abea3661836a684e177e774b80e5)) +- 在构建和发布工作流中添加Windows、Mac和Linux平台的上传步骤，优化版本变量设置和上传路径逻辑 ([3cfacb9](https://github.com/mkdir700/EchoPlayer/commit/3cfacb91cd3c60428af09bdb1b1ed74be1538e29)) +- 在构建和发布工作流中添加更新 package.json 版本的步骤，确保版本号自动更新；优化草稿发布条件以支持预发布版本 ([a78fbc7](https://github.com/mkdir700/EchoPlayer/commit/a78fbc72166e08eeec641c0970eebf83763aba39)) +- 在构建和发布工作流中添加测试构建选项，更新版本变量设置和上传路径逻辑 ([2848f92](https://github.com/mkdir700/EchoPlayer/commit/2848f92f7216dee720d84608ffce2840f5f67bcd)) +- 在视频上传时重置字幕控制状态，新增重置状态功能；更新快捷键设置以支持单句循环功能，优化用户体验 ([688dcd6](https://github.com/mkdir700/EchoPlayer/commit/688dcd6e7ddfe43499035fd828bcf26f04e08d79)) +- 增强全屏模式下的样式支持 ([94a77b1](https://github.com/mkdir700/EchoPlayer/commit/94a77b1166173b73789d14daaba12d0b7de2790a)) +- 增强全屏模式的快捷键支持 ([218882c](https://github.com/mkdir700/EchoPlayer/commit/218882cdbdd597dff7cf41df3dac9e0587b43dd0)) +- 增强字幕显示组件，新增中文字符检测和智能文本分割功能，优化用户交互体验 ([8cd50d9](https://github.com/mkdir700/EchoPlayer/commit/8cd50d9df0e2884f27187bb0df66a2f0f3c232b2)) +- 增强字幕空状态组件，支持拖拽文件导入 ([db1f608](https://github.com/mkdir700/EchoPlayer/commit/db1f60833f27b75594790387c0382cc30abd28fe)) +- 增强字幕组件交互功能 ([3e7e8c7](https://github.com/mkdir700/EchoPlayer/commit/3e7e8c74651da43cbcd5e525ba76324e6c403fd8)) +- 增强字幕组件和文本选择功能 ([36c44aa](https://github.com/mkdir700/EchoPlayer/commit/36c44aae0884e22030aae37db7424ac92e3f2c60)) +- 增强快捷键设置功能，新增快捷键冲突检查和平台特定符号显示，优化用户输入体验和界面样式 ([bde034b](https://github.com/mkdir700/EchoPlayer/commit/bde034bccab0dec6dbeb305fd5c4b7aca76caa91)) +- 增强更新通知系统，添加红点提示和用户交互逻辑 ([fdf4c81](https://github.com/mkdir700/EchoPlayer/commit/fdf4c811e2cf2611319adc6b706e12b5510fe5c8)) +- 增强版本比较逻辑，优化更新通知系统 ([f29a25f](https://github.com/mkdir700/EchoPlayer/commit/f29a25fc4d9859375654c8c3e1f532224e8e3049)) +- 增强视频兼容性模态框功能，支持初始步骤和分析结果 ([3aba45c](https://github.com/mkdir700/EchoPlayer/commit/3aba45c3464151598c1b8400c8e14d2c612f53bf)) +- 多平台构建和发布 ([cc521ea](https://github.com/mkdir700/EchoPlayer/commit/cc521ea8befde2b839810292e93475a806db4dd1)) +- 实现动态 electron-updater 渠道配置 ([28d2836](https://github.com/mkdir700/EchoPlayer/commit/28d28360a4e5cee11603cd68f959098d4e40ca0b)), closes [#3](https://github.com/mkdir700/EchoPlayer/issues/3) +- 将发布提供者从 generic 更改为 github，更新仓库和所有者信息，以支持自动更新功能 ([b6d4076](https://github.com/mkdir700/EchoPlayer/commit/b6d4076ff094f31d5f4eedf08e6b943f41f5fed6)) +- 引入常量以支持视频容器格式检查 ([da68183](https://github.com/mkdir700/EchoPlayer/commit/da681831b60f4655b72731fd1ba34e5550149543)) +- 新增 AimButton 组件以支持手动定位当前字幕并启用自动滚动；更新 SubtitleListContent 组件以集成 AimButton，优化用户滚动体验与字幕自动滚动逻辑 ([3c8a092](https://github.com/mkdir700/EchoPlayer/commit/3c8a09208d773f7a7e5d86bfb6a7ef26cfadf444)) +- 新增 AppHeader 组件并更新样式，调整导航菜单布局以提升用户体验 ([94e35c3](https://github.com/mkdir700/EchoPlayer/commit/94e35c30ff96b534046190cbd654097f0b960095)) +- 新增 cmd-reason.mdc 文件并更新 cmd-refactor-theme.mdc 规则 ([43d2222](https://github.com/mkdir700/EchoPlayer/commit/43d22225b7dd3546a90aec05ee5efb2dd158c8f6)) +- 新增 E2E 测试用例和文件选择器助手 ([9928349](https://github.com/mkdir700/EchoPlayer/commit/99283494eddf4612fa0d9434473974337045b052)) +- 新增 git commit 内容生成规则文件 ([6e0ee23](https://github.com/mkdir700/EchoPlayer/commit/6e0ee238be5d22aed2e23bf8cb4f51d5918d2a51)) +- 新增主题系统 ([369d828](https://github.com/mkdir700/EchoPlayer/commit/369d828232f0e07d1212e750b961871fe8024a3f)) +- 新增全屏模式支持 ([e8c9542](https://github.com/mkdir700/EchoPlayer/commit/e8c9542fef5766a048bd1fa65f11858cf1a44e7e)) +- 新增全屏视频进度条组件并重构视频控制逻辑 ([7fc587f](https://github.com/mkdir700/EchoPlayer/commit/7fc587f93312c6d34869543ffab8153a20aa2975)) +- 新增划词选中和快捷复制功能 ([9e22b44](https://github.com/mkdir700/EchoPlayer/commit/9e22b44a921ddea67f1ee95931c65116c619a9c2)) +- 新增单词卡片组件，支持单词点击后显示详细信息和发音功能；优化字幕显示样式，提升用户交互体验 ([c6a4ab6](https://github.com/mkdir700/EchoPlayer/commit/c6a4ab6446e9ebc9e55d46b52d84e93987673706)) +- 新增字幕列表上下文及相关钩子，重构播放页面以使用新的字幕管理逻辑，提升代码可读性与功能性 ([7766b74](https://github.com/mkdir700/EchoPlayer/commit/7766b74f5b7d472c94e78678f685ae1934e9c617)) +- 新增字幕列表项样式并禁用焦点样式 ([654a0d1](https://github.com/mkdir700/EchoPlayer/commit/654a0d1d6581749a8c651d322444df60252dff38)) +- 新增字幕布局锁定功能 ([82e75dc](https://github.com/mkdir700/EchoPlayer/commit/82e75dcb0741f6275fcf2863fccb6244383c75b2)) +- 新增字幕模式覆盖层组件及相关逻辑 ([e75740c](https://github.com/mkdir700/EchoPlayer/commit/e75740cd20e588ae2542ece91acebd4f86206b51)) +- 新增字幕空状态组件和外部链接打开功能 ([5bd4bd6](https://github.com/mkdir700/EchoPlayer/commit/5bd4bd6cb5f283114c83188c15301afe50b5d3c6)) +- 新增字幕组件样式，重构相关组件以支持主题系统，提升视觉一致性和用户体验 ([822cb74](https://github.com/mkdir700/EchoPlayer/commit/822cb74a9348d89527f3871ba7d37f92952e3165)) +- 新增字幕重置功能，优化字幕设置管理；重构相关组件以提升用户体验和代码可维护性 ([f4702a5](https://github.com/mkdir700/EchoPlayer/commit/f4702a5f59b77e36a8301c856c1ab81c3d8e26b5)) +- 新增存储管理功能，添加最近播放项的增删改查接口，优化用户体验；重构相关组件，提升代码结构与可维护性 ([a746ed3](https://github.com/mkdir700/EchoPlayer/commit/a746ed388e2476c8a84f45ec13f7e5ab6af8ad82)) +- 新增当前字幕显示上下文管理，优化字幕点击交互逻辑，确保用户体验流畅；重构相关组件以提升代码可维护性 ([91a215d](https://github.com/mkdir700/EchoPlayer/commit/91a215d0fa116f04c8f88403123574f0d6d7dd6f)) +- 新增快捷键设置模态框和快捷键显示组件，优化用户输入体验 ([b605257](https://github.com/mkdir700/EchoPlayer/commit/b605257cd97fec50e58143eba479e39defe449b6)) +- 新增控制弹窗样式并优化字幕模式选择器的交互体验；重构相关组件以提升代码可读性和用户体验 ([79eabdf](https://github.com/mkdir700/EchoPlayer/commit/79eabdfc684ba172425afc80dc61bb47ea95c78d)) +- 新增播放设置上下文，重构相关组件以支持播放设置的管理；更新播放页面以使用新的播放设置上下文，提升代码可读性与功能性 ([6fe8b4f](https://github.com/mkdir700/EchoPlayer/commit/6fe8b4fed2d3ea0bf9b2487f48fe7bf98d293ba6)) +- 新增播放速度覆盖层和相关功能 [#1](https://github.com/mkdir700/EchoPlayer/issues/1) ([d8637eb](https://github.com/mkdir700/EchoPlayer/commit/d8637eb6046ce8f24b0e4e08794681bf59a93ba9)) +- 新增数据清理功能，优化日志记录中的数据序列化，确保记录的日志信息更为准确和安全 ([8ada21a](https://github.com/mkdir700/EchoPlayer/commit/8ada21a07acc9dcb06a59b205f9b42c326d6472f)) +- 新增数据目录管理功能 ([2c93e19](https://github.com/mkdir700/EchoPlayer/commit/2c93e19e51efadcf0a91e55ae07b40c0589f2f2a)) +- 新增日志系统，集成 electron-log 以支持主进程和渲染进程的日志记录；更新相关 API 以便于日志管理和调试 ([1f621d4](https://github.com/mkdir700/EchoPlayer/commit/1f621d42eaa8cce3ca13a1eec4c6fb5235a2d671)) +- 新增智能分段功能及相关测试 ([f5b8f5c](https://github.com/mkdir700/EchoPlayer/commit/f5b8f5c96a00b64bc820335a3ed16083a7e44ce0)) +- 新增视频UI配置管理功能 ([eaf7e41](https://github.com/mkdir700/EchoPlayer/commit/eaf7e418bf8d6ea7169f243e3afef5d2b8cb542a)) +- 新增视频管理组件和确认模态框 ([4263c67](https://github.com/mkdir700/EchoPlayer/commit/4263c672a1bba108b83d80a1cfa78d71b6c6edb9)) +- 新增视频转码功能及兼容性警告模态框 ([4fc86a2](https://github.com/mkdir700/EchoPlayer/commit/4fc86a28338e9814fb1b2c98780645cf23f35cda)) +- 新增第三方服务配置组件，整合 OpenAI 和词典服务设置，优化用户界面和交互体验；引入模块化样式，提升整体一致性 ([3e45359](https://github.com/mkdir700/EchoPlayer/commit/3e45359efb188e7108ee4eb9663768b18b444678)) +- 新增获取所有字幕的功能，优化字幕查找逻辑以支持根据当前时间查找上下句字幕，提升用户体验 ([04c5155](https://github.com/mkdir700/EchoPlayer/commit/04c5155f1276968967591acbaedb36200915a5cc)) +- 新增词典服务相关的 IPC 处理器，支持有道和欧陆词典的 API 请求；实现 SHA256 哈希计算功能，增强应用的词典查询能力 ([707ee97](https://github.com/mkdir700/EchoPlayer/commit/707ee97b2680efcf9057acfd802e6113d4f89d8d)) +- 新增边距验证逻辑，优化字幕拖拽和调整大小功能，确保字幕区域不超出容器边界 ([2294bcf](https://github.com/mkdir700/EchoPlayer/commit/2294bcffac6fc83e4d21e543c276cceaea0189ff)) +- 更新 AppHeader 组件，增加背景装饰、应用图标和名称，优化导航按钮和辅助功能按钮的样式，提升用户体验 ([651c8d7](https://github.com/mkdir700/EchoPlayer/commit/651c8d79acf0649f24a30acc4a7a714f112ec85a)) +- 更新 AppHeader 组件，调整文本样式和名称，提升视觉效果 ([f208d66](https://github.com/mkdir700/EchoPlayer/commit/f208d66199d33de47c8b3f885c6f95ca655081ac)) +- 更新 GitHub Actions 工作流和文档，支持更多发布文件 ([c4bf6f7](https://github.com/mkdir700/EchoPlayer/commit/c4bf6f7a00d332a3e71f0796dbbdcf3c397ef175)) +- 更新 index.html 文件，修改内容安全策略以支持新的脚本源，添加本地开发服务器的支持，优化页面加载逻辑 ([8c11edf](https://github.com/mkdir700/EchoPlayer/commit/8c11edfc841058448c24be872d641b98beda52ec)) +- 更新 PlaybackRateSelector 组件样式和文本 ([034e758](https://github.com/mkdir700/EchoPlayer/commit/034e7581ec6facdffbd7cafc276449f7733c231b)) +- 更新 SubtitleListContent 组件，替换 rc-virtual-list 为 react-virtualized，优化字幕列表渲染性能与用户体验；调整样式以适配虚拟列表，增强滚动效果与响应式设计 ([63d9ef4](https://github.com/mkdir700/EchoPlayer/commit/63d9ef4229b9e159b0da5ae272229d192cc27a25)) +- 更新 SubtitleListContent 组件，添加激活字幕索引状态以优化渲染逻辑；重构字幕项组件以减少不必要的重渲染并提升性能；增强自动滚动逻辑，确保用户体验流畅 ([c997109](https://github.com/mkdir700/EchoPlayer/commit/c997109154faf0a92186bb94a8d2a019d85086e2)) +- 更新E2E测试，移除冗余测试用例并优化测试ID使用 ([51fd721](https://github.com/mkdir700/EchoPlayer/commit/51fd721ecd84bf54472f18298e0541d20d0d1cb8)) +- 更新E2E测试配置，添加Linux虚拟显示器支持并检查构建输出 ([ac1999f](https://github.com/mkdir700/EchoPlayer/commit/ac1999f8b30cf8cf48f9528b93b3fcb68b1c1b79)) +- 更新主题系统，新增字体粗细、间距、圆角等设计令牌，优化组件样式一致性 ([62f87dd](https://github.com/mkdir700/EchoPlayer/commit/62f87dd4fc868eefaf7d26008204edde9e778bb4)) +- 更新侧边栏导航功能和禁用状态提示 ([d41b25f](https://github.com/mkdir700/EchoPlayer/commit/d41b25f88d5a5b428b3a159db432fa951178a469)) +- 更新最近播放项管理，使用文件ID替代原有ID，新增根据文件ID获取最近播放项的功能，优化播放设置管理，提升代码可维护性 ([920856c](https://github.com/mkdir700/EchoPlayer/commit/920856c095a8ac4d5d41dab635390493c13774ad)) +- 更新图标文件，替换Mac和Windows平台的图标，优化SVG图标文件结构 ([bfe456f](https://github.com/mkdir700/EchoPlayer/commit/bfe456f9109fd99022796d8be8c533ba31c1fd9f)) +- 更新图标资源，替换 PNG 格式图标并新增 SVG 格式图标，提升图标的可扩展性与清晰度 ([8eaf560](https://github.com/mkdir700/EchoPlayer/commit/8eaf5600cff468fceb1d36bca6416a52e43f9aa9)) +- 更新字典引擎设置，默认选择为 'eudic-html'，提升用户体验 ([ebaa5d2](https://github.com/mkdir700/EchoPlayer/commit/ebaa5d290cbbfcd1c2a5f5d7b8ed99ce9bbad449)) +- 更新字幕上下文菜单，优化重置按钮状态和样式 ([cc542f2](https://github.com/mkdir700/EchoPlayer/commit/cc542f27e241c920e80272cc2c68d2aaa7ba00da)) +- 更新字幕列表项组件，添加注释以说明仅展示学习语言，优化双语字幕显示逻辑 ([89e2b33](https://github.com/mkdir700/EchoPlayer/commit/89e2b33e65f7565ee4b89a329963c66b29a78df6)) +- 更新字幕加载功能，新增对 ASS/SSA 格式的支持；优化字幕文件扩展名和解析逻辑，提升用户体验 ([9cab843](https://github.com/mkdir700/EchoPlayer/commit/9cab843eeb33c3429ce1c2a9e78f33eeee743191)) +- 更新字幕加载模态框样式，新增加载状态提示与取消功能；重构相关逻辑以提升用户体验与代码可读性 ([1f8442a](https://github.com/mkdir700/EchoPlayer/commit/1f8442a0f6eec1afd4421f520774b4132528a3a2)) +- 更新字幕展示组件样式，添加浮动控制按钮及其样式，优化响应式设计 ([ac586e2](https://github.com/mkdir700/EchoPlayer/commit/ac586e2cd1e7670855b0b92bc3dc887ec9586658)) +- 更新字幕控制功能，添加自动暂停选项，修改快捷键设置，优化相关逻辑和组件交互 ([428e4cf](https://github.com/mkdir700/EchoPlayer/commit/428e4cfc1ba2f3856e604dd82614388c1e2d09a0)) +- 更新字幕模式选择器，整合字幕显示模式的获取逻辑，优化状态管理，增强调试信息 ([c2d3c90](https://github.com/mkdir700/EchoPlayer/commit/c2d3c90cfa07c64fbd4a21ef0ee962cc389b121f)) +- 更新循环播放设置，支持无限循环和自定义次数 ([e6c5d2e](https://github.com/mkdir700/EchoPlayer/commit/e6c5d2e3b291b3e5e4c562e43da278673c51ae23)) +- 更新快捷键设置，修改单句循环和字幕导航的快捷键，优化用户体验 ([ce66e62](https://github.com/mkdir700/EchoPlayer/commit/ce66e6208e920bc6d75a1750c06de27c2958f7cd)) +- 更新总结规则，启用始终应用选项；新增指令处理逻辑以提取项目开发指导内容并编写开发文档，确保文档规范性 ([d627e2e](https://github.com/mkdir700/EchoPlayer/commit/d627e2ec7676413f96950f580a6cddc73c9ff325)) +- 更新构建产物处理逻辑，支持多架构文件重命名和 YAML 文件引用更新 ([e206e1d](https://github.com/mkdir700/EchoPlayer/commit/e206e1d5386855e5819ce6b74000487d51aa2d77)) +- 更新构建配置，支持多架构构建和文件重命名 ([17b862d](https://github.com/mkdir700/EchoPlayer/commit/17b862d57bde74e4cff8c4f89ae423b183b1e9ed)) +- 更新样式文件，优化警告框和卡片组件的视觉效果，增强响应式设计支持 ([ea6b4ab](https://github.com/mkdir700/EchoPlayer/commit/ea6b4ab9142e5cade134113e613c69b109b86889)) +- 更新滚动条样式以支持 WebKit 规范 ([224f41d](https://github.com/mkdir700/EchoPlayer/commit/224f41d853a274324d5d1bbbf4ac7d07214cca96)) +- 更新视频上传钩子，使用日志系统记录视频DAR信息和错误警告，提升调试能力 ([2392b38](https://github.com/mkdir700/EchoPlayer/commit/2392b3806dfdf8134555a6b006ea833065459a09)) +- 更新视频兼容性模态框样式，提升用户体验 ([f5c1ba5](https://github.com/mkdir700/EchoPlayer/commit/f5c1ba5e42d44d65b5c0df55c70e9e2f44cbb855)) +- 更新视频播放器和播放状态管理逻辑，重构字幕处理方式，统一使用 subtitleItems 以提升代码一致性与可读性；优化播放状态保存与恢复机制，确保更流畅的用户体验 ([0cbe11d](https://github.com/mkdir700/EchoPlayer/commit/0cbe11d4324806dbdab67dd181ac28acd5e45c06)) +- 更新视频播放器的时间跳转逻辑，支持来源标记 ([f170ff1](https://github.com/mkdir700/EchoPlayer/commit/f170ff1b508c40bb122a20262ba436e4132c77da)) +- 更新视频文件信息样式，添加文件名截断功能，优化头部布局以提升用户体验 ([a6639f1](https://github.com/mkdir700/EchoPlayer/commit/a6639f1494862620bc0fec6f7e140e6bd773335f)) +- 更新窗口管理和标题栏组件，优化样式和功能 ([a1b50f6](https://github.com/mkdir700/EchoPlayer/commit/a1b50f6c52142a9cc2c2df12b98644e1e11ddfa6)) +- 更新窗口管理器的窗口尺寸和最小尺寸，优化用户界面；移除不必要的响应式设计样式，简化 CSS 结构 ([dd561cf](https://github.com/mkdir700/EchoPlayer/commit/dd561cf35995ebd504553a26d2c83b73da06e3f1)) +- 更新第三方服务配置组件，修改标签和提示文本为中文，增强用户友好性；新增申请应用ID和密钥的链接提示，提升信息获取便利性 ([5e68e85](https://github.com/mkdir700/EchoPlayer/commit/5e68e8507f1d5509cdcb2fb3459a570d92287aa9)) +- 更新设置导航组件样式和功能 ([535f267](https://github.com/mkdir700/EchoPlayer/commit/535f267b140bc918672fdadaae6445b9eda0707f)) +- 更新设置页面，移除视频转换相关功能 ([0d96fac](https://github.com/mkdir700/EchoPlayer/commit/0d96facf476cd73aa64fd023fb01c3a2442d0dbe)) +- 更新设置页面，简化快捷键和数据管理部分的渲染逻辑，新增存储设置选项，优化用户界面和交互体验 ([9942740](https://github.com/mkdir700/EchoPlayer/commit/9942740d9bca7ba55cd4f730ed2214ed405ed867)) +- 更新设置页面样式和主题支持 ([816ca6d](https://github.com/mkdir700/EchoPlayer/commit/816ca6d3d747ace1a18cf5f01523ee56ab8cb120)) +- 更新设置页面的按钮样式和移除音频兼容性警告 ([f0be1e2](https://github.com/mkdir700/EchoPlayer/commit/f0be1e206fb69f3a75ad292dc8c3a90f02fced14)) +- 更新通知系统优化，增强用户交互体验 ([6df4374](https://github.com/mkdir700/EchoPlayer/commit/6df4374ceb90b401799107c344211b164f7a0164)) +- 更新页面渲染逻辑，添加页面冻结功能，确保首页始终挂载并优化其他页面的条件渲染，提升用户体验 ([7a4b2ba](https://github.com/mkdir700/EchoPlayer/commit/7a4b2ba5d72a83f3765b003384d09295e70403e5)) +- 替换应用头部为侧边栏组件 ([0e621fc](https://github.com/mkdir700/EchoPlayer/commit/0e621fca1703f7461a101d2899ce7d85626156ff)) +- 沉浸式标题栏 ([9c7c7d9](https://github.com/mkdir700/EchoPlayer/commit/9c7c7d9b91ba0c505d72cc3cf2d11b9049bd62a3)) +- 添加 @ant-design/v5-patch-for-react-19 支持 React19 ([95d1019](https://github.com/mkdir700/EchoPlayer/commit/95d1019a02fb244e558f8819e4c52e3a7b0bc1bf)) +- 添加 Stagewise 工具栏支持，仅在开发模式下初始化，更新 CSP 设置以允许外部样式源 ([ededb64](https://github.com/mkdir700/EchoPlayer/commit/ededb643573969a41ebc57a9666fbfd928e44e7c)) +- 添加Codecov配置文件，更新测试配置以支持覆盖率报告上传 ([d9ec00d](https://github.com/mkdir700/EchoPlayer/commit/d9ec00d895792eca2c9ad6ea455f5b1eaadb2078)) +- 添加E2E测试支持，更新Playwright配置和相关脚本 ([247b851](https://github.com/mkdir700/EchoPlayer/commit/247b85122ab88b05e789388e18b696769256e226)) +- 添加全屏功能支持，优化视频播放器组件，更新样式以移除不必要的自定义样式，提升用户体验 ([a7d4b1c](https://github.com/mkdir700/EchoPlayer/commit/a7d4b1c1408ec6177ec07c60280993f23af8c605)) +- 添加字幕控制组件，支持单句循环和自动循环功能，更新快捷键设置，优化样式和响应式设计 ([2902f2d](https://github.com/mkdir700/EchoPlayer/commit/2902f2d54e929b433ba7dfa2ed9ebe32dc8b2d58)) +- 添加应用图标 ([b86e142](https://github.com/mkdir700/EchoPlayer/commit/b86e1420b4ca8701354d644b45653ac039845db2)) +- 添加应用图标并优化代码中的事件监听和清理逻辑 ([c39da08](https://github.com/mkdir700/EchoPlayer/commit/c39da08c7ab5a17ed4fb718bcfc10df4a2b94cb9)) +- 添加当前字幕展示组件，支持多种字幕显示模式及单词hover交互，优化视频控制区样式和响应式设计 ([df4b74a](https://github.com/mkdir700/EchoPlayer/commit/df4b74a98c5ae66e6c2d3be24e25c7e4261fc70e)) +- 添加循环播放功能，支持自定义循环次数设置 ([1dbccfa](https://github.com/mkdir700/EchoPlayer/commit/1dbccfae97c22ac49a08e78287211f89ccf3aa46)) +- 添加文件系统相关的 IPC 处理器，支持文件存在性检查、读取文件内容、获取文件 URL、文件信息获取及文件完整性验证；更新 preload 和 renderer 逻辑以支持视频和字幕文件的选择与恢复功能，优化用户体验 ([6d361eb](https://github.com/mkdir700/EchoPlayer/commit/6d361eb0ec1e8f8aa2eaca5167736bd1373d93bb)) +- 添加更新通知和提示对话框组件 ([38df4d2](https://github.com/mkdir700/EchoPlayer/commit/38df4d2b55af83f3007f1b242da19eb02cca8a11)) +- 添加更新通知跳过版本功能，优化用户体验 ([165adb6](https://github.com/mkdir700/EchoPlayer/commit/165adb69c7a4dae1d2749592b01f1561580c58ec)) +- 添加本地更新测试环境脚本和相关功能 ([00aa019](https://github.com/mkdir700/EchoPlayer/commit/00aa01940583ec30e79034495fe804febe4479ab)) +- 添加构建产物重命名和验证脚本 - 新增 rename-artifacts.ts 用于重命名构建产物以符合发布要求 - 新增 verify-build-artifacts.ts 用于验证构建产物的存在性和完整性 ([696cedc](https://github.com/mkdir700/EchoPlayer/commit/696cedc090caaa56b3f2c4921022d9e131d361ac)) +- 添加构建和发布工作流，更新测试和发布脚本 ([2744005](https://github.com/mkdir700/EchoPlayer/commit/2744005aefb85874651d7e7937e5af1f9ead8b35)) +- 添加欧陆词典HTML解析服务和单元测试框架 ([52ace3e](https://github.com/mkdir700/EchoPlayer/commit/52ace3ef0ba4aa0b58d000996d1f933365c093ce)) +- 添加测试Electron CDP连接的脚本 ([9982514](https://github.com/mkdir700/EchoPlayer/commit/9982514f56ccbb6b048d0a4d961f8a5b7b29eea0)) +- 添加版本管理脚本，支持版本类型检测和版本号递增功能；更新构建和发布工作流，优化版本变量设置和上传路径逻辑；新增发布指南文档，详细说明版本管理和发布流程 ([282bde8](https://github.com/mkdir700/EchoPlayer/commit/282bde883d4c8ae965963e555feb1cd4a011ab88)) +- 添加视频播放器点击事件处理，优化用户交互体验 ([69c378f](https://github.com/mkdir700/EchoPlayer/commit/69c378fad8aa8c15b29833e668fd150775c477e3)) +- 添加视频文件选择加载状态和清空确认模态框 ([ca95a7d](https://github.com/mkdir700/EchoPlayer/commit/ca95a7d5f2cae1e42423dbe7cfe3c7d09352e16c)) +- 添加视频格式转换功能，新增视频兼容性检测与转换指南，优化视频播放器与文件上传逻辑，提升用户体验；重构相关组件，简化代码结构 ([5fd89fe](https://github.com/mkdir700/EchoPlayer/commit/5fd89fed2b346efbb4d0e5c0d029af51e60f07a1)) +- 添加腾讯云COS上传功能，支持发布文件和自动更新文件的上传 ([e79e5a9](https://github.com/mkdir700/EchoPlayer/commit/e79e5a9c5b5e29f2092d50aa9af58dafa6297612)) +- 添加自动更新功能，整合更新处理器，更新设置界面，支持版本检查和下载 ([5e5a03e](https://github.com/mkdir700/EchoPlayer/commit/5e5a03e5966e3978ba16d76ed202ce943903e3a1)) +- 添加页面切换过渡效果，优化播放页面与性能监控功能；重构相关组件，提升用户交互体验与代码结构 ([e583ecc](https://github.com/mkdir700/EchoPlayer/commit/e583ecc78836dc241392039c76092833ca354695)) +- 添加页面导航功能，重构 App 组件以支持多页面切换，新增关于、收藏、设置等页面，优化样式和用户体验 ([51f4263](https://github.com/mkdir700/EchoPlayer/commit/51f426365c12474091e8581211da3e7e36d29749)) +- 添加高效测试标识符管理指南及相关工具函数，优化E2E测试中的测试ID使用 ([2dcfe5e](https://github.com/mkdir700/EchoPlayer/commit/2dcfe5e7443095890acc7034a5b919059dcad2bc)) +- 现代化视频控制组件，优化样式和交互逻辑，增强用户体验；添加音量和设置控制，支持自动隐藏功能 ([dc45b83](https://github.com/mkdir700/EchoPlayer/commit/dc45b83bbaf02f90ccde2559f203520b172a0388)) +- 移除 HomePage 组件中的 subtitleIndex 属性，优化视频播放状态管理逻辑；调整视频网格布局以提升用户界面的一致性与可读性 ([8f54e7f](https://github.com/mkdir700/EchoPlayer/commit/8f54e7fb54574552a308c7af5188f5f46d5a37ce)) +- 移除 PlayPageHeader 的 CSS 模块，改为使用主题系统样式管理，提升组件的可维护性和一致性 ([52cedbc](https://github.com/mkdir700/EchoPlayer/commit/52cedbc09e95d3fe91308e1bdc70a38d1c988315)) +- 移除 useSidebarResize 钩子及相关样式，改用 Ant Design 的 Splitter 组件实现侧边栏调整功能，优化播放页面布局与用户体验 ([bead645](https://github.com/mkdir700/EchoPlayer/commit/bead645f2680363621a7cc7dd6139aa990aa7750)) +- 移除字幕位置控制相关组件及其逻辑，简化视频控制界面以提升用户体验 ([1edc857](https://github.com/mkdir700/EchoPlayer/commit/1edc857e3ef1f8ac87c35e6c62f1bdfcd4b545c6)) +- 移除字幕设置相关功能和组件 ([32f0138](https://github.com/mkdir700/EchoPlayer/commit/32f0138c6285b6a5805720c9306dad2d4cfd7783)) +- 移除推荐视频假数据，更新欢迎信息，优化首页布局和用户体验 ([78b000f](https://github.com/mkdir700/EchoPlayer/commit/78b000fcf2bd8511ef35e79f5a03114dfed297d4)) +- 移除视频播放器和播放控制钩子，简化代码结构以提升可维护性 ([513ba3c](https://github.com/mkdir700/EchoPlayer/commit/513ba3c21f67fbc76fc3a61ac5b128506cca68db)) +- 移除视频播放器的响应式设计中不必要的内边距，简化 CSS 结构 ([f8c8c28](https://github.com/mkdir700/EchoPlayer/commit/f8c8c2899d8545486a23421d882ecfd1c186446c)) +- 调整 HomePage 组件的响应式布局，优化列宽设置以提升用户体验 ([3c435bf](https://github.com/mkdir700/EchoPlayer/commit/3c435bfee87ab529333a2dcf3fe51553b089cc45)) +- 调整主题样式宽度 ([2fe9ff2](https://github.com/mkdir700/EchoPlayer/commit/2fe9ff24d2f35791712b3bf5b848fc7464b08fef)) +- 调整全屏视频控制组件的进度条位置和样式 ([679521f](https://github.com/mkdir700/EchoPlayer/commit/679521f2f92c1c04646a89866944b20d22d6a917)) +- 调整字幕覆盖层样式，修改底部位置为0%，移除移动端特定样式，简化 CSS 结构 ([515151d](https://github.com/mkdir700/EchoPlayer/commit/515151d022fc16d886471aad43aeda43f482214c)) +- 重命名视频控制组件为 VideoControlsFullScreen，更新相关导入，提升代码可读性 ([0fe7954](https://github.com/mkdir700/EchoPlayer/commit/0fe795404702dd1a9b68c32a21fec5ad003dcf8d)) +- 重构 SidebarSection 和 SubtitleListContent 组件，简化属性传递，增强字幕索引处理逻辑，优化自动滚动功能；新增获取指定时间点字幕索引的功能，提升用户体验与代码可读性 ([dabcbeb](https://github.com/mkdir700/EchoPlayer/commit/dabcbeb0718e2f8d6923a223d3c57e79453366a9)) +- 重构字幕控制组件样式，使用主题系统优化按钮和图标样式，提升视觉一致性和用户体验 ([12e38f2](https://github.com/mkdir700/EchoPlayer/commit/12e38f2f260467e297ad11831ff1a44eea08c317)) +- 重构字幕状态管理，新增视频特定字幕设置 ([ff5b5de](https://github.com/mkdir700/EchoPlayer/commit/ff5b5def52690c082eae9f26029f6d139d80cd47)) +- 重构字幕组件，新增字幕覆盖层和文本组件，优化字幕显示逻辑和性能；移除旧版字幕组件，提升代码可维护性 ([4fbef84](https://github.com/mkdir700/EchoPlayer/commit/4fbef8419f703f398593043932f07a14a78e170c)) +- 重构存储处理器模块，优化应用配置和通用存储功能 ([065c30d](https://github.com/mkdir700/EchoPlayer/commit/065c30d7cbc8fc5b01f3f3b59211e6548d679cdc)) +- 重构存储管理功能，更新最近播放项的类型定义，优化播放设置管理，增强用户体验；新增播放设置的深度合并逻辑，提升代码可维护性 ([3f928d4](https://github.com/mkdir700/EchoPlayer/commit/3f928d4c84df465574fde222fcb1dccf72c3dfc6)) +- 重构应用布局与样式，新增主页与播放页面组件，优化用户交互体验；整合最近文件管理功能，提升视频文件选择与加载逻辑 ([f3fefad](https://github.com/mkdir700/EchoPlayer/commit/f3fefadd3643f20e2935d2d72eeea1e56a65a1d1)) +- 重构循环切换功能，简化状态管理和播放逻辑 ([fe11037](https://github.com/mkdir700/EchoPlayer/commit/fe11037cb82119f3ff3e74c825a44e80022158f7)) +- 重构播放状态管理，替换为使用最近播放列表钩子，简化参数传递并优化代码逻辑；新增最近播放列表钩子以支持播放项的增删改查功能 ([1ec2cac](https://github.com/mkdir700/EchoPlayer/commit/1ec2cac7f2a84f11b1ff4ddd2d482a45c8eae1bd)) +- 重构播放页面，整合视频播放器与字幕控制逻辑，新增 VideoPlayerProvider 以管理视频播放状态，优化组件结构与性能；移除不再使用的 SubtitleControls 组件，简化属性传递，提升代码可读性 ([e4111c9](https://github.com/mkdir700/EchoPlayer/commit/e4111c9274cb6b6dd112c5dd7f629b244450f802)) +- 重构视频控制组件，新增全屏控制样式与逻辑，优化播放控制体验；更新相关类型定义，提升代码可读性与功能性 ([5c72a1b](https://github.com/mkdir700/EchoPlayer/commit/5c72a1b0ce481c63b0d9c03f048b527f612052e0)) +- 重构视频播放上下文，新增视频文件上传和选择功能；更新相关组件以支持新的上下文逻辑，提升代码可读性与功能性 ([37e128e](https://github.com/mkdir700/EchoPlayer/commit/37e128eede0ad02f70ee7dc2aa2aab7d49a121df)) +- 重构视频播放器组件，移除 CSS Modules，采用主题系统样式管理，提升代码可维护性和一致性 ([b3981bc](https://github.com/mkdir700/EchoPlayer/commit/b3981bc2d86a7ea7d343f1e068f404b46af509f0)) +- 重构视频播放器逻辑，整合视频播放状态管理，优化组件结构；移除不再使用的 usePlayingVideoContext 钩子，新增多个视频控制钩子以提升性能与可读性 ([b1a6dc2](https://github.com/mkdir700/EchoPlayer/commit/b1a6dc29acb83fbdf4a167c9ded069f2e53d0491)) +- 重构视频播放设置管理，整合字幕显示设置，优化状态管理逻辑，提升用户体验和代码可维护性 ([6c3d852](https://github.com/mkdir700/EchoPlayer/commit/6c3d852fbb8d66e5f07942fdf792b661327b3a4a)) +- 重构设置页面，新增快捷键、数据管理和占位符组件，优化用户界面和交互体验；引入快捷键上下文管理，支持自定义快捷键功能 ([a498905](https://github.com/mkdir700/EchoPlayer/commit/a4989050d3a747b6a66d7deb2da21a1cf9a2a0be)) + +### Reverts + +- Revert "build: 在构建和发布工作流中添加调试步骤，列出下载的文件并检查Windows、Mac和Linux平台的自动更新配置文件是否存在" ([d0f8fc4](https://github.com/mkdir700/EchoPlayer/commit/d0f8fc4be0f3b976df0752a57437eb3cd16321ef)) +- Revert "chore: 更新 Linux 构建环境配置" ([cc179a0](https://github.com/mkdir700/EchoPlayer/commit/cc179a072721fd508662924073cf03bdfa684611)) +- Revert "feat: 在构建和发布工作流中添加更新 package.json 版本的步骤，确保版本号自动更新；优化草稿发布条件以支持预发布版本" ([be1cf26](https://github.com/mkdir700/EchoPlayer/commit/be1cf2668cf7ad777739bdb40e5b75e145775386)) + +### BREAKING CHANGES + +- **player,logging,state:** - Removed TransportBar and deprecated hooks (usePlayerControls/useVideoEvents/useSubtitleSync). Migrate to ControllerPanel with usePlayerEngine/usePlayerCommandsOrchestrated. + +* Player store control actions are engine-only; components should send commands via the orchestrator instead of mutating store directly. + ## [v0.2.0-alpha.7](https://github.com/mkdir700/echolab/tree/v0.2.0-alpha.7)(2025-06-20) ### ⚙️ 构建优化 From 07c3e5f754502cd5780cbfc704aa305b3e9c2a95 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 13:02:29 +0800 Subject: [PATCH 03/82] fix(ci): resolve duplicate GitHub releases issue (#90) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(ci): resolve duplicate GitHub releases issue - Remove duplicate release creation by electron-builder - Let semantic-release handle single release creation with proper descriptions - Configure semantic-release to upload artifacts from electron-builder - Ensure single release with semantic description and electron artifacts * feat(ci): optimize release workflow trigger options - Limit manual force_version_type to dev/test only - Auto-determine version type based on branch: - main branch → stable - beta branch → beta - alpha branch → alpha - Fallback to version string detection for edge cases - Improve workflow clarity and prevent manual errors --- .github/workflows/release.yml | 53 +++++++++++++++++++++++++---------- .releaserc.js | 22 +++++++++++++-- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a72ffec0..a743ce08 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,15 +7,12 @@ on: description: 'Release version (e.g., v1.0.0, v1.0.0-beta.1, v1.0.0-alpha.1)' required: false force_version_type: - description: 'Force version type (overrides auto-detection)' + description: 'Force version type (dev/test only, others determined by branch)' required: false type: choice options: - 'dev' - 'test' - - 'alpha' - - 'beta' - - 'stable' permissions: contents: write @@ -52,16 +49,31 @@ jobs: # Detect version type if [ -n "${{ github.event.inputs.force_version_type }}" ]; then + # 手动指定的版本类型（仅限 dev/test） VERSION_TYPE="${{ github.event.inputs.force_version_type }}" + elif [[ "${{ github.ref_name }}" == "main" ]]; then + # main 分支 = stable + VERSION_TYPE="stable" + elif [[ "${{ github.ref_name }}" == "beta" ]]; then + # beta 分支 = beta + VERSION_TYPE="beta" + elif [[ "${{ github.ref_name }}" == "alpha" ]]; then + # alpha 分支 = alpha + VERSION_TYPE="alpha" elif [[ "$VERSION_NO_V" == *"-dev"* ]]; then + # 版本号包含 dev 后缀 VERSION_TYPE="dev" elif [[ "$VERSION_NO_V" == *"-test"* ]]; then + # 版本号包含 test 后缀 VERSION_TYPE="test" elif [[ "$VERSION_NO_V" == *"-alpha"* ]]; then + # 版本号包含 alpha 后缀 VERSION_TYPE="alpha" elif [[ "$VERSION_NO_V" == *"-beta"* ]]; then + # 版本号包含 beta 后缀 VERSION_TYPE="beta" else + # 默认为 stable VERSION_TYPE="stable" fi @@ -159,17 +171,10 @@ jobs: echo "🔄 更新渠道: ${{ needs.detect-version.outputs.version_type == 'stable' && 'latest' || needs.detect-version.outputs.version_type }}" pnpm build - # 根据版本类型决定发布策略 - if [[ "${{ needs.detect-version.outputs.version_type }}" == "dev" || "${{ needs.detect-version.outputs.version_type }}" == "test" ]]; then - echo "🚫 Dev/Test version - building without publishing" - pnpm exec electron-builder ${{ matrix.target }} --publish never - else - echo "🚀 Publishing version to GitHub" - # 使用 always 策略，无论是否有标签都会发布 - # electron-builder 会根据版本号自动判断是否为 prerelease - echo "📦 Publishing with always strategy (supports both release and prerelease)" - pnpm exec electron-builder ${{ matrix.target }} --publish always - fi + # 构建产物但不发布，交给 semantic-release 统一发布 + echo "🏗️ Building artifacts without publishing" + echo "📦 Semantic-release will handle the GitHub Release creation" + pnpm exec electron-builder ${{ matrix.target }} --publish never env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} APPLE_ID: ${{ secrets.APPLE_ID }} @@ -225,6 +230,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 # semantic-release 需要完整的 git 历史 - name: Setup Node.js uses: actions/setup-node@v4 @@ -252,6 +259,22 @@ jobs: - name: Install dependencies run: pnpm install + - name: Download all artifacts + uses: actions/download-artifact@v4 + with: + path: artifacts + + - name: Prepare artifacts for release + run: | + echo "📦 Preparing artifacts for GitHub Release" + mkdir -p dist + # 复制所有构建产物到 dist 目录 + find artifacts -name "*.exe" -o -name "*.dmg" -o -name "*.zip" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.yml" -o -name "*.yaml" -o -name "*.blockmap" | while read file; do + cp "$file" dist/ + echo "📁 Copied: $(basename "$file")" + done + ls -la dist/ + - name: Run Semantic Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.releaserc.js b/.releaserc.js index 1dc458fd..4adf8da1 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -31,12 +31,28 @@ module.exports = { } ], - // 创建 Draft Release + // 创建 Release 并上传构建产物 [ '@semantic-release/github', { - draft: true, - assets: [] // 不上传产物，electron-builder 会自动创建 Release 并上传产物 + assets: [ + // Windows 产物 + { path: 'dist/*.exe', label: 'Windows Installer (${nextRelease.gitTag})' }, + { path: 'dist/*-win.zip', label: 'Windows Portable (${nextRelease.gitTag})' }, + + // macOS 产物 + { path: 'dist/*.dmg', label: 'macOS Installer (${nextRelease.gitTag})' }, + { path: 'dist/*-mac.zip', label: 'macOS App Bundle (${nextRelease.gitTag})' }, + + // Linux 产物 + { path: 'dist/*.AppImage', label: 'Linux AppImage (${nextRelease.gitTag})' }, + { path: 'dist/*.deb', label: 'Linux DEB Package (${nextRelease.gitTag})' }, + + // 自动更新文件 + { path: 'dist/*.yml', label: 'Auto-update manifest' }, + { path: 'dist/*.yaml', label: 'Auto-update manifest' }, + { path: 'dist/*.blockmap', label: 'Block map for incremental updates' } + ] } ] ] From 4534162cae55c7bc4cb28200abe86df62af9a662 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 13:32:35 +0800 Subject: [PATCH 04/82] fix: improve release workflow and build configuration (#91) * refactor(ci): simplify release workflow by removing force version type Remove force_version_type input parameter and related logic from release workflow. Version type is now determined solely by branch name (main=stable, beta=beta, alpha=alpha). This simplifies the workflow and removes the manual override option that was only intended for dev/test. * fix(build): correct releaseName variable interpolation in electron-builder Remove single quotes around releaseName to allow proper ${version} variable interpolation. This fixes the issue where releaseName was showing literal 'EchoPlayer v${version}' instead of the actual version number. --- .github/workflows/release.yml | 13 +------------ electron-builder.yml | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a743ce08..22a558fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,13 +6,6 @@ on: version: description: 'Release version (e.g., v1.0.0, v1.0.0-beta.1, v1.0.0-alpha.1)' required: false - force_version_type: - description: 'Force version type (dev/test only, others determined by branch)' - required: false - type: choice - options: - - 'dev' - - 'test' permissions: contents: write @@ -47,11 +40,7 @@ jobs: # Remove 'v' prefix for processing VERSION_NO_V="${VERSION#v}" - # Detect version type - if [ -n "${{ github.event.inputs.force_version_type }}" ]; then - # 手动指定的版本类型（仅限 dev/test） - VERSION_TYPE="${{ github.event.inputs.force_version_type }}" - elif [[ "${{ github.ref_name }}" == "main" ]]; then + if [[ "${{ github.ref_name }}" == "main" ]]; then # main 分支 = stable VERSION_TYPE="stable" elif [[ "${{ github.ref_name }}" == "beta" ]]; then diff --git a/electron-builder.yml b/electron-builder.yml index 2d8c829d..294dbf73 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -132,5 +132,5 @@ publish: electronDownload: mirror: https://npmmirror.com/mirrors/electron/ releaseInfo: - releaseName: 'EchoPlayer v${version}' + releaseName: EchoPlayer v${version} releaseNotesFile: 'build/release-notes.md' From 31596b80a88cc543a5dd54c5ba6369eba889b2a9 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 8 Sep 2025 05:42:56 +0000 Subject: [PATCH 05/82] chore(release): 1.0.0-alpha.2 # [1.0.0-alpha.2](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2025-09-08) ### Bug Fixes * **ci:** resolve duplicate GitHub releases issue ([#90](https://github.com/mkdir700/EchoPlayer/issues/90)) ([07c3e5f](https://github.com/mkdir700/EchoPlayer/commit/07c3e5f754502cd5780cbfc704aa305b3e9c2a95)) * improve release workflow and build configuration ([#91](https://github.com/mkdir700/EchoPlayer/issues/91)) ([4534162](https://github.com/mkdir700/EchoPlayer/commit/4534162cae55c7bc4cb28200abe86df62af9a662)) --- CHANGELOG.md | 7 +++++++ package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2030d3f..03f98f0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [1.0.0-alpha.2](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2025-09-08) + +### Bug Fixes + +- **ci:** resolve duplicate GitHub releases issue ([#90](https://github.com/mkdir700/EchoPlayer/issues/90)) ([07c3e5f](https://github.com/mkdir700/EchoPlayer/commit/07c3e5f754502cd5780cbfc704aa305b3e9c2a95)) +- improve release workflow and build configuration ([#91](https://github.com/mkdir700/EchoPlayer/issues/91)) ([4534162](https://github.com/mkdir700/EchoPlayer/commit/4534162cae55c7bc4cb28200abe86df62af9a662)) + # 1.0.0-alpha.1 (2025-09-08) ### Bug Fixes diff --git a/package.json b/package.json index 2c7c48f0..227a26a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.1", + "version": "1.0.0-alpha.2", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From f066209bdab482481a4564827490580b753b3c8e Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 14:11:08 +0800 Subject: [PATCH 06/82] fix(release): remove custom labels from GitHub release assets (#92) - Replace custom labels with original artifact filenames for consistency - Simplify asset configuration from object format to string format - Remove platform-specific labels that obscured actual file names - Update Windows portable archive pattern from *-win.zip to *.zip - Remove macOS zip assets to match actual build output This change ensures GitHub Release asset names match the actual filenames generated by electron-builder, providing clearer identification of downloadable artifacts without confusing custom labels. --- .releaserc.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.releaserc.js b/.releaserc.js index 4adf8da1..d73f738b 100644 --- a/.releaserc.js +++ b/.releaserc.js @@ -37,21 +37,20 @@ module.exports = { { assets: [ // Windows 产物 - { path: 'dist/*.exe', label: 'Windows Installer (${nextRelease.gitTag})' }, - { path: 'dist/*-win.zip', label: 'Windows Portable (${nextRelease.gitTag})' }, + 'dist/*.exe', + 'dist/*.zip', // macOS 产物 - { path: 'dist/*.dmg', label: 'macOS Installer (${nextRelease.gitTag})' }, - { path: 'dist/*-mac.zip', label: 'macOS App Bundle (${nextRelease.gitTag})' }, + 'dist/*.dmg', // Linux 产物 - { path: 'dist/*.AppImage', label: 'Linux AppImage (${nextRelease.gitTag})' }, - { path: 'dist/*.deb', label: 'Linux DEB Package (${nextRelease.gitTag})' }, + 'dist/*.AppImage', + 'dist/*.deb', // 自动更新文件 - { path: 'dist/*.yml', label: 'Auto-update manifest' }, - { path: 'dist/*.yaml', label: 'Auto-update manifest' }, - { path: 'dist/*.blockmap', label: 'Block map for incremental updates' } + 'dist/*.yml', + 'dist/*.yaml', + 'dist/*.blockmap' ] } ] From 136902de512002dbb189a3ef82a9a3287d943035 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 15:20:12 +0800 Subject: [PATCH 07/82] refactor(config): centralize default values in ConfigManager (#93) - Add defaultValues object to centralize all configuration default values - Replace inline default values in all getter methods with references to defaultValues - Improve get() method to use defaultValues as fallback when defaultValue param is not provided - Enhance maintainability and consistency of default value management --- src/main/services/ConfigManager.ts | 37 ++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts index df0852e1..a23082a6 100644 --- a/src/main/services/ConfigManager.ts +++ b/src/main/services/ConfigManager.ts @@ -19,6 +19,20 @@ export enum ConfigKeys { DisableHardwareAcceleration = 'disableHardwareAcceleration' } +const defaultValues: Record = { + [ConfigKeys.Language]: defaultLanguage, + [ConfigKeys.Theme]: ThemeMode.system, + [ConfigKeys.LaunchToTray]: false, + [ConfigKeys.Tray]: true, + [ConfigKeys.TrayOnClose]: true, + [ConfigKeys.Shortcuts]: [], + [ConfigKeys.AutoUpdate]: true, + [ConfigKeys.TestChannel]: UpgradeChannel.BETA, + [ConfigKeys.TestPlan]: false, + [ConfigKeys.SpellCheckLanguages]: [] as string[], + [ConfigKeys.DisableHardwareAcceleration]: false +} + export class ConfigManager { private store: Conf private subscribers: Map void>> = new Map() @@ -28,7 +42,7 @@ export class ConfigManager { } getTheme(): ThemeMode { - return this.get(ConfigKeys.Theme, ThemeMode.system) + return this.get(ConfigKeys.Theme, defaultValues[ConfigKeys.Theme]) } setTheme(theme: ThemeMode) { @@ -38,7 +52,7 @@ export class ConfigManager { getLanguage(): LanguageVarious { const locale = Object.keys(locales).includes(app.getLocale()) ? app.getLocale() - : defaultLanguage + : defaultValues[ConfigKeys.Language] return this.get(ConfigKeys.Language, locale) as LanguageVarious } @@ -58,7 +72,7 @@ export class ConfigManager { } getAutoUpdate(): boolean { - return this.get(ConfigKeys.AutoUpdate, true) + return this.get(ConfigKeys.AutoUpdate, defaultValues[ConfigKeys.AutoUpdate]) } setAutoUpdate(value: boolean) { @@ -66,7 +80,7 @@ export class ConfigManager { } getTestChannel(): UpgradeChannel { - return this.get(ConfigKeys.TestChannel) + return this.get(ConfigKeys.TestChannel, defaultValues[ConfigKeys.TestChannel]) } setTestChannel(value: UpgradeChannel) { @@ -74,7 +88,7 @@ export class ConfigManager { } getTestPlan(): boolean { - return this.get(ConfigKeys.TestPlan, false) + return this.get(ConfigKeys.TestPlan, defaultValues[ConfigKeys.TestPlan]) } setTestPlan(value: boolean) { @@ -82,7 +96,7 @@ export class ConfigManager { } getLaunchToTray(): boolean { - return !!this.get(ConfigKeys.LaunchToTray, false) + return !!this.get(ConfigKeys.LaunchToTray, defaultValues[ConfigKeys.LaunchToTray]) } setLaunchToTray(value: boolean) { @@ -90,7 +104,7 @@ export class ConfigManager { } getTray(): boolean { - return !!this.get(ConfigKeys.Tray, true) + return !!this.get(ConfigKeys.Tray, defaultValues[ConfigKeys.Tray]) } setTray(value: boolean) { @@ -98,7 +112,7 @@ export class ConfigManager { } getTrayOnClose(): boolean { - return !!this.get(ConfigKeys.TrayOnClose, true) + return !!this.get(ConfigKeys.TrayOnClose, defaultValues[ConfigKeys.TrayOnClose]) } setTrayOnClose(value: boolean) { @@ -106,7 +120,10 @@ export class ConfigManager { } getDisableHardwareAcceleration(): boolean { - return this.get(ConfigKeys.DisableHardwareAcceleration, false) + return this.get( + ConfigKeys.DisableHardwareAcceleration, + defaultValues[ConfigKeys.DisableHardwareAcceleration] + ) } setDisableHardwareAcceleration(value: boolean) { @@ -163,7 +180,7 @@ export class ConfigManager { * @param defaultValue 默认值 */ get(key: string, defaultValue?: T) { - return this.store.get(key, defaultValue) as T + return this.store.get(key, defaultValue ? defaultValue : defaultValues[key]) as T } } From a47466b8e236af17785db098a761fa6dd30c67b5 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 15:26:26 +0800 Subject: [PATCH 08/82] feat(ci): add alpha and beta branch support to test workflow (#94) - Add alpha and beta branches to pull request triggers - Ensures CI tests run on all main development branches --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf16b129..922b9884 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Test on: push: - branches: [main, develop] + branches: [main, develop, alpha, beta] pull_request: - branches: [main] + branches: [main, alpha, beta] jobs: test: From c8d654d237f3426006ea09ec23aa91160ac68fc5 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 17:16:38 +0800 Subject: [PATCH 09/82] refactor(HomePage): remove watched indicator from video thumbnails (#96) - Remove WatchedIndicator component and its associated CheckIcon - Clean up unused styled-components for watched status display - Simplify video thumbnail overlay by removing watch completion visual feedback - Remove conditional rendering logic for watchProgress >= 1 state This refactoring removes the green checkmark indicator that previously showed on video thumbnails when watch progress reached 100%, streamlining the video card interface and reducing visual complexity. --- src/renderer/src/pages/home/HomePage.tsx | 49 ------------------------ 1 file changed, 49 deletions(-) diff --git a/src/renderer/src/pages/home/HomePage.tsx b/src/renderer/src/pages/home/HomePage.tsx index 9b031016..da5032e8 100644 --- a/src/renderer/src/pages/home/HomePage.tsx +++ b/src/renderer/src/pages/home/HomePage.tsx @@ -170,22 +170,6 @@ export function HomePage(): React.JSX.Element { {video.durationText} handleDeleteVideo(video)} /> - = 1}> - {video.watchProgress >= 1 && ( - - - - - - - )} - @@ -408,39 +392,6 @@ const Duration = styled.div` will-change: transform; ` -const WatchedIndicator = styled.div<{ watched: boolean }>` - display: ${(props) => (props.watched ? 'flex' : 'none')}; - align-items: center; - justify-content: center; - width: 32px; - height: 32px; - background: rgba(255, 255, 255, 0.9); - backdrop-filter: blur(10px); - border-radius: 50%; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); - will-change: transform; - transform: translateZ(0); -` - -const CheckIcon = styled.div` - --check-scale: 0.8; - --check-opacity: 0.8; - - transform: scale(var(--check-scale)) translateZ(0); - opacity: var(--check-opacity); - transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); - - ${VideoCard}:hover & { - --check-scale: 1; - --check-opacity: 1; - } - - svg { - display: block; - will-change: transform; - } -` - const ProgressBarContainer = styled.div` position: absolute; bottom: 0; From 237dd301c995133e1781e76c2f56cf167b7a78c9 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 17:26:00 +0800 Subject: [PATCH 10/82] fix: remove path unique constraint to allow duplicate video file addition (#97) * refactor(db-migrate): Remove old db migrations dir * fix: remove path unique constraint to allow duplicate video file addition - Create database migration to remove UNIQUE constraint on files.path column - Simplify FileManager.addFile() to directly add files without duplicate checks - Update user feedback message to inform about duplicate file support - Add test case for duplicate file addition functionality - Update VideoAddButton test to use correct service method names This resolves the issue where adding the same video file twice would fail with a UNIQUE constraint violation. Users can now add the same video file multiple times as separate records in the database. --- ...908171153_remove_path_unique_constraint.js | 95 +++++++++++++ src/main/db/migrations/20250829175200_init.js | 130 ------------------ .../20250831062000_add_player_settings.js | 66 --------- src/renderer/src/services/FileManager.ts | 15 +- tests/VideoAddButton.test.ts | 91 +++++++++++- 5 files changed, 189 insertions(+), 208 deletions(-) create mode 100644 db/migrations/20250908171153_remove_path_unique_constraint.js delete mode 100644 src/main/db/migrations/20250829175200_init.js delete mode 100644 src/main/db/migrations/20250831062000_add_player_settings.js diff --git a/db/migrations/20250908171153_remove_path_unique_constraint.js b/db/migrations/20250908171153_remove_path_unique_constraint.js new file mode 100644 index 00000000..0661737a --- /dev/null +++ b/db/migrations/20250908171153_remove_path_unique_constraint.js @@ -0,0 +1,95 @@ +const { sql } = require('kysely') + +/** + * 删除 files 表中 path 字段的唯一约束 + * + * 由于 SQLite 不支持直接删除约束，我们需要： + * 1. 创建新表（无 path 唯一约束） + * 2. 迁移现有数据 + * 3. 删除旧表并重命名新表 + * 4. 重建必要的索引 + */ +async function up(db) { + // 1. 创建临时表，与原表结构相同但 path 字段无唯一约束 + await db.schema + .createTable('files_temp') + .addColumn('id', 'text', (col) => col.primaryKey().notNull()) + .addColumn('name', 'text', (col) => col.notNull()) + .addColumn('origin_name', 'text', (col) => col.notNull()) + .addColumn('path', 'text', (col) => col.notNull()) // 注意：这里去掉了 .unique() + .addColumn('size', 'integer', (col) => col.notNull()) + .addColumn('ext', 'text', (col) => col.notNull()) + .addColumn('type', 'text', (col) => col.notNull()) + .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) + .execute() + + // 2. 复制现有数据到临时表 + await db + .insertInto('files_temp') + .columns(['id', 'name', 'origin_name', 'path', 'size', 'ext', 'type', 'created_at']) + .expression( + db + .selectFrom('files') + .select(['id', 'name', 'origin_name', 'path', 'size', 'ext', 'type', 'created_at']) + ) + .execute() + + // 3. 删除原表 + await db.schema.dropTable('files').execute() + + // 4. 将临时表重命名为原表名 + await db.schema.alterTable('files_temp').renameTo('files').execute() + + // 5. 重建所有索引（除了 path 的唯一约束） + await db.schema.createIndex('idx_files_name').on('files').column('name').execute() + await db.schema.createIndex('idx_files_type').on('files').column('type').execute() + await db.schema.createIndex('idx_files_created_at').on('files').column('created_at').execute() + await db.schema.createIndex('idx_files_ext').on('files').column('ext').execute() + + // 添加 path 字段的普通索引（非唯一）以保持查询性能 + await db.schema.createIndex('idx_files_path').on('files').column('path').execute() +} + +/** + * 回滚：重新添加 path 字段的唯一约束 + * 注意：如果数据中已存在重复路径，回滚可能会失败 + */ +async function down(db) { + // 1. 创建临时表，恢复 path 字段的唯一约束 + await db.schema + .createTable('files_temp') + .addColumn('id', 'text', (col) => col.primaryKey().notNull()) + .addColumn('name', 'text', (col) => col.notNull()) + .addColumn('origin_name', 'text', (col) => col.notNull()) + .addColumn('path', 'text', (col) => col.notNull().unique()) // 恢复唯一约束 + .addColumn('size', 'integer', (col) => col.notNull()) + .addColumn('ext', 'text', (col) => col.notNull()) + .addColumn('type', 'text', (col) => col.notNull()) + .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) + .execute() + + // 2. 复制数据（如果有重复路径，这一步会失败） + await db + .insertInto('files_temp') + .columns(['id', 'name', 'origin_name', 'path', 'size', 'ext', 'type', 'created_at']) + .expression( + db + .selectFrom('files') + .select(['id', 'name', 'origin_name', 'path', 'size', 'ext', 'type', 'created_at']) + ) + .execute() + + // 3. 删除当前表 + await db.schema.dropTable('files').execute() + + // 4. 重命名临时表 + await db.schema.alterTable('files_temp').renameTo('files').execute() + + // 5. 重建索引（包括原有的所有索引） + await db.schema.createIndex('idx_files_name').on('files').column('name').execute() + await db.schema.createIndex('idx_files_type').on('files').column('type').execute() + await db.schema.createIndex('idx_files_created_at').on('files').column('created_at').execute() + await db.schema.createIndex('idx_files_ext').on('files').column('ext').execute() +} + +module.exports = { up, down } diff --git a/src/main/db/migrations/20250829175200_init.js b/src/main/db/migrations/20250829175200_init.js deleted file mode 100644 index f2026c2f..00000000 --- a/src/main/db/migrations/20250829175200_init.js +++ /dev/null @@ -1,130 +0,0 @@ -const { sql } = require('kysely') - -/** - * Apply the initial database schema migration. - * - * Creates the tables `files`, `videoLibrary`, and `subtitleLibrary` (if not exists) - * and their associated indices. Designed to be run as the migration "up" step. - */ -async function up(db) { - // 创建文件表 - await db.schema - .createTable('files') - .ifNotExists() - .addColumn('id', 'text', (col) => col.primaryKey().notNull()) - .addColumn('name', 'text', (col) => col.notNull()) - .addColumn('origin_name', 'text', (col) => col.notNull()) - .addColumn('path', 'text', (col) => col.notNull().unique()) - .addColumn('size', 'integer', (col) => col.notNull()) - .addColumn('ext', 'text', (col) => col.notNull()) - .addColumn('type', 'text', (col) => col.notNull()) - .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) - .execute() - - // 创建文件表索引 - await db.schema.createIndex('idx_files_name').ifNotExists().on('files').column('name').execute() - await db.schema.createIndex('idx_files_type').ifNotExists().on('files').column('type').execute() - await db.schema - .createIndex('idx_files_created_at') - .ifNotExists() - .on('files') - .column('created_at') - .execute() - await db.schema.createIndex('idx_files_ext').ifNotExists().on('files').column('ext').execute() - - // 创建视频库表 - await db.schema - .createTable('videoLibrary') - .ifNotExists() - .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement()) - .addColumn('fileId', 'text', (col) => col.notNull()) - .addColumn('currentTime', 'real', (col) => col.notNull().defaultTo(0)) - .addColumn('duration', 'real', (col) => col.notNull().defaultTo(0)) - .addColumn('playedAt', 'integer', (col) => col.notNull()) - .addColumn('firstPlayedAt', 'integer', (col) => col.notNull()) - .addColumn('playCount', 'integer', (col) => col.notNull().defaultTo(0)) - .addColumn('isFinished', 'integer', (col) => col.notNull().defaultTo(0)) - .addColumn('isFavorite', 'integer', (col) => col.notNull().defaultTo(0)) - .addColumn('thumbnailPath', 'text') - .execute() - - // 创建视频库表索引 - await db.schema - .createIndex('idx_videoLibrary_fileId_playedAt') - .ifNotExists() - .on('videoLibrary') - .columns(['fileId', 'playedAt']) - .execute() - await db.schema - .createIndex('idx_videoLibrary_playedAt') - .ifNotExists() - .on('videoLibrary') - .column('playedAt') - .execute() - await db.schema - .createIndex('idx_videoLibrary_playCount') - .ifNotExists() - .on('videoLibrary') - .column('playCount') - .execute() - await db.schema - .createIndex('idx_videoLibrary_isFavorite') - .ifNotExists() - .on('videoLibrary') - .column('isFavorite') - .execute() - - // 创建字幕库表 - await db.schema - .createTable('subtitleLibrary') - .ifNotExists() - .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement()) - .addColumn('videoId', 'integer', (col) => col.notNull()) - .addColumn('filePath', 'text', (col) => col.notNull()) - .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) - .execute() - - // 创建字幕库表索引 - await db.schema - .createIndex('idx_subtitleLibrary_videoId_filePath') - .ifNotExists() - .on('subtitleLibrary') - .columns(['videoId', 'filePath']) - .execute() - await db.schema - .createIndex('idx_subtitleLibrary_created_at') - .ifNotExists() - .on('subtitleLibrary') - .column('created_at') - .execute() -} - -/** - * Reverts the migration by removing created indices and tables. - * - * Drops the migration's indices (using `ifExists`) in a safe order, then drops - * the tables `subtitleLibrary`, `videoLibrary`, and `files` (also using `ifExists`). - * The operation is idempotent and intended to fully revert the schema changes made by `up`. - * - * @returns {Promise} Resolves when all drop statements have completed. - */ -async function down(db) { - // 删除所有索引 - await db.schema.dropIndex('idx_subtitleLibrary_created_at').ifExists().execute() - await db.schema.dropIndex('idx_subtitleLibrary_videoId_filePath').ifExists().execute() - await db.schema.dropIndex('idx_videoLibrary_isFavorite').ifExists().execute() - await db.schema.dropIndex('idx_videoLibrary_playCount').ifExists().execute() - await db.schema.dropIndex('idx_videoLibrary_playedAt').ifExists().execute() - await db.schema.dropIndex('idx_videoLibrary_fileId_playedAt').ifExists().execute() - await db.schema.dropIndex('idx_files_ext').ifExists().execute() - await db.schema.dropIndex('idx_files_created_at').ifExists().execute() - await db.schema.dropIndex('idx_files_type').ifExists().execute() - await db.schema.dropIndex('idx_files_name').ifExists().execute() - - // 删除所有表 - await db.schema.dropTable('subtitleLibrary').ifExists().execute() - await db.schema.dropTable('videoLibrary').ifExists().execute() - await db.schema.dropTable('files').ifExists().execute() -} - -module.exports = { up, down } diff --git a/src/main/db/migrations/20250831062000_add_player_settings.js b/src/main/db/migrations/20250831062000_add_player_settings.js deleted file mode 100644 index 70a33df5..00000000 --- a/src/main/db/migrations/20250831062000_add_player_settings.js +++ /dev/null @@ -1,66 +0,0 @@ -const { sql } = require('kysely') - -/** - * Migration: Add player settings table for per-video configuration - * - * Creates the `playerSettings` table to store individual player configurations - * for each video in the library, replacing the global player settings approach. - */ -async function up(db) { - // 创建播放器设置表 - await db.schema - .createTable('playerSettings') - .ifNotExists() - .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement()) - .addColumn('videoId', 'integer', (col) => - col.notNull().references('videoLibrary.id').onDelete('cascade') - ) - .addColumn('playbackRate', 'real', (col) => col.notNull().defaultTo(1.0)) - .addColumn('volume', 'real', (col) => col.notNull().defaultTo(1.0)) - .addColumn('muted', 'integer', (col) => col.notNull().defaultTo(0)) - .addColumn('loopSettings', 'text') // JSON: {enabled, count, mode, remainingCount} - .addColumn('autoPauseSettings', 'text') // JSON: {enabled, pauseOnSubtitleEnd, resumeEnabled, resumeDelay} - .addColumn('subtitleOverlaySettings', 'text') // JSON: subtitleOverlay完整配置 - .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) - .addColumn('updated_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) - .execute() - - // 创建索引 - await db.schema - .createIndex('idx_playerSettings_videoId') - .ifNotExists() - .on('playerSettings') - .column('videoId') - .execute() - - await db.schema - .createIndex('idx_playerSettings_updated_at') - .ifNotExists() - .on('playerSettings') - .column('updated_at') - .execute() - - // 创建唯一约束确保每个视频只有一个设置记录 - await db.schema - .createIndex('idx_playerSettings_videoId_unique') - .ifNotExists() - .on('playerSettings') - .column('videoId') - .unique() - .execute() -} - -/** - * Reverts the migration by removing the playerSettings table and its indices. - */ -async function down(db) { - // 删除索引 - await db.schema.dropIndex('idx_playerSettings_videoId_unique').ifExists().execute() - await db.schema.dropIndex('idx_playerSettings_updated_at').ifExists().execute() - await db.schema.dropIndex('idx_playerSettings_videoId').ifExists().execute() - - // 删除表（外键约束会自动删除） - await db.schema.dropTable('playerSettings').ifExists().execute() -} - -module.exports = { up, down } diff --git a/src/renderer/src/services/FileManager.ts b/src/renderer/src/services/FileManager.ts index c42bc8a4..207820c5 100644 --- a/src/renderer/src/services/FileManager.ts +++ b/src/renderer/src/services/FileManager.ts @@ -18,17 +18,12 @@ class FileManager { static async addFile(file: FileMetadata): Promise { logger.info('💾 开始添加文件到数据库', { fileName: file.name, filePath: file.path }) - // 先检查文件是否已存在（通过路径查找） - const queryStartTime = performance.now() - const existingFile = await db.files.getFileByPath(file.path) - const queryEndTime = performance.now() - logger.info(`🔍 文件查询耗时: ${(queryEndTime - queryStartTime).toFixed(2)}ms`) + const addedFile = await db.files.addFile({ ...file, created_at: file.created_at.getTime() }) + logger.info(`✅ 文件添加成功`, { + fileId: addedFile.id + }) - if (existingFile) { - const updatedFile = await db.files.updateFile(existingFile.id, file) - return updatedFile || existingFile - } - return await db.files.addFile({ ...file, created_at: file.created_at.getTime() }) + return addedFile } } diff --git a/tests/VideoAddButton.test.ts b/tests/VideoAddButton.test.ts index c09fc55c..4fa5a8b4 100644 --- a/tests/VideoAddButton.test.ts +++ b/tests/VideoAddButton.test.ts @@ -23,7 +23,7 @@ const mockFileManager = { // Mock VideoLibraryService const mockVideoLibraryService = { - addOrUpdateRecord: vi.fn() + addRecord: vi.fn() } // Mock antd message（当前测试未直接使用，保留以便未来扩展示例） @@ -90,7 +90,7 @@ describe('VideoAddButton 功能测试', () => { mockApi.ffmpeg.checkExists.mockResolvedValue(true) mockApi.ffmpeg.getVideoInfo.mockResolvedValue(mockVideoInfo) mockFileManager.addFile.mockResolvedValue(mockFile) - mockVideoLibraryService.addOrUpdateRecord.mockResolvedValue(mockVideoRecord) + mockVideoLibraryService.addRecord.mockResolvedValue(mockVideoRecord) // 这里应该测试实际的 VideoAddButton 组件 // 由于这是一个集成测试示例，我们主要验证流程逻辑 @@ -207,4 +207,91 @@ describe('VideoAddButton 功能测试', () => { // 在实际组件中，这里应该抛出错误并显示相应的错误消息 }) + + it('应该允许重复添加相同路径的视频文件 (单元测试)', async () => { + // 准备测试数据 - 同一个文件 + const mockFile = { + id: 'test-file-id', + name: 'duplicate-video.mp4', + path: '/path/to/duplicate-video.mp4', + size: 1024000, + ext: '.mp4', + type: 'video', + origin_name: 'duplicate-video.mp4', + created_at: new Date().toISOString() + } + + const mockVideoInfo = { + duration: 120, + videoCodec: 'h264', + audioCodec: 'aac', + resolution: '1920x1080', + bitrate: '2000kb/s' + } + + // 模拟两次添加相同文件的返回结果 + const mockVideoRecord1 = { + id: 1, + fileId: 'test-file-id-1', + currentTime: 0, + duration: 120, + playedAt: Date.now(), + firstPlayedAt: Date.now(), + playCount: 0, + isFinished: false, + isFavorite: false, + thumbnailPath: undefined + } + + const mockVideoRecord2 = { + id: 2, + fileId: 'test-file-id-2', + currentTime: 0, + duration: 120, + playedAt: Date.now(), + firstPlayedAt: Date.now(), + playCount: 0, + isFinished: false, + isFavorite: false, + thumbnailPath: undefined + } + + // 设置 mock 返回值 + mockApi.file.select.mockResolvedValue([mockFile]) + mockApi.ffmpeg.checkExists.mockResolvedValue(true) + mockApi.ffmpeg.getVideoInfo.mockResolvedValue(mockVideoInfo) + + // 第一次添加 + mockFileManager.addFile.mockResolvedValueOnce({ + ...mockFile, + id: 'test-file-id-1' + }) + mockVideoLibraryService.addRecord.mockResolvedValueOnce(mockVideoRecord1) + + // 第二次添加相同文件 + mockFileManager.addFile.mockResolvedValueOnce({ + ...mockFile, + id: 'test-file-id-2' + }) + mockVideoLibraryService.addRecord.mockResolvedValueOnce(mockVideoRecord2) + + // 第一次添加文件 + const files1 = await mockApi.file.select({ + properties: ['openFile'], + filters: [{ name: 'Video Files', extensions: ['mp4'] }] + }) + expect(files1).toHaveLength(1) + + // 第一次添加文件 + const addedFile1 = await mockFileManager.addFile(mockFile) + expect(addedFile1.id).toBe('test-file-id-1') + + // 第二次添加相同路径文件（应该成功，因为删除了唯一约束） + const addedFile2 = await mockFileManager.addFile(mockFile) + expect(addedFile2.id).toBe('test-file-id-2') + + // 验证两次都调用了 addFile，生成了不同的ID + expect(mockFileManager.addFile).toHaveBeenCalledTimes(2) + expect(addedFile1.id).not.toBe(addedFile2.id) + }) }) From 2f640299078bc354735c8c665c190c849dc52615 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 17:38:00 +0800 Subject: [PATCH 11/82] feat: replace FFmpeg with MediaInfo for video metadata extraction (#95) * feat: replace FFmpeg with MediaInfo for video metadata extraction - Add mediainfo.js WebAssembly support for lightweight video analysis - Create MediaInfoService with intelligent duration format detection - Update IPC channels and preload API for MediaInfo integration - Implement fallback strategy: MediaInfo (preferred) -> FFmpeg (backup) - Add comprehensive WASM file handling with vite-plugin-static-copy - Update test cases to cover MediaInfo priority and fallback scenarios - Improve duration parsing with smart milliseconds/seconds detection - Reduce dependency size from ~100MB+ (FFmpeg) to ~3MB (MediaInfo WASM) - Maintain full backward compatibility with existing FFmpegVideoInfo interface Performance improvements: - Faster video file processing with WebAssembly - No external process spawning overhead - Better error handling and detailed logging - Streaming file reading for memory efficiency This change addresses commercial licensing concerns with FFmpeg while providing superior performance and maintainability. * fix(build): resolve Windows build failure for MediaInfo WASM file - Simplify vite-plugin-static-copy path configuration for cross-platform compatibility - Add WASM files to electron-builder asarUnpack configuration - Enhance MediaInfoService WASM file path resolution with multiple fallback paths - Ensure MediaInfoModule.wasm is properly accessible at runtime on all platforms Fixes issue where Windows CI builds failed with "No file was found to copy" error for MediaInfoModule.wasm during vite-plugin-static-copy execution. --- electron-builder.yml | 3 +- electron.vite.config.ts | 10 + package.json | 2 + packages/shared/IpcChannel.ts | 5 + packages/shared/types/mediainfo.ts | 139 ++++++ pnpm-lock.yaml | 112 +++++ src/main/ipc.ts | 13 + src/main/services/MediaInfoService.ts | 450 ++++++++++++++++++ src/preload/index.ts | 11 +- src/renderer/src/hooks/useVideoFileSelect.ts | 42 +- .../src/infrastructure/types/index.ts | 1 + tests/VideoAddButton.test.ts | 121 ++++- 12 files changed, 865 insertions(+), 44 deletions(-) create mode 100644 packages/shared/types/mediainfo.ts create mode 100644 src/main/services/MediaInfoService.ts diff --git a/electron-builder.yml b/electron-builder.yml index 294dbf73..288e1c45 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -45,7 +45,8 @@ files: - '!**/{example,examples}/**' asarUnpack: - resources/** - - '**/*.{metal,exp,lib}' + - '**/*.{metal,exp,lib,wasm}' + - '**/assets/MediaInfoModule.wasm' copyright: Copyright © 2025 EchoPlayer win: executableName: EchoPlayer diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 15cc73b3..d611b16e 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -5,6 +5,7 @@ import react from '@vitejs/plugin-react-swc' import { CodeInspectorPlugin } from 'code-inspector-plugin' import { defineConfig, externalizeDepsPlugin } from 'electron-vite' import { resolve } from 'path' +import { viteStaticCopy } from 'vite-plugin-static-copy' const isDev = process.env.NODE_ENV === 'development' const isProd = process.env.NODE_ENV === 'production' @@ -13,6 +14,15 @@ export default defineConfig({ main: { plugins: [ externalizeDepsPlugin(), + // 复制 MediaInfo WASM 文件到构建输出 + viteStaticCopy({ + targets: [ + { + src: 'node_modules/mediainfo.js/dist/MediaInfoModule.wasm', + dest: 'assets' + } + ] + }), // 复制迁移文件到构建目录 { name: 'copy-migrations', diff --git a/package.json b/package.json index 227a26a3..8b0e849a 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,7 @@ "kysely": "^0.28.5", "macos-release": "^3.4.0", "marked": "^15.0.12", + "mediainfo.js": "^0.3.6", "react-hotkeys-hook": "^5.1.0", "react-player": "^2.16.1", "react-virtualized": "^9.22.6", @@ -158,6 +159,7 @@ "tsx": "^4.20.5", "typescript": "^5.9.2", "vite": "^6.3.5", + "vite-plugin-static-copy": "^3.1.2", "vitest": "^2.1.9", "winston-daily-rotate-file": "^5.0.0", "yaml": "^2.8.1", diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts index 592a94bb..6482a8ce 100644 --- a/packages/shared/IpcChannel.ts +++ b/packages/shared/IpcChannel.ts @@ -79,6 +79,11 @@ export enum IpcChannel { Ffmpeg_Transcode = 'ffmpeg:transcode', Ffmpeg_CancelTranscode = 'ffmpeg:cancel-transcode', + // MediaInfo 相关 IPC 通道 / MediaInfo related IPC channels + MediaInfo_CheckExists = 'mediainfo:check-exists', + MediaInfo_GetVersion = 'mediainfo:get-version', + MediaInfo_GetVideoInfo = 'mediainfo:get-video-info', + // 文件系统相关 IPC 通道 / File system related IPC channels Fs_CheckFileExists = 'fs:check-file-exists', Fs_ReadFile = 'fs:read-file', diff --git a/packages/shared/types/mediainfo.ts b/packages/shared/types/mediainfo.ts new file mode 100644 index 00000000..adb4874e --- /dev/null +++ b/packages/shared/types/mediainfo.ts @@ -0,0 +1,139 @@ +// MediaInfo 相关类型定义 + +/** + * MediaInfo 服务状态接口 + */ +export interface MediaInfoStatus { + isInitialized: boolean + version: string | null + lastError?: string +} + +/** + * MediaInfo 原始结果接口 + * 基于 mediainfo.js 返回的标准格式 + */ +export interface MediaInfoRawResult { + media: { + '@ref': string + track: MediaInfoTrack[] + } +} + +/** + * MediaInfo 轨道信息接口 + */ +export interface MediaInfoTrack { + '@type': 'General' | 'Video' | 'Audio' | 'Text' | 'Other' + [key: string]: any + + // 通用字段 + ID?: string + UniqueID?: string + + // General 轨道字段 + CompleteName?: string + FileName?: string + FileExtension?: string + Format?: string + Duration?: string + FileSize?: string + OverallBitRate?: string + + // Video 轨道字段 + Width?: string + Height?: string + DisplayAspectRatio?: string + FrameRate?: string + BitRate?: string + CodecID?: string + + // Audio 轨道字段 + Channels?: string + SamplingRate?: string + BitDepth?: string +} + +/** + * MediaInfo 扩展视频信息接口 + * 包含比 FFmpegVideoInfo 更详细的信息 + */ +export interface MediaInfoVideoDetails { + // 基本信息（兼容 FFmpegVideoInfo） + duration: number + videoCodec: string + audioCodec: string + resolution: string + bitrate: string + + // 扩展信息 + fileSize?: number + frameRate?: number + aspectRatio?: string + audioChannels?: number + audioSampleRate?: number + audioBitDepth?: number + + // 元数据 + title?: string + creationTime?: string + + // 技术细节 + pixelFormat?: string + colorSpace?: string + profile?: string + level?: string +} + +/** + * MediaInfo 分析选项接口 + */ +export interface MediaInfoOptions { + /** 是否包含扩展信息 */ + includeExtendedInfo?: boolean + + /** 超时时间（毫秒） */ + timeout?: number + + /** 是否缓存结果 */ + enableCache?: boolean + + /** 自定义解析器 */ + customParser?: (result: MediaInfoRawResult) => any +} + +/** + * MediaInfo 性能统计接口 + */ +export interface MediaInfoPerformanceStats { + initializationTime: number + pathConversionTime: number + fileCheckTime: number + fileReadTime: number + analysisTime: number + parseTime: number + totalTime: number + fileSize: number +} + +/** + * MediaInfo 错误类型 + */ +export enum MediaInfoErrorType { + INITIALIZATION_FAILED = 'INITIALIZATION_FAILED', + FILE_NOT_FOUND = 'FILE_NOT_FOUND', + FILE_READ_ERROR = 'FILE_READ_ERROR', + ANALYSIS_FAILED = 'ANALYSIS_FAILED', + PARSE_ERROR = 'PARSE_ERROR', + UNSUPPORTED_FORMAT = 'UNSUPPORTED_FORMAT', + WASM_LOAD_ERROR = 'WASM_LOAD_ERROR' +} + +/** + * MediaInfo 错误接口 + */ +export interface MediaInfoError extends Error { + type: MediaInfoErrorType + filePath?: string + details?: any +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1571a04a..755a1efd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: marked: specifier: ^15.0.12 version: 15.0.12 + mediainfo.js: + specifier: ^0.3.6 + version: 0.3.6 react-hotkeys-hook: specifier: ^5.1.0 version: 5.1.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -276,6 +279,9 @@ importers: vite: specifier: ^6.3.5 version: 6.3.5(@types/node@22.18.1)(jiti@2.5.1)(sass@1.92.1)(tsx@4.20.5)(yaml@2.8.1) + vite-plugin-static-copy: + specifier: ^3.1.2 + version: 3.1.2(vite@6.3.5(@types/node@22.18.1)(jiti@2.5.1)(sass@1.92.1)(tsx@4.20.5)(yaml@2.8.1)) vitest: specifier: ^2.1.9 version: 2.1.9(@types/node@22.18.1)(@vitest/ui@2.1.9)(jsdom@25.0.1)(msw@2.11.1(@types/node@22.18.1)(typescript@5.9.2))(sass@1.92.1) @@ -2049,6 +2055,10 @@ packages: any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} + anymatch@3.1.3: + resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} + engines: {node: '>= 8'} + app-builder-bin@5.0.0-alpha.12: resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==} @@ -2177,6 +2187,10 @@ packages: resolution: {integrity: sha512-eGbYq2CT+tos1fBwLQ/tkBt9J5M3JEHjku4hbvQUePCckkvVf14xWj+1m7dGoK81M/fOjFT7yM9UMeKT/+vFLQ==} engines: {node: 20.x || 22.x || 23.x || 24.x} + binary-extensions@2.3.0: + resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} + engines: {node: '>=8'} + bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -2327,6 +2341,10 @@ packages: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} + chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + chokidar@4.0.3: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} @@ -2403,6 +2421,10 @@ packages: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} + cliui@9.0.1: + resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==} + engines: {node: '>=20'} + clone-response@1.0.3: resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==} @@ -3779,6 +3801,10 @@ packages: resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==} engines: {node: '>= 0.4'} + is-binary-path@2.1.0: + resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} + engines: {node: '>=8'} + is-boolean-object@1.2.2: resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==} engines: {node: '>= 0.4'} @@ -4359,6 +4385,11 @@ packages: mdast-util-to-string@4.0.0: resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} + mediainfo.js@0.3.6: + resolution: {integrity: sha512-3xVRlxwlVWIZV3z1q7pb8LzFOO7iKi/DXoRiFRZdOlrUEhPyJDaaRt0uK32yQJabArQicRBeq7cRxmdZlIBTyA==} + engines: {node: '>=18.0.0'} + hasBin: true + memoize-one@5.2.1: resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==} @@ -4645,6 +4676,10 @@ packages: resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==} engines: {node: ^16.14.0 || >=18.0.0} + normalize-path@3.0.0: + resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} + engines: {node: '>=0.10.0'} + normalize-url@6.1.0: resolution: {integrity: sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==} engines: {node: '>=10'} @@ -5574,6 +5609,10 @@ packages: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} + readdirp@3.6.0: + resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} + engines: {node: '>=8.10.0'} + readdirp@4.1.2: resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} engines: {node: '>= 14.18.0'} @@ -6505,6 +6544,12 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true + vite-plugin-static-copy@3.1.2: + resolution: {integrity: sha512-aVmYOzptLVOI2b1jL+cmkF7O6uhRv1u5fvOkQgbohWZp2CbR22kn9ZqkCUIt9umKF7UhdbsEpshn1rf4720QFg==} + engines: {node: ^18.0.0 || >=20.0.0} + peerDependencies: + vite: ^5.0.0 || ^6.0.0 || ^7.0.0 + vite@5.4.19: resolution: {integrity: sha512-qO3aKv3HoQC8QKiNSTuUM1l9o/XX3+c+VTgLHbJWHZGeTPVAg2XwazI9UWzoxjIJCGCV2zU60uqMzjeLZuULqA==} engines: {node: ^18.0.0 || >=20.0.0} @@ -6780,6 +6825,10 @@ packages: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} + yargs-parser@22.0.0: + resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + yargs-parser@4.2.1: resolution: {integrity: sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==} @@ -6791,6 +6840,10 @@ packages: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} + yargs@18.0.0: + resolution: {integrity: sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + yargs@6.6.0: resolution: {integrity: sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==} @@ -8956,6 +9009,11 @@ snapshots: any-promise@1.3.0: {} + anymatch@3.1.3: + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + app-builder-bin@5.0.0-alpha.12: {} app-builder-lib@26.0.19(dmg-builder@26.0.19(electron-builder-squirrel-windows@26.0.19))(electron-builder-squirrel-windows@26.0.19(dmg-builder@26.0.19)): @@ -9129,6 +9187,8 @@ snapshots: bindings: 1.5.0 prebuild-install: 7.1.3 + binary-extensions@2.3.0: {} + bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -9323,6 +9383,18 @@ snapshots: check-error@2.1.1: {} + chokidar@3.6.0: + dependencies: + anymatch: 3.1.3 + braces: 3.0.3 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + chokidar@4.0.3: dependencies: readdirp: 4.1.2 @@ -9403,6 +9475,12 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 + cliui@9.0.1: + dependencies: + string-width: 7.2.0 + strip-ansi: 7.1.0 + wrap-ansi: 9.0.0 + clone-response@1.0.3: dependencies: mimic-response: 1.0.1 @@ -11074,6 +11152,10 @@ snapshots: dependencies: has-bigints: 1.1.0 + is-binary-path@2.1.0: + dependencies: + binary-extensions: 2.3.0 + is-boolean-object@1.2.2: dependencies: call-bound: 1.0.4 @@ -11750,6 +11832,10 @@ snapshots: dependencies: '@types/mdast': 4.0.4 + mediainfo.js@0.3.6: + dependencies: + yargs: 18.0.0 + memoize-one@5.2.1: {} meow@12.1.1: {} @@ -12080,6 +12166,8 @@ snapshots: semver: 7.7.2 validate-npm-package-license: 3.0.4 + normalize-path@3.0.0: {} + normalize-url@6.1.0: {} normalize-url@8.0.2: {} @@ -13011,6 +13099,10 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 + readdirp@3.6.0: + dependencies: + picomatch: 2.3.1 + readdirp@4.1.2: {} redent@3.0.0: @@ -14103,6 +14195,15 @@ snapshots: - supports-color - terser + vite-plugin-static-copy@3.1.2(vite@6.3.5(@types/node@22.18.1)(jiti@2.5.1)(sass@1.92.1)(tsx@4.20.5)(yaml@2.8.1)): + dependencies: + chokidar: 3.6.0 + fs-extra: 11.3.1 + p-map: 7.0.3 + picocolors: 1.1.1 + tinyglobby: 0.2.15 + vite: 6.3.5(@types/node@22.18.1)(jiti@2.5.1)(sass@1.92.1)(tsx@4.20.5)(yaml@2.8.1) + vite@5.4.19(@types/node@22.18.1)(sass@1.92.1): dependencies: esbuild: 0.25.8 @@ -14354,6 +14455,8 @@ snapshots: yargs-parser@21.1.1: {} + yargs-parser@22.0.0: {} + yargs-parser@4.2.1: dependencies: camelcase: 3.0.0 @@ -14378,6 +14481,15 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 + yargs@18.0.0: + dependencies: + cliui: 9.0.1 + escalade: 3.2.0 + get-caller-file: 2.0.5 + string-width: 7.2.0 + y18n: 5.0.8 + yargs-parser: 22.0.0 + yargs@6.6.0: dependencies: camelcase: 3.0.0 diff --git a/src/main/ipc.ts b/src/main/ipc.ts index c9e4753c..35572798 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -24,6 +24,7 @@ import DictionaryService from './services/DictionaryService' import FFmpegService from './services/FFmpegService' import FileStorage from './services/FileStorage' import { loggerService } from './services/LoggerService' +import MediaInfoService from './services/MediaInfoService' import NotificationService from './services/NotificationService' import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService' import { themeService } from './services/ThemeService' @@ -36,6 +37,7 @@ const logger = loggerService.withContext('IPC') const fileManager = new FileStorage() const dictionaryService = new DictionaryService() const ffmpegService = new FFmpegService() +const mediaInfoService = new MediaInfoService() /** * Register all IPC handlers used by the main process. @@ -442,6 +444,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { return ffmpegService.getFFmpegPath() }) + // MediaInfo + ipcMain.handle(IpcChannel.MediaInfo_CheckExists, async () => { + return await mediaInfoService.checkMediaInfoExists() + }) + ipcMain.handle(IpcChannel.MediaInfo_GetVersion, async () => { + return await mediaInfoService.getMediaInfoVersion() + }) + ipcMain.handle(IpcChannel.MediaInfo_GetVideoInfo, async (_, inputPath: string) => { + return await mediaInfoService.getVideoInfo(inputPath) + }) + // shortcuts ipcMain.handle(IpcChannel.Shortcuts_Update, (_, shortcuts: Shortcut[]) => { configManager.setShortcuts(shortcuts) diff --git a/src/main/services/MediaInfoService.ts b/src/main/services/MediaInfoService.ts new file mode 100644 index 00000000..c9fb0248 --- /dev/null +++ b/src/main/services/MediaInfoService.ts @@ -0,0 +1,450 @@ +import type { FFmpegVideoInfo } from '@types' +import * as fs from 'fs' +import type { MediaInfo, ReadChunkFunc } from 'mediainfo.js' +import * as path from 'path' + +import { loggerService } from './LoggerService' + +const logger = loggerService.withContext('MediaInfoService') + +class MediaInfoService { + private mediaInfo: MediaInfo<'object'> | null = null + private isInitialized = false + + constructor() { + // 构造函数可以用于初始化操作 + } + + /** + * 创建文件读取函数 + */ + private makeReadChunk(filePath: string): ReadChunkFunc { + return async (chunkSize: number, offset: number) => { + const fd = fs.openSync(filePath, 'r') + try { + const buffer = Buffer.alloc(chunkSize) + const bytesRead = fs.readSync(fd, buffer, 0, chunkSize, offset) + return new Uint8Array(buffer.buffer, buffer.byteOffset, bytesRead) + } finally { + fs.closeSync(fd) + } + } + } + + /** + * 初始化 MediaInfo WebAssembly + */ + private async initializeMediaInfo(): Promise { + if (this.isInitialized && this.mediaInfo) { + return + } + + try { + logger.info('🚀 开始初始化 MediaInfo WebAssembly') + const startTime = Date.now() + + // 使用动态导入来处理 ESM 模块 + const { default: mediaInfoFactory } = await import('mediainfo.js') + this.mediaInfo = await mediaInfoFactory({ + format: 'object', + locateFile: (wasmPath: string) => { + // 在 Electron 中寻找 WASM 文件路径 + if (wasmPath === 'MediaInfoModule.wasm') { + // 可能的路径列表，按优先级排序 + const possiblePaths = [ + // 开发环境路径 + path.join(__dirname, 'assets', wasmPath), + path.join(__dirname, '..', 'assets', wasmPath), + + // 生产环境路径（优先 asar.unpacked） + path.join( + process.resourcesPath || __dirname, + 'app.asar.unpacked/out/main/assets', + wasmPath + ), + path.join(process.resourcesPath || __dirname, 'app/out/main/assets', wasmPath), + + // 备用路径 + path.join(process.resourcesPath || __dirname, 'assets', wasmPath), + path.join(__dirname, '../../../assets', wasmPath), + path.join(process.cwd(), 'assets', wasmPath), + + // Windows特殊路径 + path.join(__dirname, 'assets', wasmPath).replace(/\\/g, '/') + ] + + // 逐一检查路径 + for (const testPath of possiblePaths) { + if (fs.existsSync(testPath)) { + logger.info('🔧 找到 WASM 文件路径', { + path: testPath, + platform: process.platform + }) + return testPath + } + } + + logger.warn('⚠️ 未找到 WASM 文件，尝试的路径:', { + paths: possiblePaths, + platform: process.platform, + __dirname, + resourcesPath: process.resourcesPath, + cwd: process.cwd() + }) + } + return wasmPath + } + }) + + const initTime = Date.now() - startTime + this.isInitialized = true + + logger.info(`✅ MediaInfo 初始化成功，耗时: ${initTime}ms`) + } catch (error) { + logger.error('❌ MediaInfo 初始化失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + throw error + } + } + + /** + * 将文件 URL 转换为本地路径 + */ + private convertFileUrlToLocalPath(inputPath: string): string { + // 如果是file://URL，需要转换为本地路径 + if (inputPath.startsWith('file://')) { + try { + const url = new URL(inputPath) + let localPath = decodeURIComponent(url.pathname) + + // Windows路径处理：移除开头的斜杠 + if (process.platform === 'win32' && localPath.startsWith('/')) { + localPath = localPath.substring(1) + } + + logger.info('🔄 URL路径转换', { + 原始路径: inputPath, + 转换后路径: localPath, + 平台: process.platform, + 文件是否存在: fs.existsSync(localPath) + }) + + return localPath + } catch (error) { + logger.error('URL路径转换失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + // 如果转换失败，返回原路径 + return inputPath + } + } + + // 如果不是file://URL，直接返回 + return inputPath + } + + /** + * 解析 MediaInfo 结果为 FFmpegVideoInfo 格式 + */ + private parseMediaInfoResult(result: any): FFmpegVideoInfo | null { + try { + logger.info('🔍 开始解析 MediaInfo 结果') + + if (!result || !result.media || !result.media.track) { + logger.error('❌ MediaInfo 结果格式无效') + return null + } + + const tracks = result.media.track as any[] + + // 查找通用轨道（包含文件信息） + const generalTrack = tracks.find((track) => track['@type'] === 'General') + + // 查找视频轨道 + const videoTrack = tracks.find((track) => track['@type'] === 'Video') + + // 查找音频轨道 + const audioTrack = tracks.find((track) => track['@type'] === 'Audio') + + if (!videoTrack) { + logger.error('❌ 未找到视频轨道') + return null + } + + // 解析时长（需要检查 MediaInfo 返回的实际格式） + let duration = 0 + + // 先记录原始数据以便调试 + logger.info('📊 MediaInfo 原始时长数据', { + generalTrack_Duration: generalTrack?.Duration, + videoTrack_Duration: videoTrack?.Duration, + generalTrack_DurationString: generalTrack?.['Duration/String'], + generalTrack_DurationString1: generalTrack?.['Duration/String1'], + generalTrack_DurationString2: generalTrack?.['Duration/String2'], + generalTrack_DurationString3: generalTrack?.['Duration/String3'] + }) + + if (generalTrack?.Duration) { + const rawDuration = String(generalTrack.Duration) + const durationValue = parseFloat(rawDuration) + + // MediaInfo 可能返回毫秒或秒，需要智能判断 + if (durationValue > 3600000) { + // 如果值大于1小时的毫秒数（3600000），很可能是毫秒 + duration = durationValue / 1000 + logger.info('🕐 检测到毫秒格式时长（大于1小时）', { + 原始值: durationValue, + 转换后秒数: duration + }) + } else if (durationValue > 60000) { + // 如果值大于1分钟的毫秒数（60000），很可能是毫秒 + duration = durationValue / 1000 + logger.info('🕐 检测到毫秒格式时长（大于1分钟）', { + 原始值: durationValue, + 转换后秒数: duration + }) + } else if (durationValue > 3600) { + // 如果值大于1小时的秒数（3600），很可能是秒 + duration = durationValue + logger.info('🕐 检测到秒格式时长', { + 原始值: durationValue, + 秒数: duration + }) + } else { + // 对于较小的值，假设是秒（因为很少有视频短于1分钟但用毫秒表示会小于60000） + duration = durationValue + logger.warn('🕐 时长值较小，假设为秒格式', { + 原始值: durationValue, + 假设秒数: duration + }) + } + } else if (videoTrack?.Duration) { + const rawDuration = String(videoTrack.Duration) + const durationValue = parseFloat(rawDuration) + + // 同样的逻辑应用于视频轨道时长 + if (durationValue > 3600000) { + duration = durationValue / 1000 + logger.info('🕐 从视频轨道检测到毫秒格式时长（大于1小时）', { + 原始值: durationValue, + 转换后秒数: duration + }) + } else if (durationValue > 60000) { + duration = durationValue / 1000 + logger.info('🕐 从视频轨道检测到毫秒格式时长（大于1分钟）', { + 原始值: durationValue, + 转换后秒数: duration + }) + } else if (durationValue > 3600) { + duration = durationValue + logger.info('🕐 从视频轨道检测到秒格式时长', { + 原始值: durationValue, + 秒数: duration + }) + } else { + duration = durationValue + logger.warn('🕐 从视频轨道获取时长值较小，假设为秒格式', { + 原始值: durationValue, + 假设秒数: duration + }) + } + } + + // 解析视频编解码器 + const videoCodec = videoTrack.Format || videoTrack.CodecID || 'unknown' + + // 解析音频编解码器 + const audioCodec = audioTrack?.Format || audioTrack?.CodecID || 'unknown' + + // 解析分辨率 + let resolution = '0x0' + if (videoTrack.Width && videoTrack.Height) { + resolution = `${videoTrack.Width}x${videoTrack.Height}` + } + + // 解析码率 + let bitrate = '0' + if (generalTrack?.OverallBitRate) { + bitrate = String(generalTrack.OverallBitRate) + } else if (videoTrack.BitRate) { + bitrate = String(videoTrack.BitRate) + } + + const videoInfo: FFmpegVideoInfo = { + duration, + videoCodec, + audioCodec, + resolution, + bitrate + } + + logger.info('🎬 解析的视频信息', { + duration: `${duration}s`, + videoCodec, + audioCodec, + resolution, + bitrate: `${bitrate} bps`, + 原始数据样本: { + generalTrack: generalTrack ? Object.keys(generalTrack).slice(0, 5) : 'none', + videoTrack: videoTrack ? Object.keys(videoTrack).slice(0, 8) : 'none', + audioTrack: audioTrack ? Object.keys(audioTrack).slice(0, 5) : 'none' + } + }) + + return videoInfo + } catch (error) { + logger.error('解析 MediaInfo 结果失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return null + } + } + + /** + * 获取视频文件信息 + */ + public async getVideoInfo(inputPath: string): Promise { + const startTime = Date.now() + logger.info('🎬 开始获取视频信息 (MediaInfo)', { inputPath }) + + try { + // 确保 MediaInfo 已初始化 + await this.initializeMediaInfo() + + if (!this.mediaInfo) { + throw new Error('MediaInfo 未初始化') + } + + // 转换文件路径 + const pathConvertStartTime = Date.now() + const localInputPath = this.convertFileUrlToLocalPath(inputPath) + const pathConvertEndTime = Date.now() + + logger.info(`🔄 路径转换耗时: ${pathConvertEndTime - pathConvertStartTime}ms`, { + 原始输入路径: inputPath, + 转换后本地路径: localInputPath + }) + + // 检查文件是否存在 + const fileCheckStartTime = Date.now() + const fileExists = fs.existsSync(localInputPath) + const fileCheckEndTime = Date.now() + + logger.info(`📁 文件存在性检查耗时: ${fileCheckEndTime - fileCheckStartTime}ms`, { + 文件存在性: fileExists + }) + + if (!fileExists) { + logger.error(`❌ 文件不存在: ${localInputPath}`) + return null + } + + // 获取文件大小 + const fileStatsStartTime = Date.now() + const fileStats = fs.statSync(localInputPath) + const fileSize = fileStats.size + const fileStatsEndTime = Date.now() + + logger.info(`📊 文件信息获取耗时: ${fileStatsEndTime - fileStatsStartTime}ms`, { + 文件大小: `${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB` + }) + + // 使用 MediaInfo 分析文件（参考例子的方式） + const analysisStartTime = Date.now() + const result = await this.mediaInfo.analyzeData(fileSize, this.makeReadChunk(localInputPath)) + const analysisEndTime = Date.now() + + logger.info(`🔍 MediaInfo 分析耗时: ${analysisEndTime - analysisStartTime}ms`) + + // 解析结果 + const parseStartTime = Date.now() + const videoInfo = this.parseMediaInfoResult(result) + const parseEndTime = Date.now() + + logger.info(`📊 结果解析耗时: ${parseEndTime - parseStartTime}ms`) + + if (videoInfo) { + const totalTime = Date.now() - startTime + logger.info(`✅ 成功获取视频信息 (MediaInfo)，总耗时: ${totalTime}ms`, { + ...videoInfo, + 性能统计: { + 路径转换: `${pathConvertEndTime - pathConvertStartTime}ms`, + 文件检查: `${fileCheckEndTime - fileCheckStartTime}ms`, + 文件信息获取: `${fileStatsEndTime - fileStatsStartTime}ms`, + MediaInfo分析: `${analysisEndTime - analysisStartTime}ms`, + 结果解析: `${parseEndTime - parseStartTime}ms`, + 总耗时: `${totalTime}ms` + } + }) + return videoInfo + } else { + logger.error('❌ 无法解析视频信息') + return null + } + } catch (error) { + const totalTime = Date.now() - startTime + logger.error(`❌ 获取视频信息失败，耗时: ${totalTime}ms`, { + inputPath, + error: error instanceof Error ? error.message : String(error), + 总耗时: `${totalTime}ms` + }) + return null + } + } + + /** + * 检查 MediaInfo 是否可用 + */ + public async checkMediaInfoExists(): Promise { + try { + await this.initializeMediaInfo() + return this.isInitialized && this.mediaInfo !== null + } catch (error) { + logger.error('MediaInfo 检查失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return false + } + } + + /** + * 获取 MediaInfo 版本信息 + */ + public async getMediaInfoVersion(): Promise { + try { + await this.initializeMediaInfo() + if (this.mediaInfo) { + // MediaInfo.js 没有稳定的运行时版本查询 API；如需展示版本请从 package.json 读取 + return 'mediainfo.js' + } + return null + } catch (error) { + logger.error('获取 MediaInfo 版本失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return null + } + } + + /** + * 清理资源 + */ + public async dispose(): Promise { + if (this.mediaInfo) { + try { + // 根据参考例子，调用 close 方法清理资源 + logger.info('🧹 清理 MediaInfo 资源') + this.mediaInfo.close() + this.mediaInfo = null + this.isInitialized = false + } catch (error) { + logger.error('清理 MediaInfo 资源失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + } + } + } +} + +export default MediaInfoService diff --git a/src/preload/index.ts b/src/preload/index.ts index c3cb10e4..82d6312c 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -190,11 +190,12 @@ const api = { cancelTranscode: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_CancelTranscode), getPath: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_GetPath) }, - // export: { - // toWord: (markdown: string, fileName: string) => - // ipcRenderer.invoke(IpcChannel.Export_Word, markdown, fileName) - // }, - // openPath: (path: string) => ipcRenderer.invoke(IpcChannel.Open_Path, path), + mediainfo: { + checkExists: (): Promise => ipcRenderer.invoke(IpcChannel.MediaInfo_CheckExists), + getVersion: (): Promise => ipcRenderer.invoke(IpcChannel.MediaInfo_GetVersion), + getVideoInfo: (inputPath: string): Promise => + ipcRenderer.invoke(IpcChannel.MediaInfo_GetVideoInfo, inputPath) + }, shortcuts: { update: (shortcuts: Shortcut[]) => ipcRenderer.invoke(IpcChannel.Shortcuts_Update, shortcuts) }, diff --git a/src/renderer/src/hooks/useVideoFileSelect.ts b/src/renderer/src/hooks/useVideoFileSelect.ts index 1fa0fb3e..fd6a2416 100644 --- a/src/renderer/src/hooks/useVideoFileSelect.ts +++ b/src/renderer/src/hooks/useVideoFileSelect.ts @@ -21,9 +21,10 @@ export interface UseVideoFileSelectReturn { /** * Hook to select a video file, validate/process it, and add it to the video library. * - * Opens a file picker restricted to configured video extensions, verifies FFmpeg availability, - * persists the file via FileManager, extracts video metadata (duration, codec, resolution) - * using FFmpeg, creates a VideoLibrary record, and invokes an optional success callback. + * Opens a file picker restricted to configured video extensions, verifies video parser availability + * (MediaInfo WebAssembly preferred, FFmpeg as fallback), persists the file via FileManager, + * extracts video metadata (duration, codec, resolution) using the available parser, + * creates a VideoLibrary record, and invokes an optional success callback. * Exposes a function to trigger the flow and a flag that indicates ongoing processing to * prevent concurrent operations. * @@ -50,27 +51,38 @@ export function useVideoFileSelect( }) try { - // 1. 检查 FFmpeg 是否可用 - monitor.startTiming('FFmpeg检查') - const ffmpegExists = await window.api.ffmpeg.checkExists() - monitor.endTiming('FFmpeg检查') - - if (!ffmpegExists) { - throw new Error('FFmpeg 不可用。请确保系统已安装 FFmpeg 并添加到 PATH 环境变量中。') + // 1. 检查 MediaInfo 是否可用（优先使用），回退到 FFmpeg + monitor.startTiming('视频解析器检查') + const mediaInfoExists = await window.api.mediainfo.checkExists() + const ffmpegExists = !mediaInfoExists ? await window.api.ffmpeg.checkExists() : false + monitor.endTiming('视频解析器检查') + + if (!mediaInfoExists && !ffmpegExists) { + throw new Error('视频解析器不可用。MediaInfo 和 FFmpeg 都无法使用，请检查系统配置。') } + const usingMediaInfo = mediaInfoExists + logger.info(`📊 使用视频解析器: ${usingMediaInfo ? 'MediaInfo' : 'FFmpeg'}`, { + mediaInfoAvailable: mediaInfoExists, + ffmpegAvailable: ffmpegExists + }) + // 2. 将文件添加到文件数据库 monitor.startTiming('文件数据库添加', { fileName: file.name, fileSize: file.size }) const addedFile = await FileManager.addFile(file) monitor.endTiming('文件数据库添加') // 3. 解析视频文件信息，包括：分辨率、码率、时长等 - // TODO: 当前使用系统 FFmpeg，后续需要实现： - // - FFmpeg 的自动下载和安装 - // - 更完整的视频信息解析（包括分辨率、帧率、编解码器等） - monitor.startTiming('视频信息获取', { filePath: file.path }) - const videoInfo = await window.api.ffmpeg.getVideoInfo(file.path) + // 优先使用 MediaInfo (WebAssembly)，回退到 FFmpeg + monitor.startTiming('视频信息获取', { + filePath: file.path, + parser: usingMediaInfo ? 'MediaInfo' : 'FFmpeg' + }) + const videoInfo = usingMediaInfo + ? await window.api.mediainfo.getVideoInfo(file.path) + : await window.api.ffmpeg.getVideoInfo(file.path) monitor.endTiming('视频信息获取', { + parser: usingMediaInfo ? 'MediaInfo' : 'FFmpeg', duration: videoInfo?.duration, videoCodec: videoInfo?.videoCodec, resolution: videoInfo?.resolution diff --git a/src/renderer/src/infrastructure/types/index.ts b/src/renderer/src/infrastructure/types/index.ts index 1fe6c045..7c322500 100644 --- a/src/renderer/src/infrastructure/types/index.ts +++ b/src/renderer/src/infrastructure/types/index.ts @@ -8,6 +8,7 @@ export * from './update' export * from './video' export * from './video-library' export * from './video-settings' +export * from '@shared/types/mediainfo' /** * 可序列化数据类型 / Serializable data types diff --git a/tests/VideoAddButton.test.ts b/tests/VideoAddButton.test.ts index 4fa5a8b4..16829967 100644 --- a/tests/VideoAddButton.test.ts +++ b/tests/VideoAddButton.test.ts @@ -13,6 +13,11 @@ const mockApi = { ffmpeg: { checkExists: vi.fn(), getVideoInfo: vi.fn() + }, + mediainfo: { + checkExists: vi.fn(), + getVideoInfo: vi.fn(), + getVersion: vi.fn() } } @@ -85,10 +90,11 @@ describe('VideoAddButton 功能测试', () => { thumbnailPath: undefined } - // 设置 mock 返回值 + // 设置 mock 返回值 - MediaInfo 优先 mockApi.file.select.mockResolvedValue([mockFile]) - mockApi.ffmpeg.checkExists.mockResolvedValue(true) - mockApi.ffmpeg.getVideoInfo.mockResolvedValue(mockVideoInfo) + mockApi.mediainfo.checkExists.mockResolvedValue(true) + mockApi.mediainfo.getVideoInfo.mockResolvedValue(mockVideoInfo) + mockApi.ffmpeg.checkExists.mockResolvedValue(false) // 不会被调用，因为 MediaInfo 可用 mockFileManager.addFile.mockResolvedValue(mockFile) mockVideoLibraryService.addRecord.mockResolvedValue(mockVideoRecord) @@ -109,12 +115,12 @@ describe('VideoAddButton 功能测试', () => { expect(files).toHaveLength(1) expect(files[0]).toEqual(mockFile) - // 2. 检查 FFmpeg - const ffmpegExists = await mockApi.ffmpeg.checkExists() - expect(ffmpegExists).toBe(true) + // 2. 检查 MediaInfo 优先级 + const mediaInfoExists = await mockApi.mediainfo.checkExists() + expect(mediaInfoExists).toBe(true) - // 3. 获取视频信息 - const videoInfo = await mockApi.ffmpeg.getVideoInfo(mockFile.path) + // 3. 获取视频信息（使用 MediaInfo） + const videoInfo = await mockApi.mediainfo.getVideoInfo(mockFile.path) expect(videoInfo).toEqual(mockVideoInfo) // 验证所有 mock 函数都被正确调用 @@ -127,11 +133,13 @@ describe('VideoAddButton 功能测试', () => { } ] }) - expect(mockApi.ffmpeg.checkExists).toHaveBeenCalled() - expect(mockApi.ffmpeg.getVideoInfo).toHaveBeenCalledWith(mockFile.path) + expect(mockApi.mediainfo.checkExists).toHaveBeenCalled() + expect(mockApi.mediainfo.getVideoInfo).toHaveBeenCalledWith(mockFile.path) + // FFmpeg 不应该被调用，因为 MediaInfo 可用 + expect(mockApi.ffmpeg.checkExists).not.toHaveBeenCalled() }) - it('应该处理 FFmpeg 不可用的情况', async () => { + it('应该在 MediaInfo 不可用时回退到 FFmpeg', async () => { const mockFile = { id: 'test-file-id', name: 'test-video.mp4', @@ -143,9 +151,19 @@ describe('VideoAddButton 功能测试', () => { created_at: new Date().toISOString() } - // 设置 FFmpeg 不可用 + // 设置 MediaInfo 不可用，回退到 FFmpeg mockApi.file.select.mockResolvedValue([mockFile]) - mockApi.ffmpeg.checkExists.mockResolvedValue(false) + mockApi.mediainfo.checkExists.mockResolvedValue(false) + mockApi.ffmpeg.checkExists.mockResolvedValue(true) + + const mockVideoInfo = { + duration: 120, + videoCodec: 'h264', + audioCodec: 'aac', + resolution: '1920x1080', + bitrate: '2000kb/s' + } + mockApi.ffmpeg.getVideoInfo.mockResolvedValue(mockVideoInfo) // 选择文件 const files = await mockApi.file.select({ @@ -160,11 +178,22 @@ describe('VideoAddButton 功能测试', () => { expect(files).toHaveLength(1) - // 检查 FFmpeg（应该返回 false） + // 检查 MediaInfo（应该返回 false） + const mediaInfoExists = await mockApi.mediainfo.checkExists() + expect(mediaInfoExists).toBe(false) + + // 检查 FFmpeg（应该返回 true） const ffmpegExists = await mockApi.ffmpeg.checkExists() - expect(ffmpegExists).toBe(false) + expect(ffmpegExists).toBe(true) - // 在实际组件中，这里应该抛出错误并显示相应的错误消息 + // 使用 FFmpeg 获取视频信息 + const videoInfo = await mockApi.ffmpeg.getVideoInfo(mockFile.path) + expect(videoInfo).toEqual(mockVideoInfo) + + // 验证调用顺序 + expect(mockApi.mediainfo.checkExists).toHaveBeenCalled() + expect(mockApi.ffmpeg.checkExists).toHaveBeenCalled() + expect(mockApi.ffmpeg.getVideoInfo).toHaveBeenCalledWith(mockFile.path) }) it('应该处理无效视频文件的情况', async () => { @@ -179,10 +208,10 @@ describe('VideoAddButton 功能测试', () => { created_at: new Date().toISOString() } - // 设置 mock 返回值 + // 设置 mock 返回值 - MediaInfo 可用但无法解析 mockApi.file.select.mockResolvedValue([mockFile]) - mockApi.ffmpeg.checkExists.mockResolvedValue(true) - mockApi.ffmpeg.getVideoInfo.mockResolvedValue(null) // 无法获取视频信息 + mockApi.mediainfo.checkExists.mockResolvedValue(true) + mockApi.mediainfo.getVideoInfo.mockResolvedValue(null) // 无法获取视频信息 // 选择文件 const files = await mockApi.file.select({ @@ -197,17 +226,63 @@ describe('VideoAddButton 功能测试', () => { expect(files).toHaveLength(1) - // 检查 FFmpeg - const ffmpegExists = await mockApi.ffmpeg.checkExists() - expect(ffmpegExists).toBe(true) + // 检查 MediaInfo + const mediaInfoExists = await mockApi.mediainfo.checkExists() + expect(mediaInfoExists).toBe(true) // 尝试获取视频信息（应该返回 null） - const videoInfo = await mockApi.ffmpeg.getVideoInfo(mockFile.path) + const videoInfo = await mockApi.mediainfo.getVideoInfo(mockFile.path) expect(videoInfo).toBeNull() // 在实际组件中，这里应该抛出错误并显示相应的错误消息 }) + it('应该处理所有视频解析器都不可用的情况', async () => { + const mockFile = { + id: 'test-file-id', + name: 'test-video.mp4', + path: '/path/to/test-video.mp4', + size: 1024000, + ext: '.mp4', + type: 'video', + origin_name: 'test-video.mp4', + created_at: new Date().toISOString() + } + + // 设置两个解析器都不可用 + mockApi.file.select.mockResolvedValue([mockFile]) + mockApi.mediainfo.checkExists.mockResolvedValue(false) + mockApi.ffmpeg.checkExists.mockResolvedValue(false) + + // 选择文件 + const files = await mockApi.file.select({ + properties: ['openFile'], + filters: [ + { + name: 'Video Files', + extensions: ['mp4', 'avi', 'mkv', 'mov', 'wmv', 'flv', 'webm'] + } + ] + }) + + expect(files).toHaveLength(1) + + // 检查 MediaInfo（应该返回 false） + const mediaInfoExists = await mockApi.mediainfo.checkExists() + expect(mediaInfoExists).toBe(false) + + // 检查 FFmpeg（应该返回 false） + const ffmpegExists = await mockApi.ffmpeg.checkExists() + expect(ffmpegExists).toBe(false) + + // 验证调用顺序 + expect(mockApi.mediainfo.checkExists).toHaveBeenCalled() + expect(mockApi.ffmpeg.checkExists).toHaveBeenCalled() + + // 在实际组件中，这里应该抛出错误并显示相应的错误消息： + // "视频解析器不可用。MediaInfo 和 FFmpeg 都无法使用，请检查系统配置。" + }) + it('应该允许重复添加相同路径的视频文件 (单元测试)', async () => { // 准备测试数据 - 同一个文件 const mockFile = { From 8bdae3b1e17668a225200eb40c74946726de20d0 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 8 Sep 2025 09:49:26 +0000 Subject: [PATCH 12/82] chore(release): 1.0.0-alpha.3 # [1.0.0-alpha.3](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2025-09-08) ### Bug Fixes * **release:** remove custom labels from GitHub release assets ([#92](https://github.com/mkdir700/EchoPlayer/issues/92)) ([f066209](https://github.com/mkdir700/EchoPlayer/commit/f066209bdab482481a4564827490580b753b3c8e)) * remove path unique constraint to allow duplicate video file addition ([#97](https://github.com/mkdir700/EchoPlayer/issues/97)) ([237dd30](https://github.com/mkdir700/EchoPlayer/commit/237dd301c995133e1781e76c2f56cf167b7a78c9)) ### Features * **ci:** add alpha and beta branch support to test workflow ([#94](https://github.com/mkdir700/EchoPlayer/issues/94)) ([a47466b](https://github.com/mkdir700/EchoPlayer/commit/a47466b8e236af17785db098a761fa6dd30c67b5)) * replace FFmpeg with MediaInfo for video metadata extraction ([#95](https://github.com/mkdir700/EchoPlayer/issues/95)) ([2f64029](https://github.com/mkdir700/EchoPlayer/commit/2f640299078bc354735c8c665c190c849dc52615)) --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03f98f0f..ce0e9f37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [1.0.0-alpha.3](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2025-09-08) + +### Bug Fixes + +- **release:** remove custom labels from GitHub release assets ([#92](https://github.com/mkdir700/EchoPlayer/issues/92)) ([f066209](https://github.com/mkdir700/EchoPlayer/commit/f066209bdab482481a4564827490580b753b3c8e)) +- remove path unique constraint to allow duplicate video file addition ([#97](https://github.com/mkdir700/EchoPlayer/issues/97)) ([237dd30](https://github.com/mkdir700/EchoPlayer/commit/237dd301c995133e1781e76c2f56cf167b7a78c9)) + +### Features + +- **ci:** add alpha and beta branch support to test workflow ([#94](https://github.com/mkdir700/EchoPlayer/issues/94)) ([a47466b](https://github.com/mkdir700/EchoPlayer/commit/a47466b8e236af17785db098a761fa6dd30c67b5)) +- replace FFmpeg with MediaInfo for video metadata extraction ([#95](https://github.com/mkdir700/EchoPlayer/issues/95)) ([2f64029](https://github.com/mkdir700/EchoPlayer/commit/2f640299078bc354735c8c665c190c849dc52615)) + # [1.0.0-alpha.2](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2025-09-08) ### Bug Fixes diff --git a/package.json b/package.json index 8b0e849a..4788d475 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.2", + "version": "1.0.0-alpha.3", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From e30213babd3f0cc391864df8e2b95774e6d41051 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 18:51:42 +0800 Subject: [PATCH 13/82] fix(updater): resolve auto-update channel handling and version-based test defaults (#98) - Fix AppUpdater to respect specified channel instead of forcing LATEST channel - Add dynamic test channel defaults based on application version (alpha/beta detection) - Update ConfigManager with version-aware default configuration logic - Enhance i18n translations for auto-update and test plan settings across languages Changes: - AppUpdater.ts: Remove hardcoded LATEST channel override, use specified channel - ConfigManager.ts: Add getVersionBasedDefaults() for dynamic test configuration - package.json: Version rollback for testing purposes - i18n locales: Updated translations for auto-update and beta testing program This fix ensures proper channel handling for alpha/beta releases and provides appropriate default test settings based on the application version identifier --- src/main/services/AppUpdater.ts | 7 +- src/main/services/ConfigManager.ts | 30 ++++++- src/renderer/src/i18n/locales/en-us.json | 110 +++++++++++------------ src/renderer/src/i18n/locales/ja-jp.json | 58 ++++++------ src/renderer/src/i18n/locales/ru-ru.json | 11 +++ src/renderer/src/i18n/locales/zh-cn.json | 6 +- src/renderer/src/i18n/locales/zh-tw.json | 11 +++ 7 files changed, 139 insertions(+), 94 deletions(-) diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index 8085eaad..611ae76a 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -173,11 +173,8 @@ export default class AppUpdater { const preReleaseUrl = `https://github.com/mkdir700/EchoPlayer/releases/download/${release.tag_name}` if (preReleaseUrl) { this.autoUpdater.setFeedURL(preReleaseUrl) - // Keep channel as 'latest' because GitHub releases only have latest-mac.yml, not alpha-mac.yml - this.autoUpdater.channel = UpgradeChannel.LATEST - logger.info( - `Using pre-release URL: ${preReleaseUrl} with channel: ${UpgradeChannel.LATEST}` - ) + this.autoUpdater.channel = channel + logger.info(`Using pre-release URL: ${preReleaseUrl} with channel: ${channel}`) return } diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts index a23082a6..8798e76c 100644 --- a/src/main/services/ConfigManager.ts +++ b/src/main/services/ConfigManager.ts @@ -5,6 +5,29 @@ import { ThemeMode } from '@types' import { app } from 'electron' import { Conf } from 'electron-conf/main' +// 根据应用版本动态设置测试相关的默认值 +function getVersionBasedDefaults() { + const version = app.getVersion() + + // 检查版本是否包含 alpha, beta 等标识 + if (version.includes('alpha')) { + return { + testChannel: UpgradeChannel.ALPHA, + testPlan: true + } + } else if (version.includes('beta')) { + return { + testChannel: UpgradeChannel.BETA, + testPlan: true + } + } else { + return { + testChannel: UpgradeChannel.LATEST, + testPlan: false + } + } +} + export enum ConfigKeys { Language = 'language', Theme = 'theme', @@ -19,6 +42,9 @@ export enum ConfigKeys { DisableHardwareAcceleration = 'disableHardwareAcceleration' } +// 获取基于版本的动态默认值 +const versionBasedDefaults = getVersionBasedDefaults() + const defaultValues: Record = { [ConfigKeys.Language]: defaultLanguage, [ConfigKeys.Theme]: ThemeMode.system, @@ -27,8 +53,8 @@ const defaultValues: Record = { [ConfigKeys.TrayOnClose]: true, [ConfigKeys.Shortcuts]: [], [ConfigKeys.AutoUpdate]: true, - [ConfigKeys.TestChannel]: UpgradeChannel.BETA, - [ConfigKeys.TestPlan]: false, + [ConfigKeys.TestChannel]: versionBasedDefaults.testChannel, + [ConfigKeys.TestPlan]: versionBasedDefaults.testPlan, [ConfigKeys.SpellCheckLanguages]: [] as string[], [ConfigKeys.DisableHardwareAcceleration]: false } diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 7f32fd9a..55717394 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -10,38 +10,38 @@ }, "settings": { "about": { - "title": "About", - "description": "EchoPlayer is a video player designed for language learners", - "updateError": "Update check failed", - "updateAvailable": "Update {{version}} available", - "downloading": "Downloading...", "checkUpdate": { "available": "Install Update", "label": "Check for Updates" }, - "releases": { - "title": "Release Notes", - "button": "View Releases" + "contact": { + "button": "Send Email", + "title": "Contact Support" }, - "website": { - "title": "Official Website", - "button": "Visit Website" + "debug": { + "open": "Open DevTools", + "title": "Developer Tools" }, + "description": "EchoPlayer is a video player designed for language learners", + "downloading": "Downloading...", "feedback": { - "title": "Bug Report", - "button": "Report Issue" + "button": "Report Issue", + "title": "Bug Report" }, "license": { - "title": "License", - "button": "View License" + "button": "View License", + "title": "License" }, - "contact": { - "title": "Contact Support", - "button": "Send Email" + "releases": { + "button": "View Releases", + "title": "Release Notes" }, - "debug": { - "title": "Developer Tools", - "open": "Open DevTools" + "title": "About", + "updateAvailable": "Update {{version}} available", + "updateError": "Update check failed", + "website": { + "button": "Visit Website", + "title": "Official Website" } }, "appearance": { @@ -52,26 +52,52 @@ "title": "Developer mode" }, "general": { - "title": "General settings", "auto_check_update": { - "title": "Auto-check for updates" + "title": "Automatic Updates" }, "test_plan": { + "alpha_version": "Alpha Version", + "alpha_version_tooltip": "Alpha - Unstable test version with frequent updates", + "beta_version": "Beta Version", + "beta_version_tooltip": "Beta - More stable test version, equivalent to RC", "title": "Beta Testing Program", "tooltip": "Join the beta testing program to receive early access to new features", "version_channel_not_match": "Warning: Your current version channel doesn't match the selected test channel", - "version_options": "Beta Channel", - "alpha_version_tooltip": "Alpha - Unstable test version with frequent updates", - "alpha_version": "Alpha Version", - "beta_version_tooltip": "Beta - More stable test version, equivalent to RC", - "beta_version": "Beta Version" - } + "version_options": "Beta Channel" + }, + "title": "General settings" }, "launch": { "onboot": "Auto-start on boot", "title": "start", "totray": "Minimize to tray on startup" }, + "playback": { + "defaultPlaybackSpeed": "Playback Speed", + "defaultVolume": "Default Volume", + "subtitle": { + "backgroundType": { + "blur": "Blur", + "solid": "Solid", + "transparent": "Transparent" + }, + "defaultBackgroundType": "Default Background", + "defaultDisplayMode": "Default Display Mode", + "displayMode": { + "bilingual": "Bilingual", + "none": "Hidden", + "original": "Original", + "translation": "Translation" + }, + "overlay": { + "resizeHandle": { + "tooltip": "Drag to resize, double-click to expand horizontally" + } + }, + "title": "Subtitle Settings" + }, + "title": "Playback Settings" + }, "shortcuts": { "action": "operation", "actions": "operation", @@ -127,32 +153,6 @@ "onclose": "Minimize to tray when closed", "show": "Show tray icon", "title": "tray" - }, - "playback": { - "defaultPlaybackSpeed": "Playback Speed", - "defaultVolume": "Default Volume", - "subtitle": { - "backgroundType": { - "blur": "Blur", - "solid": "Solid", - "transparent": "Transparent" - }, - "defaultBackgroundType": "Default Background", - "defaultDisplayMode": "Default Display Mode", - "displayMode": { - "bilingual": "Bilingual", - "none": "Hidden", - "original": "Original", - "translation": "Translation" - }, - "overlay": { - "resizeHandle": { - "tooltip": "Drag to resize, double-click to expand horizontally" - } - }, - "title": "Subtitle Settings" - }, - "title": "Playback Settings" } }, "title": "Settings", diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json index 65128d71..0649b53f 100644 --- a/src/renderer/src/i18n/locales/ja-jp.json +++ b/src/renderer/src/i18n/locales/ja-jp.json @@ -7,38 +7,38 @@ }, "settings": { "about": { - "title": "について", - "description": "EchoPlayerは語学学習者向けの動画プレーヤーです", - "updateError": "アップデート確認に失敗しました", - "updateAvailable": "アップデート {{version}} が利用可能です", - "downloading": "ダウンロード中...", "checkUpdate": { "available": "アップデートをインストール", "label": "アップデートを確認" }, - "releases": { - "title": "リリースノート", - "button": "リリースを表示" + "contact": { + "button": "メールを送信", + "title": "サポートへ連絡" }, - "website": { - "title": "公式ウェブサイト", - "button": "ウェブサイトを訪問" + "debug": { + "open": "DevToolsを開く", + "title": "開発者ツール" }, + "description": "EchoPlayerは語学学習者向けの動画プレーヤーです", + "downloading": "ダウンロード中...", "feedback": { - "title": "バグ報告", - "button": "問題を報告" + "button": "問題を報告", + "title": "バグ報告" }, "license": { - "title": "ライセンス", - "button": "ライセンスを表示" + "button": "ライセンスを表示", + "title": "ライセンス" }, - "contact": { - "title": "サポートへ連絡", - "button": "メールを送信" + "releases": { + "button": "リリースを表示", + "title": "リリースノート" }, - "debug": { - "title": "開発者ツール", - "open": "DevToolsを開く" + "title": "について", + "updateAvailable": "アップデート {{version}} が利用可能です", + "updateError": "アップデート確認に失敗しました", + "website": { + "button": "ウェブサイトを訪問", + "title": "公式ウェブサイト" } }, "appearance": { @@ -49,20 +49,20 @@ "title": "開発者モード" }, "general": { - "title": "一般的な設定", "auto_check_update": { - "title": "自動アップデート確認" + "title": "自動更新" }, "test_plan": { + "alpha_version": "Alphaバージョン", + "alpha_version_tooltip": "Alphaバージョン - 不安定なテスト版、更新頻度が高い", + "beta_version": "Betaバージョン", + "beta_version_tooltip": "Betaバージョン - Alphaより安定したテスト版", "title": "ベータテストプログラム", "tooltip": "新機能に早期アクセスするためのベータテストプログラムに参加", "version_channel_not_match": "警告：現在のバージョンチャンネルが選択されたテストチャンネルと一致しません", - "version_options": "ベータチャンネル", - "alpha_version_tooltip": "Alphaバージョン - 不安定なテスト版、更新頻度が高い", - "alpha_version": "Alphaバージョン", - "beta_version_tooltip": "Betaバージョン - Alphaより安定したテスト版", - "beta_version": "Betaバージョン" - } + "version_options": "ベータチャンネル" + }, + "title": "一般的な設定" }, "launch": { "onboot": "开机自启动", diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json index 5f6b8527..64be142a 100644 --- a/src/renderer/src/i18n/locales/ru-ru.json +++ b/src/renderer/src/i18n/locales/ru-ru.json @@ -3,6 +3,9 @@ "language": "язык" }, "settings": { + "about": { + "updateError": "Проверка обновления не удалась" + }, "appearance": { "title": "Настройки внешнего вида" }, @@ -11,6 +14,14 @@ "title": "Режим разработчика" }, "general": { + "auto_check_update": { + "title": "Автоматическое обновление" + }, + "test_plan": { + "title": "План тестирования", + "tooltip": "Присоединяйтесь к программе тестирования, чтобы первыми опробовать новые функции.", + "version_options": "Бета-канал" + }, "title": "Общие настройки" }, "launch": { diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 075a20bd..52baa036 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -112,15 +112,15 @@ }, "general": { "auto_check_update": { - "title": "自动检查更新" + "title": "自动更新" }, "test_plan": { "alpha_version": "Alpha 版", "alpha_version_tooltip": "Alpha 版 - 不稳定的测试版本，更新较快", "beta_version": "Beta 版", "beta_version_tooltip": "Beta 版 - 比 Alpha 更稳定的测试版本", - "title": "测试版程序", - "tooltip": "加入测试版程序以提前体验新功能", + "title": "测试计划", + "tooltip": "加入测试计划以提前体验新功能", "version_channel_not_match": "警告：您当前的版本通道与所选的测试通道不匹配", "version_options": "测试版通道" }, diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json index 948bab4b..843d3ba2 100644 --- a/src/renderer/src/i18n/locales/zh-tw.json +++ b/src/renderer/src/i18n/locales/zh-tw.json @@ -3,6 +3,9 @@ "language": "語言" }, "settings": { + "about": { + "updateError": "更新檢查失敗" + }, "appearance": { "title": "外观设置" }, @@ -11,6 +14,14 @@ "title": "開發者模式" }, "general": { + "auto_check_update": { + "title": "自動更新" + }, + "test_plan": { + "title": "測試計劃", + "tooltip": "加入測試計劃以提前體驗新功能", + "version_options": "測試版頻道" + }, "title": "通用設置" }, "launch": { From 526e71a7a40268e88a0ba6c9f7dab9565d929a21 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 8 Sep 2025 21:21:19 +0800 Subject: [PATCH 14/82] feat(player): implement hover menu system for control panel components (#99) - Add useHoverMenu hook with configurable delays and event handling - Integrate hover menu functionality across all control components (CaptionsButton, LoopControl, PauseControl, PlaybackRateControl, VolumeControl) - Update CaptionsButton with internationalized UI text and improved accessibility - Enhance FullscreenButton with proper i18n key paths - Refactor control components to use ControlContainer for consistent layout - Add comprehensive hover interaction patterns with 200ms open delay and 100ms close delay - Maintain backward compatibility with existing click-to-toggle behavior - Improve user experience with seamless hover-to-reveal menu functionality Changes: - Add useHoverMenu.ts: Generic hover menu hook with timeout management - Update all control components to integrate hover menu behavior - Reorganize i18n structure for better player control translations - Enhance control styles for consistent hover menu presentation This implementation provides a more intuitive user experience where users can hover over control buttons to quickly access settings without requiring clicks, while preserving the existing click behavior for primary actions. --- src/renderer/src/i18n/locales/zh-cn.json | 78 +++++-- .../controls/CaptionsButton.tsx | 158 +++++++------ .../controls/FullscreenButton.tsx | 4 +- .../ControllerPanel/controls/LoopControl.tsx | 215 +++++++++--------- .../ControllerPanel/controls/PauseControl.tsx | 196 ++++++++-------- .../controls/PlaybackRateControl.tsx | 29 ++- .../controls/VolumeControl.tsx | 27 ++- .../ControllerPanel/styles/controls.ts | 4 + .../src/pages/player/hooks/useHoverMenu.ts | 134 +++++++++++ 9 files changed, 549 insertions(+), 296 deletions(-) create mode 100644 src/renderer/src/pages/player/hooks/useHoverMenu.ts diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 52baa036..bdd2f29a 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -14,23 +14,9 @@ "return": "返回", "search": "搜索", "search_no_results": "暂无搜索结果", - "search_placeholder": "搜索视频..." - }, - "controls": { - "auto_pause": { - "disabled": "字幕未加载", - "enabled": "自动暂停", - "resume_delay": "恢复延迟（秒）", - "resume_title": "自动恢复播放" - }, - "fullscreen": { - "enter": "全屏", - "exit": "退出全屏" - }, - "loop": { - "disabled": "字幕未加载", - "enabled": "循环" - } + "search_placeholder": "搜索视频...", + "enabled": "已开启", + "disabled": "已关闭" }, "docs": { "title": "帮助文档" @@ -48,6 +34,64 @@ } }, "player": { + "controls": { + "auto_pause": { + "subtitle_end": "在单个字幕结束时暂停", + "disabled": "字幕未加载", + "enabled": "自动暂停", + "resume_delay": "恢复延迟（秒）", + "resume_title": "自动恢复播放" + }, + "subtitle": { + "display-mode": { + "title": "显示模式", + "hide": { + "label": "隐藏", + "tooltip": "隐藏字幕 (Ctrl+1)" + }, + "original": { + "label": "原文", + "tooltip": "仅显示原文字幕 (Ctrl+2)" + }, + "translation": { + "label": "译文", + "tooltip": "仅显示译文字幕 (Ctrl+3)" + }, + "bilingual": { + "label": "双语", + "tooltip": "显示双语字幕 (Ctrl+4)" + } + }, + "background-type": { + "title": "背景样式", + "transparent": { + "tooltip": "透明背景" + }, + "blur": { + "tooltip": "模糊背景" + }, + "solid-black": { + "tooltip": "黑色背景" + }, + "solid-gray": { + "tooltip": "灰色背景" + } + } + }, + "loop": { + "count": "循环次数", + "mode": { + "single": "单句循环" + }, + "title": "循环模式", + "disabled": "字幕未加载", + "enabled": "循环" + }, + "fullscreen": { + "enter": "全屏", + "exit": "退出全屏" + } + }, "subtitles": { "hide": "隐藏字幕列表", "show": "展开字幕列表" diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/CaptionsButton.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/CaptionsButton.tsx index bea23e30..1e4f5826 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/CaptionsButton.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/CaptionsButton.tsx @@ -1,17 +1,20 @@ import { loggerService } from '@logger' import { useSubtitleOverlay } from '@renderer/pages/player/hooks' import { useControlMenuManager } from '@renderer/pages/player/hooks/useControlMenuManager' +import { useHoverMenu } from '@renderer/pages/player/hooks/useHoverMenu' import { usePlayerStore } from '@renderer/state' import { SubtitleBackgroundType, SubtitleDisplayMode } from '@types' import { Captions } from 'lucide-react' import { useMemo } from 'react' +import { useTranslation } from 'react-i18next' import styled, { css } from 'styled-components' -import { ControlToggleButton } from '../styles/controls' +import { ControlContainer, ControlToggleButton } from '../styles/controls' const logger = loggerService.withContext('CaptionsButton') export default function CaptionsButton() { + const { t } = useTranslation() const integration = useSubtitleOverlay() // 获取当前字幕配置 @@ -29,37 +32,48 @@ export default function CaptionsButton() { // 使用全局菜单管理器 const { isMenuOpen: isCaptionsMenuOpen, - toggleMenu, + closeMenu: closeCaptionsMenu, + openMenu, containerRef } = useControlMenuManager({ menuId: 'captions' }) + // 使用hover菜单Hook + const { buttonProps, menuProps } = useHoverMenu({ + openDelay: 200, + closeDelay: 100, + disabled: false, + isMenuOpen: isCaptionsMenuOpen, + openMenu, + closeMenu: closeCaptionsMenu + }) + // 显示模式选项 const displayModes = useMemo( () => [ { mode: SubtitleDisplayMode.NONE, - label: '隐藏', - tooltip: '隐藏字幕 (Ctrl+1)' + label: t('player.controls.subtitle.display-mode.hide.label'), + tooltip: t('player.controls.subtitle.display-mode.hide.tooltip') }, { mode: SubtitleDisplayMode.ORIGINAL, - label: '原文', - tooltip: '仅显示原文 (Ctrl+2)' + label: t('player.controls.subtitle.display-mode.original.label'), + tooltip: t('player.controls.subtitle.display-mode.original.tooltip') }, { mode: SubtitleDisplayMode.TRANSLATED, - label: '译文', - tooltip: '仅显示译文 (Ctrl+3)' + label: t('player.controls.subtitle.display-mode.translation.label'), + tooltip: t('player.controls.subtitle.display-mode.translation.tooltip') }, { mode: SubtitleDisplayMode.BILINGUAL, - label: '双语', - tooltip: '显示双语字幕 (Ctrl+4)' + label: t('player.controls.subtitle.display-mode.bilingual.label'), + tooltip: t('player.controls.subtitle.display-mode.bilingual.tooltip') } ], - [] + [t] ) // 背景类型选项 @@ -67,22 +81,22 @@ export default function CaptionsButton() { () => [ { type: SubtitleBackgroundType.TRANSPARENT, - tooltip: '透明背景' + tooltip: t('player.controls.subtitle.background-type.transparent.tooltip') }, { type: SubtitleBackgroundType.BLUR, - tooltip: '模糊背景' + tooltip: t('player.controls.subtitle.background-type.blur.tooltip') }, { type: SubtitleBackgroundType.SOLID_BLACK, - tooltip: '黑色背景' + tooltip: t('player.controls.subtitle.background-type.solid-black.tooltip') }, { type: SubtitleBackgroundType.SOLID_GRAY, - tooltip: '灰色背景' + tooltip: t('player.controls.subtitle.background-type.solid-gray.tooltip') } ], - [] + [t] ) // 事件处理器 @@ -96,66 +110,74 @@ export default function CaptionsButton() { logger.info('字幕背景类型已切换', { type }) } + // 切换字幕显示/隐藏（左键点击功能） + const toggleCaptions = () => { + if (displayMode === SubtitleDisplayMode.NONE) { + // 如果当前隐藏，默认显示双语 + setDisplayMode(SubtitleDisplayMode.BILINGUAL) + logger.info('字幕已启用', { mode: SubtitleDisplayMode.BILINGUAL }) + } else { + // 如果当前显示，则隐藏 + setDisplayMode(SubtitleDisplayMode.NONE) + logger.info('字幕已隐藏') + } + } + return ( -
+ { - e.preventDefault() - toggleMenu() - }} + aria-label="Toggle captions / Hover for settings" + onClick={() => buttonProps.onClick(toggleCaptions)} + onMouseEnter={buttonProps.onMouseEnter} + onMouseLeave={buttonProps.onMouseLeave} aria-pressed={displayMode !== SubtitleDisplayMode.NONE} > - - {isCaptionsMenuOpen && ( - e.stopPropagation()} - onContextMenu={(e) => { - e.preventDefault() - e.stopPropagation() - }} - > - - 显示模式 - - {displayModes.map(({ mode, label, tooltip }) => ( - handleModeChange(mode)} - title={tooltip} - > - {label} - - ))} - - - - - 背景样式 - - {backgroundTypes.map(({ type, tooltip }) => ( - handleBackgroundChange(type)} - title={tooltip} - > - - - ))} - - - - )} -
+ + {isCaptionsMenuOpen && ( + e.stopPropagation()} + onMouseEnter={menuProps.onMouseEnter} + onMouseLeave={menuProps.onMouseLeave} + > + + {t('player.controls.subtitle.display-mode.title')} + + {displayModes.map(({ mode, label, tooltip }) => ( + handleModeChange(mode)} + title={tooltip} + > + {label} + + ))} + + + + + {t('player.controls.subtitle.background-type.title')} + + {backgroundTypes.map(({ type, tooltip }) => ( + handleBackgroundChange(type)} + title={tooltip} + > + + + ))} + + + + )} + ) } diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx index f4b64496..2b3aaef3 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx @@ -15,7 +15,9 @@ export default function FullscreenButton() { diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/LoopControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/LoopControl.tsx index 35d0baba..c15beb61 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/LoopControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/LoopControl.tsx @@ -1,14 +1,14 @@ import { useControlMenuManager } from '@renderer/pages/player/hooks/useControlMenuManager' +import { useHoverMenu } from '@renderer/pages/player/hooks/useHoverMenu' import { useSubtitles } from '@renderer/pages/player/state/player-context' import { usePlayerStore } from '@renderer/state/stores/player.store' import { LoopMode } from '@types' -import { Tooltip } from 'antd' import { Repeat } from 'lucide-react' import { useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { ControlToggleButton } from '../styles/controls' +import { ControlContainer, ControlToggleButton } from '../styles/controls' export default function LoopControl() { const { t } = useTranslation() @@ -30,7 +30,7 @@ export default function LoopControl() { const { isMenuOpen: isLoopMenuOpen, closeMenu: closeLoopMenu, - toggleMenu, + openMenu, containerRef } = useControlMenuManager({ menuId: 'loop', @@ -46,115 +46,122 @@ export default function LoopControl() { } }) + // 使用hover菜单Hook + const { buttonProps, menuProps, closeMenu } = useHoverMenu({ + openDelay: 200, + closeDelay: 100, + disabled: isDisabled, + isMenuOpen: isLoopMenuOpen, + openMenu, + closeMenu: closeLoopMenu, + onMenuOpen: () => { + setPendingLoopCount(loopCount) + }, + onMenuClose: () => { + // 应用挂起的循环次数 + if (pendingLoopCount !== null && pendingLoopCount !== loopCount) { + setLoopCount(pendingLoopCount) + } + setPendingLoopCount(null) + } + }) + const closeLoopMenuAndApply = () => { - closeLoopMenu() + closeMenu() } const activeCount = isLoopMenuOpen && pendingLoopCount !== null ? pendingLoopCount : loopCount return ( -
- + buttonProps.onClick(() => setLoopEnabled(!loopEnabled))} + onMouseEnter={buttonProps.onMouseEnter} + onMouseLeave={buttonProps.onMouseLeave} + aria-pressed={loopEnabled && !isDisabled} + aria-disabled={isDisabled} > - { - if (isDisabled || isLoopMenuOpen) return // 禁用或菜单打开时，忽略点击 - setLoopEnabled(!loopEnabled) - }} - onContextMenu={(e) => { - e.preventDefault() - if (isDisabled) return // 禁用时不显示菜单 - toggleMenu() - }} - aria-pressed={loopEnabled && !isDisabled} - aria-disabled={isDisabled} + + {loopEnabled && !isDisabled && (loopRemaining === -1 || loopRemaining > 0) && ( + + )} + + + {isLoopMenuOpen && !isDisabled && ( + e.stopPropagation()} > - - {loopEnabled && !isDisabled && (loopRemaining === -1 || loopRemaining > 0) && ( - - )} - {isLoopMenuOpen && !isDisabled && ( - e.stopPropagation()} - onContextMenu={(e) => { - // 防止在菜单内部右键触发外层开关逻辑 - e.preventDefault() - e.stopPropagation() - }} - > - - 循环模式 - - { - setLoopMode(LoopMode.SINGLE) - }} - > - 单句循环 - - {/* 预留：AB 循环（暂不实现） */} - AB 循环（开发中） - - - - - 循环次数 - - { - setPendingLoopCount(-1) - }} - $active={activeCount === -1} - > - ∞ - - {[2, 5, 10].map((n) => ( - { - setPendingLoopCount(n) - }} - $active={activeCount === n} - > - {n} - - ))} - { - if (e.key === 'Enter') { - const v = Number((e.target as HTMLInputElement).value) - if (Number.isFinite(v)) { - const n = Math.max(1, Math.min(99, Math.floor(v))) - setPendingLoopCount(n) - } - closeLoopMenuAndApply() - } - }} - /> - - - - )} - - -
+ + {t('player.controls.loop.title')} + + { + setLoopMode(LoopMode.SINGLE) + }} + > + {t('player.controls.loop.mode.single')} + + {/* 预留：AB 循环（暂不实现） */} + {/* AB 循环（开发中） */} + + + + + {t('player.controls.loop.count')} + + { + setPendingLoopCount(-1) + }} + $active={activeCount === -1} + > + ∞ + + {[2, 5, 10].map((n) => ( + { + setPendingLoopCount(n) + }} + $active={activeCount === n} + > + {n} + + ))} + { + if (e.key === 'Enter') { + const v = Number((e.target as HTMLInputElement).value) + if (Number.isFinite(v)) { + const n = Math.max(1, Math.min(99, Math.floor(v))) + setPendingLoopCount(n) + } + closeLoopMenuAndApply() + } + }} + /> + + + + )} + ) } diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/PauseControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/PauseControl.tsx index 96effba5..e5676097 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/PauseControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/PauseControl.tsx @@ -1,14 +1,14 @@ import { useControlMenuManager } from '@renderer/pages/player/hooks/useControlMenuManager' +import { useHoverMenu } from '@renderer/pages/player/hooks/useHoverMenu' import { useSubtitles } from '@renderer/pages/player/state/player-context' import { usePlayerStore } from '@renderer/state/stores/player.store' import { InputNumber, Switch } from 'antd' -import { Tooltip } from 'antd' import { PauseCircle } from 'lucide-react' import { useState } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' -import { ControlToggleButton } from '../styles/controls' +import { ControlContainer, ControlToggleButton } from '../styles/controls' export default function AutoPauseButton() { const { t } = useTranslation() @@ -30,7 +30,12 @@ export default function AutoPauseButton() { const [pendingDelay, setPendingDelay] = useState(resumeDelay) // 使用全局菜单管理器 - const { isMenuOpen, closeMenu, toggleMenu, containerRef } = useControlMenuManager({ + const { + isMenuOpen, + closeMenu: closeMenuManager, + openMenu, + containerRef + } = useControlMenuManager({ menuId: 'pause', onOpen: () => { setPendingPauseOnSubtitleEnd(pauseOnSubtitleEnd) @@ -47,104 +52,107 @@ export default function AutoPauseButton() { } }) + // 使用hover菜单Hook + const { buttonProps, menuProps, closeMenu } = useHoverMenu({ + openDelay: 200, + closeDelay: 100, + disabled: isDisabled, + isMenuOpen: isMenuOpen, + openMenu, + closeMenu: closeMenuManager, + onMenuOpen: () => { + setPendingPauseOnSubtitleEnd(pauseOnSubtitleEnd) + setPendingResumeEnabled(resumeEnabled) + setPendingDelay(resumeDelay) + }, + onMenuClose: () => { + // 统一提交 + if (pendingPauseOnSubtitleEnd !== pauseOnSubtitleEnd) + setPauseOnSubtitleEnd(pendingPauseOnSubtitleEnd) + if (pendingResumeEnabled !== resumeEnabled) setResumeEnabled(pendingResumeEnabled) + if (Number.isFinite(pendingDelay) && pendingDelay !== resumeDelay) + setResumeDelay(pendingDelay) + } + }) + const closeMenuAndApply = () => { closeMenu() } return ( -
- + buttonProps.onClick(() => setAutoPauseEnabled(!autoPauseEnabled))} + onMouseEnter={buttonProps.onMouseEnter} + onMouseLeave={buttonProps.onMouseLeave} + aria-pressed={autoPauseEnabled && !isDisabled} + aria-disabled={isDisabled} > - { - if (isDisabled || isMenuOpen) return // 禁用或菜单打开时，忽略点击 - setAutoPauseEnabled(!autoPauseEnabled) - }} - onContextMenu={(e) => { - e.preventDefault() - if (isDisabled) return // 禁用时不显示菜单 - toggleMenu() - }} - aria-pressed={autoPauseEnabled && !isDisabled} - aria-disabled={isDisabled} + + + + {isMenuOpen && !isDisabled && ( + e.stopPropagation()} > - - - {isMenuOpen && !isDisabled && ( - e.stopPropagation()} - onContextMenu={(e) => { - e.preventDefault() - e.stopPropagation() - }} - > - - 字幕结束暂停 - - setPendingPauseOnSubtitleEnd(checked)} - /> - - {pendingPauseOnSubtitleEnd ? '已开启' : '已关闭'} - - - - - - {t('controls.auto_pause.resume_title')} - - setPendingResumeEnabled(checked)} - /> - - {pendingResumeEnabled ? '已开启' : '已关闭'} - - - - - - {t('controls.auto_pause.resume_delay')} - - setPendingDelay(typeof v === 'number' ? v * 1000 : 0)} - onPressEnter={closeMenuAndApply} - style={{ width: 100 }} - /> - setPendingDelay(5000)} $active={pendingDelay === 5000}> - 5 - - setPendingDelay(10000)} - $active={pendingDelay === 10000} - > - 10 - - - - - )} - - -
+ + {t('player.controls.auto_pause.subtitle_end')} + + setPendingPauseOnSubtitleEnd(checked)} + /> + + {pendingPauseOnSubtitleEnd ? '已开启' : '已关闭'} + + + + + + {t('player.controls.auto_pause.resume_title')} + + setPendingResumeEnabled(checked)} + /> + + {pendingResumeEnabled ? t('common.enabled') : t('common.disabled')} + + + + + + {t('player.controls.auto_pause.resume_delay')} + + setPendingDelay(typeof v === 'number' ? v * 1000 : 0)} + onPressEnter={closeMenuAndApply} + style={{ width: 100 }} + /> + setPendingDelay(5000)} $active={pendingDelay === 5000}> + 5 + + setPendingDelay(10000)} $active={pendingDelay === 10000}> + 10 + + + + + )} + ) } diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx index d527cf42..dccc1f6b 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx @@ -3,8 +3,9 @@ import { Check, Zap } from 'lucide-react' import styled from 'styled-components' import { useControlMenuManager } from '../../../hooks/useControlMenuManager' +import { useHoverMenu } from '../../../hooks/useHoverMenu' import { usePlayerCommands } from '../../../hooks/usePlayerCommands' -import { GlassPopup } from '../styles/controls' +import { ControlContainer, GlassPopup } from '../styles/controls' const RATE_OPTIONS = [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2] @@ -17,24 +18,38 @@ export default function PlaybackRateControl() { isMenuOpen: isRateOpen, toggleMenu, closeMenu, + openMenu, containerRef } = useControlMenuManager({ menuId: 'playback-rate' }) + // 使用hover菜单逻辑 + const { buttonProps, menuProps } = useHoverMenu({ + isMenuOpen: isRateOpen, + openMenu, + closeMenu, + openDelay: 200, + closeDelay: 100 + }) + const setSpeed = (rate: number) => { const clampedRate = Math.max(0.25, Math.min(3, rate)) setPlaybackRate(clampedRate) } return ( - - + + buttonProps.onClick(toggleMenu)} + aria-label="Playback rate" + > {playbackRate.toFixed(2).replace(/\.00$/, '')}x {isRateOpen && ( - + {RATE_OPTIONS.map((opt) => { const active = Math.abs(opt - playbackRate) < 1e-6 @@ -55,14 +70,10 @@ export default function PlaybackRateControl() { )} - + ) } -const PlaybackRateControlWrap = styled.div` - position: relative; -` - const RateButton = styled.button` display: flex; align-items: center; diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx index 250a2bdf..959fa3fb 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx @@ -5,6 +5,7 @@ import { useCallback } from 'react' import styled from 'styled-components' import { useControlMenuManager } from '../../../hooks/useControlMenuManager' +import { useHoverMenu } from '../../../hooks/useHoverMenu' import { usePlayerCommands } from '../../../hooks/usePlayerCommands' import { GlassPopup } from '../styles/controls' @@ -16,12 +17,23 @@ export default function VolumeControl() { // 使用全局菜单管理器 const { isMenuOpen: isVolumeOpen, - toggleMenu, + closeMenu: closeVolumeMenu, + openMenu, containerRef } = useControlMenuManager({ menuId: 'volume' }) + // 使用hover菜单Hook + const { buttonProps, menuProps } = useHoverMenu({ + openDelay: 200, + closeDelay: 100, + disabled: false, + isMenuOpen: isVolumeOpen, + openMenu, + closeMenu: closeVolumeMenu + }) + const setVolumeLevel = useCallback( (level: number) => { const normalizedLevel = level / 100 // antd Slider 使用 0-100，我们的状态使用 0-1 @@ -45,7 +57,12 @@ export default function VolumeControl() { return ( - + buttonProps.onClick(toggleMute)} + onMouseEnter={buttonProps.onMouseEnter} + onMouseLeave={buttonProps.onMouseLeave} + aria-label="Toggle mute / Hover for volume slider" + > {muted ? ( ) : volume > 0.5 ? ( @@ -55,7 +72,11 @@ export default function VolumeControl() { )} {isVolumeOpen && ( - + void + /** 菜单关闭时的回调 */ + onMenuClose?: () => void + /** 打开菜单的函数 */ + openMenu: () => void + /** 关闭菜单的函数 */ + closeMenu: () => void +} + +export interface UseHoverMenuReturn { + /** 按钮的鼠标事件处理器 */ + buttonProps: { + onMouseEnter: () => void + onMouseLeave: () => void + onClick: (originalOnClick?: () => void) => void + } + /** 菜单的鼠标事件处理器 */ + menuProps: { + onMouseEnter: () => void + onMouseLeave: () => void + } + /** 手动关闭菜单 */ + closeMenu: () => void +} + +/** + * 通用的hover菜单Hook + * 提供按钮hover显示菜单、鼠标离开延迟关闭菜单的完整逻辑 + */ +export function useHoverMenu({ + openDelay = 200, + closeDelay = 100, + disabled = false, + isMenuOpen, + onMenuOpen, + onMenuClose, + openMenu, + closeMenu +}: UseHoverMenuOptions): UseHoverMenuReturn { + const hoverTimeoutRef = useRef(null) + const leaveTimeoutRef = useRef(null) + + const handleButtonMouseEnter = () => { + if (disabled) return + + // 清除离开定时器（如果存在） + if (leaveTimeoutRef.current) { + clearTimeout(leaveTimeoutRef.current) + leaveTimeoutRef.current = null + } + + // 清除之前的悬停定时器 + if (hoverTimeoutRef.current) { + clearTimeout(hoverTimeoutRef.current) + } + + // 延迟显示菜单 + hoverTimeoutRef.current = setTimeout(() => { + openMenu() + onMenuOpen?.() + }, openDelay) + } + + const handleButtonMouseLeave = () => { + // 清除悬停定时器 + if (hoverTimeoutRef.current) { + clearTimeout(hoverTimeoutRef.current) + hoverTimeoutRef.current = null + } + + // 如果菜单已经打开，延迟关闭 + if (isMenuOpen) { + leaveTimeoutRef.current = setTimeout(() => { + closeMenu() + onMenuClose?.() + }, closeDelay) + } + } + + const handleButtonClick = (originalOnClick?: () => void) => { + if (disabled) return + + // 如果菜单打开，先关闭菜单 + if (isMenuOpen) { + closeMenu() + onMenuClose?.() + } + + // 执行原始点击处理 + originalOnClick?.() + } + + const handleMenuMouseEnter = () => { + // 鼠标进入菜单时清除关闭定时器 + if (leaveTimeoutRef.current) { + clearTimeout(leaveTimeoutRef.current) + leaveTimeoutRef.current = null + } + } + + const handleMenuMouseLeave = () => { + // 鼠标离开菜单时立即关闭 + closeMenu() + onMenuClose?.() + } + + return { + buttonProps: { + onMouseEnter: handleButtonMouseEnter, + onMouseLeave: handleButtonMouseLeave, + onClick: handleButtonClick + }, + menuProps: { + onMouseEnter: handleMenuMouseEnter, + onMouseLeave: handleMenuMouseLeave + }, + closeMenu: () => { + closeMenu() + onMenuClose?.() + } + } +} From bd7d1160e8aba1f8900bcb3f82bd7595489d8604 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 8 Sep 2025 13:50:59 +0000 Subject: [PATCH 15/82] chore(release): 1.0.0-alpha.4 # [1.0.0-alpha.4](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2025-09-08) ### Bug Fixes * **updater:** resolve auto-update channel handling and version-based test defaults ([#98](https://github.com/mkdir700/EchoPlayer/issues/98)) ([e30213b](https://github.com/mkdir700/EchoPlayer/commit/e30213babd3f0cc391864df8e2b95774e6d41051)) ### Features * **player:** implement hover menu system for control panel components ([#99](https://github.com/mkdir700/EchoPlayer/issues/99)) ([526e71a](https://github.com/mkdir700/EchoPlayer/commit/526e71a7a40268e88a0ba6c9f7dab9565d929a21)) --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce0e9f37..5cc14d11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [1.0.0-alpha.4](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2025-09-08) + +### Bug Fixes + +- **updater:** resolve auto-update channel handling and version-based test defaults ([#98](https://github.com/mkdir700/EchoPlayer/issues/98)) ([e30213b](https://github.com/mkdir700/EchoPlayer/commit/e30213babd3f0cc391864df8e2b95774e6d41051)) + +### Features + +- **player:** implement hover menu system for control panel components ([#99](https://github.com/mkdir700/EchoPlayer/issues/99)) ([526e71a](https://github.com/mkdir700/EchoPlayer/commit/526e71a7a40268e88a0ba6c9f7dab9565d929a21)) + # [1.0.0-alpha.3](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.2...v1.0.0-alpha.3) (2025-09-08) ### Bug Fixes diff --git a/package.json b/package.json index 4788d475..5630aaa2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.3", + "version": "1.0.0-alpha.4", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From df830955971080e5db393590a082e86718da10cd Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Tue, 9 Sep 2025 12:00:05 +0800 Subject: [PATCH 16/82] feat(player): implement favorite playback rates with hover menu system (#100) * feat(player): implement favorite playback rates with hover menu system - Add favorite rates database schema and migration with JSON storage - Implement favorite rates selection in PlaybackSettings with multi-select - Add PlaybackRateControl hover menu with favorite rate toggling (Ctrl+click) - Integrate keyboard shortcuts (Shift+[ / Shift+]) for rate cycling - Add comprehensive i18n support for selectedItems and favorite rates - Extend player store with favorite rate management and persistence - Update settings store with defaultFavoriteRates configuration Database changes: - Add favoriteRates column to playerSettings table (JSON array string) - Add migration with proper rollback for SQLite compatibility - Update schemas with JsonStringSchema validation UI improvements: - Visual indicators for favorite rates (warning color theme) - Context menu and keyboard shortcuts for rate management - Multi-select dropdown for settings configuration - Hover menu system integration with existing controls State management: - Add favorite rate cycling logic with index tracking - Persist favorite rates per video with global defaults fallback - Integrate with existing player commands and shortcuts system This implementation provides a complete favorite playback rates feature allowing users to customize frequently used rates both globally and per-video, with intuitive UI controls and keyboard shortcuts for efficient rate switching * refactor(player): improve type safety and code maintainability - Add explicit number type conversion for favoriteRates array elements in player store - Refactor shortcut key mapping to use dynamic generation from key array - Update PLAYBACK_RATE_PRESETS to explicit number[] type annotation - Simplify PlayerSettingsSaver to use full state instead of manual slicing Changes: - player.store.ts: Wrap favoriteRates array access with Number() conversion to ensure type safety - label.ts: Replace static shortcutKeyMap object with dynamic generation using reduce() - playback.const.ts: Add explicit number[] type annotation for better type inference - PlayerSettingsSaver.ts: Remove manual property selection in favor of full state casting This refactoring improves type safety, reduces code duplication, and enhances maintainability while preserving existing functionality. The dynamic key mapping approach eliminates manual repetition and ensures consistency across i18n keys. --- ...0250908220526_add_favorite_rates_fields.js | 115 ++++++++++++++ packages/shared/schema.ts | 2 + src/main/db/schemas/player-settings.ts | 27 +--- src/main/db/schemas/transforms.ts | 23 +++ src/renderer/src/i18n/label.ts | 96 ++++++----- src/renderer/src/i18n/locales/en-us.json | 8 +- src/renderer/src/i18n/locales/zh-cn.json | 9 +- .../constants/playback.const.ts | 2 +- .../constants/shortcuts.const.ts | 14 ++ .../src/infrastructure/hooks/useSettings.ts | 4 +- .../src/infrastructure/hooks/useShortcut.ts | 2 +- .../controls/PlaybackRateControl.tsx | 149 ++++++++++++++++-- .../ControllerPanel/styles/controls.ts | 2 +- .../pages/player/hooks/usePlayerShortcuts.ts | 13 +- .../src/pages/settings/PlaybackSettings.tsx | 22 ++- .../src/services/PlayerSettingsLoader.ts | 76 ++++++++- .../src/services/PlayerSettingsSaver.ts | 16 +- src/renderer/src/state/stores/player.store.ts | 114 ++++++++++++++ .../src/state/stores/settings.store.ts | 16 +- 19 files changed, 600 insertions(+), 110 deletions(-) create mode 100644 db/migrations/20250908220526_add_favorite_rates_fields.js diff --git a/db/migrations/20250908220526_add_favorite_rates_fields.js b/db/migrations/20250908220526_add_favorite_rates_fields.js new file mode 100644 index 00000000..9a1beb72 --- /dev/null +++ b/db/migrations/20250908220526_add_favorite_rates_fields.js @@ -0,0 +1,115 @@ +const { sql } = require('kysely') + +/** + * Migration: Add favorite rates field to player settings + * + * Adds the following field to the playerSettings table: + * - favoriteRates: JSON string containing array of favorite playback rates + * + * Note: currentFavoriteIndex is a runtime state and doesn't need to be persisted + * + * This field supports the favorite playback rates feature that allows users to: + * 1. Configure default favorite rates in global settings + * 2. Customize favorite rates per video (persisted) + * 3. Cycle through favorite rates with mouse clicks and keyboard shortcuts (runtime) + */ +async function up(db) { + // Add favoriteRates column (JSON string) + await db.schema + .alterTable('playerSettings') + .addColumn('favoriteRates', 'text', (col) => + col.notNull().defaultTo(JSON.stringify([0.75, 1.0, 1.25, 1.5])) + ) + .execute() + + console.log('✅ Added favoriteRates field to playerSettings table') +} + +/** + * Rollback: Remove favorite rates field from player settings + */ +async function down(db) { + // SQLite doesn't support DROP COLUMN directly, so we need to recreate the table + // 1. Create temporary table without the favoriteRates column + await db.schema + .createTable('playerSettings_temp') + .addColumn('id', 'integer', (col) => col.primaryKey().autoIncrement()) + .addColumn('videoId', 'integer', (col) => + col.notNull().references('videoLibrary.id').onDelete('cascade') + ) + .addColumn('playbackRate', 'real', (col) => col.notNull().defaultTo(1.0)) + .addColumn('volume', 'real', (col) => col.notNull().defaultTo(1.0)) + .addColumn('muted', 'integer', (col) => col.notNull().defaultTo(0)) + .addColumn('loopSettings', 'text') + .addColumn('autoPauseSettings', 'text') + .addColumn('subtitleOverlaySettings', 'text') + .addColumn('created_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) + .addColumn('updated_at', 'integer', (col) => col.notNull().defaultTo(sql`(unixepoch())`)) + .execute() + + // 2. Copy existing data (excluding the favoriteRates column) + await db + .insertInto('playerSettings_temp') + .columns([ + 'id', + 'videoId', + 'playbackRate', + 'volume', + 'muted', + 'loopSettings', + 'autoPauseSettings', + 'subtitleOverlaySettings', + 'created_at', + 'updated_at' + ]) + .expression( + db + .selectFrom('playerSettings') + .select([ + 'id', + 'videoId', + 'playbackRate', + 'volume', + 'muted', + 'loopSettings', + 'autoPauseSettings', + 'subtitleOverlaySettings', + 'created_at', + 'updated_at' + ]) + ) + .execute() + + // 3. Drop original table + await db.schema.dropTable('playerSettings').execute() + + // 4. Rename temporary table + await db.schema.alterTable('playerSettings_temp').renameTo('playerSettings').execute() + + // 5. Recreate original indices + await db.schema + .createIndex('idx_playerSettings_videoId') + .ifNotExists() + .on('playerSettings') + .column('videoId') + .execute() + + await db.schema + .createIndex('idx_playerSettings_updated_at') + .ifNotExists() + .on('playerSettings') + .column('updated_at') + .execute() + + await db.schema + .createIndex('idx_playerSettings_videoId_unique') + .ifNotExists() + .on('playerSettings') + .column('videoId') + .unique() + .execute() + + console.log('✅ Removed favoriteRates field from playerSettings table') +} + +module.exports = { up, down } diff --git a/packages/shared/schema.ts b/packages/shared/schema.ts index 0d27e532..297f5557 100644 --- a/packages/shared/schema.ts +++ b/packages/shared/schema.ts @@ -78,6 +78,8 @@ export interface PlayerSettingsTable { videoId: number /** 播放速度 */ playbackRate: number + /** 收藏的播放速度 JSON 数组字符串 */ + favoriteRates: string /** 音量 (0-1) */ volume: number /** 是否静音 */ diff --git a/src/main/db/schemas/player-settings.ts b/src/main/db/schemas/player-settings.ts index 323d5476..1096d954 100644 --- a/src/main/db/schemas/player-settings.ts +++ b/src/main/db/schemas/player-settings.ts @@ -2,35 +2,13 @@ import { z } from 'zod' import { BooleanToSqlSchema, + JsonStringSchema, PositiveIntegerSchema, SqlBooleanSchema, SqlTimestampSchema, TimestampToDateSchema } from './transforms' -/** - * PlayerSettings 表的 Zod Schema 定义 - */ - -/** - * JSON 字符串验证器 - * 验证 JSON 字符串格式并允许 null - */ -const JsonStringSchema = z - .string() - .refine( - (str) => { - try { - JSON.parse(str) - return true - } catch { - return false - } - }, - { message: 'Invalid JSON string' } - ) - .nullable() - /** * 播放速度验证器 (0.25 - 3.0) */ @@ -48,6 +26,7 @@ const VolumeSchema = z.number().min(0).max(1) export const PlayerSettingsInsertSchema = z.object({ videoId: PositiveIntegerSchema, playbackRate: PlaybackRateSchema.default(1.0), + favoriteRates: JsonStringSchema.default(JSON.stringify([])), volume: VolumeSchema.default(1.0), muted: BooleanToSqlSchema.default(false), loopSettings: JsonStringSchema.optional(), @@ -60,6 +39,7 @@ export const PlayerSettingsInsertSchema = z.object({ */ export const PlayerSettingsUpdateSchema = z.object({ playbackRate: PlaybackRateSchema.optional(), + favoriteRates: JsonStringSchema.optional(), volume: VolumeSchema.optional(), muted: BooleanToSqlSchema.optional(), loopSettings: JsonStringSchema.optional(), @@ -76,6 +56,7 @@ export const PlayerSettingsSelectSchema = z.object({ id: PositiveIntegerSchema, videoId: PositiveIntegerSchema, playbackRate: PlaybackRateSchema, + favoriteRates: JsonStringSchema, volume: VolumeSchema, muted: SqlBooleanSchema, loopSettings: z.string().nullable(), diff --git a/src/main/db/schemas/transforms.ts b/src/main/db/schemas/transforms.ts index d2b044fc..bcb4b1fd 100644 --- a/src/main/db/schemas/transforms.ts +++ b/src/main/db/schemas/transforms.ts @@ -209,3 +209,26 @@ export function withDataTransforms>(schema: z.ZodS fromSelect: (data: unknown) => schema.parse(data) } } + +/** + * PlayerSettings 表的 Zod Schema 定义 + */ + +/** + * JSON 字符串验证器 + * 验证 JSON 字符串格式并允许 null + */ +export const JsonStringSchema = z + .string() + .refine( + (str) => { + try { + JSON.parse(str) + return true + } catch { + return false + } + }, + { message: 'Invalid JSON string' } + ) + .nullable() diff --git a/src/renderer/src/i18n/label.ts b/src/renderer/src/i18n/label.ts index 70122ef0..217ee518 100644 --- a/src/renderer/src/i18n/label.ts +++ b/src/renderer/src/i18n/label.ts @@ -134,47 +134,61 @@ export const getSidebarIconLabel = (key: string): string => { return sidebarIconKeyMap[key] ? t(sidebarIconKeyMap[key]) : key } -const shortcutKeyMap = { - action: 'settings.shortcuts.action', - actions: 'settings.shortcuts.actions', - clear_shortcut: 'settings.shortcuts.clear_shortcut', - clear_topic: 'settings.shortcuts.clear_topic', - copy_last_message: 'settings.shortcuts.copy_last_message', - enabled: 'settings.shortcuts.enabled', - exit_fullscreen: 'settings.shortcuts.exit_fullscreen', - label: 'settings.shortcuts.label', - mini_window: 'settings.shortcuts.mini_window', - new_topic: 'settings.shortcuts.new_topic', - press_shortcut: 'settings.shortcuts.press_shortcut', - reset_defaults: 'settings.shortcuts.reset_defaults', - reset_defaults_confirm: 'settings.shortcuts.reset_defaults_confirm', - reset_to_default: 'settings.shortcuts.reset_to_default', - search_message: 'settings.shortcuts.search_message', - search_message_in_chat: 'settings.shortcuts.search_message_in_chat', - selection_assistant_select_text: 'settings.shortcuts.selection_assistant_select_text', - selection_assistant_toggle: 'settings.shortcuts.selection_assistant_toggle', - show_app: 'settings.shortcuts.show_app', - show_settings: 'settings.shortcuts.show_settings', - title: 'settings.shortcuts.title', - toggle_new_context: 'settings.shortcuts.toggle_new_context', - toggle_show_assistants: 'settings.shortcuts.toggle_show_assistants', - toggle_show_topics: 'settings.shortcuts.toggle_show_topics', - zoom_in: 'settings.shortcuts.zoom_in', - zoom_out: 'settings.shortcuts.zoom_out', - zoom_reset: 'settings.shortcuts.zoom_reset', - play_pause: 'settings.shortcuts.play_pause', - seek_backward: 'settings.shortcuts.seek_backward', - seek_forward: 'settings.shortcuts.seek_forward', - volume_up: 'settings.shortcuts.volume_up', - volume_down: 'settings.shortcuts.volume_down', - previous_subtitle: 'settings.shortcuts.previous_subtitle', - next_subtitle: 'settings.shortcuts.next_subtitle', - single_loop: 'settings.shortcuts.single_loop', - replay_current_subtitle: 'settings.shortcuts.replay_current_subtitle', - toggle_fullscreen: 'settings.shortcuts.toggle_fullscreen', - escape_fullscreen: 'settings.shortcuts.escape_fullscreen', - toggle_subtitle_panel: 'settings.shortcuts.toggle_subtitle_panel' -} as const +const shortcutKeys = [ + 'action', + 'actions', + 'clear_shortcut', + 'clear_topic', + 'copy_last_message', + 'enabled', + 'exit_fullscreen', + 'label', + 'mini_window', + 'new_topic', + 'press_shortcut', + 'reset_defaults', + 'reset_defaults_confirm', + 'reset_to_default', + 'search_message', + 'search_message_in_chat', + 'selection_assistant_select_text', + 'selection_assistant_toggle', + 'show_app', + 'show_settings', + 'title', + 'toggle_new_context', + 'toggle_show_assistants', + 'toggle_show_topics', + 'zoom_in', + 'zoom_out', + 'zoom_reset', + 'play_pause', + 'seek_backward', + 'seek_forward', + 'volume_up', + 'volume_down', + 'previous_subtitle', + 'next_subtitle', + 'single_loop', + 'replay_current_subtitle', + 'toggle_fullscreen', + 'escape_fullscreen', + 'toggle_subtitle_panel', + 'playback_rate_next', + 'playback_rate_prev', + 'subtitle_mode_none', + 'subtitle_mode_original', + 'subtitle_mode_translated', + 'subtitle_mode_bilingual' +] as const + +const shortcutKeyMap = shortcutKeys.reduce( + (acc, key) => { + acc[key] = `settings.shortcuts.${key}` as const + return acc + }, + {} as Record<(typeof shortcutKeys)[number], `settings.shortcuts.${(typeof shortcutKeys)[number]}`> +) export const getShortcutLabel = (key: string): string => { return shortcutKeyMap[key] ? t(shortcutKeyMap[key]) : key diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index 55717394..a32abc69 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -3,7 +3,10 @@ "favorites": "Favorites", "favorites_developing": "This feature is under development", "home": "Home", - "language": "language" + "language": "language", + "selectedItems": "{{count}} items selected", + "selectedItems_one": "{{count}} item selected", + "selectedItems_other": "{{count}} items selected" }, "docs": { "title": "Documentation" @@ -75,6 +78,7 @@ "playback": { "defaultPlaybackSpeed": "Playback Speed", "defaultVolume": "Default Volume", + "favoriteRates": "Favorite Rates", "subtitle": { "backgroundType": { "blur": "Blur", @@ -126,6 +130,8 @@ "show_app": "Show / Hide App", "show_settings": "Open settings", "single_loop": "Loop playback", + "playback_rate_next": "Next favorite rate", + "playback_rate_prev": "Previous favorite rate", "title": "Shortcut keys", "toggle_fullscreen": "Switch to fullscreen", "toggle_new_context": "Clear context", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index bdd2f29a..4c1097ba 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -16,7 +16,8 @@ "search_no_results": "暂无搜索结果", "search_placeholder": "搜索视频...", "enabled": "已开启", - "disabled": "已关闭" + "disabled": "已关闭", + "selectedItems": "已选择 {{count}} 项" }, "docs": { "title": "帮助文档" @@ -178,6 +179,10 @@ "playback": { "defaultPlaybackSpeed": "播放速度", "defaultVolume": "默认音量", + "favoriteRates": { + "label": "常用播放速度", + "placeholder": "选择常用播放速度" + }, "subtitle": { "backgroundType": { "blur": "模糊", @@ -233,6 +238,8 @@ "show_app": "显示 / 隐藏应用", "show_settings": "打开设置", "single_loop": "循环播放", + "playback_rate_next": "下一个常用速度", + "playback_rate_prev": "上一个常用速度", "title": "快捷键", "toggle_fullscreen": "切换全屏", "toggle_new_context": "清除上下文", diff --git a/src/renderer/src/infrastructure/constants/playback.const.ts b/src/renderer/src/infrastructure/constants/playback.const.ts index 82a998d9..22d8231d 100644 --- a/src/renderer/src/infrastructure/constants/playback.const.ts +++ b/src/renderer/src/infrastructure/constants/playback.const.ts @@ -1,5 +1,5 @@ // 播放速度预设常量 / Playback Rate Presets Constants -export const PLAYBACK_RATE_PRESETS = [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0] as const +export const PLAYBACK_RATE_PRESETS: number[] = [0.25, 0.5, 0.75, 1.0, 1.25, 1.5, 1.75, 2.0] as const // 音量设置常量 / Volume Settings Constants export const VOLUME_SETTINGS = { diff --git a/src/renderer/src/infrastructure/constants/shortcuts.const.ts b/src/renderer/src/infrastructure/constants/shortcuts.const.ts index b26b3e58..a4efa9cb 100644 --- a/src/renderer/src/infrastructure/constants/shortcuts.const.ts +++ b/src/renderer/src/infrastructure/constants/shortcuts.const.ts @@ -116,5 +116,19 @@ export const DEFAULT_SHORTCUTS: Shortcut[] = [ editable: true, enabled: true, system: false + }, + { + key: 'playback_rate_next', + shortcut: ['Shift', 'BracketRight'], + editable: true, + enabled: true, + system: false + }, + { + key: 'playback_rate_prev', + shortcut: ['Shift', 'BracketLeft'], + editable: true, + enabled: true, + system: false } ] diff --git a/src/renderer/src/infrastructure/hooks/useSettings.ts b/src/renderer/src/infrastructure/hooks/useSettings.ts index 88712459..0deb1952 100644 --- a/src/renderer/src/infrastructure/hooks/useSettings.ts +++ b/src/renderer/src/infrastructure/hooks/useSettings.ts @@ -46,6 +46,7 @@ export function useSettings() { const setDefaultSubtitleDisplayMode = useSettingsStore( (state) => state.setDefaultSubtitleDisplayMode ) + const setDefaultFavoriteRates = useSettingsStore((state) => state.setDefaultFavoriteRates) // ✅ 复合操作使用 useCallback 稳定引用 const setLaunch = useCallback( @@ -151,7 +152,8 @@ export function useSettings() { setDefaultVolume, setDefaultPlaybackSpeed, setDefaultSubtitleBackgroundType, - setDefaultSubtitleDisplayMode + setDefaultSubtitleDisplayMode, + setDefaultFavoriteRates } } diff --git a/src/renderer/src/infrastructure/hooks/useShortcut.ts b/src/renderer/src/infrastructure/hooks/useShortcut.ts index 018c1841..165b3f5c 100644 --- a/src/renderer/src/infrastructure/hooks/useShortcut.ts +++ b/src/renderer/src/infrastructure/hooks/useShortcut.ts @@ -63,7 +63,7 @@ export function useShortcuts(): { shortcuts: Shortcut[] } { return { shortcuts: orderBy(shortcuts, 'system', 'desc') } } -export function useShortcutDisplay(key: string) { +export function useShortcutDisplay(key: string): string { const formatShortcut = useCallback((shortcut: string[]) => { return shortcut .map((key) => { diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx index dccc1f6b..99302ac2 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/PlaybackRateControl.tsx @@ -1,5 +1,6 @@ +import { PLAYBACK_RATE_PRESETS } from '@renderer/infrastructure' import { usePlayerStore } from '@renderer/state/stores/player.store' -import { Check, Zap } from 'lucide-react' +import { Zap } from 'lucide-react' import styled from 'styled-components' import { useControlMenuManager } from '../../../hooks/useControlMenuManager' @@ -7,12 +8,17 @@ import { useHoverMenu } from '../../../hooks/useHoverMenu' import { usePlayerCommands } from '../../../hooks/usePlayerCommands' import { ControlContainer, GlassPopup } from '../styles/controls' -const RATE_OPTIONS = [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2] - export default function PlaybackRateControl() { - const playbackRate = usePlayerStore((s) => s.playbackRate) + const rawPlaybackRate = usePlayerStore((s) => s.playbackRate) + const favoriteRates = usePlayerStore((s) => s.favoriteRates) + const cycleFavoriteRate = usePlayerStore((s) => s.cycleFavoriteRate) + const toggleFavoriteRate = usePlayerStore((s) => s.toggleFavoriteRate) const { setPlaybackRate } = usePlayerCommands() + // 确保 playbackRate 始终是一个有效的数字 + const playbackRate = + typeof rawPlaybackRate === 'number' && !isNaN(rawPlaybackRate) ? rawPlaybackRate : 1 + // 使用全局菜单管理器 const { isMenuOpen: isRateOpen, @@ -38,11 +44,59 @@ export default function PlaybackRateControl() { setPlaybackRate(clampedRate) } + // 处理左键点击：循环切换常用速度 + const handleLeftClick = () => { + if (favoriteRates.length > 0) { + cycleFavoriteRate() + } else { + // 如果没有常用速度，使用默认逻辑（打开菜单） + toggleMenu() + } + } + + // 检查当前速度是否为常用速度 + const isFavoriteRate = (rate: number) => { + return favoriteRates.some((fav) => Math.abs(fav - rate) < 1e-6) + } + + // 处理速度选项的点击事件 + const handleRateOptionClick = (rate: number, event: React.MouseEvent) => { + event.preventDefault() + + if (event.ctrlKey) { + // Ctrl + 点击：切换收藏状态 + toggleFavoriteRate(rate) + } else { + // 普通点击：设置速度并关闭菜单 + setSpeed(rate) + closeMenu() + } + } + + // 处理右键菜单 + const handleRateOptionContextMenu = (rate: number, event: React.MouseEvent) => { + event.preventDefault() + event.stopPropagation() + toggleFavoriteRate(rate) + } + return ( buttonProps.onClick(toggleMenu)} + onClick={(e) => { + e.preventDefault() + // 左键点击处理常用速度切换，右键或其他情况打开菜单 + if (e.button === 0) { + handleLeftClick() + } else { + buttonProps.onClick(toggleMenu) + } + }} + onContextMenu={(e) => { + e.preventDefault() + openMenu() + }} aria-label="Playback rate" > @@ -51,23 +105,25 @@ export default function PlaybackRateControl() { {isRateOpen && ( - {RATE_OPTIONS.map((opt) => { + {PLAYBACK_RATE_PRESETS.map((opt) => { const active = Math.abs(opt - playbackRate) < 1e-6 + const isFavorite = isFavoriteRate(opt) return ( { - setSpeed(opt) - closeMenu() - }} + $favorite={isFavorite} + onClick={(event) => handleRateOptionClick(opt, event)} + onContextMenu={(event) => handleRateOptionContextMenu(opt, event)} > - {opt} - {active && } + + {opt} + ) })} + 右键或 Control+点击 设置常用速度 )} @@ -106,20 +162,79 @@ const RateGrid = styled.div` gap: var(--spacing-xs, 8px); ` -const RateOption = styled.button<{ $active?: boolean }>` +const RateOption = styled.button<{ $active?: boolean; $favorite?: boolean }>` padding: 6px 8px; display: flex; align-items: center; justify-content: space-between; cursor: pointer; border-radius: 6px; - border: 1px solid ${(props) => (props.$active ? 'var(--color-primary)' : 'var(--color-border)')}; - background: ${(props) => - props.$active ? 'var(--color-primary-mute)' : 'var(--color-background-soft)'}; + position: relative; + border: 1px solid + ${(props) => { + if (props.$active) return 'var(--color-primary)' + if (props.$favorite) return 'var(--color-warning)' + return 'var(--color-border)' + }}; + background: ${(props) => { + if (props.$active) return 'var(--color-primary-mute)' + if (props.$favorite) return 'var(--color-warning-mute)' + return 'var(--color-background-soft)' + }}; color: var(--color-text-1); min-height: 28px; transition: all 0.15s ease; + &:hover { - background: ${(props) => (props.$active ? 'var(--color-primary-soft)' : 'var(--color-hover)')}; + background: ${(props) => { + if (props.$active) return 'var(--color-primary-soft)' + if (props.$favorite) return 'var(--color-warning-soft)' + return 'var(--color-hover)' + }}; + transform: scale(1.02); } + + /* 收藏状态的额外视觉提示 */ + ${(props) => + props.$favorite && + ` + &::before { + content: ''; + position: absolute; + top: 2px; + right: 2px; + width: 4px; + height: 4px; + border-radius: 50%; + background: var(--color-warning); + opacity: 0.6; + z-index: 1; + } + `} + + /* 激活状态优先级高于收藏状态 */ + ${(props) => + props.$active && + props.$favorite && + ` + &::before { + background: var(--color-primary); + } + `} +` + +const RateOptionContent = styled.div` + display: flex; + align-items: center; + gap: 4px; +` + +const RateHint = styled.div` + font-size: 11px; + color: var(--color-text-3); + text-align: center; + padding: 8px 12px 4px; + border-top: 1px solid var(--color-border-light); + margin-top: 8px; + opacity: 0.8; ` diff --git a/src/renderer/src/pages/player/components/ControllerPanel/styles/controls.ts b/src/renderer/src/pages/player/components/ControllerPanel/styles/controls.ts index 00d771d4..c767f515 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/styles/controls.ts +++ b/src/renderer/src/pages/player/components/ControllerPanel/styles/controls.ts @@ -159,7 +159,7 @@ export const GlassPopup = styled.div` left: 50%; transform: translateX(-50%); background: var(--modal-background-glass); - padding: 12px 14px; + padding: 10px 12px; border-radius: 10px; display: flex; flex-direction: column; diff --git a/src/renderer/src/pages/player/hooks/usePlayerShortcuts.ts b/src/renderer/src/pages/player/hooks/usePlayerShortcuts.ts index de8a1bbe..1c205742 100644 --- a/src/renderer/src/pages/player/hooks/usePlayerShortcuts.ts +++ b/src/renderer/src/pages/player/hooks/usePlayerShortcuts.ts @@ -11,7 +11,7 @@ const logger = loggerService.withContext('TransportBar') export function usePlayerShortcuts() { const cmd = usePlayerCommands() const { setDisplayMode } = useSubtitleOverlay() - const { toggleSubtitlePanel } = usePlayerStore() + const { toggleSubtitlePanel, cycleFavoriteRateNext, cycleFavoriteRatePrev } = usePlayerStore() useShortcut('play_pause', () => { cmd.playPause() @@ -76,4 +76,15 @@ export function usePlayerShortcuts() { toggleSubtitlePanel() logger.info('字幕面板切换') }) + + // 播放速度切换 + useShortcut('playback_rate_next', () => { + cycleFavoriteRateNext() + logger.info('播放速度切换: 下一个常用速度') + }) + + useShortcut('playback_rate_prev', () => { + cycleFavoriteRatePrev() + logger.info('播放速度切换: 上一个常用速度') + }) } diff --git a/src/renderer/src/pages/settings/PlaybackSettings.tsx b/src/renderer/src/pages/settings/PlaybackSettings.tsx index e0bbba77..73a9b3ab 100644 --- a/src/renderer/src/pages/settings/PlaybackSettings.tsx +++ b/src/renderer/src/pages/settings/PlaybackSettings.tsx @@ -19,11 +19,12 @@ const PlaybackSettings: FC = () => { const { theme } = useTheme() const { t } = useTranslation() const { - playback: { defaultSubtitleDisplayMode, defaultSubtitleBackgroundType }, + playback: { defaultSubtitleDisplayMode, defaultSubtitleBackgroundType, defaultFavoriteRates }, setDefaultVolume, setDefaultPlaybackSpeed, setDefaultSubtitleBackgroundType, - setDefaultSubtitleDisplayMode + setDefaultSubtitleDisplayMode, + setDefaultFavoriteRates } = useSettings() const volumeOptions = [ @@ -50,6 +51,9 @@ const PlaybackSettings: FC = () => { { label: '2.0x', value: 2.0 } ] + // 常用速度选项（用于多选） + const favoriteRateOptions = playbackSpeedOptions + return ( @@ -84,6 +88,20 @@ const PlaybackSettings: FC = () => { }))} /> + + + {t('settings.playback.favoriteRates.label')} + { + setDefaultFavoriteRates(value as number[]) + }} + options={favoriteRateOptions} + placeholder={t('settings.playback.favoriteRates.placeholder')} + /> + {t('settings.playback.subtitle.title')} diff --git a/src/renderer/src/services/PlayerSettingsLoader.ts b/src/renderer/src/services/PlayerSettingsLoader.ts index 84de29ed..308119fb 100644 --- a/src/renderer/src/services/PlayerSettingsLoader.ts +++ b/src/renderer/src/services/PlayerSettingsLoader.ts @@ -4,6 +4,7 @@ import { LoopMode, SubtitleBackgroundType, SubtitleDisplayMode } from '@types' import type { PlayerSettingsRecord } from 'packages/shared/types/database' import type { PlayerState } from '../state/stores/player.store' +import { useSettingsStore } from '../state/stores/settings.store' const logger = loggerService.withContext('PlayerSettingsService') @@ -14,8 +15,8 @@ export class PlayerSettingsService { const dbSettings = await window.api.db.playerSettings.get(videoId) if (!dbSettings) { - logger.debug('未找到播放器设置:', { videoId }) - return null + logger.debug('未找到播放器设置，使用全局默认设置:', { videoId }) + return this.createDefaultPlayerState() } const playerState = this.mapDatabaseToState(dbSettings) @@ -28,6 +29,64 @@ export class PlayerSettingsService { } } + /** + * 创建基于全局设置的默认播放器状态 + */ + private static createDefaultPlayerState(): PlayerState { + const globalSettings = useSettingsStore.getState().playback + + return { + // 基础播放状态（不从数据库恢复这些实时状态） + currentTime: 0, + duration: 0, + paused: true, + isFullscreen: false, + + // 从全局设置获取的默认值 + volume: globalSettings.defaultVolume, + muted: false, + playbackRate: globalSettings.defaultPlaybackSpeed, + + // 常用播放速度设置（从全局设置获取） + favoriteRates: globalSettings.defaultFavoriteRates, + currentFavoriteIndex: Math.max( + 0, + globalSettings.defaultFavoriteRates.indexOf(globalSettings.defaultPlaybackSpeed) + ), + + // 循环设置（从全局设置获取） + loopEnabled: false, + loopMode: globalSettings.defaultLoopMode, + loopCount: globalSettings.defaultLoopCount, + loopRemainingCount: globalSettings.defaultLoopCount, + + // 自动暂停设置（默认值） + autoPauseEnabled: false, + pauseOnSubtitleEnd: true, + resumeEnabled: false, + resumeDelay: 5000, + + // 字幕覆盖层设置（从全局设置获取） + subtitleOverlay: { + displayMode: globalSettings.defaultSubtitleDisplayMode, + backgroundStyle: { + type: globalSettings.defaultSubtitleBackgroundType, + opacity: 0.8 + }, + position: { x: 10, y: 75 }, + size: { width: 80, height: 20 }, + autoPositioning: true, + isInitialized: false + }, + + // UI 短时态（不持久化） + isSettingsOpen: false, + wasPlayingBeforeOpen: false, + isAutoResumeCountdownOpen: false, + subtitlePanelVisible: true + } + } + static async save(videoId: number, state: PlayerState): Promise { try { logger.debug('保存播放器设置:', { videoId }) @@ -72,6 +131,7 @@ export class PlayerSettingsService { * @returns PlayerState 部分数据 */ private static mapDatabaseToState(dbData: PlayerSettingsRecord): PlayerState { + const globalSettings = useSettingsStore.getState().playback // 解析 JSON 字段 const parseJsonField = (jsonStr: string | null, defaultValue: T): T => { if (!jsonStr) return defaultValue @@ -125,6 +185,16 @@ export class PlayerSettingsService { muted: Boolean(dbData.muted), playbackRate: dbData.playbackRate, + // 常用播放速度设置（解析 JSON 字段，使用全局设置作为默认值） + favoriteRates: parseJsonField(dbData.favoriteRates, globalSettings.defaultFavoriteRates), + // currentFavoriteIndex 是运行时状态，根据当前播放速度和常用列表计算 + currentFavoriteIndex: Math.max( + 0, + parseJsonField(dbData.favoriteRates, globalSettings.defaultFavoriteRates).indexOf( + dbData.playbackRate + ) + ), + // 循环设置 loopEnabled: loopSettings.loopEnabled, loopMode: loopSettings.loopMode, @@ -178,6 +248,8 @@ export class PlayerSettingsService { playbackRate: state.playbackRate, volume: state.volume, muted: state.muted, + favoriteRates: JSON.stringify(state.favoriteRates), + // currentFavoriteIndex 是运行时状态，不需要持久化 loopSettings: JSON.stringify(loopSettings), autoPauseSettings: JSON.stringify(autoPauseSettings), subtitleOverlaySettings: JSON.stringify(subtitleOverlaySettings) diff --git a/src/renderer/src/services/PlayerSettingsSaver.ts b/src/renderer/src/services/PlayerSettingsSaver.ts index abac06c0..7550c16e 100644 --- a/src/renderer/src/services/PlayerSettingsSaver.ts +++ b/src/renderer/src/services/PlayerSettingsSaver.ts @@ -5,22 +5,8 @@ import { PlayerSettingsService } from './PlayerSettingsLoader' const logger = loggerService.withContext('PlayerSettingsPersistenceService') -// 仅选择需要持久化的切片 function selectPersistedSlice(state: ReturnType): PlayerSettings { - return { - volume: state.volume, - muted: state.muted, - playbackRate: state.playbackRate, - loopEnabled: state.loopEnabled, - loopMode: state.loopMode, - loopCount: state.loopCount, - loopRemainingCount: state.loopRemainingCount, - autoPauseEnabled: state.autoPauseEnabled, - pauseOnSubtitleEnd: state.pauseOnSubtitleEnd, - resumeEnabled: state.resumeEnabled, - resumeDelay: state.resumeDelay, - subtitleOverlay: state.subtitleOverlay - } + return state as PlayerSettings } function deepEqual(a: any, b: any): boolean { diff --git a/src/renderer/src/state/stores/player.store.ts b/src/renderer/src/state/stores/player.store.ts index 42e6ad96..7520782b 100644 --- a/src/renderer/src/state/stores/player.store.ts +++ b/src/renderer/src/state/stores/player.store.ts @@ -1,3 +1,4 @@ +import { PLAYBACK_RATE_PRESETS } from '@renderer/infrastructure' import { LoopMode, SubtitleBackgroundType, SubtitleDisplayMode } from '@types' import { Draft } from 'immer' import { create, StateCreator } from 'zustand' @@ -43,6 +44,12 @@ export interface PlayerState { /** 播放速度 */ playbackRate: number + /** 常用播放速度列表（当前视频独立保存） */ + favoriteRates: number[] + + /** 当前常用速度索引（用于循环切换） */ + currentFavoriteIndex: number + // === 循环设置 / Loop Settings === /** 循环播放 */ loopEnabled: boolean @@ -94,6 +101,15 @@ export interface PlayerActions { setMuted: (m: boolean) => void // 引擎专用：通过 orchestrator.requestToggleMute() 调用 setPlaybackRate: (r: number) => void // 引擎专用：通过 orchestrator.requestSetPlaybackRate() 调用 + // === 常用速度控制 === + // 组件可调用：用户设置 + setFavoriteRates: (rates: number[]) => void + toggleFavoriteRate: (rate: number) => void // 添加或移除常用速度 + cycleFavoriteRate: () => void // 循环切换常用速度 + setCurrentFavoriteIndex: (index: number) => void + cycleFavoriteRateNext: () => void // 切换到下一个常用速度 + cycleFavoriteRatePrev: () => void // 切换到上一个常用速度 + // === 循环控制 === // 组件可调用：用户设置 toggleLoopEnabled: () => void @@ -135,6 +151,8 @@ const initialState: PlayerState = { volume: 1, muted: false, playbackRate: 1, + favoriteRates: [1.0], // 默认常用速度 + currentFavoriteIndex: 1, // 默认选择 1.0x isFullscreen: false, // === 循环设置 / Loop Settings === @@ -173,6 +191,7 @@ export type PlayerSettings = Pick< | 'volume' | 'muted' | 'playbackRate' + | 'favoriteRates' | 'loopEnabled' | 'loopMode' | 'loopCount' @@ -201,6 +220,93 @@ const createPlayerStore: StateCreator) => void (s.playbackRate = Math.max(0.25, Math.min(3, r)))), setFullscreen: (f) => set((s: Draft) => void (s.isFullscreen = !!f)), + // 常用速度控制 + setFavoriteRates: (rates) => + set((s: Draft) => { + s.favoriteRates = rates + // 如果当前索引超出范围，重置为0 + if (s.currentFavoriteIndex >= rates.length) { + s.currentFavoriteIndex = 0 + } + }), + toggleFavoriteRate: (rate) => + set((s: Draft) => { + const existingIndex = s.favoriteRates.findIndex((fav) => Math.abs(fav - rate) < 1e-6) + + if (existingIndex >= 0) { + // 如果已存在，则移除 + s.favoriteRates.splice(existingIndex, 1) + // 如果移除的是当前选中的项，需要调整索引 + if (s.currentFavoriteIndex >= s.favoriteRates.length) { + s.currentFavoriteIndex = Math.max(0, s.favoriteRates.length - 1) + } else if (existingIndex < s.currentFavoriteIndex) { + s.currentFavoriteIndex -= 1 + } + } else { + // 如果不存在，则添加并保持排序 + const newRates = [...s.favoriteRates, rate].sort((a, b) => a - b) + const newIndex = newRates.findIndex((fav) => Math.abs(fav - rate) < 1e-6) + s.favoriteRates = newRates + + // 如果插入位置在当前索引之前，需要调整索引 + if (newIndex <= s.currentFavoriteIndex) { + s.currentFavoriteIndex += 1 + } + } + }), + cycleFavoriteRate: () => + set((s: Draft) => { + const { favoriteRates, currentFavoriteIndex } = s + if (favoriteRates.length === 0) return + + const nextIndex = (currentFavoriteIndex + 1) % favoriteRates.length + s.currentFavoriteIndex = nextIndex + s.playbackRate = Number(favoriteRates[nextIndex]) + }), + setCurrentFavoriteIndex: (index) => + set((s: Draft) => { + const { favoriteRates } = s + if (index >= 0 && index < favoriteRates.length) { + s.currentFavoriteIndex = index + s.playbackRate = Number(favoriteRates[index]) + } + }), + cycleFavoriteRateNext: () => + set((s: Draft) => { + const { favoriteRates, currentFavoriteIndex } = s + if (favoriteRates.length === 0) { + // 如果常用速度为空，基于所有速度选择 + const allRates = PLAYBACK_RATE_PRESETS + const currentIndex = allRates.findIndex((rate) => Math.abs(rate - s.playbackRate) < 1e-6) + const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % allRates.length + s.playbackRate = Number(allRates[nextIndex]) + return + } + + const nextIndex = (currentFavoriteIndex + 1) % favoriteRates.length + s.currentFavoriteIndex = nextIndex + s.playbackRate = Number(favoriteRates[nextIndex]) + }), + cycleFavoriteRatePrev: () => + set((s: Draft) => { + const { favoriteRates, currentFavoriteIndex } = s + if (favoriteRates.length === 0) { + // 如果常用速度为空，基于所有速度选择 + const allRates = PLAYBACK_RATE_PRESETS + const currentIndex = allRates.findIndex((rate) => Math.abs(rate - s.playbackRate) < 1e-6) + const prevIndex = + currentIndex === -1 + ? allRates.length - 1 + : (currentIndex - 1 + allRates.length) % allRates.length + s.playbackRate = Number(allRates[prevIndex]) + return + } + + const prevIndex = (currentFavoriteIndex - 1 + favoriteRates.length) % favoriteRates.length + s.currentFavoriteIndex = prevIndex + s.playbackRate = Number(favoriteRates[prevIndex]) + }), + // 循环控制 toggleLoopEnabled: () => set((s: Draft) => { @@ -293,6 +399,14 @@ const createPlayerStore: StateCreator Math.abs(rate - s.playbackRate) < 1e-6 + ) + s.currentFavoriteIndex = Math.max(0, currentRateIndex) + } if (settings.loopEnabled !== undefined) { s.loopEnabled = settings.loopEnabled } diff --git a/src/renderer/src/state/stores/settings.store.ts b/src/renderer/src/state/stores/settings.store.ts index dfe2ee12..7c7cbc51 100644 --- a/src/renderer/src/state/stores/settings.store.ts +++ b/src/renderer/src/state/stores/settings.store.ts @@ -36,9 +36,11 @@ export interface SettingsState { defaultPlaybackSpeed: number defaultSubtitleDisplayMode: SubtitleDisplayMode defaultSubtitleBackgroundType: SubtitleBackgroundType - /** 循环“默认设置”（全局偏好，右键菜单可调整；用于初始化新视频时的默认值） */ + /** 循环"默认设置"（全局偏好，右键菜单可调整；用于初始化新视频时的默认值） */ defaultLoopMode: LoopMode defaultLoopCount: number // -1=无限；1-99 + /** 默认常用播放速度列表（全局偏好，用于初始化新视频时的默认值） */ + defaultFavoriteRates: number[] } autoCheckUpdate: boolean testPlan: boolean @@ -74,6 +76,8 @@ type Actions = { // 循环默认设置（全局偏好） setDefaultLoopMode: (mode: LoopMode) => void setDefaultLoopCount: (count: number) => void // -1=∞；1-99 + // 常用播放速度默认设置（全局偏好） + setDefaultFavoriteRates: (rates: number[]) => void } export type SettingsStore = SettingsState & Actions @@ -98,7 +102,8 @@ const initialState: SettingsState = { defaultVolume: 1.0, defaultSubtitleBackgroundType: SubtitleBackgroundType.BLUR, defaultLoopCount: -1, - defaultLoopMode: LoopMode.SINGLE + defaultLoopMode: LoopMode.SINGLE, + defaultFavoriteRates: [1.0] }, autoCheckUpdate: true, testPlan: false, @@ -169,7 +174,12 @@ const createSettingsStore: StateCreator< set((state) => { const clamped = count === -1 ? -1 : Math.max(1, Math.min(99, Math.floor(count))) return { playback: { ...state.playback, defaultLoopCount: clamped } } - }) + }), + // 常用播放速度默认设置（全局偏好） + setDefaultFavoriteRates: (rates) => + set((state) => ({ + playback: { ...state.playback, defaultFavoriteRates: rates } + })) }) export const useSettingsStore = create()( From a95187723ddc7706f52e72a66f61ceb6b2ceb439 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Tue, 9 Sep 2025 12:32:03 +0800 Subject: [PATCH 17/82] feat(ui): enhance video selection clarity and simplify display (#101) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(ui): enhance video selection clarity in library view - Add currently playing indicator with visual feedback on video cards - Implement blue border and shadow effects for active video - Add subtitle information showing file directory and size - Integrate with player session store to track current playing video - Improve video differentiation for similar titles Resolves user confusion when multiple similar videos exist in library * fix: implement persistent current video tracking - Add currentVideoId to settings store with persistence - Replace temporary player session store usage with persistent tracking - Update video selection to persist across page navigation - Set currentVideoId both on player page load and video card click Fixes issue where "currently playing" indicator disappears when navigating back from player page to library view * refactor: remove playing indicator overlay from video cards - Remove text "正在播放" and play icon overlay from video thumbnails - Keep blue border and shadow effects for selected video identification - Simplify visual design while maintaining clear selection feedback - Clean up unused styled components (CurrentPlayingIndicator, PlayingIcon, PlayingText) * feat: remove current video display functionality - Remove currentVideoId field from settings store - Remove video selection highlighting and blue border effects - Remove persistent current video tracking across navigation - Clean up related code in HomePage and PlayerPage components - Return to simple video library display without selection state This simplifies the UI by removing the complexity of tracking and displaying which video is currently selected/playing. --- src/renderer/src/pages/home/HomePage.tsx | 17 +++++++++++++ src/renderer/src/services/HomePageVideos.ts | 28 +++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/renderer/src/pages/home/HomePage.tsx b/src/renderer/src/pages/home/HomePage.tsx index da5032e8..c05c6d70 100644 --- a/src/renderer/src/pages/home/HomePage.tsx +++ b/src/renderer/src/pages/home/HomePage.tsx @@ -205,6 +205,11 @@ export function HomePage(): React.JSX.Element { {video.title} + {video.subtitle && ( + + {video.subtitle} + + )} {formatDate(video.createdAt)} {video.publishedAt} @@ -497,4 +502,16 @@ const MetaText = styled.div` letter-spacing: -0.1px; ` +const VideoSubtitle = styled.div` + font-size: 12px; + font-weight: 400; + color: var(--color-text-3, #666); + font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Text', sans-serif; + letter-spacing: -0.1px; + margin-bottom: 4px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +` + export default HomePage diff --git a/src/renderer/src/services/HomePageVideos.ts b/src/renderer/src/services/HomePageVideos.ts index c36b5db5..cc393f91 100644 --- a/src/renderer/src/services/HomePageVideos.ts +++ b/src/renderer/src/services/HomePageVideos.ts @@ -5,6 +5,7 @@ import { VideoLibraryService } from '@renderer/services/VideoLibrary' export interface HomePageVideoItem { id: number title: string + subtitle?: string // 添加副标题信息，用于显示文件路径或大小等 thumbnail?: string duration: number durationText: string @@ -49,6 +50,27 @@ function formatTimeAgo(timestampMs: number): string { return new Date(timestampMs).toLocaleDateString('zh-CN') } +function formatFileSize(bytes: number): string { + if (bytes === 0) return '0 B' + const k = 1024 + const sizes = ['B', 'KB', 'MB', 'GB', 'TB'] + const i = Math.floor(Math.log(bytes) / Math.log(k)) + return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i] +} + +function getFileDirectory(filePath: string): string { + if (!filePath) return '' + const lastSlash = Math.max(filePath.lastIndexOf('/'), filePath.lastIndexOf('\\')) + if (lastSlash === -1) return '' + const dir = filePath.substring(0, lastSlash) + const parts = dir.split(/[/\\]/) + // 返回最后两级目录，方便用户识别 + if (parts.length >= 2) { + return parts.slice(-2).join('/') + } + return parts[parts.length - 1] || '' +} + export class HomePageVideoService { private readonly videoLibrary = new VideoLibraryService() @@ -70,11 +92,17 @@ export class HomePageVideoService { const durationText = formatDuration(duration) const watchProgress = r.isFinished ? 1 : clamp01(duration > 0 ? r.currentTime / duration : 0) + // 创建副标题信息来帮助区分相似的视频 + const fileSize = file?.size ? formatFileSize(file.size) : '' + const fileDir = file?.path ? getFileDirectory(file.path) : '' + const subtitle = [fileDir, fileSize].filter(Boolean).join(' • ') + const thumbnail = r.thumbnailPath ? toFileUrl(r.thumbnailPath) : undefined items.push({ id: r.id, title, + subtitle, thumbnail, duration, durationText, From c6c890986d6a0137cb6a70e01144c9c995589840 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Tue, 9 Sep 2025 21:23:22 +0800 Subject: [PATCH 18/82] fix(player): ensure video always starts paused and sync UI state correctly (#102) - Add AppLifecycleService for proper resource cleanup on app exit - Implement force pause state synchronization in VideoSurface - Ensure video element and player engine state consistency - Add autoPlay={false} attribute to prevent browser auto-play behavior - Fix play/pause button icon state sync issue when re-entering video Resolves issue where returning from homepage during playback would show incorrect play button icon despite video being properly paused. Changes: - Add AppLifecycleService.ts for comprehensive resource management - Enhance VideoSurface with multiple pause state enforcement points - Update WindowService to notify renderer process on app quit - Integrate lifecycle service in App.tsx and PlayerPage.tsx --- src/main/services/WindowService.ts | 2 + src/renderer/src/App.tsx | 16 ++ src/renderer/src/pages/player/PlayerPage.tsx | 9 + .../pages/player/components/VideoSurface.tsx | 30 +++- .../src/services/AppLifecycleService.ts | 169 ++++++++++++++++++ src/renderer/src/services/index.ts | 1 + 6 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 src/renderer/src/services/AppLifecycleService.ts diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts index b7afe805..5eae94b3 100644 --- a/src/main/services/WindowService.ts +++ b/src/main/services/WindowService.ts @@ -331,6 +331,8 @@ export class WindowService { mainWindow.on('close', (event) => { // 如果已经触发退出，直接退出 if (app.isQuitting) { + // 通知渲染进程应用即将退出，让它进行资源清理 + mainWindow.webContents.send('app-will-quit') return app.quit() } diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 0d8306f9..d6c2e851 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -1,6 +1,7 @@ import { loggerService } from '@logger' import { AntdProvider, NotificationProvider, ThemeProvider } from '@renderer/contexts' import { configSyncService } from '@renderer/services' +import { appLifecycleService } from '@renderer/services/AppLifecycleService' import React, { useEffect, useState } from 'react' import { SearchOverlay } from './components/SearchOverlay' @@ -53,6 +54,21 @@ function App(): React.JSX.Element { initializeApp() }, []) + // 初始化应用生命周期管理服务 + useEffect(() => { + logger.debug('应用生命周期服务已初始化') + + // 组件卸载时清理服务 + return () => { + try { + appLifecycleService.dispose() + logger.debug('应用生命周期服务已清理') + } catch (error) { + logger.error('清理应用生命周期服务时出错:', { error }) + } + } + }, []) + // 启动页面退出动画完成后完全隐藏 const handleSplashAnimationEnd = () => { logger.debug('启动页面动画完成，完全隐藏') diff --git a/src/renderer/src/pages/player/PlayerPage.tsx b/src/renderer/src/pages/player/PlayerPage.tsx index 7cb9bc59..7f4c2f58 100644 --- a/src/renderer/src/pages/player/PlayerPage.tsx +++ b/src/renderer/src/pages/player/PlayerPage.tsx @@ -23,6 +23,7 @@ import { SubtitleListPanel, VideoSurface } from './components' +import { disposeGlobalOrchestrator } from './hooks/usePlayerEngine' import { PlayerPageProvider } from './state/player-page.provider' const logger = loggerService.withContext('PlayerPage') @@ -149,6 +150,14 @@ function PlayerPage() { // 页面卸载时清理会话态 usePlayerSessionStore.getState().clear() playerSettingsPersistenceService.detach() + + // 清理播放器编排器资源 + try { + disposeGlobalOrchestrator() + logger.debug('播放器编排器已清理') + } catch (error) { + logger.error('清理播放器编排器时出错:', { error }) + } } }, [videoId]) diff --git a/src/renderer/src/pages/player/components/VideoSurface.tsx b/src/renderer/src/pages/player/components/VideoSurface.tsx index 96496623..9d01fb8b 100644 --- a/src/renderer/src/pages/player/components/VideoSurface.tsx +++ b/src/renderer/src/pages/player/components/VideoSurface.tsx @@ -33,11 +33,26 @@ function VideoSurface({ src, onLoadedMetadata, onError }: VideoSurfaceProps) { // 连接到新的播放器引擎 if (node) { + // 确保视频元素始终以暂停状态开始 + if (!node.paused) { + node.pause() + logger.debug('视频元素连接时确保暂停状态') + } + connectVideoElement(node) logger.debug('视频元素已连接到播放器引擎', { src: node.src }) + + // 强制同步暂停状态到播放器引擎 + // 延迟执行确保引擎完全初始化 + setTimeout(() => { + if (orchestrator) { + orchestrator.onPause() // 确保引擎状态为暂停 + logger.debug('强制同步暂停状态到播放器引擎') + } + }, 10) } }, - [connectVideoElement] + [connectVideoElement, orchestrator] ) // 获取媒体事件处理器 @@ -55,6 +70,18 @@ function VideoSurface({ src, onLoadedMetadata, onError }: VideoSurfaceProps) { videoHeight: video.videoHeight }) + // 确保视频始终处于暂停状态（防止浏览器自动播放行为） + if (!video.paused) { + video.pause() + logger.debug('视频自动暂停（防止意外播放）') + } + + // 强制同步暂停状态到播放器引擎 + if (orchestrator) { + orchestrator.onPause() + logger.debug('元数据加载完成后强制同步暂停状态到播放器引擎') + } + // 恢复保存的播放时间（在元数据加载完成后执行，通过引擎统一调度） if (currentTime > 0 && Math.abs(video.currentTime - currentTime) > 0.1) { // 延迟一小段时间确保引擎完全准备就绪 @@ -148,6 +175,7 @@ function VideoSurface({ src, onLoadedMetadata, onError }: VideoSurfaceProps) { controlsList="nodownload" disablePictureInPicture={false} preload="metadata" + autoPlay={false} // 明确禁用自动播放 playsInline // 添加更多有用的事件处理 // onCanPlay={() => { diff --git a/src/renderer/src/services/AppLifecycleService.ts b/src/renderer/src/services/AppLifecycleService.ts new file mode 100644 index 00000000..3db7f526 --- /dev/null +++ b/src/renderer/src/services/AppLifecycleService.ts @@ -0,0 +1,169 @@ +import { loggerService } from '@logger' + +import { disposeGlobalOrchestrator } from '../pages/player/hooks/usePlayerEngine' + +const logger = loggerService.withContext('AppLifecycleService') + +/** + * 应用生命周期服务 + * 负责处理应用退出、窗口关闭等场景下的资源清理 + */ +export class AppLifecycleService { + private static instance: AppLifecycleService | null = null + private isDisposed = false + private cleanupHandlers: Array<() => void> = [] + + public static getInstance(): AppLifecycleService { + if (!AppLifecycleService.instance) { + AppLifecycleService.instance = new AppLifecycleService() + } + return AppLifecycleService.instance + } + + private constructor() { + this.setupEventListeners() + } + + /** + * 注册清理处理器 + */ + public registerCleanupHandler(handler: () => void): () => void { + this.cleanupHandlers.push(handler) + + // 返回取消注册的函数 + return () => { + const index = this.cleanupHandlers.indexOf(handler) + if (index > -1) { + this.cleanupHandlers.splice(index, 1) + } + } + } + + /** + * 设置事件监听器 + */ + private setupEventListeners(): void { + // 页面即将卸载时的清理 + window.addEventListener('beforeunload', this.handleBeforeUnload.bind(this)) + + // 页面可见性变化处理（用户切换应用、最小化窗口等） + document.addEventListener('visibilitychange', this.handleVisibilityChange.bind(this)) + + // 监听主进程发送的退出信号（如果有的话） + if (window.electron?.ipcRenderer) { + window.electron.ipcRenderer.on('app-will-quit', this.handleAppWillQuit.bind(this)) + } + + logger.debug('应用生命周期事件监听器已设置') + } + + /** + * 处理页面即将卸载 + */ + private handleBeforeUnload(): void { + if (this.isDisposed) return + + try { + logger.debug('页面即将卸载，开始清理资源') + this.performFullCleanup() + } catch (error) { + logger.error('页面卸载时清理资源失败:', { error }) + } + } + + /** + * 处理页面可见性变化 + */ + private handleVisibilityChange(): void { + if (document.visibilityState === 'hidden') { + logger.debug('页面变为不可见状态') + // 这里可以添加暂停播放等逻辑，但不完全清理资源 + } else if (document.visibilityState === 'visible') { + logger.debug('页面变为可见状态') + // 页面重新可见时的恢复逻辑 + } + } + + /** + * 处理应用即将退出（来自主进程的信号） + */ + private handleAppWillQuit(): void { + if (this.isDisposed) return + + try { + logger.debug('应用即将退出，开始清理资源') + this.performFullCleanup() + } catch (error) { + logger.error('应用退出时清理资源失败:', { error }) + } + } + + /** + * 执行完整的资源清理 + */ + private performFullCleanup(): void { + if (this.isDisposed) { + logger.warn('资源已被清理，跳过重复清理') + return + } + + logger.debug('开始执行完整资源清理') + + // 1. 清理播放器编排器 + try { + disposeGlobalOrchestrator() + logger.debug('播放器编排器已清理') + } catch (error) { + logger.error('清理播放器编排器失败:', { error }) + } + + // 2. 执行所有注册的清理处理器 + try { + this.cleanupHandlers.forEach((handler, index) => { + try { + handler() + logger.debug(`清理处理器 ${index} 执行成功`) + } catch (error) { + logger.error(`清理处理器 ${index} 执行失败:`, { error }) + } + }) + } catch (error) { + logger.error('执行自定义清理处理器时出错:', { error }) + } + + // 3. 标记为已清理 + this.isDisposed = true + logger.debug('完整资源清理完成') + } + + /** + * 手动触发清理（供外部调用） + */ + public dispose(): void { + this.performFullCleanup() + + // 移除事件监听器 + try { + window.removeEventListener('beforeunload', this.handleBeforeUnload.bind(this)) + document.removeEventListener('visibilitychange', this.handleVisibilityChange.bind(this)) + + if (window.electron?.ipcRenderer) { + window.electron.ipcRenderer.removeAllListeners('app-will-quit') + } + + logger.debug('应用生命周期事件监听器已移除') + } catch (error) { + logger.error('移除事件监听器时出错:', { error }) + } + } + + /** + * 检查是否已被清理 + */ + public isDisposedState(): boolean { + return this.isDisposed + } +} + +// 创建全局单例实例 +export const appLifecycleService = AppLifecycleService.getInstance() diff --git a/src/renderer/src/services/index.ts b/src/renderer/src/services/index.ts index 7bdebb04..fada4526 100644 --- a/src/renderer/src/services/index.ts +++ b/src/renderer/src/services/index.ts @@ -1,3 +1,4 @@ +export * from './AppLifecycleService' export * from './ConfigSyncService' export * from './FileManager' export * from './VideoLibrary' From cb148f4763cb680a29e9d2f3c4e23cea104ccbd5 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 08:35:18 +0800 Subject: [PATCH 19/82] refactor(media): replace mediainfo.js with @remotion/media-parser (#103) - Remove mediainfo.js dependency and complex WASM handling - Add @remotion/media-parser for lighter, more modern media parsing - Replace MediaInfoService with MediaParserService - Maintain API compatibility with existing FFmpegVideoInfo interface - Remove WASM file copying from build configuration - Update electron-builder to exclude unnecessary WASM patterns - All tests pass and build succeeds with new implementation --- electron-builder.yml | 3 +- electron.vite.config.ts | 10 - package.json | 2 +- pnpm-lock.yaml | 49 +-- src/main/ipc.ts | 12 +- src/main/services/MediaInfoService.ts | 450 ------------------------ src/main/services/MediaParserService.ts | 263 ++++++++++++++ 7 files changed, 279 insertions(+), 510 deletions(-) delete mode 100644 src/main/services/MediaInfoService.ts create mode 100644 src/main/services/MediaParserService.ts diff --git a/electron-builder.yml b/electron-builder.yml index 288e1c45..294dbf73 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -45,8 +45,7 @@ files: - '!**/{example,examples}/**' asarUnpack: - resources/** - - '**/*.{metal,exp,lib,wasm}' - - '**/assets/MediaInfoModule.wasm' + - '**/*.{metal,exp,lib}' copyright: Copyright © 2025 EchoPlayer win: executableName: EchoPlayer diff --git a/electron.vite.config.ts b/electron.vite.config.ts index d611b16e..15cc73b3 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -5,7 +5,6 @@ import react from '@vitejs/plugin-react-swc' import { CodeInspectorPlugin } from 'code-inspector-plugin' import { defineConfig, externalizeDepsPlugin } from 'electron-vite' import { resolve } from 'path' -import { viteStaticCopy } from 'vite-plugin-static-copy' const isDev = process.env.NODE_ENV === 'development' const isProd = process.env.NODE_ENV === 'production' @@ -14,15 +13,6 @@ export default defineConfig({ main: { plugins: [ externalizeDepsPlugin(), - // 复制 MediaInfo WASM 文件到构建输出 - viteStaticCopy({ - targets: [ - { - src: 'node_modules/mediainfo.js/dist/MediaInfoModule.wasm', - dest: 'assets' - } - ] - }), // 复制迁移文件到构建目录 { name: 'copy-migrations', diff --git a/package.json b/package.json index 5630aaa2..17616a83 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "@ant-design/v5-patch-for-react-19": "^1.0.3", "@electron-toolkit/preload": "^3.0.2", "@electron-toolkit/utils": "^4.0.0", + "@remotion/media-parser": "^4.0.344", "antd": "^5.27.3", "better-sqlite3": "^12.2.0", "dompurify": "^3.2.6", @@ -83,7 +84,6 @@ "kysely": "^0.28.5", "macos-release": "^3.4.0", "marked": "^15.0.12", - "mediainfo.js": "^0.3.6", "react-hotkeys-hook": "^5.1.0", "react-player": "^2.16.1", "react-virtualized": "^9.22.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 755a1efd..eac64848 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -26,6 +26,9 @@ importers: '@electron-toolkit/utils': specifier: ^4.0.0 version: 4.0.0(electron@37.2.4) + '@remotion/media-parser': + specifier: ^4.0.344 + version: 4.0.344 antd: specifier: ^5.27.3 version: 5.27.3(moment@2.30.1)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -56,9 +59,6 @@ importers: marked: specifier: ^15.0.12 version: 15.0.12 - mediainfo.js: - specifier: ^0.3.6 - version: 0.3.6 react-hotkeys-hook: specifier: ^5.1.0 version: 5.1.0(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -1418,6 +1418,9 @@ packages: peerDependencies: redux: ^3.1.0 || ^4.0.0 || ^5.0.0 + '@remotion/media-parser@4.0.344': + resolution: {integrity: sha512-HI7Jz6OkhN53FTz5K1uiiXMPM0mDJXy/RmbUcYZBDukdRBgCWv4O6g4enjywgYY80FH17IHIXz2gVmdRXAGBfg==} + '@rolldown/pluginutils@1.0.0-beta.27': resolution: {integrity: sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==} @@ -2421,10 +2424,6 @@ packages: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} - cliui@9.0.1: - resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==} - engines: {node: '>=20'} - clone-response@1.0.3: resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==} @@ -4385,11 +4384,6 @@ packages: mdast-util-to-string@4.0.0: resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==} - mediainfo.js@0.3.6: - resolution: {integrity: sha512-3xVRlxwlVWIZV3z1q7pb8LzFOO7iKi/DXoRiFRZdOlrUEhPyJDaaRt0uK32yQJabArQicRBeq7cRxmdZlIBTyA==} - engines: {node: '>=18.0.0'} - hasBin: true - memoize-one@5.2.1: resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==} @@ -6825,10 +6819,6 @@ packages: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} - yargs-parser@22.0.0: - resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} - engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yargs-parser@4.2.1: resolution: {integrity: sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==} @@ -6840,10 +6830,6 @@ packages: resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} engines: {node: '>=12'} - yargs@18.0.0: - resolution: {integrity: sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==} - engines: {node: ^20.19.0 || ^22.12.0 || >=23} - yargs@6.6.0: resolution: {integrity: sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==} @@ -8257,6 +8243,8 @@ snapshots: immutable: 4.3.7 redux: 4.2.1 + '@remotion/media-parser@4.0.344': {} + '@rolldown/pluginutils@1.0.0-beta.27': {} '@rollup/rollup-android-arm-eabi@4.50.0': @@ -9475,12 +9463,6 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 - cliui@9.0.1: - dependencies: - string-width: 7.2.0 - strip-ansi: 7.1.0 - wrap-ansi: 9.0.0 - clone-response@1.0.3: dependencies: mimic-response: 1.0.1 @@ -11832,10 +11814,6 @@ snapshots: dependencies: '@types/mdast': 4.0.4 - mediainfo.js@0.3.6: - dependencies: - yargs: 18.0.0 - memoize-one@5.2.1: {} meow@12.1.1: {} @@ -14455,8 +14433,6 @@ snapshots: yargs-parser@21.1.1: {} - yargs-parser@22.0.0: {} - yargs-parser@4.2.1: dependencies: camelcase: 3.0.0 @@ -14481,15 +14457,6 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 - yargs@18.0.0: - dependencies: - cliui: 9.0.1 - escalade: 3.2.0 - get-caller-file: 2.0.5 - string-width: 7.2.0 - y18n: 5.0.8 - yargs-parser: 22.0.0 - yargs@6.6.0: dependencies: camelcase: 3.0.0 diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 35572798..f0cb0b3e 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -24,7 +24,7 @@ import DictionaryService from './services/DictionaryService' import FFmpegService from './services/FFmpegService' import FileStorage from './services/FileStorage' import { loggerService } from './services/LoggerService' -import MediaInfoService from './services/MediaInfoService' +import MediaParserService from './services/MediaParserService' import NotificationService from './services/NotificationService' import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService' import { themeService } from './services/ThemeService' @@ -37,7 +37,7 @@ const logger = loggerService.withContext('IPC') const fileManager = new FileStorage() const dictionaryService = new DictionaryService() const ffmpegService = new FFmpegService() -const mediaInfoService = new MediaInfoService() +const mediaParserService = new MediaParserService() /** * Register all IPC handlers used by the main process. @@ -444,15 +444,15 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { return ffmpegService.getFFmpegPath() }) - // MediaInfo + // MediaParser (Remotion) ipcMain.handle(IpcChannel.MediaInfo_CheckExists, async () => { - return await mediaInfoService.checkMediaInfoExists() + return await mediaParserService.checkExists() }) ipcMain.handle(IpcChannel.MediaInfo_GetVersion, async () => { - return await mediaInfoService.getMediaInfoVersion() + return await mediaParserService.getVersion() }) ipcMain.handle(IpcChannel.MediaInfo_GetVideoInfo, async (_, inputPath: string) => { - return await mediaInfoService.getVideoInfo(inputPath) + return await mediaParserService.getVideoInfo(inputPath) }) // shortcuts diff --git a/src/main/services/MediaInfoService.ts b/src/main/services/MediaInfoService.ts deleted file mode 100644 index c9fb0248..00000000 --- a/src/main/services/MediaInfoService.ts +++ /dev/null @@ -1,450 +0,0 @@ -import type { FFmpegVideoInfo } from '@types' -import * as fs from 'fs' -import type { MediaInfo, ReadChunkFunc } from 'mediainfo.js' -import * as path from 'path' - -import { loggerService } from './LoggerService' - -const logger = loggerService.withContext('MediaInfoService') - -class MediaInfoService { - private mediaInfo: MediaInfo<'object'> | null = null - private isInitialized = false - - constructor() { - // 构造函数可以用于初始化操作 - } - - /** - * 创建文件读取函数 - */ - private makeReadChunk(filePath: string): ReadChunkFunc { - return async (chunkSize: number, offset: number) => { - const fd = fs.openSync(filePath, 'r') - try { - const buffer = Buffer.alloc(chunkSize) - const bytesRead = fs.readSync(fd, buffer, 0, chunkSize, offset) - return new Uint8Array(buffer.buffer, buffer.byteOffset, bytesRead) - } finally { - fs.closeSync(fd) - } - } - } - - /** - * 初始化 MediaInfo WebAssembly - */ - private async initializeMediaInfo(): Promise { - if (this.isInitialized && this.mediaInfo) { - return - } - - try { - logger.info('🚀 开始初始化 MediaInfo WebAssembly') - const startTime = Date.now() - - // 使用动态导入来处理 ESM 模块 - const { default: mediaInfoFactory } = await import('mediainfo.js') - this.mediaInfo = await mediaInfoFactory({ - format: 'object', - locateFile: (wasmPath: string) => { - // 在 Electron 中寻找 WASM 文件路径 - if (wasmPath === 'MediaInfoModule.wasm') { - // 可能的路径列表，按优先级排序 - const possiblePaths = [ - // 开发环境路径 - path.join(__dirname, 'assets', wasmPath), - path.join(__dirname, '..', 'assets', wasmPath), - - // 生产环境路径（优先 asar.unpacked） - path.join( - process.resourcesPath || __dirname, - 'app.asar.unpacked/out/main/assets', - wasmPath - ), - path.join(process.resourcesPath || __dirname, 'app/out/main/assets', wasmPath), - - // 备用路径 - path.join(process.resourcesPath || __dirname, 'assets', wasmPath), - path.join(__dirname, '../../../assets', wasmPath), - path.join(process.cwd(), 'assets', wasmPath), - - // Windows特殊路径 - path.join(__dirname, 'assets', wasmPath).replace(/\\/g, '/') - ] - - // 逐一检查路径 - for (const testPath of possiblePaths) { - if (fs.existsSync(testPath)) { - logger.info('🔧 找到 WASM 文件路径', { - path: testPath, - platform: process.platform - }) - return testPath - } - } - - logger.warn('⚠️ 未找到 WASM 文件，尝试的路径:', { - paths: possiblePaths, - platform: process.platform, - __dirname, - resourcesPath: process.resourcesPath, - cwd: process.cwd() - }) - } - return wasmPath - } - }) - - const initTime = Date.now() - startTime - this.isInitialized = true - - logger.info(`✅ MediaInfo 初始化成功，耗时: ${initTime}ms`) - } catch (error) { - logger.error('❌ MediaInfo 初始化失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - throw error - } - } - - /** - * 将文件 URL 转换为本地路径 - */ - private convertFileUrlToLocalPath(inputPath: string): string { - // 如果是file://URL，需要转换为本地路径 - if (inputPath.startsWith('file://')) { - try { - const url = new URL(inputPath) - let localPath = decodeURIComponent(url.pathname) - - // Windows路径处理：移除开头的斜杠 - if (process.platform === 'win32' && localPath.startsWith('/')) { - localPath = localPath.substring(1) - } - - logger.info('🔄 URL路径转换', { - 原始路径: inputPath, - 转换后路径: localPath, - 平台: process.platform, - 文件是否存在: fs.existsSync(localPath) - }) - - return localPath - } catch (error) { - logger.error('URL路径转换失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - // 如果转换失败，返回原路径 - return inputPath - } - } - - // 如果不是file://URL，直接返回 - return inputPath - } - - /** - * 解析 MediaInfo 结果为 FFmpegVideoInfo 格式 - */ - private parseMediaInfoResult(result: any): FFmpegVideoInfo | null { - try { - logger.info('🔍 开始解析 MediaInfo 结果') - - if (!result || !result.media || !result.media.track) { - logger.error('❌ MediaInfo 结果格式无效') - return null - } - - const tracks = result.media.track as any[] - - // 查找通用轨道（包含文件信息） - const generalTrack = tracks.find((track) => track['@type'] === 'General') - - // 查找视频轨道 - const videoTrack = tracks.find((track) => track['@type'] === 'Video') - - // 查找音频轨道 - const audioTrack = tracks.find((track) => track['@type'] === 'Audio') - - if (!videoTrack) { - logger.error('❌ 未找到视频轨道') - return null - } - - // 解析时长（需要检查 MediaInfo 返回的实际格式） - let duration = 0 - - // 先记录原始数据以便调试 - logger.info('📊 MediaInfo 原始时长数据', { - generalTrack_Duration: generalTrack?.Duration, - videoTrack_Duration: videoTrack?.Duration, - generalTrack_DurationString: generalTrack?.['Duration/String'], - generalTrack_DurationString1: generalTrack?.['Duration/String1'], - generalTrack_DurationString2: generalTrack?.['Duration/String2'], - generalTrack_DurationString3: generalTrack?.['Duration/String3'] - }) - - if (generalTrack?.Duration) { - const rawDuration = String(generalTrack.Duration) - const durationValue = parseFloat(rawDuration) - - // MediaInfo 可能返回毫秒或秒，需要智能判断 - if (durationValue > 3600000) { - // 如果值大于1小时的毫秒数（3600000），很可能是毫秒 - duration = durationValue / 1000 - logger.info('🕐 检测到毫秒格式时长（大于1小时）', { - 原始值: durationValue, - 转换后秒数: duration - }) - } else if (durationValue > 60000) { - // 如果值大于1分钟的毫秒数（60000），很可能是毫秒 - duration = durationValue / 1000 - logger.info('🕐 检测到毫秒格式时长（大于1分钟）', { - 原始值: durationValue, - 转换后秒数: duration - }) - } else if (durationValue > 3600) { - // 如果值大于1小时的秒数（3600），很可能是秒 - duration = durationValue - logger.info('🕐 检测到秒格式时长', { - 原始值: durationValue, - 秒数: duration - }) - } else { - // 对于较小的值，假设是秒（因为很少有视频短于1分钟但用毫秒表示会小于60000） - duration = durationValue - logger.warn('🕐 时长值较小，假设为秒格式', { - 原始值: durationValue, - 假设秒数: duration - }) - } - } else if (videoTrack?.Duration) { - const rawDuration = String(videoTrack.Duration) - const durationValue = parseFloat(rawDuration) - - // 同样的逻辑应用于视频轨道时长 - if (durationValue > 3600000) { - duration = durationValue / 1000 - logger.info('🕐 从视频轨道检测到毫秒格式时长（大于1小时）', { - 原始值: durationValue, - 转换后秒数: duration - }) - } else if (durationValue > 60000) { - duration = durationValue / 1000 - logger.info('🕐 从视频轨道检测到毫秒格式时长（大于1分钟）', { - 原始值: durationValue, - 转换后秒数: duration - }) - } else if (durationValue > 3600) { - duration = durationValue - logger.info('🕐 从视频轨道检测到秒格式时长', { - 原始值: durationValue, - 秒数: duration - }) - } else { - duration = durationValue - logger.warn('🕐 从视频轨道获取时长值较小，假设为秒格式', { - 原始值: durationValue, - 假设秒数: duration - }) - } - } - - // 解析视频编解码器 - const videoCodec = videoTrack.Format || videoTrack.CodecID || 'unknown' - - // 解析音频编解码器 - const audioCodec = audioTrack?.Format || audioTrack?.CodecID || 'unknown' - - // 解析分辨率 - let resolution = '0x0' - if (videoTrack.Width && videoTrack.Height) { - resolution = `${videoTrack.Width}x${videoTrack.Height}` - } - - // 解析码率 - let bitrate = '0' - if (generalTrack?.OverallBitRate) { - bitrate = String(generalTrack.OverallBitRate) - } else if (videoTrack.BitRate) { - bitrate = String(videoTrack.BitRate) - } - - const videoInfo: FFmpegVideoInfo = { - duration, - videoCodec, - audioCodec, - resolution, - bitrate - } - - logger.info('🎬 解析的视频信息', { - duration: `${duration}s`, - videoCodec, - audioCodec, - resolution, - bitrate: `${bitrate} bps`, - 原始数据样本: { - generalTrack: generalTrack ? Object.keys(generalTrack).slice(0, 5) : 'none', - videoTrack: videoTrack ? Object.keys(videoTrack).slice(0, 8) : 'none', - audioTrack: audioTrack ? Object.keys(audioTrack).slice(0, 5) : 'none' - } - }) - - return videoInfo - } catch (error) { - logger.error('解析 MediaInfo 结果失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - return null - } - } - - /** - * 获取视频文件信息 - */ - public async getVideoInfo(inputPath: string): Promise { - const startTime = Date.now() - logger.info('🎬 开始获取视频信息 (MediaInfo)', { inputPath }) - - try { - // 确保 MediaInfo 已初始化 - await this.initializeMediaInfo() - - if (!this.mediaInfo) { - throw new Error('MediaInfo 未初始化') - } - - // 转换文件路径 - const pathConvertStartTime = Date.now() - const localInputPath = this.convertFileUrlToLocalPath(inputPath) - const pathConvertEndTime = Date.now() - - logger.info(`🔄 路径转换耗时: ${pathConvertEndTime - pathConvertStartTime}ms`, { - 原始输入路径: inputPath, - 转换后本地路径: localInputPath - }) - - // 检查文件是否存在 - const fileCheckStartTime = Date.now() - const fileExists = fs.existsSync(localInputPath) - const fileCheckEndTime = Date.now() - - logger.info(`📁 文件存在性检查耗时: ${fileCheckEndTime - fileCheckStartTime}ms`, { - 文件存在性: fileExists - }) - - if (!fileExists) { - logger.error(`❌ 文件不存在: ${localInputPath}`) - return null - } - - // 获取文件大小 - const fileStatsStartTime = Date.now() - const fileStats = fs.statSync(localInputPath) - const fileSize = fileStats.size - const fileStatsEndTime = Date.now() - - logger.info(`📊 文件信息获取耗时: ${fileStatsEndTime - fileStatsStartTime}ms`, { - 文件大小: `${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB` - }) - - // 使用 MediaInfo 分析文件（参考例子的方式） - const analysisStartTime = Date.now() - const result = await this.mediaInfo.analyzeData(fileSize, this.makeReadChunk(localInputPath)) - const analysisEndTime = Date.now() - - logger.info(`🔍 MediaInfo 分析耗时: ${analysisEndTime - analysisStartTime}ms`) - - // 解析结果 - const parseStartTime = Date.now() - const videoInfo = this.parseMediaInfoResult(result) - const parseEndTime = Date.now() - - logger.info(`📊 结果解析耗时: ${parseEndTime - parseStartTime}ms`) - - if (videoInfo) { - const totalTime = Date.now() - startTime - logger.info(`✅ 成功获取视频信息 (MediaInfo)，总耗时: ${totalTime}ms`, { - ...videoInfo, - 性能统计: { - 路径转换: `${pathConvertEndTime - pathConvertStartTime}ms`, - 文件检查: `${fileCheckEndTime - fileCheckStartTime}ms`, - 文件信息获取: `${fileStatsEndTime - fileStatsStartTime}ms`, - MediaInfo分析: `${analysisEndTime - analysisStartTime}ms`, - 结果解析: `${parseEndTime - parseStartTime}ms`, - 总耗时: `${totalTime}ms` - } - }) - return videoInfo - } else { - logger.error('❌ 无法解析视频信息') - return null - } - } catch (error) { - const totalTime = Date.now() - startTime - logger.error(`❌ 获取视频信息失败，耗时: ${totalTime}ms`, { - inputPath, - error: error instanceof Error ? error.message : String(error), - 总耗时: `${totalTime}ms` - }) - return null - } - } - - /** - * 检查 MediaInfo 是否可用 - */ - public async checkMediaInfoExists(): Promise { - try { - await this.initializeMediaInfo() - return this.isInitialized && this.mediaInfo !== null - } catch (error) { - logger.error('MediaInfo 检查失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - return false - } - } - - /** - * 获取 MediaInfo 版本信息 - */ - public async getMediaInfoVersion(): Promise { - try { - await this.initializeMediaInfo() - if (this.mediaInfo) { - // MediaInfo.js 没有稳定的运行时版本查询 API；如需展示版本请从 package.json 读取 - return 'mediainfo.js' - } - return null - } catch (error) { - logger.error('获取 MediaInfo 版本失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - return null - } - } - - /** - * 清理资源 - */ - public async dispose(): Promise { - if (this.mediaInfo) { - try { - // 根据参考例子，调用 close 方法清理资源 - logger.info('🧹 清理 MediaInfo 资源') - this.mediaInfo.close() - this.mediaInfo = null - this.isInitialized = false - } catch (error) { - logger.error('清理 MediaInfo 资源失败:', { - error: error instanceof Error ? error : new Error(String(error)) - }) - } - } - } -} - -export default MediaInfoService diff --git a/src/main/services/MediaParserService.ts b/src/main/services/MediaParserService.ts new file mode 100644 index 00000000..cb5b0c38 --- /dev/null +++ b/src/main/services/MediaParserService.ts @@ -0,0 +1,263 @@ +import { parseMedia } from '@remotion/media-parser' +import { nodeReader } from '@remotion/media-parser/node' +import type { FFmpegVideoInfo } from '@types' +import * as fs from 'fs' + +import { loggerService } from './LoggerService' + +const logger = loggerService.withContext('MediaParserService') + +class MediaParserService { + constructor() { + // 构造函数可以用于初始化操作 + } + + /** + * 将文件 URL 转换为本地路径 + */ + private convertFileUrlToLocalPath(inputPath: string): string { + // 如果是file://URL，需要转换为本地路径 + if (inputPath.startsWith('file://')) { + try { + const url = new URL(inputPath) + let localPath = decodeURIComponent(url.pathname) + + // Windows路径处理：移除开头的斜杠 + if (process.platform === 'win32' && localPath.startsWith('/')) { + localPath = localPath.substring(1) + } + + logger.info('🔄 URL路径转换', { + 原始路径: inputPath, + 转换后路径: localPath, + 平台: process.platform, + 文件是否存在: fs.existsSync(localPath) + }) + + return localPath + } catch (error) { + logger.error('URL路径转换失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + // 如果转换失败，返回原路径 + return inputPath + } + } + + // 如果不是file://URL，直接返回 + return inputPath + } + + /** + * 将 Remotion parseMedia 结果转换为 FFmpegVideoInfo 格式 + */ + private parseRemotionResult(result: any): FFmpegVideoInfo | null { + try { + logger.info('🔍 开始解析 Remotion 媒体解析结果') + + if (!result) { + logger.error('❌ Remotion 结果为空') + return null + } + + // 获取时长（秒） + const duration = result.durationInSeconds || 0 + + // 获取视频轨道信息 + let videoCodec = 'unknown' + let resolution = '0x0' + let bitrate = '0' + + if (result.videoTracks && result.videoTracks.length > 0) { + const videoTrack = result.videoTracks[0] + videoCodec = videoTrack.codecWithoutConfig || videoTrack.codec || 'unknown' + + if (videoTrack.width && videoTrack.height) { + resolution = `${videoTrack.width}x${videoTrack.height}` + } + + if (videoTrack.bitrate) { + bitrate = String(videoTrack.bitrate) + } + } + + // 获取音频编解码器 + let audioCodec = 'unknown' + if (result.audioTracks && result.audioTracks.length > 0) { + const audioTrack = result.audioTracks[0] + audioCodec = audioTrack.codecWithoutConfig || audioTrack.codec || 'unknown' + } + + const videoInfo: FFmpegVideoInfo = { + duration, + videoCodec, + audioCodec, + resolution, + bitrate + } + + logger.info('🎬 解析的视频信息', { + duration: `${duration}s`, + videoCodec, + audioCodec, + resolution, + bitrate: `${bitrate} bps`, + 原始数据样本: { + videoTracks: result.videoTracks?.length || 0, + audioTracks: result.audioTracks?.length || 0, + container: result.container + } + }) + + return videoInfo + } catch (error) { + logger.error('解析 Remotion 结果失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return null + } + } + + /** + * 获取视频文件信息 + */ + public async getVideoInfo(inputPath: string): Promise { + const startTime = Date.now() + logger.info('🎬 开始获取视频信息 (Remotion)', { inputPath }) + + try { + // 转换文件路径 + const pathConvertStartTime = Date.now() + const localInputPath = this.convertFileUrlToLocalPath(inputPath) + const pathConvertEndTime = Date.now() + + logger.info(`🔄 路径转换耗时: ${pathConvertEndTime - pathConvertStartTime}ms`, { + 原始输入路径: inputPath, + 转换后本地路径: localInputPath + }) + + // 检查文件是否存在 + const fileCheckStartTime = Date.now() + const fileExists = fs.existsSync(localInputPath) + const fileCheckEndTime = Date.now() + + logger.info(`📁 文件存在性检查耗时: ${fileCheckEndTime - fileCheckStartTime}ms`, { + 文件存在性: fileExists + }) + + if (!fileExists) { + logger.error(`❌ 文件不存在: ${localInputPath}`) + return null + } + + // 获取文件大小 + const fileStatsStartTime = Date.now() + const fileStats = fs.statSync(localInputPath) + const fileSize = fileStats.size + const fileStatsEndTime = Date.now() + + logger.info(`📊 文件信息获取耗时: ${fileStatsEndTime - fileStatsStartTime}ms`, { + 文件大小: `${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB` + }) + + // 使用 Remotion parseMedia 分析文件 + const analysisStartTime = Date.now() + const result = await parseMedia({ + src: localInputPath, + reader: nodeReader, + fields: { + durationInSeconds: true, + dimensions: true, + videoCodec: true, + audioCodec: true, + tracks: true, + container: true + }, + logLevel: 'error' // 减少日志输出 + }) + const analysisEndTime = Date.now() + + logger.info(`🔍 Remotion 分析耗时: ${analysisEndTime - analysisStartTime}ms`) + + // 解析结果 + const parseStartTime = Date.now() + const videoInfo = this.parseRemotionResult(result) + const parseEndTime = Date.now() + + logger.info(`📊 结果解析耗时: ${parseEndTime - parseStartTime}ms`) + + if (videoInfo) { + const totalTime = Date.now() - startTime + logger.info(`✅ 成功获取视频信息 (Remotion)，总耗时: ${totalTime}ms`, { + ...videoInfo, + 性能统计: { + 路径转换: `${pathConvertEndTime - pathConvertStartTime}ms`, + 文件检查: `${fileCheckEndTime - fileCheckStartTime}ms`, + 文件信息获取: `${fileStatsEndTime - fileStatsStartTime}ms`, + Remotion分析: `${analysisEndTime - analysisStartTime}ms`, + 结果解析: `${parseEndTime - parseStartTime}ms`, + 总耗时: `${totalTime}ms` + } + }) + return videoInfo + } else { + logger.error('❌ 无法解析视频信息') + return null + } + } catch (error) { + const totalTime = Date.now() - startTime + logger.error(`❌ 获取视频信息失败，耗时: ${totalTime}ms`, { + inputPath, + error: error instanceof Error ? error.message : String(error), + 总耗时: `${totalTime}ms` + }) + return null + } + } + + /** + * 检查媒体解析器是否可用 + */ + public async checkExists(): Promise { + try { + // Remotion media-parser 不需要特殊初始化，总是可用 + return true + } catch (error) { + logger.error('媒体解析器检查失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return false + } + } + + /** + * 获取媒体解析器版本信息 + */ + public async getVersion(): Promise { + try { + // 返回 Remotion media-parser 标识 + return '@remotion/media-parser' + } catch (error) { + logger.error('获取媒体解析器版本失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + return null + } + } + + /** + * 清理资源 + */ + public async dispose(): Promise { + try { + logger.info('🧹 清理媒体解析器资源') + // Remotion media-parser 不需要特殊清理 + } catch (error) { + logger.error('清理媒体解析器资源失败:', { + error: error instanceof Error ? error : new Error(String(error)) + }) + } + } +} + +export default MediaParserService From e5f41092843333c39dc2029bd040aae6854a1036 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 09:32:58 +0800 Subject: [PATCH 20/82] feat(startup): implement configurable startup intro with preloading optimization (#104) * feat(startup): implement configurable startup intro with preloading optimization - Add StartupLoadingState component with modern design and animations - Add showStartupIntro setting to control startup intro visibility - Implement HomePage data preloading during startup intro for better UX - Add LoadingState component for HomePage initial loading state - Refactor App.tsx with simplified state management and async data flow - Extend video-list store with initialization tracking and data caching - Add localization support for startup intro setting Technical improvements: - Replace deprecated SplashScreen with modern StartupLoadingState component - Implement intelligent caching to avoid duplicate data loading - Add proper loading states and initialization tracking - Use stable useCallback references to prevent rendering loops - Support reduced motion preferences for accessibility This enhancement provides users with a polished startup experience while optimizing data loading performance through strategic preloading and caching. * chore: Reformat code --- src/renderer/src/App.tsx | 147 ++++++++---- .../StartupIntro/StartupLoadingState.tsx | 214 ++++++++++++++++++ .../src/components/StartupIntro/index.ts | 1 + src/renderer/src/i18n/locales/en-us.json | 1 + src/renderer/src/i18n/locales/zh-cn.json | 1 + .../src/infrastructure/hooks/useSettings.ts | 4 + src/renderer/src/pages/home/HomePage.tsx | 88 ++++--- src/renderer/src/pages/home/LoadingState.tsx | 87 +++++++ .../src/pages/settings/GeneralSettings.tsx | 9 +- .../src/state/stores/settings.store.ts | 5 + .../src/state/stores/video-list.store.ts | 45 +++- 11 files changed, 527 insertions(+), 75 deletions(-) create mode 100644 src/renderer/src/components/StartupIntro/StartupLoadingState.tsx create mode 100644 src/renderer/src/components/StartupIntro/index.ts create mode 100644 src/renderer/src/pages/home/LoadingState.tsx diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index d6c2e851..7688ef85 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -1,61 +1,131 @@ import { loggerService } from '@logger' import { AntdProvider, NotificationProvider, ThemeProvider } from '@renderer/contexts' +import { useSettings } from '@renderer/infrastructure/hooks/useSettings' import { configSyncService } from '@renderer/services' import { appLifecycleService } from '@renderer/services/AppLifecycleService' -import React, { useEffect, useState } from 'react' +import HomePageVideoService from '@renderer/services/HomePageVideos' +import { useVideoListStore } from '@renderer/state/stores/video-list.store' +import React, { useCallback, useEffect, useState } from 'react' import { SearchOverlay } from './components/SearchOverlay' -import SplashScreen from './components/SplashScreen' +import { StartupLoadingState } from './components/StartupIntro' import TopViewContainer from './components/TopView' import Router from './Router' const logger = loggerService.withContext('App.tsx') -function App(): React.JSX.Element { - const [splashVisible, setSplashVisible] = useState(true) - const [splashExiting, setSplashExiting] = useState(false) +// 内部组件，可以访问设置 +const AppContent: React.FC = () => { + const { showStartupIntro } = useSettings() + const { setLoading, setCachedVideos, setInitialized } = useVideoListStore() + + // 简化状态管理 - 只保留必要的状态 + const [isInitialized, setIsInitialized] = useState(false) + const [isPreloading, setIsPreloading] = useState(false) + const [preloadCompleted, setPreloadCompleted] = useState(false) + const [introCompleted, setIntroCompleted] = useState(false) + + // 计算是否应该显示主应用 + const shouldShowMainApp = + !showStartupIntro || (introCompleted && preloadCompleted && !isPreloading) + + // 预加载 HomePage 数据 + const preloadHomePageData = useCallback(async () => { + if (isPreloading || preloadCompleted) return // 防止重复预加载 + + try { + setIsPreloading(true) + logger.info('开始预加载 HomePage 数据') + + setLoading(true) + + // 预加载数据并缓存到 store + const svc = new HomePageVideoService() + const videos = await svc.getHomePageVideos(50) + + // 缓存到 store 供 HomePage 使用 + setCachedVideos(videos) + setInitialized(true) + + logger.info('HomePage 数据预加载完成，已缓存到 store', { videoCount: videos.length }) + setPreloadCompleted(true) + } catch (error) { + logger.error('预加载 HomePage 数据失败:', { error }) + } finally { + setLoading(false) + setIsPreloading(false) + } + }, [isPreloading, preloadCompleted, setCachedVideos, setInitialized, setLoading]) + + // StartupIntro 完成回调 - 使用 useCallback 稳定引用 + const handleIntroComplete = useCallback(() => { + logger.info('🎬 启动界面完成回调触发', { preloadCompleted, isPreloading }) + + setIntroCompleted(true) // 标记启动介绍已完成 + + // 移除手动设置showMainApp，让计算属性自动处理 + logger.info('🔄 启动介绍已完成，等待状态重新计算') + }, [preloadCompleted, isPreloading]) + + // 应用初始化逻辑 - 只执行一次 + useEffect(() => { + logger.info('🔄 初始化逻辑检查', { isInitialized, showStartupIntro }) + + if (isInitialized) { + logger.info('⏩ 已初始化，跳过重复初始化') + return // 避免重复初始化 + } + + logger.info('🚀 开始应用初始化', { showStartupIntro }) + preloadHomePageData().then(() => { + logger.info('✅ 主应用条件满足（跳过启动界面）') + }) + setIsInitialized(true) + + // 确保所有分支都有返回值 + return undefined + }, [showStartupIntro, isInitialized, preloadHomePageData]) + + // 渲染前的条件检查 + const shouldRenderIntro = showStartupIntro && !shouldShowMainApp + const shouldRenderMainApp = shouldShowMainApp + return ( + + {/* 基于计算属性显示主应用 */} + {shouldRenderMainApp && ( + <> + + + + )} + + {/* 显示启动页面 - 只在启用且主应用未显示时显示 */} + {shouldRenderIntro && } + + ) +} + +function App(): React.JSX.Element { logger.info('App initialized') useEffect(() => { - // 模拟应用初始化过程 + // 应用初始化过程 const initializeApp = async () => { try { logger.info('开始应用初始化') - // 最小显示时间确保用户能看到启动页面 - const minDisplayTime = new Promise((resolve) => setTimeout(resolve, 1500)) - - // 这里可以添加真实的初始化逻辑，比如： - // - 加载用户设置 - // - 初始化数据库 - // - 检查更新等 - // 同步配置从 main 进程到 renderer store - const configSyncPromise = configSyncService.syncAllConfigs() - - await Promise.all([ - minDisplayTime, - configSyncPromise - // 其他初始化任务... - ]) - - logger.info('应用初始化完成，准备隐藏启动页面') + await configSyncService.syncAllConfigs() - // 开始退出动画 - setSplashExiting(true) + logger.info('应用初始化完成') } catch (error) { logger.error('应用初始化失败:', { error }) - // 即使初始化失败也要隐藏启动页面 - setSplashExiting(true) } } initializeApp() - }, []) - // 初始化应用生命周期管理服务 - useEffect(() => { logger.debug('应用生命周期服务已初始化') // 组件卸载时清理服务 @@ -69,26 +139,11 @@ function App(): React.JSX.Element { } }, []) - // 启动页面退出动画完成后完全隐藏 - const handleSplashAnimationEnd = () => { - logger.debug('启动页面动画完成，完全隐藏') - setSplashVisible(false) - setSplashExiting(false) - } - return ( - - - - - + diff --git a/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx b/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx new file mode 100644 index 00000000..b0a01881 --- /dev/null +++ b/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx @@ -0,0 +1,214 @@ +import { loggerService } from '@logger' +import { AudioWaveform } from 'lucide-react' +import React, { useEffect } from 'react' +import styled, { keyframes } from 'styled-components' + +const logger = loggerService.withContext('StartupLoadingState') + +interface StartupLoadingStateProps { + visible: boolean + onComplete?: () => void +} + +export const StartupLoadingState: React.FC = ({ + visible, + onComplete +}) => { + useEffect(() => { + logger.info('🎦 StartupLoadingState useEffect 执行', { + visible + }) + + if (visible) { + logger.info('🚀 StartupLoadingState 开始显示') + + // 检查是否开启了减少动效偏好 + const reduced = + window.matchMedia && window.matchMedia('(prefers-reduced-motion: reduce)').matches + const delay = reduced ? 100 : 1800 // 稍长一些的展示时间 + + logger.info(`⏱️ StartupLoadingState 将在 ${delay}ms 后自动完成`, { reduced }) + + // 自动完成 + const timer = setTimeout(() => { + logger.info('✅ StartupLoadingState 定时器触发，执行完成回调') + onComplete?.() + }, delay) + + return () => { + logger.info('🧹 StartupLoadingState useEffect 清理定时器') + clearTimeout(timer) + } + } + + return undefined + }, [visible, onComplete]) + + if (!visible) { + return null + } + + return ( + + + {/* 品牌 Logo 区域 */} + + + + + + + + EchoPlayer + + + + {/* 背景效果 */} + + + ) +} + +// 动画定义 +const fadeIn = keyframes` + from { + opacity: 0; + transform: translateY(20px); + } + to { + opacity: 1; + transform: translateY(0px); + } +` + +const glow = keyframes` + 0%, 100% { + opacity: 0.6; + transform: scale(1); + } + 50% { + opacity: 1; + transform: scale(1.05); + } +` + +const shimmer = keyframes` + 0% { + background-position: -200% center; + } + 100% { + background-position: 200% center; + } +` + +// 样式组件 +const StartupContainer = styled.div` + position: fixed; + inset: 0; + z-index: 60; + display: flex; + align-items: center; + justify-content: center; + background-color: var(--color-background); + animation: ${fadeIn} 0.5s ease-out; + overflow: hidden; +` + +const BackgroundOverlay = styled.div` + position: absolute; + inset: 0; + background: + radial-gradient(1200px circle at 50% 40%, transparent 60%, rgba(0, 0, 0, 0.02)), + radial-gradient(800px circle at 50% 55%, var(--color-primary, #007aff) / 3, transparent 65%); + backdrop-filter: blur(20px) saturate(120%); + -webkit-backdrop-filter: blur(20px) saturate(120%); + + /* macOS 专属增强 */ + @supports (backdrop-filter: blur(20px)) { + background-color: rgba(0, 0, 0, 0.02); + } +` + +const ContentWrapper = styled.div` + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + gap: 48px; + position: relative; + z-index: 1; +` + +const BrandSection = styled.div` + display: flex; + flex-direction: column; + align-items: center; + gap: 20px; +` + +const LogoContainer = styled.div` + width: 80px; + height: 80px; + display: flex; + align-items: center; + justify-content: center; + position: relative; + will-change: transform; +` + +const LogoGlow = styled.div` + position: absolute; + inset: -8px; + border-radius: 50%; + background: var(--color-primary, #007aff) / 15; + filter: blur(16px); + animation: ${glow} 3s ease-in-out infinite; +` + +const LogoIcon = styled.div` + width: 64px; + height: 64px; + border-radius: 16px; + background: linear-gradient( + 135deg, + var(--color-primary, #007aff), + var(--color-primary, #007aff) / 80 + ); + display: flex; + align-items: center; + justify-content: center; + color: white; + font-size: 28px; + font-weight: 700; + position: relative; + z-index: 1; + box-shadow: + 0 12px 32px rgba(0, 122, 255, 0.25), + 0 4px 16px rgba(0, 122, 255, 0.15); + will-change: transform; +` + +const BrandText = styled.h1` + font-size: 42px; + font-weight: 650; + color: var(--color-text); + margin: 0; + line-height: 1.2; + font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Display', sans-serif; + letter-spacing: -1px; + + /* 添加渐变文字效果 */ + background: linear-gradient( + 135deg, + var(--color-text) 0%, + var(--color-text) 60%, + var(--color-primary) 100% + ); + background-size: 200% auto; + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + animation: ${shimmer} 3s ease-in-out infinite; +` + +export default StartupLoadingState diff --git a/src/renderer/src/components/StartupIntro/index.ts b/src/renderer/src/components/StartupIntro/index.ts new file mode 100644 index 00000000..14381028 --- /dev/null +++ b/src/renderer/src/components/StartupIntro/index.ts @@ -0,0 +1 @@ +export { StartupLoadingState } from './StartupLoadingState' diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json index a32abc69..5d4ec8ab 100644 --- a/src/renderer/src/i18n/locales/en-us.json +++ b/src/renderer/src/i18n/locales/en-us.json @@ -58,6 +58,7 @@ "auto_check_update": { "title": "Automatic Updates" }, + "show_startup_intro": "Show startup intro", "test_plan": { "alpha_version": "Alpha Version", "alpha_version_tooltip": "Alpha - Unstable test version with frequent updates", diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 4c1097ba..23cd8754 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -159,6 +159,7 @@ "auto_check_update": { "title": "自动更新" }, + "show_startup_intro": "显示启动界面", "test_plan": { "alpha_version": "Alpha 版", "alpha_version_tooltip": "Alpha 版 - 不稳定的测试版本，更新较快", diff --git a/src/renderer/src/infrastructure/hooks/useSettings.ts b/src/renderer/src/infrastructure/hooks/useSettings.ts index 0deb1952..717634c6 100644 --- a/src/renderer/src/infrastructure/hooks/useSettings.ts +++ b/src/renderer/src/infrastructure/hooks/useSettings.ts @@ -12,6 +12,7 @@ export function useSettings() { const windowStyle = useSettingsStore((state) => state.windowStyle) const messageStyle = useSettingsStore((state) => state.messageStyle) const videoListViewMode = useSettingsStore((state) => state.videoListViewMode) + const showStartupIntro = useSettingsStore((state) => state.showStartupIntro) const playback = useSettingsStore((state) => state.playback) const autoCheckUpdate = useSettingsStore((state) => state.autoCheckUpdate) const testPlan = useSettingsStore((state) => state.testPlan) @@ -30,6 +31,7 @@ export function useSettings() { const setWindowStyle = useSettingsStore((state) => state.setWindowStyle) const setMessageStyle = useSettingsStore((state) => state.setMessageStyle) const setVideoListViewMode = useSettingsStore((state) => state.setVideoListViewMode) + const setShowStartupIntro = useSettingsStore((state) => state.setShowStartupIntro) const setPlayback = useSettingsStore((state) => state.setPlayback) const setAutoCheckUpdate = useSettingsStore((state) => state.setAutoCheckUpdate) const setTestPlan = useSettingsStore((state) => state.setTestPlan) @@ -119,6 +121,7 @@ export function useSettings() { windowStyle, messageStyle, videoListViewMode, + showStartupIntro, playback, autoCheckUpdate, testPlan, @@ -134,6 +137,7 @@ export function useSettings() { setUserTheme, setMessageStyle, setVideoListViewMode, + setShowStartupIntro, setPlayback, // 复合操作 diff --git a/src/renderer/src/pages/home/HomePage.tsx b/src/renderer/src/pages/home/HomePage.tsx index c05c6d70..d294203e 100644 --- a/src/renderer/src/pages/home/HomePage.tsx +++ b/src/renderer/src/pages/home/HomePage.tsx @@ -12,6 +12,7 @@ import styled from 'styled-components' import DeleteButton from './DeleteButton' import EmptyState from './EmptyState' import HeaderNavbar from './HeaderNavbar' +import LoadingState from './LoadingState' import ThumbnailWithFallback from './ThumbnailWithFallback' const logger = loggerService.withContext('HomePage') @@ -69,28 +70,59 @@ const gridVariants = { export function HomePage(): React.JSX.Element { const { videoListViewMode, setVideoListViewMode } = useSettingsStore() - const { refreshTrigger, setLoading } = useVideoListStore() + const { + refreshTrigger, + isLoading, + isInitialized, + cachedVideos, + setLoading, + setInitialized, + setCachedVideos + } = useVideoListStore() const [videos, setVideos] = React.useState([]) const navigate = useNavigate() + // 初始化时使用缓存数据 + React.useEffect(() => { + if (isInitialized && cachedVideos.length > 0 && videos.length === 0) { + logger.info('HomePage 使用缓存数据初始化', { cachedCount: cachedVideos.length }) + setVideos(cachedVideos) + } + }, [isInitialized, cachedVideos, videos.length]) + const loadVideos = React.useCallback(async () => { try { setLoading(true) const svc = new HomePageVideoService() const items = await svc.getHomePageVideos(50) setVideos(items) + setCachedVideos(items) + + // 标记为已初始化 + if (!isInitialized) { + setInitialized(true) + } } catch (error) { logger.error('加载视频列表失败', { error }) } finally { setLoading(false) } - }, [setLoading]) + }, [setLoading, isInitialized, setInitialized, setCachedVideos]) // 监听刷新触发器变化 React.useEffect(() => { + // 如果已经初始化且不是刷新触发（refreshTrigger = 0），则跳过加载 + if (isInitialized && refreshTrigger === 0) { + logger.info('HomePage 跳过重复数据加载，已在 App.tsx 中预加载', { + isInitialized, + refreshTrigger + }) + return + } + loadVideos() - }, [loadVideos, refreshTrigger]) + }, [loadVideos, refreshTrigger, isInitialized]) const handleVideoAdded = React.useCallback(() => { loadVideos() @@ -139,7 +171,9 @@ export function HomePage(): React.JSX.Element { /> - {videos.length === 0 ? ( + {isLoading && !isInitialized ? ( + + ) : videos.length === 0 ? ( ) : ( @@ -150,7 +184,7 @@ export function HomePage(): React.JSX.Element { animate="animate" exit="exit" > - + {videos.map((video: HomePageVideoItem, index: number) => ( navigate(`/player/${video.id}`)} > - + {video.durationText} @@ -186,7 +220,7 @@ export function HomePage(): React.JSX.Element { - + ` +const VideoGrid = styled.div<{ $viewMode: 'grid' | 'list' }>` display: grid; /* 默认：中屏 3 列 */ - grid-template-columns: ${(props) => (props.viewMode === 'list' ? '1fr' : 'repeat(3, 1fr)')}; - gap: ${(props) => (props.viewMode === 'list' ? '16px' : '24px')}; + grid-template-columns: ${(props) => (props.$viewMode === 'list' ? '1fr' : 'repeat(3, 1fr)')}; + gap: ${(props) => (props.$viewMode === 'list' ? '16px' : '24px')}; will-change: transform; transform: translateZ(0); /* 强制 GPU 加速 */ /* 小屏：≤900px → 2 列 */ @media (max-width: 900px) { - grid-template-columns: ${(props) => (props.viewMode === 'list' ? '1fr' : 'repeat(2, 1fr)')}; + grid-template-columns: ${(props) => (props.$viewMode === 'list' ? '1fr' : 'repeat(2, 1fr)')}; } /* 大屏：≥1025px → 4 列 */ @media (min-width: 1025px) { - grid-template-columns: ${(props) => (props.viewMode === 'list' ? '1fr' : 'repeat(4, 1fr)')}; + grid-template-columns: ${(props) => (props.$viewMode === 'list' ? '1fr' : 'repeat(4, 1fr)')}; } /* 超大屏：≥1440px → 6 列（1920 宽标准可见 6 列）*/ @media (min-width: 1440px) { - grid-template-columns: ${(props) => (props.viewMode === 'list' ? '1fr' : 'repeat(6, 1fr)')}; + grid-template-columns: ${(props) => (props.$viewMode === 'list' ? '1fr' : 'repeat(6, 1fr)')}; } ` -const VideoCard = styled(motion.div)<{ viewMode: 'grid' | 'list' }>` +const VideoCard = styled(motion.div)<{ $viewMode: 'grid' | 'list' }>` --card-scale: 1; --card-y: 0px; --card-x: 0px; @@ -288,7 +322,7 @@ const VideoCard = styled(motion.div)<{ viewMode: 'grid' | 'list' }>` border: 1px solid var(--color-border); backdrop-filter: blur(20px); -webkit-backdrop-filter: blur(20px); - border-radius: ${(props) => (props.viewMode === 'list' ? '12px' : '20px')}; + border-radius: ${(props) => (props.$viewMode === 'list' ? '12px' : '20px')}; overflow: hidden; cursor: pointer; position: relative; @@ -299,9 +333,9 @@ const VideoCard = styled(motion.div)<{ viewMode: 'grid' | 'list' }>` transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); &:hover { - --card-scale: ${(props) => (props.viewMode === 'list' ? '1' : '1.01')}; - --card-y: ${(props) => (props.viewMode === 'list' ? '0px' : '-2px')}; - --card-x: ${(props) => (props.viewMode === 'list' ? '4px' : '0px')}; + --card-scale: ${(props) => (props.$viewMode === 'list' ? '1' : '1.01')}; + --card-y: ${(props) => (props.$viewMode === 'list' ? '0px' : '-2px')}; + --card-x: ${(props) => (props.$viewMode === 'list' ? '4px' : '0px')}; --shadow-opacity: 0.15; --border-opacity: 0.8; --bg-opacity: 0.95; @@ -317,9 +351,9 @@ const VideoCard = styled(motion.div)<{ viewMode: 'grid' | 'list' }>` ` // 普通的卡片内容容器 - 不使用 motion -const CardContent = styled.div<{ viewMode: 'grid' | 'list' }>` +const CardContent = styled.div<{ $viewMode: 'grid' | 'list' }>` display: flex; - flex-direction: ${(props) => (props.viewMode === 'list' ? 'row' : 'column')}; + flex-direction: ${(props) => (props.$viewMode === 'list' ? 'row' : 'column')}; height: 100%; width: 100%; will-change: transform; @@ -370,12 +404,12 @@ const TopRightActions = styled.div` } ` -const ThumbnailContainer = styled.div<{ viewMode: 'grid' | 'list' }>` +const ThumbnailContainer = styled.div<{ $viewMode: 'grid' | 'list' }>` position: relative; - width: ${(props) => (props.viewMode === 'list' ? '240px' : '100%')}; + width: ${(props) => (props.$viewMode === 'list' ? '240px' : '100%')}; aspect-ratio: 16/9; overflow: hidden; - border-radius: ${(props) => (props.viewMode === 'list' ? '11px 0 0 11px' : '19px 19px 0 0')}; + border-radius: ${(props) => (props.$viewMode === 'list' ? '11px 0 0 11px' : '19px 19px 0 0')}; background: var(--color-background-mute); flex-shrink: 0; will-change: transform; @@ -424,8 +458,8 @@ const MotionProgressBar = styled(motion.div)<{ progress: number }>` } ` -const VideoInfo = styled.div<{ viewMode: 'grid' | 'list' }>` - padding: ${(props) => (props.viewMode === 'list' ? '16px 20px' : '20px')}; +const VideoInfo = styled.div<{ $viewMode: 'grid' | 'list' }>` + padding: ${(props) => (props.$viewMode === 'list' ? '16px 20px' : '20px')}; background-color: var(--color-background); flex: 1; display: flex; diff --git a/src/renderer/src/pages/home/LoadingState.tsx b/src/renderer/src/pages/home/LoadingState.tsx new file mode 100644 index 00000000..cf81c4fc --- /dev/null +++ b/src/renderer/src/pages/home/LoadingState.tsx @@ -0,0 +1,87 @@ +import { Spin } from 'antd' +import { LoaderCircle } from 'lucide-react' +import React from 'react' +import { useTranslation } from 'react-i18next' +import styled, { keyframes } from 'styled-components' + +export function LoadingState(): React.JSX.Element { + const { t } = useTranslation() + + return ( + + + + } size="large" /> + + {t('home.loading_videos', '正在加载视频...')} + + + ) +} + +// 动画定义 +const fadeIn = keyframes` + from { + opacity: 0; + transform: translateY(20px); + } + to { + opacity: 1; + transform: translateY(0px); + } +` + +const spin = keyframes` + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +` + +const Container = styled.div` + display: flex; + align-items: center; + justify-content: center; + position: relative; + height: 100%; + min-height: 400px; + padding: 48px 24px; + animation: ${fadeIn} 0.3s ease-out; +` + +const ContentWrapper = styled.div` + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + gap: 24px; +` + +const LoadingIconContainer = styled.div` + display: flex; + align-items: center; + justify-content: center; + + .lucide-loader-circle { + animation: ${spin} 1s linear infinite; + color: var(--color-primary); + } +` + +const StyledSpin = styled(Spin)` + .ant-spin-dot { + display: none; + } +` + +const LoadingText = styled.div` + font-size: 16px; + font-weight: 500; + color: var(--color-text-secondary); + line-height: 1.5; + opacity: 0.8; +` + +export default LoadingState diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx index b2c7c59d..bf479da6 100644 --- a/src/renderer/src/pages/settings/GeneralSettings.tsx +++ b/src/renderer/src/pages/settings/GeneralSettings.tsx @@ -24,9 +24,11 @@ const GeneralSettings: FC = () => { launchToTray, trayOnClose, language, + showStartupIntro, setTray, setLaunch, - setLanguage + setLanguage, + setShowStartupIntro } = useSettings() const { theme } = useTheme() const { enableDeveloperMode, setEnableDeveloperMode } = useEnableDeveloperMode() @@ -104,6 +106,11 @@ const GeneralSettings: FC = () => { }))} /> + + + {t('settings.general.show_startup_intro')} + + {t('settings.launch.title')} diff --git a/src/renderer/src/state/stores/settings.store.ts b/src/renderer/src/state/stores/settings.store.ts index 7c7cbc51..f8d67989 100644 --- a/src/renderer/src/state/stores/settings.store.ts +++ b/src/renderer/src/state/stores/settings.store.ts @@ -31,6 +31,7 @@ export interface SettingsState { windowStyle: 'transparent' | 'opaque' messageStyle: 'plain' | 'bubble' videoListViewMode: 'grid' | 'list' + showStartupIntro: boolean playback: { defaultVolume: number defaultPlaybackSpeed: number @@ -60,6 +61,7 @@ type Actions = { setWindowStyle: (windowStyle: 'transparent' | 'opaque') => void setMessageStyle: (messageStyle: 'plain' | 'bubble') => void setVideoListViewMode: (mode: 'grid' | 'list') => void + setShowStartupIntro: (showStartupIntro: boolean) => void setPlayback: (playback: SettingsState['playback']) => void setLaunchOnBoot: (isLaunchOnBoot: boolean) => void setLaunchToTray: (isLaunchToTray: boolean) => void @@ -96,6 +98,7 @@ const initialState: SettingsState = { windowStyle: 'transparent', messageStyle: 'bubble', videoListViewMode: 'grid', + showStartupIntro: true, playback: { defaultPlaybackSpeed: 1.0, defaultSubtitleDisplayMode: DEFAULT_SUBTITLE_DISPLAY_MODE, @@ -140,6 +143,7 @@ const createSettingsStore: StateCreator< setWindowStyle: (windowStyle) => set({ windowStyle }), setMessageStyle: (messageStyle) => set({ messageStyle }), setVideoListViewMode: (mode) => set({ videoListViewMode: mode }), + setShowStartupIntro: (showStartupIntro) => set({ showStartupIntro }), setPlayback: (playback) => set({ playback }), setAutoCheckUpdate: (autoCheckUpdate) => set({ autoCheckUpdate }), setTestPlan: (testPlan) => set({ testPlan }), @@ -192,6 +196,7 @@ export const useSettingsStore = create()( windowStyle: state.windowStyle, messageStyle: state.messageStyle, videoListViewMode: state.videoListViewMode, + showStartupIntro: state.showStartupIntro, playback: state.playback, enableDeveloperMode: state.enableDeveloperMode }), diff --git a/src/renderer/src/state/stores/video-list.store.ts b/src/renderer/src/state/stores/video-list.store.ts index ad3d5436..37933eb6 100644 --- a/src/renderer/src/state/stores/video-list.store.ts +++ b/src/renderer/src/state/stores/video-list.store.ts @@ -3,11 +3,28 @@ import { create, StateCreator } from 'zustand' import { MiddlewarePresets } from '../infrastructure' +// 引入视频数据类型 +export interface CachedVideoItem { + id: number + title: string + subtitle?: string + thumbnail?: string + duration: number + durationText: string + watchProgress: number + createdAt: Date + publishedAt: string +} + export interface VideoListState { /** 刷新触发器，递增数值触发重新加载 */ refreshTrigger: number /** 当前是否正在加载视频列表 */ isLoading: boolean + /** 是否已完成初始化（首次数据加载） */ + isInitialized: boolean + /** 缓存的视频数据 */ + cachedVideos: CachedVideoItem[] } export interface VideoListActions { @@ -15,13 +32,21 @@ export interface VideoListActions { refreshVideoList: () => void /** 设置加载状态 */ setLoading: (loading: boolean) => void + /** 标记为已初始化 */ + setInitialized: (initialized: boolean) => void + /** 缓存视频数据 */ + setCachedVideos: (videos: CachedVideoItem[]) => void + /** 清空缓存的视频数据 */ + clearCachedVideos: () => void } export type VideoListStore = VideoListState & VideoListActions const initialState: VideoListState = { refreshTrigger: 0, - isLoading: false + isLoading: false, + isInitialized: false, + cachedVideos: [] } const createVideoListStore: StateCreator< @@ -43,6 +68,24 @@ const createVideoListStore: StateCreator< set((state: Draft) => { state.isLoading = loading }) + }, + + setInitialized: (initialized: boolean) => { + set((state: Draft) => { + state.isInitialized = initialized + }) + }, + + setCachedVideos: (videos: CachedVideoItem[]) => { + set((state: Draft) => { + state.cachedVideos = videos + }) + }, + + clearCachedVideos: () => { + set((state: Draft) => { + state.cachedVideos = [] + }) } }) From b6751504ccff70f71fe518393587b3e70e6d7dba Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 09:53:01 +0800 Subject: [PATCH 21/82] feat(player): implement volume wheel control with intelligent acceleration (#105) - Add useVolumeWheelControl hook for smooth volume adjustment via mouse wheel - Integrate wheel control with existing hover menu system in VolumeControl component - Implement intelligent acceleration based on scroll velocity and intensity - Support configurable step sizes (min: 1%, default: 2%, max: 8%) - Add comprehensive logging for debugging wheel control behavior - Sync container refs between menu manager and wheel control systems - Update volume icon logic to show mute state when volume is 0 Changes: - VolumeControl.tsx: Integrate wheel control hook with hover menu system - useVolumeWheelControl.ts: New hook with velocity-based smart acceleration - Enhanced UX with immediate response and smooth volume transitions This feature provides intuitive volume control when hovering over the volume button, delivering a professional media player experience with fine-grained control and intelligent acceleration for both precise and rapid adjustments. --- .../controls/VolumeControl.tsx | 17 ++- .../player/hooks/useVolumeWheelControl.ts | 101 ++++++++++++++++++ 2 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 src/renderer/src/pages/player/hooks/useVolumeWheelControl.ts diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx index 959fa3fb..e07981ec 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/VolumeControl.tsx @@ -1,12 +1,13 @@ import { usePlayerStore } from '@renderer/state/stores/player.store' import { Slider } from 'antd' import { Volume1, Volume2, VolumeX } from 'lucide-react' -import { useCallback } from 'react' +import { useCallback, useEffect } from 'react' import styled from 'styled-components' import { useControlMenuManager } from '../../../hooks/useControlMenuManager' import { useHoverMenu } from '../../../hooks/useHoverMenu' import { usePlayerCommands } from '../../../hooks/usePlayerCommands' +import { useVolumeWheelControl } from '../../../hooks/useVolumeWheelControl' import { GlassPopup } from '../styles/controls' export default function VolumeControl() { @@ -34,6 +35,18 @@ export default function VolumeControl() { closeMenu: closeVolumeMenu }) + // 使用滚轮控制Hook + const { containerRef: wheelContainerRef } = useVolumeWheelControl({ + enabled: isVolumeOpen + }) + + // 同步ref - 让滚轮控制的ref指向菜单管理器的容器元素 + useEffect(() => { + if (containerRef.current && wheelContainerRef.current !== containerRef.current) { + wheelContainerRef.current = containerRef.current + } + }, [containerRef, wheelContainerRef]) + const setVolumeLevel = useCallback( (level: number) => { const normalizedLevel = level / 100 // antd Slider 使用 0-100，我们的状态使用 0-1 @@ -63,7 +76,7 @@ export default function VolumeControl() { onMouseLeave={buttonProps.onMouseLeave} aria-label="Toggle mute / Hover for volume slider" > - {muted ? ( + {muted || volume === 0 ? ( ) : volume > 0.5 ? ( diff --git a/src/renderer/src/pages/player/hooks/useVolumeWheelControl.ts b/src/renderer/src/pages/player/hooks/useVolumeWheelControl.ts new file mode 100644 index 00000000..6e27647b --- /dev/null +++ b/src/renderer/src/pages/player/hooks/useVolumeWheelControl.ts @@ -0,0 +1,101 @@ +import { loggerService } from '@logger' +import { useCallback, useEffect, useRef } from 'react' + +import { usePlayerCommands } from './usePlayerCommands' + +const logger = loggerService.withContext('VolumeWheelControl') + +export interface UseVolumeWheelControlOptions { + /** 是否启用滚轮控制 */ + enabled: boolean + /** 基础滚轮步长，默认为0.02 (2%) */ + wheelStep?: number + /** 最小步长，默认为0.01 (1%) */ + minStep?: number + /** 最大步长，默认为0.08 (8%) */ + maxStep?: number +} + +/** + * 音量滚轮控制Hook + * 当hover菜单打开时，激活滚轮控制音量功能 + * 提供丝滑的即时响应体验，支持智能加速和精细控制 + */ +export function useVolumeWheelControl({ + enabled, + wheelStep = 0.02, + minStep = 0.01, + maxStep = 0.08 +}: UseVolumeWheelControlOptions) { + const { changeVolumeBy } = usePlayerCommands() + const containerRef = useRef(null) + const lastWheelTimeRef = useRef(0) + const wheelVelocityRef = useRef(0) + + const handleWheel = useCallback( + (event: WheelEvent) => { + if (!enabled) return + + // 阻止默认滚动行为 + event.preventDefault() + event.stopPropagation() + + const currentTime = Date.now() + const timeDelta = currentTime - lastWheelTimeRef.current + lastWheelTimeRef.current = currentTime + + // 计算滚轮速度（基于时间间隔） + if (timeDelta < 50) { + // 快速滚动时增加速度感知 + wheelVelocityRef.current = Math.min(wheelVelocityRef.current + 0.3, 2.0) + } else if (timeDelta > 200) { + // 慢速滚动时重置速度 + wheelVelocityRef.current = 1.0 + } else { + // 中等速度时保持或微调 + wheelVelocityRef.current = Math.max(wheelVelocityRef.current * 0.9, 1.0) + } + + // 基于滚轮强度和速度计算步长 + const wheelIntensity = Math.abs(event.deltaY) + const normalizedIntensity = Math.min(wheelIntensity / 100, 1.5) // 基础强度控制 + const velocityMultiplier = wheelVelocityRef.current // 速度加成 + + // 计算最终步长 + let adjustedStep = wheelStep * normalizedIntensity * velocityMultiplier + adjustedStep = Math.max(minStep, Math.min(maxStep, adjustedStep)) + + // deltaY > 0 表示向下滚动（降低音量） + // deltaY < 0 表示向上滚动（提高音量） + const delta = event.deltaY > 0 ? -adjustedStep : adjustedStep + + // 立即响应，无防抖 + changeVolumeBy(delta) + + logger.debug('Volume changed by wheel', { + delta, + intensity: normalizedIntensity, + velocity: velocityMultiplier, + timeDelta, + wheelDirection: event.deltaY > 0 ? 'down' : 'up' + }) + }, + [enabled, wheelStep, minStep, maxStep, changeVolumeBy] + ) + + // 添加滚轮事件监听器 + useEffect(() => { + const container = containerRef.current + if (!container || !enabled) return + + container.addEventListener('wheel', handleWheel, { passive: false }) + + return () => { + container.removeEventListener('wheel', handleWheel) + } + }, [enabled, handleWheel]) + + return { + containerRef + } +} From a05abd229db6e33df84914481618ed6dc6fc3e75 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 11:09:03 +0800 Subject: [PATCH 22/82] refactor(SubtitleList): implement state machine architecture for scroll management (#106) - Replace scattered state management with centralized state machine approach - Add comprehensive state machine with 4 clear states: DISABLED, LOCKED_TO_CURRENT, USER_BROWSING, TRANSITIONING - Implement 6 event triggers for predictable state transitions - Remove complex manual scroll logic with 100+ lines of imperative code - Simplify SubtitleListPanel component by extracting scroll behavior to dedicated hook - Add intelligent timer management with 3-second auto-return to current subtitle - Improve maintainability with clear separation of concerns and type safety Changes: - Add useSubtitleScrollStateMachine: Complete state machine implementation with transition rules - Refactor SubtitleListPanel: Remove userScrolled, showBackToCurrent, and complex scroll logic - Remove BackToCurrentWrapper: Temporarily simplified UI (can be re-added with state machine integration) - Add SCROLL_CONFIG: Centralized configuration for timing and behavior parameters - Replace imperative scroll handling with declarative state transitions This refactor transforms complex, bug-prone scroll management into a predictable, maintainable state machine that follows YouTube-like interaction patterns and provides clear mental model for subtitle list behavior. --- .../player/components/SubtitleListPanel.tsx | 215 ++------ .../hooks/useSubtitleScrollStateMachine.ts | 507 ++++++++++++++++++ 2 files changed, 537 insertions(+), 185 deletions(-) create mode 100644 src/renderer/src/pages/player/hooks/useSubtitleScrollStateMachine.ts diff --git a/src/renderer/src/pages/player/components/SubtitleListPanel.tsx b/src/renderer/src/pages/player/components/SubtitleListPanel.tsx index e4a7645a..97fd50a4 100644 --- a/src/renderer/src/pages/player/components/SubtitleListPanel.tsx +++ b/src/renderer/src/pages/player/components/SubtitleListPanel.tsx @@ -1,13 +1,15 @@ -import { usePlayerStore } from '@renderer/state/stores/player.store' import type { SubtitleItem } from '@types' -import { Button, FloatButton, Tooltip } from 'antd' -import { LocateFixed } from 'lucide-react' -import { ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react' +import { Button } from 'antd' +import { ReactNode, RefObject, useCallback, useEffect, useMemo, useRef } from 'react' import { Virtuoso, VirtuosoHandle } from 'react-virtuoso' import styled from 'styled-components' import { usePlayerEngine, useSubtitleEngine } from '../hooks' import { usePlayerCommands } from '../hooks/usePlayerCommands' +import { + SubtitleScrollState, + useSubtitleScrollStateMachine +} from '../hooks/useSubtitleScrollStateMachine' import { useSubtitles } from '../state/player-context' import { ImportSubtitleButton } from './' @@ -34,30 +36,25 @@ function SubtitleListPanel({ emptyActions }: SubtitleListPannelProps) { const subtitles = useSubtitles() - const [userScrolled, setUserScrolled] = useState(false) - const [showBackToCurrent, setShowBackToCurrent] = useState(false) usePlayerEngine() const virtuosoRef = useRef(null) const scrollerElRef = useRef(null) - const programmaticScrollRef = useRef(false) - const resetProgrammaticTimerRef = useRef(null) - // 抑制“回到当前”按钮在点击后的短暂闪现 - const suppressShowBackRef = useRef(false) - const suppressShowBackTimerRef = useRef(null) - const prevIndexRef = useRef(-1) - const prevTimeRef = useRef(-1) - const viewportHeightRef = useRef(0) const avgItemHeightRef = useRef(56) // 初始估算单项高度 const initialIndexRef = useRef(null) const initialCenterAppliedRef = useRef(false) - const isAtTopRef = useRef(false) - const isAtBottomRef = useRef(false) - const currentTime = usePlayerStore((s) => s.currentTime) const { orchestrator } = usePlayerEngine() const { currentIndex } = useSubtitleEngine() const { seekToSubtitle } = usePlayerCommands() - const [subtitleFollow, setSubtitleFollow] = useState(false) + + // 使用新的状态机Hook + const { scrollState, handleItemClick, handleRangeChanged, initialize } = + useSubtitleScrollStateMachine( + currentIndex, + subtitles.length, + virtuosoRef as RefObject, + seekToSubtitle + ) // 计算首次加载的初始索引（仅在 Virtuoso 首次挂载前生效） const initialTopMostItemIndex = useMemo(() => { @@ -86,117 +83,12 @@ function SubtitleListPanel({ return `${minutes}:${seconds.toString().padStart(2, '0')}` }, []) - // 点击字幕行跳转 - 使用 orchestrator 命令 - const handleSubtitleClick = useCallback( - (index: number) => { - seekToSubtitle(index) - }, - [seekToSubtitle] - ) - - // 根据阶段与跳转幅度滚动到当前字幕 - const scrollToCurrentRow = useCallback( - (forceImmediate?: boolean) => { - if (currentIndex < 0 || !virtuosoRef.current) return - - // 测量视口高度与当前项高度（粗略） - const scroller = scrollerElRef.current - if (scroller) { - viewportHeightRef.current = scroller.clientHeight - const activeEl = scroller.querySelector( - `[data-subtitle-item][data-index="${currentIndex}"]` - ) as HTMLElement | null - const sampleEl = - activeEl || (scroller.querySelector('[data-subtitle-item]') as HTMLElement | null) - if (sampleEl) { - const h = sampleEl.offsetHeight - if (h > 0) avgItemHeightRef.current = h - } - } - - const total = subtitles.length - const i = currentIndex - const prevI = prevIndexRef.current - const timeJump = prevTimeRef.current >= 0 ? Math.abs(currentTime - prevTimeRef.current) : 0 - const indexJump = prevI >= 0 ? Math.abs(i - prevI) : 0 - const largeJump = timeJump > 2 || indexJump > 3 - - const viewportItems = Math.max( - 1, - Math.floor(viewportHeightRef.current / Math.max(1, avgItemHeightRef.current)) - ) - const threshold = Math.ceil(viewportItems / 2) - - // 计算阶段对齐方式（结合顶部/底部状态与索引阶段） - let align: 'start' | 'center' | 'end' | undefined - if (isAtTopRef.current) { - align = 'start' - } else if (isAtBottomRef.current) { - align = 'end' - } else if (i === 0) { - // 开始阶段：第一个字幕顶对齐 - align = 'start' - } else if (i >= total - threshold) { - // 结束阶段：靠近底部时底对齐 - align = 'end' - } else if (i < threshold && !largeJump) { - // 开始阶段过渡：不滚动，让聚焦项逐步下移到中间 - align = undefined - } else { - // 中间阶段：保持居中 - align = 'center' - } - - // 执行滚动 - if (align) { - programmaticScrollRef.current = true - if (resetProgrammaticTimerRef.current) { - window.clearTimeout(resetProgrammaticTimerRef.current) - resetProgrammaticTimerRef.current = null - } - virtuosoRef.current.scrollToIndex({ - index: i, - align, - behavior: forceImmediate || largeJump ? 'auto' : 'smooth' - }) - resetProgrammaticTimerRef.current = window.setTimeout(() => { - programmaticScrollRef.current = false - }, 200) - setUserScrolled(false) - setShowBackToCurrent(false) - } - - // 记录历史 - prevIndexRef.current = i - prevTimeRef.current = currentTime - }, - [currentIndex, currentTime, subtitles.length] - ) - - // 自动滚动逻辑 + // 初始化状态机（当字幕加载完成时） useEffect(() => { - if (subtitleFollow && !userScrolled && currentIndex >= 0) { - scrollToCurrentRow() - } - }, [subtitleFollow, userScrolled, currentIndex, scrollToCurrentRow]) - - const handleBackToCurrent = useCallback(() => { - setSubtitleFollow(true) - setUserScrolled(false) - setShowBackToCurrent(false) - // 在点击后的短时间内抑制按钮再次出现，避免视觉闪烁 - suppressShowBackRef.current = true - if (suppressShowBackTimerRef.current) { - window.clearTimeout(suppressShowBackTimerRef.current) - suppressShowBackTimerRef.current = null + if (subtitles.length > 0 && scrollState === SubtitleScrollState.DISABLED) { + initialize() } - suppressShowBackTimerRef.current = window.setTimeout(() => { - suppressShowBackRef.current = false - }, 600) - - // 使用立即滚动，避免平滑滚动期间 rangeChanged 中的临时“越界”导致按钮短暂回显 - scrollToCurrentRow(true) - }, [setSubtitleFollow, scrollToCurrentRow]) + }, [subtitles.length, scrollState, initialize]) if (subtitles.length === 0) { return ( @@ -249,7 +141,7 @@ function SubtitleListPanel({ data-index={index} data-active={index === currentIndex} active={index === currentIndex} - onClick={() => handleSubtitleClick(index)} + onClick={() => handleItemClick(index)} > {formatTime(subtitle.startTime)} @@ -264,11 +156,11 @@ function SubtitleListPanel({ computeItemKey={(index, s: SubtitleItem) => s.id ?? index} atTopThreshold={24} atBottomThreshold={24} - atTopStateChange={(atTop) => { - isAtTopRef.current = atTop + atTopStateChange={() => { + // 状态由状态机管理，这里暂时保留但不执行任何操作 }} - atBottomStateChange={(atBottom) => { - isAtBottomRef.current = atBottom + atBottomStateChange={() => { + // 状态由状态机管理，这里暂时保留但不执行任何操作 }} scrollerRef={(ref) => { const el = (ref as HTMLElement) ?? null @@ -277,7 +169,10 @@ function SubtitleListPanel({ rangeChanged={({ startIndex, endIndex }) => { const scroller = scrollerElRef.current if (scroller) { - viewportHeightRef.current = scroller.clientHeight + avgItemHeightRef.current = Math.max( + 56, + scroller.clientHeight / Math.max(1, endIndex - startIndex + 1) + ) } // 初次挂载后，将初始索引项滚动到垂直居中（只执行一次） @@ -288,51 +183,19 @@ function SubtitleListPanel({ virtuosoRef.current ) { initialCenterAppliedRef.current = true - programmaticScrollRef.current = true - if (resetProgrammaticTimerRef.current) { - window.clearTimeout(resetProgrammaticTimerRef.current) - resetProgrammaticTimerRef.current = null - } virtuosoRef.current.scrollToIndex({ index: initialIndexRef.current, align: 'center', behavior: 'auto' }) - resetProgrammaticTimerRef.current = window.setTimeout(() => { - programmaticScrollRef.current = false - }, 200) return } - if (programmaticScrollRef.current) return - const out = currentIndex < startIndex || currentIndex > endIndex - if (out) { - if (!userScrolled && !suppressShowBackRef.current) { - setUserScrolled(true) - setShowBackToCurrent(true) - if (subtitleFollow) setSubtitleFollow(false) - } - } else { - if (userScrolled) { - setUserScrolled(false) - setShowBackToCurrent(false) - } - } + // 使用新的状态机处理范围变化 + handleRangeChanged({ startIndex, endIndex }) }} /> - - - - } - onClick={handleBackToCurrent} - aria-label="回到当前字幕" - /> - - ) } @@ -456,21 +319,3 @@ const TextContent = styled.div` line-height: 1.5; word-break: break-word; ` - -const BackToCurrentWrapper = styled.div<{ $visible: boolean }>` - position: absolute; - bottom: 16px; - right: 16px; - - opacity: ${(p) => (p.$visible ? 1 : 0)}; - transition: opacity 0.15s ease; - pointer-events: ${(p) => (p.$visible ? 'auto' : 'none')}; - z-index: 2; -` - -const BackToCurrentFloatButton = styled(FloatButton)` - && { - position: static !important; /* 在容器内定位 */ - box-shadow: 0 6px 16px rgba(0, 0, 0, 0.2); - } -` diff --git a/src/renderer/src/pages/player/hooks/useSubtitleScrollStateMachine.ts b/src/renderer/src/pages/player/hooks/useSubtitleScrollStateMachine.ts new file mode 100644 index 00000000..6a51ec19 --- /dev/null +++ b/src/renderer/src/pages/player/hooks/useSubtitleScrollStateMachine.ts @@ -0,0 +1,507 @@ +import type { RefObject } from 'react' +import { useCallback, useEffect, useRef, useState } from 'react' +import type { VirtuosoHandle } from 'react-virtuoso' + +/** + * 字幕滚动状态枚举 + */ +export enum SubtitleScrollState { + /** 锁定到当前字幕（自动跟随播放进度） */ + LOCKED_TO_CURRENT = 'locked_to_current', + /** 用户浏览模式（用户手动滚动后） */ + USER_BROWSING = 'user_browsing', + /** 过渡状态（即将自动回到当前字幕） */ + TRANSITIONING = 'transitioning', + /** 禁用状态（初始化等） */ + DISABLED = 'disabled' +} + +/** + * 触发状态转换的事件类型 + */ +export enum ScrollTrigger { + /** 用户手动滚动 */ + USER_MANUAL_SCROLL = 'user_manual_scroll', + /** 用户点击字幕项 */ + USER_CLICK_ITEM = 'user_click_item', + /** 用户点击"回到当前"按钮 */ + USER_CLICK_RETURN = 'user_click_return', + /** 自动超时触发 */ + AUTO_TIMEOUT = 'auto_timeout', + /** 播放进度更新 */ + PLAYBACK_PROGRESS = 'playback_progress', + /** 初始加载完成 */ + INITIAL_LOAD = 'initial_load' +} + +/** + * 滚动配置参数 + */ +export const SCROLL_CONFIG = { + /** 用户停止交互后自动回到当前字幕的延迟时间（毫秒） */ + AUTO_RETURN_DELAY: 3000, + /** 状态转换动画时长（毫秒） */ + TRANSITION_DURATION: 500, + /** 滚动行为类型 */ + SCROLL_BEHAVIOR: 'smooth' as ScrollBehavior, + /** 当前字幕在视口中的位置阈值 */ + CENTER_THRESHOLD: 0.3, + /** 视口缓冲区大小（行数） */ + VIEWPORT_BUFFER: 2 +} as const + +/** + * 状态机内部状态接口 + */ +interface StateMachineState { + /** 当前滚动状态 */ + scrollState: SubtitleScrollState + /** 最后一次用户交互时间戳 */ + lastUserInteraction: number + /** 最后记录的滚动位置 */ + lastScrollPosition: number + /** 当前字幕是否在视口内 */ + isInViewport: boolean + /** 是否正在执行程序化滚动 */ + isProgrammaticScroll: boolean +} + +/** + * 状态转换规则定义 + */ +const STATE_TRANSITIONS: Record< + SubtitleScrollState, + Partial> +> = { + [SubtitleScrollState.DISABLED]: { + [ScrollTrigger.INITIAL_LOAD]: SubtitleScrollState.LOCKED_TO_CURRENT + }, + [SubtitleScrollState.LOCKED_TO_CURRENT]: { + [ScrollTrigger.USER_MANUAL_SCROLL]: SubtitleScrollState.USER_BROWSING, + [ScrollTrigger.USER_CLICK_ITEM]: SubtitleScrollState.USER_BROWSING + }, + [SubtitleScrollState.USER_BROWSING]: { + [ScrollTrigger.AUTO_TIMEOUT]: SubtitleScrollState.TRANSITIONING, + [ScrollTrigger.USER_CLICK_RETURN]: SubtitleScrollState.LOCKED_TO_CURRENT, + [ScrollTrigger.USER_MANUAL_SCROLL]: SubtitleScrollState.USER_BROWSING // 重置定时器 + }, + [SubtitleScrollState.TRANSITIONING]: { + [ScrollTrigger.PLAYBACK_PROGRESS]: SubtitleScrollState.LOCKED_TO_CURRENT, + [ScrollTrigger.USER_MANUAL_SCROLL]: SubtitleScrollState.USER_BROWSING, + [ScrollTrigger.USER_CLICK_ITEM]: SubtitleScrollState.USER_BROWSING + } +} + +/** + * 字幕滚动状态机类 + */ +class SubtitleScrollStateMachine { + private state: StateMachineState + private timers: Map = new Map() + private onStateChangeCallback?: (newState: SubtitleScrollState) => void + + constructor() { + this.state = { + scrollState: SubtitleScrollState.DISABLED, + lastUserInteraction: 0, + lastScrollPosition: 0, + isInViewport: true, + isProgrammaticScroll: false + } + } + + /** + * 设置状态变化回调 + */ + setOnStateChange(callback: (newState: SubtitleScrollState) => void): void { + this.onStateChangeCallback = callback + } + + /** + * 获取当前状态 + */ + getCurrentState(): SubtitleScrollState { + return this.state.scrollState + } + + /** + * 检查是否可以执行状态转换 + */ + canTransition(trigger: ScrollTrigger): boolean { + const currentState = this.state.scrollState + return !!STATE_TRANSITIONS[currentState]?.[trigger] + } + + /** + * 执行状态转换 + */ + transition(trigger: ScrollTrigger): boolean { + const currentState = this.state.scrollState + const nextState = STATE_TRANSITIONS[currentState]?.[trigger] + + if (!nextState) { + return false // 无效转换 + } + + // 处理特殊的转换逻辑 + this.handleSpecialTransition(trigger) + + // 更新状态 + const oldState = this.state.scrollState + this.state.scrollState = nextState + this.state.lastUserInteraction = Date.now() + + // 处理状态变化的副作用 + this.handleStateChange(oldState, nextState, trigger) + + // 通知外部状态变化 + this.onStateChangeCallback?.(nextState) + + return true + } + + /** + * 启动自动回到当前字幕的定时器 + */ + startAutoReturnTimer(): void { + this.clearTimer('autoReturn') + + const timer = setTimeout(() => { + if (this.state.scrollState === SubtitleScrollState.USER_BROWSING) { + this.transition(ScrollTrigger.AUTO_TIMEOUT) + } + }, SCROLL_CONFIG.AUTO_RETURN_DELAY) + + this.timers.set('autoReturn', timer) + } + + /** + * 清除指定的定时器 + */ + clearTimer(name: string): void { + const timer = this.timers.get(name) + if (timer) { + clearTimeout(timer) + this.timers.delete(name) + } + } + + /** + * 清除所有定时器 + */ + clearAllTimers(): void { + for (const timer of this.timers.values()) { + clearTimeout(timer) + } + this.timers.clear() + } + + /** + * 设置程序化滚动标志 + */ + setProgrammaticScroll(isProgrammatic: boolean): void { + this.state.isProgrammaticScroll = isProgrammatic + } + + /** + * 获取程序化滚动状态 + */ + isProgrammaticScroll(): boolean { + return this.state.isProgrammaticScroll + } + + /** + * 处理特殊转换逻辑 + */ + private handleSpecialTransition(trigger: ScrollTrigger): void { + switch (trigger) { + case ScrollTrigger.USER_MANUAL_SCROLL: + // 用户手动滚动时清除所有定时器 + this.clearAllTimers() + break + case ScrollTrigger.USER_CLICK_RETURN: + // 用户主动点击回到当前时清除定时器 + this.clearAllTimers() + break + } + } + + /** + * 处理状态变化的副作用 + */ + private handleStateChange( + _oldState: SubtitleScrollState, + newState: SubtitleScrollState, + trigger: ScrollTrigger + ): void { + switch (newState) { + case SubtitleScrollState.USER_BROWSING: + // 进入浏览模式时启动自动回到当前的定时器 + if (trigger === ScrollTrigger.USER_MANUAL_SCROLL) { + this.startAutoReturnTimer() + } + break + + case SubtitleScrollState.TRANSITIONING: + // 过渡状态，准备滚动回当前字幕 + break + + case SubtitleScrollState.LOCKED_TO_CURRENT: + // 锁定到当前字幕，清除所有定时器 + this.clearAllTimers() + break + } + } + + /** + * 销毁状态机 + */ + destroy(): void { + this.clearAllTimers() + this.onStateChangeCallback = undefined + } +} + +/** + * Hook返回的接口 + */ +export interface UseSubtitleScrollStateMachineReturn { + /** 当前滚动状态 */ + scrollState: SubtitleScrollState + /** 是否显示"回到当前"按钮 */ + showReturnButton: boolean + /** 是否正在自动滚动跟随 */ + isAutoScrolling: boolean + /** 是否正在过渡状态 */ + isTransitioning: boolean + /** 处理用户手动滚动 */ + handleUserScroll: () => void + /** 处理用户点击"回到当前"按钮 */ + handleReturnClick: () => void + /** 处理用户点击字幕项 */ + handleItemClick: (index: number) => void + /** 处理Virtuoso范围变化 */ + handleRangeChanged: (range: { startIndex: number; endIndex: number }) => void + /** 执行自动滚动到当前字幕 */ + scrollToCurrentSubtitle: (immediate?: boolean) => void + /** 初始化状态机（首次加载完成） */ + initialize: () => void +} + +/** + * 字幕列表滚动状态机Hook + */ +export function useSubtitleScrollStateMachine( + currentSubtitleIndex: number, + totalSubtitles: number, + virtuosoRef: RefObject, + onSeekToSubtitle?: (index: number) => void +): UseSubtitleScrollStateMachineReturn { + // 状态机实例 + const stateMachineRef = useRef(undefined) + const [scrollState, setScrollState] = useState(SubtitleScrollState.DISABLED) + + // 滚动相关的引用 + const resetProgrammaticTimerRef = useRef(null) + const lastCurrentIndexRef = useRef(-1) + const suppressUserScrollRef = useRef(false) + + // 初始化状态机 + useEffect(() => { + if (!stateMachineRef.current) { + stateMachineRef.current = new SubtitleScrollStateMachine() + stateMachineRef.current.setOnStateChange(setScrollState) + } + + return () => { + stateMachineRef.current?.destroy() + } + }, []) + + // 监听当前字幕变化，触发播放进度更新 + useEffect(() => { + const stateMachine = stateMachineRef.current + if (!stateMachine) return + + // 只有在索引真正变化时才触发 + if (currentSubtitleIndex !== lastCurrentIndexRef.current) { + lastCurrentIndexRef.current = currentSubtitleIndex + + if (currentSubtitleIndex >= 0) { + stateMachine.transition(ScrollTrigger.PLAYBACK_PROGRESS) + } + } + }, [currentSubtitleIndex]) + + // 计算滚动位置和对齐方式 + const calculateScrollAlignment = useCallback( + ( + targetIndex: number, + isLargeJump: boolean = false + ): { align: 'start' | 'center' | 'end'; behavior: 'auto' | 'smooth' } => { + const total = totalSubtitles + const threshold = 3 + + let align: 'start' | 'center' | 'end' + + if (targetIndex === 0) { + align = 'start' + } else if (targetIndex >= total - threshold) { + align = 'end' + } else { + align = 'center' + } + + return { + align, + behavior: isLargeJump ? 'auto' : 'smooth' + } + }, + [totalSubtitles] + ) + + // 执行滚动到指定字幕 + const executeScrollToIndex = useCallback( + (targetIndex: number, immediate: boolean = false) => { + const virtuoso = virtuosoRef.current + if (!virtuoso || targetIndex < 0 || targetIndex >= totalSubtitles) return + + const stateMachine = stateMachineRef.current + if (!stateMachine) return + + // 计算是否为大跳转 + const indexJump = Math.abs(targetIndex - lastCurrentIndexRef.current) + const isLargeJump = immediate || indexJump > 5 + + const { align, behavior } = calculateScrollAlignment(targetIndex, isLargeJump) + + // 设置程序化滚动标志 + stateMachine.setProgrammaticScroll(true) + suppressUserScrollRef.current = true + + // 清除之前的重置定时器 + if (resetProgrammaticTimerRef.current) { + clearTimeout(resetProgrammaticTimerRef.current) + } + + // 执行滚动 + virtuoso.scrollToIndex({ + index: targetIndex, + align, + behavior: immediate ? 'auto' : behavior + }) + + // 设置重置程序化滚动标志的定时器 + resetProgrammaticTimerRef.current = setTimeout(() => { + stateMachine.setProgrammaticScroll(false) + suppressUserScrollRef.current = false + }, 300) + }, + [virtuosoRef, totalSubtitles, calculateScrollAlignment] + ) + + // 滚动到当前字幕 + const scrollToCurrentSubtitle = useCallback( + (immediate: boolean = false) => { + if (currentSubtitleIndex >= 0) { + executeScrollToIndex(currentSubtitleIndex, immediate) + } + }, + [currentSubtitleIndex, executeScrollToIndex] + ) + + // 处理用户手动滚动 + const handleUserScroll = useCallback(() => { + const stateMachine = stateMachineRef.current + if (!stateMachine || suppressUserScrollRef.current) return + + if (stateMachine.isProgrammaticScroll()) return + + stateMachine.transition(ScrollTrigger.USER_MANUAL_SCROLL) + }, []) + + // 处理用户点击回到当前按钮 + const handleReturnClick = useCallback(() => { + const stateMachine = stateMachineRef.current + if (!stateMachine) return + + stateMachine.transition(ScrollTrigger.USER_CLICK_RETURN) + scrollToCurrentSubtitle(true) // 立即滚动 + }, [scrollToCurrentSubtitle]) + + // 处理用户点击字幕项 + const handleItemClick = useCallback( + (index: number) => { + const stateMachine = stateMachineRef.current + if (!stateMachine) return + + // 先切换到用户浏览状态 + stateMachine.transition(ScrollTrigger.USER_CLICK_ITEM) + + // 执行跳转到指定时间 + onSeekToSubtitle?.(index) + }, + [onSeekToSubtitle] + ) + + // 处理Virtuoso范围变化 + const handleRangeChanged = useCallback( + (range: { startIndex: number; endIndex: number }) => { + const stateMachine = stateMachineRef.current + if (!stateMachine || stateMachine.isProgrammaticScroll()) return + + const { startIndex, endIndex } = range + const currentIndex = currentSubtitleIndex + + // 检查当前字幕是否在可见范围内 + const isCurrentInView = currentIndex >= startIndex && currentIndex <= endIndex + + if ( + !isCurrentInView && + stateMachine.getCurrentState() === SubtitleScrollState.LOCKED_TO_CURRENT + ) { + // 如果当前字幕不在可见范围但状态是锁定的，触发用户滚动 + handleUserScroll() + } + }, + [currentSubtitleIndex, handleUserScroll] + ) + + // 初始化状态机 + const initialize = useCallback(() => { + const stateMachine = stateMachineRef.current + if (!stateMachine) return + + stateMachine.transition(ScrollTrigger.INITIAL_LOAD) + }, []) + + // 当状态变为LOCKED_TO_CURRENT或TRANSITIONING时，执行自动滚动 + useEffect(() => { + if ( + scrollState === SubtitleScrollState.LOCKED_TO_CURRENT || + scrollState === SubtitleScrollState.TRANSITIONING + ) { + scrollToCurrentSubtitle(scrollState === SubtitleScrollState.TRANSITIONING) + } + }, [scrollState, scrollToCurrentSubtitle]) + + // 计算派生状态 + const showReturnButton = scrollState === SubtitleScrollState.USER_BROWSING + const isAutoScrolling = scrollState === SubtitleScrollState.LOCKED_TO_CURRENT + const isTransitioning = scrollState === SubtitleScrollState.TRANSITIONING + + return { + scrollState, + showReturnButton, + isAutoScrolling, + isTransitioning, + handleUserScroll, + handleReturnClick, + handleItemClick, + handleRangeChanged, + scrollToCurrentSubtitle, + initialize + } +} + +export { SubtitleScrollStateMachine } From 4f5bad2e220f4b8e814d9a9a3df16224f4d620ae Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 11:17:42 +0800 Subject: [PATCH 23/82] feat(ci): configure CodeRabbit for alpha, beta, and main branch PR reviews (#108) - Add base_branches configuration to auto-review PRs targeting alpha, beta, and main branches - Enable assertive review profile for detailed feedback - Configure code quality tools (ESLint, Ruff, Gitleaks, Hadolint) - Include code guidelines from .cursorrules files - Maintain existing filters for WIP and draft PRs --- .coderabbit.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .coderabbit.yaml diff --git a/.coderabbit.yaml b/.coderabbit.yaml new file mode 100644 index 00000000..57cf5526 --- /dev/null +++ b/.coderabbit.yaml @@ -0,0 +1,34 @@ +# Configuration for development teams +language: 'en-US' + +reviews: + profile: 'assertive' + high_level_summary: true + auto_review: + enabled: true + drafts: false + base_branches: + - 'alpha' + - 'beta' + - 'main' + ignore_title_keywords: + - 'wip' + - 'draft' +tools: + eslint: + enabled: true + ruff: + enabled: true + gitleaks: + enabled: true + hadolint: + enabled: true + +chat: + auto_reply: true + +knowledge_base: + code_guidelines: + enabled: true + filePatterns: + - '**/.cursorrules' From bd7f5c3ec319c174bd8b0244e935daef8ec90d9d Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 11:57:41 +0800 Subject: [PATCH 24/82] fix(player): improve subtitle overlay positioning and remove i18n dependencies (#109) - Remove useTranslation dependency from SubtitleContent component - Replace internationalized empty state messages with fixed '--Empty--' text - Remove unnecessary aria attributes and CSS color variables for consistency - Optimize SubtitleOverlay double-click expansion logic with centered positioning - Simplify positioning calculation for better maintainability Changes improve subtitle display consistency and fix positioning behavior during double-click expansion interactions --- .../player/components/SubtitleContent.tsx | 14 ++++---------- .../player/components/SubtitleOverlay.tsx | 19 +++++-------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/renderer/src/pages/player/components/SubtitleContent.tsx b/src/renderer/src/pages/player/components/SubtitleContent.tsx index 6207e8c1..bef9330d 100644 --- a/src/renderer/src/pages/player/components/SubtitleContent.tsx +++ b/src/renderer/src/pages/player/components/SubtitleContent.tsx @@ -13,7 +13,6 @@ import { loggerService } from '@logger' import { isClickableToken, tokenizeText, type WordToken } from '@renderer/utils/textTokenizer' import { SubtitleDisplayMode } from '@types' import React, { memo, useCallback, useMemo, useRef, useState } from 'react' -import { useTranslation } from 'react-i18next' import styled from 'styled-components' const logger = loggerService.withContext('SubtitleContent') @@ -46,7 +45,6 @@ export const SubtitleContent = memo(function SubtitleContent({ className, style }: SubtitleContentProps) { - const { t } = useTranslation() const containerRef = useRef(null) // 划词选择状态 @@ -285,14 +283,14 @@ export const SubtitleContent = memo(function SubtitleContent({ case SubtitleDisplayMode.ORIGINAL: if (!originalText.trim()) { - return {t('subtitle-overlay.no-original')} + return --Empty-- } return {renderTokenizedText(originalTokens)} case SubtitleDisplayMode.TRANSLATED: { const textToShow = translatedText?.trim() || originalText.trim() if (!textToShow) { - return {t('subtitle-overlay.no-translated')} + return --Empty-- } // 译文显示整句，原文显示分词 return ( @@ -304,7 +302,7 @@ export const SubtitleContent = memo(function SubtitleContent({ case SubtitleDisplayMode.BILINGUAL: if (!originalText.trim()) { - return {t('subtitle-overlay.no-original')} + return --Empty-- } return ( <> @@ -317,7 +315,7 @@ export const SubtitleContent = memo(function SubtitleContent({ default: logger.warn('未知的字幕显示模式', { displayMode }) - return {t('subtitle-overlay.unknown')} + return --Empty-- } } @@ -336,8 +334,6 @@ export const SubtitleContent = memo(function SubtitleContent({ onKeyDown={handleKeyDown} tabIndex={0} // 使元素可聚焦，支持键盘操作 role="region" - aria-label="字幕内容" - aria-live="polite" // 屏幕阅读器支持 data-testid="subtitle-content" > {content} @@ -394,7 +390,6 @@ const TranslatedTextLine = styled.div` font-size: 15px; font-weight: 500; opacity: 0.95; - color: var(--color-text-2, #f0f0f0); text-shadow: var(--subtitle-text-shadow); margin-top: 0; transition: all var(--subtitle-transition-duration); @@ -402,7 +397,6 @@ const TranslatedTextLine = styled.div` const EmptyState = styled.div` font-size: 14px; - color: var(--color-text-3, #999999); font-style: italic; opacity: 0.7; background: rgba(0, 0, 0, 0.4); diff --git a/src/renderer/src/pages/player/components/SubtitleOverlay.tsx b/src/renderer/src/pages/player/components/SubtitleOverlay.tsx index 04a190d8..c160d9e8 100644 --- a/src/renderer/src/pages/player/components/SubtitleOverlay.tsx +++ b/src/renderer/src/pages/player/components/SubtitleOverlay.tsx @@ -329,19 +329,10 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ event.preventDefault() event.stopPropagation() - // 计算当前字幕框的中心点 - const currentCenterX = position.x + size.width / 2 - const maxWidth = 95 // 最大宽度95% - // 计算新的位置，让字幕框向两边扩展 - const newX = Math.max( - 0, // 不能超出左边界 - Math.min( - 100 - maxWidth, // 不能超出右边界 - currentCenterX - maxWidth / 2 // 以中心点为基准向两边扩展 - ) - ) + // 计算扩展后的居中位置（95%宽度居中） + const expandedCenterX = 50 - maxWidth / 2 const newSize = { ...size, @@ -350,7 +341,7 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ const newPosition = { ...position, - x: newX + x: Math.max(0, Math.min(100 - maxWidth, expandedCenterX)) } // 同时更新尺寸和位置 @@ -360,8 +351,8 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ logger.info('字幕覆盖层双击扩展', { newSize, newPosition, - currentCenterX, - expandedFromCenter: true + centerFirst: true, + thenExpand: true }) }, [size, position, setSize, setPosition] From b8a95223f7f0e7327d0d43bfbe3ab730679aaa4d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 10 Sep 2025 04:16:38 +0000 Subject: [PATCH 25/82] chore(release): 1.0.0-alpha.5 # [1.0.0-alpha.5](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2025-09-10) ### Bug Fixes * **player:** ensure video always starts paused and sync UI state correctly ([#102](https://github.com/mkdir700/EchoPlayer/issues/102)) ([c6c8909](https://github.com/mkdir700/EchoPlayer/commit/c6c890986d6a0137cb6a70e01144c9c995589840)) * **player:** improve subtitle overlay positioning and remove i18n dependencies ([#109](https://github.com/mkdir700/EchoPlayer/issues/109)) ([bd7f5c3](https://github.com/mkdir700/EchoPlayer/commit/bd7f5c3ec319c174bd8b0244e935daef8ec90d9d)) ### Features * **ci:** configure CodeRabbit for alpha, beta, and main branch PR reviews ([#108](https://github.com/mkdir700/EchoPlayer/issues/108)) ([4f5bad2](https://github.com/mkdir700/EchoPlayer/commit/4f5bad2e220f4b8e814d9a9a3df16224f4d620ae)) * **player:** implement favorite playback rates with hover menu system ([#100](https://github.com/mkdir700/EchoPlayer/issues/100)) ([df83095](https://github.com/mkdir700/EchoPlayer/commit/df830955971080e5db393590a082e86718da10cd)) * **player:** implement volume wheel control with intelligent acceleration ([#105](https://github.com/mkdir700/EchoPlayer/issues/105)) ([b675150](https://github.com/mkdir700/EchoPlayer/commit/b6751504ccff70f71fe518393587b3e70e6d7dba)) * **startup:** implement configurable startup intro with preloading optimization ([#104](https://github.com/mkdir700/EchoPlayer/issues/104)) ([e5f4109](https://github.com/mkdir700/EchoPlayer/commit/e5f41092843333c39dc2029bd040aae6854a1036)) * **ui:** enhance video selection clarity and simplify display ([#101](https://github.com/mkdir700/EchoPlayer/issues/101)) ([a951877](https://github.com/mkdir700/EchoPlayer/commit/a95187723ddc7706f52e72a66f61ceb6b2ceb439)) --- CHANGELOG.md | 15 +++++++++++++++ package.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc14d11..648a6eb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +# [1.0.0-alpha.5](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2025-09-10) + +### Bug Fixes + +- **player:** ensure video always starts paused and sync UI state correctly ([#102](https://github.com/mkdir700/EchoPlayer/issues/102)) ([c6c8909](https://github.com/mkdir700/EchoPlayer/commit/c6c890986d6a0137cb6a70e01144c9c995589840)) +- **player:** improve subtitle overlay positioning and remove i18n dependencies ([#109](https://github.com/mkdir700/EchoPlayer/issues/109)) ([bd7f5c3](https://github.com/mkdir700/EchoPlayer/commit/bd7f5c3ec319c174bd8b0244e935daef8ec90d9d)) + +### Features + +- **ci:** configure CodeRabbit for alpha, beta, and main branch PR reviews ([#108](https://github.com/mkdir700/EchoPlayer/issues/108)) ([4f5bad2](https://github.com/mkdir700/EchoPlayer/commit/4f5bad2e220f4b8e814d9a9a3df16224f4d620ae)) +- **player:** implement favorite playback rates with hover menu system ([#100](https://github.com/mkdir700/EchoPlayer/issues/100)) ([df83095](https://github.com/mkdir700/EchoPlayer/commit/df830955971080e5db393590a082e86718da10cd)) +- **player:** implement volume wheel control with intelligent acceleration ([#105](https://github.com/mkdir700/EchoPlayer/issues/105)) ([b675150](https://github.com/mkdir700/EchoPlayer/commit/b6751504ccff70f71fe518393587b3e70e6d7dba)) +- **startup:** implement configurable startup intro with preloading optimization ([#104](https://github.com/mkdir700/EchoPlayer/issues/104)) ([e5f4109](https://github.com/mkdir700/EchoPlayer/commit/e5f41092843333c39dc2029bd040aae6854a1036)) +- **ui:** enhance video selection clarity and simplify display ([#101](https://github.com/mkdir700/EchoPlayer/issues/101)) ([a951877](https://github.com/mkdir700/EchoPlayer/commit/a95187723ddc7706f52e72a66f61ceb6b2ceb439)) + # [1.0.0-alpha.4](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2025-09-08) ### Bug Fixes diff --git a/package.json b/package.json index 17616a83..02896aff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.4", + "version": "1.0.0-alpha.5", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From bb2ac3028a45df5e49f74ac4cab6752806af048d Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 16:22:12 +0800 Subject: [PATCH 26/82] feat(search): implement video search engine with live results and highlighting (#110) - Add VideoSearchService with fuzzy matching and relevance scoring - Create VideoSearchResult component with thumbnail, progress, and text highlighting - Implement live search with 300ms debounce and loading states - Add comprehensive i18n support for search UI text - Enhance SearchOverlay with unified design and scrollable results - Move SearchOverlay from App to Router for proper global positioning - Update search.store with results state and async operation support Features: - Real-time search across video titles and subtitles - Keyword highlighting with styled matches - Relevance-based sorting with title priority and recency fallback - Responsive design with hover states and smooth transitions - Progress bar integration for partially watched videos - Click-to-play navigation with search overlay auto-hide This implementation provides a complete video search experience with intelligent matching, visual feedback, and seamless navigation flow. --- src/renderer/src/App.tsx | 2 - src/renderer/src/Router.tsx | 2 + .../SearchOverlay/SearchOverlay.tsx | 136 +++++++++++- .../SearchOverlay/VideoSearchResult.tsx | 199 ++++++++++++++++++ src/renderer/src/i18n/locales/zh-cn.json | 6 + .../src/services/VideoSearchService.ts | 142 +++++++++++++ src/renderer/src/state/stores/search.store.ts | 23 +- 7 files changed, 499 insertions(+), 11 deletions(-) create mode 100644 src/renderer/src/components/SearchOverlay/VideoSearchResult.tsx create mode 100644 src/renderer/src/services/VideoSearchService.ts diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 7688ef85..236ab62f 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -7,7 +7,6 @@ import HomePageVideoService from '@renderer/services/HomePageVideos' import { useVideoListStore } from '@renderer/state/stores/video-list.store' import React, { useCallback, useEffect, useState } from 'react' -import { SearchOverlay } from './components/SearchOverlay' import { StartupLoadingState } from './components/StartupIntro' import TopViewContainer from './components/TopView' import Router from './Router' @@ -96,7 +95,6 @@ const AppContent: React.FC = () => { {shouldRenderMainApp && ( <> - )} diff --git a/src/renderer/src/Router.tsx b/src/renderer/src/Router.tsx index 0446f138..0d94ab3b 100644 --- a/src/renderer/src/Router.tsx +++ b/src/renderer/src/Router.tsx @@ -6,6 +6,7 @@ import { HomePage, PlayerPage, SettingsPage } from '@renderer/pages' import { FC } from 'react' import { HashRouter, Route, Routes } from 'react-router-dom' +import { SearchOverlay } from './components/SearchOverlay' import NavigationHandler from './infrastructure/handler/NavigationHandler' const AppContent: FC = () => { @@ -23,6 +24,7 @@ const AppContent: FC = () => { <> {!isPlayerPage && } {routes} + ) diff --git a/src/renderer/src/components/SearchOverlay/SearchOverlay.tsx b/src/renderer/src/components/SearchOverlay/SearchOverlay.tsx index 4bfff978..00a255db 100644 --- a/src/renderer/src/components/SearchOverlay/SearchOverlay.tsx +++ b/src/renderer/src/components/SearchOverlay/SearchOverlay.tsx @@ -1,13 +1,59 @@ +import VideoSearchService from '@renderer/services/VideoSearchService' import { useSearchStore } from '@renderer/state/stores/search.store' -import { Search } from 'lucide-react' -import { FC, useEffect, useRef } from 'react' +import { Loader2, Search } from 'lucide-react' +import { FC, useCallback, useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' +import VideoSearchResult from './VideoSearchResult' + const SearchOverlay: FC = () => { const { t } = useTranslation() - const { isSearchVisible, searchQuery, hideSearch, setSearchQuery, clearSearch } = useSearchStore() + const { + isSearchVisible, + searchQuery, + searchResults, + isSearching, + hideSearch, + setSearchQuery, + clearSearch, + setSearchResults, + setSearching + } = useSearchStore() const inputRef = useRef(null) + const searchServiceRef = useRef(new VideoSearchService()) + + // 执行搜索的函数 + const performSearch = useCallback( + async (query: string) => { + if (!query.trim()) { + setSearchResults([]) + setSearching(false) + return + } + + setSearching(true) + try { + const results = await searchServiceRef.current.searchVideos(query) + setSearchResults(results) + } catch (error) { + // 由于这是UI层组件，这里简单处理错误即可 + setSearchResults([]) + } finally { + setSearching(false) + } + }, + [setSearchResults, setSearching] + ) + + // 搜索防抖 + useEffect(() => { + const timeoutId = setTimeout(() => { + performSearch(searchQuery) + }, 300) + + return () => clearTimeout(timeoutId) + }, [searchQuery, performSearch]) // 处理键盘事件 useEffect(() => { @@ -89,7 +135,27 @@ const SearchOverlay: FC = () => { {/* 搜索结果区域 - 与输入框一体化 */} {searchQuery && ( - {t('common.search_no_results', '暂无搜索结果')} + {isSearching ? ( + + + {t('search.searching', '搜索中...')} + + ) : searchResults.length > 0 ? ( + <> + + {t('search.found_videos', '找到 {{count}} 个视频', { + count: searchResults.length + })} + + + {searchResults.map((video) => ( + + ))} + + + ) : ( + {t('search.no_videos_found', '未找到相关视频')} + )} )} @@ -153,10 +219,9 @@ const UnifiedSearchBox = styled.div` overflow: hidden; /* 确保内容不会超出圆角边界 */ &:focus-within { - border-color: var(--color-primary); box-shadow: - 0 8px 32px rgba(0, 0, 0, 0.16), - 0 0 0 3px rgba(22, 119, 255, 0.1); + 0 0 0 2px rgba(0, 0, 0, 0.15), + 0 0 0 3px rgba(0, 0, 0, 0.15); } /* 确保在亮色主题下也有合适的背景色 */ @@ -197,7 +262,7 @@ const SearchInput = styled.input` padding: 0 16px 0 0; &::placeholder { - color: var(--color-text-tertiary); + color: var(--color-text-secondary); } ` @@ -248,6 +313,61 @@ const SearchResults = styled.div` } ` +const LoadingState = styled.div` + display: flex; + align-items: center; + justify-content: center; + gap: 8px; + padding: 24px 32px; + color: var(--color-text-secondary); + font-size: 14px; + + .spin { + animation: spin 1s linear infinite; + } + + @keyframes spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } + } +` + +const ResultsHeader = styled.div` + padding: 12px 16px; + font-size: 12px; + font-weight: 500; + color: var(--color-text-secondary); + border-bottom: 1px solid var(--color-border-soft); + background-color: var(--color-background-soft); +` + +const ResultsList = styled.div` + max-height: 320px; + overflow-y: auto; + + /* 自定义滚动条样式 */ + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-track { + background: transparent; + } + + &::-webkit-scrollbar-thumb { + background: var(--color-border); + border-radius: 3px; + } + + &::-webkit-scrollbar-thumb:hover { + background: var(--color-border-hover); + } +` + const EmptyState = styled.div` padding: 24px 32px; text-align: center; diff --git a/src/renderer/src/components/SearchOverlay/VideoSearchResult.tsx b/src/renderer/src/components/SearchOverlay/VideoSearchResult.tsx new file mode 100644 index 00000000..f5f18cfb --- /dev/null +++ b/src/renderer/src/components/SearchOverlay/VideoSearchResult.tsx @@ -0,0 +1,199 @@ +import ThumbnailWithFallback from '@renderer/pages/home/ThumbnailWithFallback' +import { HomePageVideoItem } from '@renderer/services/HomePageVideos' +import { useSearchStore } from '@renderer/state/stores/search.store' +import { Clock, Play } from 'lucide-react' +import React, { FC } from 'react' +import { useNavigate } from 'react-router-dom' +import styled from 'styled-components' + +interface VideoSearchResultProps { + video: HomePageVideoItem + searchQuery: string +} + +const VideoSearchResult: FC = ({ video, searchQuery }) => { + const navigate = useNavigate() + const { hideSearch } = useSearchStore() + + const handleClick = () => { + // 点击跳转到播放页面 + navigate(`/player/${video.id}`) + // 关闭搜索界面 + hideSearch() + } + + // 高亮匹配的文本 + const highlightText = (text: string, query: string): React.ReactElement => { + if (!query.trim()) { + return {text} + } + + const regex = new RegExp(`(${query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi') + const parts = text.split(regex) + + return ( + + {parts.map((part, index) => + regex.test(part) ? ( + {part} + ) : ( + {part} + ) + )} + + ) + } + + return ( + + + + + + + {video.watchProgress > 0 && ( + + + + )} + + + + {highlightText(video.title, searchQuery)} + + {video.subtitle && ( + {highlightText(video.subtitle, searchQuery)} + )} + + + + + {video.durationText} + + + {video.publishedAt} + + + + + ) +} + +// 样式组件 +const ResultItem = styled.div` + display: flex; + align-items: flex-start; + gap: 12px; + padding: 12px 16px; + cursor: pointer; + transition: all 0.2s ease-in-out; + border-radius: 8px; + margin: 0 8px; + + &:hover { + background-color: var(--color-background-soft); + } + + &:active { + background-color: var(--color-background-mute); + transform: translateY(1px); + } +` + +const ThumbnailContainer = styled.div` + position: relative; + flex-shrink: 0; + border-radius: 6px; + overflow: hidden; + width: 120px; + height: 68px; +` + +const PlayButton = styled.div` + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 28px; + height: 28px; + border-radius: 50%; + display: flex; + align-items: center; + justify-content: center; + color: white; + opacity: 0; + transition: opacity 0.2s ease; +` + +const ProgressBar = styled.div` + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 3px; + background-color: rgba(0, 0, 0, 0.3); +` + +const ProgressFill = styled.div<{ progress: number }>` + height: 100%; + background-color: var(--color-primary); + width: ${(props) => props.progress * 100}%; + transition: width 0.2s ease; +` + +const ContentContainer = styled.div` + flex: 1; + min-width: 0; + display: flex; + flex-direction: column; + gap: 4px; +` + +const VideoTitle = styled.div` + font-size: 14px; + font-weight: 500; + color: var(--color-text); + line-height: 1.4; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; +` + +const VideoSubtitle = styled.div` + font-size: 12px; + color: var(--color-text-secondary); + line-height: 1.3; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +` + +const VideoMeta = styled.div` + display: flex; + align-items: center; + gap: 12px; + margin-top: 4px; +` + +const MetaItem = styled.div` + display: flex; + align-items: center; + gap: 4px; + font-size: 11px; + color: var(--color-text-tertiary); + + svg { + flex-shrink: 0; + } +` + +const HighlightText = styled.span` + background-color: var(--color-primary); + color: white; + padding: 1px 2px; + border-radius: 2px; + font-weight: 500; +` + +export default VideoSearchResult diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 23cd8754..16403841 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -22,6 +22,12 @@ "docs": { "title": "帮助文档" }, + "search": { + "searching": "搜索中...", + "found_videos": "找到 {{count}} 个视频", + "no_videos_found": "未找到相关视频", + "search_videos": "搜索视频" + }, "home": { "add_video": "新增视频", "no_video": "空空如也", diff --git a/src/renderer/src/services/VideoSearchService.ts b/src/renderer/src/services/VideoSearchService.ts new file mode 100644 index 00000000..7272461f --- /dev/null +++ b/src/renderer/src/services/VideoSearchService.ts @@ -0,0 +1,142 @@ +import { loggerService } from '@logger' + +import HomePageVideoService, { HomePageVideoItem } from './HomePageVideos' + +const logger = loggerService.withContext('VideoSearchService') + +export class VideoSearchService { + private readonly videoService = new HomePageVideoService() + + /** + * 搜索视频 + * @param query 搜索关键词 + * @param limit 最大结果数量 + * @returns 匹配的视频列表 + */ + async searchVideos(query: string, limit: number = 20): Promise { + if (!query.trim()) { + return [] + } + + try { + logger.debug('开始搜索视频', { query, limit }) + + // 获取所有视频 + const allVideos = await this.videoService.getHomePageVideos(500) // 获取更多视频用于搜索 + + // 执行搜索过滤 + const filteredVideos = this.filterVideos(allVideos, query.trim()) + + // 返回限制数量的结果 + const results = filteredVideos.slice(0, limit) + + logger.debug('搜索完成', { + query, + totalVideos: allVideos.length, + matchedVideos: results.length + }) + + return results + } catch (error) { + logger.error('搜索视频失败', { error, query }) + throw error + } + } + + /** + * 过滤和排序视频 + * @param videos 视频列表 + * @param query 搜索关键词 + * @returns 过滤后的视频列表 + */ + private filterVideos(videos: HomePageVideoItem[], query: string): HomePageVideoItem[] { + const lowerQuery = query.toLowerCase() + + // 过滤匹配的视频 + const matchedVideos = videos.filter((video) => this.isVideoMatch(video, lowerQuery)) + + // 按相关性排序 + return this.sortByRelevance(matchedVideos, lowerQuery) + } + + /** + * 判断视频是否匹配搜索关键词 + * @param video 视频项 + * @param query 小写的搜索关键词 + * @returns 是否匹配 + */ + private isVideoMatch(video: HomePageVideoItem, query: string): boolean { + // 搜索标题 + if (video.title.toLowerCase().includes(query)) { + return true + } + + // 搜索副标题（包含路径和文件大小信息） + if (video.subtitle?.toLowerCase().includes(query)) { + return true + } + + return false + } + + /** + * 按相关性排序视频结果 + * @param videos 匹配的视频列表 + * @param query 小写的搜索关键词 + * @returns 排序后的视频列表 + */ + private sortByRelevance(videos: HomePageVideoItem[], query: string): HomePageVideoItem[] { + return videos.sort((a, b) => { + const scoreA = this.calculateRelevanceScore(a, query) + const scoreB = this.calculateRelevanceScore(b, query) + + // 按相关性得分降序排列 + if (scoreA !== scoreB) { + return scoreB - scoreA + } + + // 相关性相同时，按播放时间降序排列（最近播放的在前） + return b.createdAt.getTime() - a.createdAt.getTime() + }) + } + + /** + * 计算视频的相关性得分 + * @param video 视频项 + * @param query 小写的搜索关键词 + * @returns 相关性得分（越高越相关） + */ + private calculateRelevanceScore(video: HomePageVideoItem, query: string): number { + let score = 0 + const lowerTitle = video.title.toLowerCase() + const lowerSubtitle = video.subtitle?.toLowerCase() || '' + + // 标题完全匹配给最高分 + if (lowerTitle === query) { + score += 100 + } + // 标题开头匹配给高分 + else if (lowerTitle.startsWith(query)) { + score += 80 + } + // 标题包含关键词给中等分数 + else if (lowerTitle.includes(query)) { + score += 50 + } + + // 副标题匹配给额外分数 + if (lowerSubtitle.includes(query)) { + score += 20 + } + + // 关键词在标题中出现的次数 + const titleMatches = ( + lowerTitle.match(new RegExp(query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), 'g')) || [] + ).length + score += titleMatches * 10 + + return score + } +} + +export default VideoSearchService diff --git a/src/renderer/src/state/stores/search.store.ts b/src/renderer/src/state/stores/search.store.ts index e44b831c..bff0ce04 100644 --- a/src/renderer/src/state/stores/search.store.ts +++ b/src/renderer/src/state/stores/search.store.ts @@ -1,3 +1,4 @@ +import { HomePageVideoItem } from '@renderer/services/HomePageVideos' import { Draft } from 'immer' import { create, StateCreator } from 'zustand' @@ -6,6 +7,8 @@ import { MiddlewarePresets } from '../infrastructure' export interface SearchState { isSearchVisible: boolean searchQuery: string + searchResults: HomePageVideoItem[] + isSearching: boolean } export interface SearchActions { @@ -14,13 +17,17 @@ export interface SearchActions { toggleSearch: () => void setSearchQuery: (query: string) => void clearSearch: () => void + setSearchResults: (results: HomePageVideoItem[]) => void + setSearching: (isSearching: boolean) => void } export type SearchStore = SearchState & SearchActions const initialState: SearchState = { isSearchVisible: false, - searchQuery: '' + searchQuery: '', + searchResults: [], + isSearching: false } const createSearchStore: StateCreator< @@ -59,6 +66,20 @@ const createSearchStore: StateCreator< clearSearch: () => { set((state: Draft) => { state.searchQuery = '' + state.searchResults = [] + state.isSearching = false + }) + }, + + setSearchResults: (results: HomePageVideoItem[]) => { + set((state: Draft) => { + state.searchResults = results + }) + }, + + setSearching: (isSearching: boolean) => { + set((state: Draft) => { + state.isSearching = isSearching }) } }) From 444476bae35afcd916f098dbc544eced7542a4b9 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 18:44:25 +0800 Subject: [PATCH 27/82] fix(subtitle): improve ASS subtitle parsing for bilingual text (#111) * fix(subtitle): improve ASS subtitle parsing for bilingual text - Fix stripAssTags method to properly handle complex ASS style markers like {\3c&HFF8000&\fnKaiTi}{\an8} - Add support for \h (hard space) and \n (lowercase newline) ASS markers - Adjust script priority in splitBilingualText to correctly identify English as original text and Chinese as translated text - Improve bilingual text splitting logic to handle ASS \N line breaks properly - All existing tests pass, ensuring backward compatibility Fixes the issue where ASS subtitle style markers were not properly stripped and original/translated text were incorrectly assigned. * fix(subtitle): handle partially processed ASS style markers from subsrt library - Add regex patterns to handle ASS style markers that are missing opening braces like \3c&HFF8000&\fnKaiTi} - Fix issue where subsrt library partially processes ASS content but leaves style marker remnants - Add comprehensive regex to clean up various ASS marker patterns: - Complete markers: {\3c&HFF8000&\fnKaiTi} - Partial markers: \3c&HFF8000&\fnKaiTi} - Orphaned markers: \fnKaiTi without closing brace - All tests pass, ensuring backward compatibility This fixes the remaining ASS subtitle display issue where style markers were still visible in the UI. * test(subtitle): add comprehensive tests for ASS subtitle parsing fixes - Add regression tests for ASS style marker cleaning issues - Test partial ASS style markers left by subsrt library (\3c&HFF8000&\fnKaiTi}) - Test complete ASS style markers ({\3c&HFF8000&\fnKaiTi}) - Test script detection for bilingual text parsing - Test format detection for ASS files - Test error handling for empty files and read failures - Ensure 449 tests pass including 7 new ASS parsing tests These tests prevent regressions of the issues encountered with Forrest Gump ASS subtitles where style markers were not properly cleaned from displayed text. --- .../src/services/subtitles/SubtitleReader.ts | 40 ++++-- .../__tests__/SubtitleReader.test.ts | 115 ++++++++++++++++++ 2 files changed, 144 insertions(+), 11 deletions(-) create mode 100644 src/renderer/src/services/subtitles/__tests__/SubtitleReader.test.ts diff --git a/src/renderer/src/services/subtitles/SubtitleReader.ts b/src/renderer/src/services/subtitles/SubtitleReader.ts index a9f360a9..efe0b226 100644 --- a/src/renderer/src/services/subtitles/SubtitleReader.ts +++ b/src/renderer/src/services/subtitles/SubtitleReader.ts @@ -337,15 +337,16 @@ export class SubtitleReader { } // 多脚本识别 + 原文优先策略（可扩展到多语言） + // 对于中英双语字幕，通常英文是原文，中文是译文 private readonly preferredOriginalScripts: Script[] = [ - 'Latin', - 'Han', - 'Hiragana', - 'Katakana', - 'Hangul', - 'Cyrillic', - 'Arabic', - 'Devanagari', + 'Latin', // 英文等拉丁字母优先作为原文 + 'Hiragana', // 日文假名 + 'Katakana', // 日文片假名 + 'Hangul', // 韩文 + 'Cyrillic', // 西里尔字母（俄语等） + 'Arabic', // 阿拉伯语 + 'Devanagari', // 梵文字母（印地语等） + 'Han', // 中文汉字通常是译文 'Other' ] @@ -381,13 +382,19 @@ export class SubtitleReader { const trimmed = text.trim() if (!trimmed) return { originalText: '' } + // 先按换行符分割（包括从stripAssTags转换过来的 \N） const lines = trimmed .split(/\n+/) .map((l) => l.trim()) .filter(Boolean) const pickByScript = (parts: string[]) => { + if (parts.length === 0) return { originalText: '' } + if (parts.length === 1) return { originalText: parts[0] } + const scored = parts.map((p) => ({ text: p, script: this.detectScript(p) })) + + // 找到第一个匹配优先脚本的文本作为原文 const hit = this.preferredOriginalScripts.find((scr) => scored.some((x) => x.script === scr)) if (hit) { const orig = scored.find((x) => x.script === hit)!.text @@ -397,9 +404,12 @@ export class SubtitleReader { .join('\n') return rest ? { originalText: orig, translatedText: rest } : { originalText: orig } } + + // 如果没有匹配的脚本，默认第一行为原文，其余为译文 return { originalText: parts[0], translatedText: parts.slice(1).join('\n') } } + // 多行情况：按脚本类型分配 if (lines.length >= 2) { return pickByScript(lines) } @@ -413,6 +423,7 @@ export class SubtitleReader { return pickByScript(segs) } + // 单行单语言 return { originalText: trimmed } } @@ -454,10 +465,17 @@ export class SubtitleReader { } private stripAssTags(s: string): string { - // 去掉样式 {\i1} 等；将 \N 转换为换行 + // 去掉样式标记，支持嵌套和复杂格式 + // {\3c&HFF8000&\fnKaiTi}{\an8} -> 空字符串 + // {\fnTahoma\fs12\3c&H400000&\b1\i1} -> 空字符串 + // 处理subsrt库可能部分处理后的残留标记，如：\3c&HFF8000&\fnKaiTi} return s - .replace(/\{[^}]*\}/g, '') - .replace(/\\N/g, '\n') + .replace(/\{[^}]*\}/g, '') // 去掉完整的 {...} 样式标记 + .replace(/\\[a-zA-Z0-9&]+[^}]*\}/g, '') // 去掉缺少开头括号的残留样式标记，如 \3c&HFF8000&\fnKaiTi} + .replace(/\\[a-zA-Z]+\d*[&\w]*(?=[^}]|$)/g, '') // 去掉没有结束括号的ASS标记 + .replace(/\\N/g, '\n') // 将 \N 转换为换行 + .replace(/\\n/g, '\n') // 将 \n 转换为换行（小写） + .replace(/\\h/g, ' ') // 将 \h 转换为空格（硬空格） .trim() } } diff --git a/src/renderer/src/services/subtitles/__tests__/SubtitleReader.test.ts b/src/renderer/src/services/subtitles/__tests__/SubtitleReader.test.ts new file mode 100644 index 00000000..d4fc50b4 --- /dev/null +++ b/src/renderer/src/services/subtitles/__tests__/SubtitleReader.test.ts @@ -0,0 +1,115 @@ +import { SubtitleFormat } from '@types' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +import { SubtitleReader, SubtitleReaderError } from '../SubtitleReader' + +// Mock window.api.file.readFromPath +const mockReadFromPath = vi.fn() +vi.stubGlobal('window', { + api: { + file: { + readFromPath: mockReadFromPath + } + } +}) + +describe('SubtitleReader - ASS字幕解析修复测试', () => { + let reader: SubtitleReader + + beforeEach(() => { + reader = SubtitleReader.create('test') + mockReadFromPath.mockReset() + }) + + describe('ASS样式标记清理回归测试', () => { + it('应该清理缺少开头大括号的样式标记（关键修复）', () => { + // 这是导致问题的核心场景：\\3c&HFF8000&\\fnKaiTi}从侧面下的雨 + const stripASSTagsPrivate = (reader as any).stripAssTags.bind(reader) + + const input = '\\\\3c&HFF8000&\\\\fnKaiTi}从侧面下的雨' + const result = stripASSTagsPrivate(input) + + // 关键是确保样式标记被清理，文本内容保留 + expect(result).not.toContain('\\\\3c') + expect(result).not.toContain('\\\\fn') + expect(result).not.toContain('&HFF8000&') + expect(result).not.toContain('}') + expect(result).toContain('从侧面下的雨') + }) + + it('应该清理所有真实的ASS字幕残留标记', () => { + const stripASSTagsPrivate = (reader as any).stripAssTags.bind(reader) + + const cases = [ + '\\\\3c&HFF8000&\\\\fnKaiTi}从侧面下的雨', + '\\\\3c&HFF8000&\\\\fnKaiTi}我们经历了各种各样的雨', + '\\\\3c&HFF8000&\\\\fnKaiTi}象小针样的雨', + '\\\\3c&HFF8000&\\\\fnKaiTi}还有倾盆大雨', + '\\\\3c&HFF8000&\\\\fnKaiTi}从下往上的雨', + '\\\\3c&HFF8000&\\\\fnKaiTi}连晚上也下雨' + ] + + cases.forEach((input) => { + const result = stripASSTagsPrivate(input) + + // 确保样式标记被完全清理 + expect(result).not.toContain('\\\\3c') + expect(result).not.toContain('\\\\fn') + expect(result).not.toContain('&HFF8000&') + expect(result).not.toContain('}') + + // 确保中文内容被保留 + expect(result.trim().length).toBeGreaterThan(0) + expect(result).toMatch(/雨/) + }) + }) + + it('应该清理完整的ASS样式标记', () => { + const stripASSTagsPrivate = (reader as any).stripAssTags.bind(reader) + + const input = '{\\\\3c&HFF8000&\\\\fnKaiTi}从侧面下的雨' + const result = stripASSTagsPrivate(input) + + expect(result).toContain('从侧面下的雨') + expect(result).not.toContain('\\\\3c') + expect(result).not.toContain('\\\\fn') + }) + }) + + describe('脚本检测测试', () => { + it('应该正确检测脚本类型', () => { + const detectScriptPrivate = (reader as any).detectScript.bind(reader) + + expect(detectScriptPrivate('Hello world')).toBe('Latin') + expect(detectScriptPrivate('你好世界')).toBe('Han') + expect(detectScriptPrivate('Hello 你好')).toBe('Latin') // 拉丁字母优先级高 + }) + }) + + describe('格式检测测试', () => { + it('应该正确检测ASS格式', () => { + const detectFormatPrivate = (reader as any).detectFormatByPathOrContent.bind(reader) + + expect(detectFormatPrivate('/path/to/test.ass', '')).toBe(SubtitleFormat.ASS) + + const assContent = '[Script Info]\\n[V4+ Styles]\\n[Events]' + expect(detectFormatPrivate('/path/to/test.txt', assContent)).toBe(SubtitleFormat.ASS) + }) + }) + + describe('错误处理测试', () => { + it('应该处理空文件', async () => { + mockReadFromPath.mockResolvedValue('') + + await expect(reader.readFromFile('/path/to/empty.ass')).rejects.toThrow(SubtitleReaderError) + }) + + it('应该处理文件读取失败', async () => { + mockReadFromPath.mockRejectedValue(new Error('File not found')) + + await expect(reader.readFromFile('/path/to/nonexistent.ass')).rejects.toThrow( + SubtitleReaderError + ) + }) + }) +}) From 28d061e195a3887e264066f0862dd32b481784c0 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 10 Sep 2025 10:54:48 +0000 Subject: [PATCH 28/82] chore(release): 1.0.0-alpha.6 # [1.0.0-alpha.6](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2025-09-10) ### Bug Fixes * **subtitle:** improve ASS subtitle parsing for bilingual text ([#111](https://github.com/mkdir700/EchoPlayer/issues/111)) ([444476b](https://github.com/mkdir700/EchoPlayer/commit/444476bae35afcd916f098dbc544eced7542a4b9)) ### Features * **search:** implement video search engine with live results and highlighting ([#110](https://github.com/mkdir700/EchoPlayer/issues/110)) ([bb2ac30](https://github.com/mkdir700/EchoPlayer/commit/bb2ac3028a45df5e49f74ac4cab6752806af048d)) --- CHANGELOG.md | 10 ++++++++++ package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 648a6eb2..678ae594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# [1.0.0-alpha.6](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2025-09-10) + +### Bug Fixes + +- **subtitle:** improve ASS subtitle parsing for bilingual text ([#111](https://github.com/mkdir700/EchoPlayer/issues/111)) ([444476b](https://github.com/mkdir700/EchoPlayer/commit/444476bae35afcd916f098dbc544eced7542a4b9)) + +### Features + +- **search:** implement video search engine with live results and highlighting ([#110](https://github.com/mkdir700/EchoPlayer/issues/110)) ([bb2ac30](https://github.com/mkdir700/EchoPlayer/commit/bb2ac3028a45df5e49f74ac4cab6752806af048d)) + # [1.0.0-alpha.5](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2025-09-10) ### Bug Fixes diff --git a/package.json b/package.json index 02896aff..2d541d8b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.5", + "version": "1.0.0-alpha.6", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From c25f17ab83b0be7a60bbd589d971637bf74eb8b6 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 18:57:25 +0800 Subject: [PATCH 29/82] feat(player): implement comprehensive video error recovery (#113) * feat(player): implement comprehensive video error recovery with file relocation - Add VideoErrorRecovery modal component with smart error categorization and recovery options - Implement file existence checking via new IPC bridge (fs.checkFileExists) - Enhance VideoSurface error handling with detailed error type detection (file-missing, unsupported-format, decode-error, network-error) - Add file relocation workflow allowing users to reselect missing video files - Add remove from library option for permanently unavailable videos - Implement modal with forced interaction (no dismiss) to ensure user handles critical errors - Improve dangerous button styling consistency across light/dark themes Changes: - Add VideoErrorRecovery: Modal-based error recovery interface with file browser integration - Enhance VideoSurface: Smart error detection with file existence validation - Add IPC bridge: fs.checkFileExists for file system validation from renderer process - Update PlayerPage: Integrate error recovery workflow with database operations - Fix ant.scss: Ensure dangerous button text visibility in all themes This implementation provides a robust solution for handling missing video files, allowing users to either relocate files or clean up their library when content is no longer accessible, preventing broken player states and improving UX. * feat(i18n): implement internationalization for VideoErrorRecovery component - Add comprehensive Chinese translations for video error recovery dialogs - Replace hardcoded Chinese strings with i18n keys in VideoErrorRecovery component - Support all error types: file-missing, unsupported-format, decode-error, network-error, unknown - Include translations for action buttons, dialog content, and file path labels - Maintain existing functionality while enabling future localization support --- src/main/ipc.ts | 12 + src/preload/index.ts | 4 + src/renderer/src/assets/styles/ant.scss | 3 +- src/renderer/src/i18n/locales/zh-cn.json | 59 ++++ src/renderer/src/pages/player/PlayerPage.tsx | 86 ++++- .../player/components/VideoErrorRecovery.tsx | 295 ++++++++++++++++++ .../pages/player/components/VideoSurface.tsx | 53 +++- .../src/pages/player/components/index.ts | 1 + 8 files changed, 501 insertions(+), 12 deletions(-) create mode 100644 src/renderer/src/pages/player/components/VideoErrorRecovery.tsx diff --git a/src/main/ipc.ts b/src/main/ipc.ts index f0cb0b3e..32d503ac 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -455,6 +455,18 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { return await mediaParserService.getVideoInfo(inputPath) }) + // 文件系统相关 IPC 处理程序 / File system-related IPC handlers + ipcMain.handle(IpcChannel.Fs_CheckFileExists, async (_, filePath: string) => { + try { + const exists = fs.existsSync(filePath) + logger.debug('检查文件存在性', { filePath, exists }) + return exists + } catch (error) { + logger.error('检查文件存在性时出错', { filePath, error }) + return false + } + }) + // shortcuts ipcMain.handle(IpcChannel.Shortcuts_Update, (_, shortcuts: Shortcut[]) => { configManager.setShortcuts(shortcuts) diff --git a/src/preload/index.ts b/src/preload/index.ts index 82d6312c..6316d9c0 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -196,6 +196,10 @@ const api = { getVideoInfo: (inputPath: string): Promise => ipcRenderer.invoke(IpcChannel.MediaInfo_GetVideoInfo, inputPath) }, + fs: { + checkFileExists: (filePath: string): Promise => + ipcRenderer.invoke(IpcChannel.Fs_CheckFileExists, filePath) + }, shortcuts: { update: (shortcuts: Shortcut[]) => ipcRenderer.invoke(IpcChannel.Shortcuts_Update, shortcuts) }, diff --git a/src/renderer/src/assets/styles/ant.scss b/src/renderer/src/assets/styles/ant.scss index 7be9db88..f04150fe 100644 --- a/src/renderer/src/assets/styles/ant.scss +++ b/src/renderer/src/assets/styles/ant.scss @@ -216,6 +216,7 @@ &.ant-btn-dangerous { background: var(--color-error); border: 1px solid var(--color-error); + color: #ffffff !important; &:hover { background: rgba(244, 67, 54, 0.8); @@ -306,7 +307,7 @@ .ant-btn.ant-btn-dangerous { background: var(--color-error); border: 1px solid var(--color-error); - color: var(--color-icon-white); + color: #ffffff !important; &:hover { background: rgba(244, 67, 54, 0.8); diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 16403841..55482bbc 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -102,6 +102,65 @@ "subtitles": { "hide": "隐藏字幕列表", "show": "展开字幕列表" + }, + "errorRecovery": { + "errors": { + "fileMissing": { + "title": "视频文件缺失", + "description": "原视频文件可能已被删除、移动或重命名" + }, + "unsupportedFormat": { + "title": "不支持的视频格式", + "description": "当前视频格式不受支持或文件已损坏" + }, + "decodeError": { + "title": "视频解码错误", + "description": "视频文件可能损坏或编码格式不兼容" + }, + "networkError": { + "title": "网络错误", + "description": "加载网络视频时发生连接错误" + }, + "unknown": { + "title": "播放错误", + "description": "视频播放时发生未知错误" + } + }, + "actions": { + "relocateFile": "重新选择文件", + "backToHome": "返回首页", + "removeFromLibrary": "从媒体库移除" + }, + "dialogs": { + "relocate": { + "title": "重新选择文件", + "confirmText": "我已了解，继续选择", + "content": { + "warning": "请务必选择与当前视频记录对应的原始文件。", + "note": "⚠️ 选择错误的文件可能导致播放进度、字幕等数据不匹配。" + } + }, + "remove": { + "title": "确认从媒体库移除？", + "confirmText": "确认移除", + "content": { + "description": "此操作将从媒体库中永久删除该视频记录，包括：", + "items": { + "playbackHistory": "播放进度和历史记录", + "subtitleLinks": "已导入的字幕文件关联", + "personalSettings": "个人设置和标记" + }, + "warning": "⚠️ 此操作不可撤销，但不会删除原视频文件。" + } + } + }, + "fileDialog": { + "videoFiles": "视频文件", + "allFiles": "所有文件" + }, + "pathInfo": { + "label": "文件路径" + } } }, "settings": { diff --git a/src/renderer/src/pages/player/PlayerPage.tsx b/src/renderer/src/pages/player/PlayerPage.tsx index 7f4c2f58..e45d5cc4 100644 --- a/src/renderer/src/pages/player/PlayerPage.tsx +++ b/src/renderer/src/pages/player/PlayerPage.tsx @@ -10,7 +10,7 @@ import { Layout, Tooltip } from 'antd' const { Content, Sider } = Layout import { ArrowLeft, PanelRightClose, PanelRightOpen } from 'lucide-react' -import { useEffect, useMemo, useState } from 'react' +import { useCallback, useEffect, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' import { useNavigate, useParams } from 'react-router-dom' import styled from 'styled-components' @@ -21,6 +21,7 @@ import { ProgressBar, SettingsPopover, SubtitleListPanel, + VideoErrorRecovery, VideoSurface } from './components' import { disposeGlobalOrchestrator } from './hooks/usePlayerEngine' @@ -81,6 +82,11 @@ function PlayerPage() { const [videoData, setVideoData] = useState(null) const [loading, setLoading] = useState(true) const [error, setError] = useState(null) + const [videoError, setVideoError] = useState<{ + message: string + type: 'file-missing' | 'unsupported-format' | 'decode-error' | 'network-error' | 'unknown' + originalPath?: string + } | null>(null) // const { pokeInteraction } = usePlayerUI() // 加载视频数据 @@ -161,9 +167,69 @@ function PlayerPage() { } }, [videoId]) - const handleVideoError = (errorMessage: string) => { - setError(errorMessage) - } + const handleVideoError = useCallback( + ( + errorMessage: string, + errorType?: + | 'file-missing' + | 'unsupported-format' + | 'decode-error' + | 'network-error' + | 'unknown' + ) => { + logger.error('视频播放错误', { errorMessage, errorType, videoId }) + setVideoError({ + message: errorMessage, + type: errorType || 'unknown', + originalPath: videoData?.src + ? decodeURIComponent(videoData.src.replace('file://', '')) + : undefined + }) + }, + [videoId, videoData?.src] + ) + + const handleFileRelocate = useCallback( + async (newPath: string) => { + if (!videoData) return + + try { + logger.info('开始重新定位视频文件', { videoId, newPath }) + + // 更新数据库中的文件路径 + // 这里需要调用数据库服务来更新文件记录 + // 暂时先更新本地状态，实际实现需要更新数据库 + const newFileUrl = toFileUrl(newPath) + const updatedVideoData = { + ...videoData, + src: newFileUrl + } + + setVideoData(updatedVideoData) + setVideoError(null) // 清除错误状态 + + logger.info('视频文件路径已更新', { videoId, newPath, newFileUrl }) + } catch (error) { + logger.error('重新定位视频文件时出错', { error }) + } + }, + [videoData, videoId] + ) + + const handleRemoveFromLibrary = useCallback(async () => { + try { + logger.info('从媒体库中移除视频', { videoId }) + + // 调用数据库服务删除记录 + const videoLibService = new VideoLibraryService() + await videoLibService.deleteRecord(videoId) + + // 返回首页 + navigate('/') + } catch (error) { + logger.error('从媒体库移除视频时出错', { error }) + } + }, [videoId, navigate]) if (loading) { return ( @@ -263,6 +329,18 @@ function PlayerPage() { + + {/* 错误恢复 Modal */} + setVideoError(null)} + videoId={videoId} + videoTitle={videoData.title} + originalPath={videoError?.originalPath} + errorType={videoError?.type || 'unknown'} + onFileRelocate={handleFileRelocate} + onRemoveFromLibrary={handleRemoveFromLibrary} + /> ) diff --git a/src/renderer/src/pages/player/components/VideoErrorRecovery.tsx b/src/renderer/src/pages/player/components/VideoErrorRecovery.tsx new file mode 100644 index 00000000..43445877 --- /dev/null +++ b/src/renderer/src/pages/player/components/VideoErrorRecovery.tsx @@ -0,0 +1,295 @@ +import { loggerService } from '@logger' +import { Button, Modal, Space } from 'antd' +import { AlertTriangle, FileSearch, RotateCcw, Trash2 } from 'lucide-react' +import { useCallback, useState } from 'react' +import { useTranslation } from 'react-i18next' +import { useNavigate } from 'react-router-dom' +import styled from 'styled-components' + +const logger = loggerService.withContext('VideoErrorRecovery') + +interface VideoErrorRecoveryProps { + open: boolean + onClose: () => void + videoId: number + videoTitle: string + originalPath?: string + errorType: 'file-missing' | 'unsupported-format' | 'decode-error' | 'network-error' | 'unknown' + onFileRelocate?: (newPath: string) => void + onRemoveFromLibrary?: () => void +} + +function VideoErrorRecovery({ + open, + onClose, + videoId, + videoTitle, + originalPath, + errorType, + onFileRelocate, + onRemoveFromLibrary +}: VideoErrorRecoveryProps) { + const { t } = useTranslation() + const navigate = useNavigate() + const [isRelocating, setIsRelocating] = useState(false) + const [showRelocateConfirm, setShowRelocateConfirm] = useState(false) + const [showRemoveConfirm, setShowRemoveConfirm] = useState(false) + + // 获取简化的错误信息 + const getErrorInfo = useCallback(() => { + switch (errorType) { + case 'file-missing': + return { + title: t('player.errorRecovery.errors.fileMissing.title'), + description: t('player.errorRecovery.errors.fileMissing.description') + } + case 'unsupported-format': + return { + title: t('player.errorRecovery.errors.unsupportedFormat.title'), + description: t('player.errorRecovery.errors.unsupportedFormat.description') + } + case 'decode-error': + return { + title: t('player.errorRecovery.errors.decodeError.title'), + description: t('player.errorRecovery.errors.decodeError.description') + } + case 'network-error': + return { + title: t('player.errorRecovery.errors.networkError.title'), + description: t('player.errorRecovery.errors.networkError.description') + } + default: + return { + title: t('player.errorRecovery.errors.unknown.title'), + description: t('player.errorRecovery.errors.unknown.description') + } + } + }, [errorType, t]) + + const handleRelocateFile = useCallback(() => { + if (!onFileRelocate) return + setShowRelocateConfirm(true) + }, [onFileRelocate]) + + const handleConfirmRelocate = useCallback(async () => { + if (!onFileRelocate) return + + try { + setIsRelocating(true) + setShowRelocateConfirm(false) + logger.info('开始重新定位视频文件', { videoId, originalPath }) + + // 使用文件选择对话框让用户选择新的文件位置 + const files = await window.api.file.select({ + properties: ['openFile'], + filters: [ + { + name: t('player.errorRecovery.fileDialog.videoFiles'), + extensions: ['mp4', 'mkv', 'avi', 'mov', 'wmv', 'flv', 'webm'] + }, + { name: t('player.errorRecovery.fileDialog.allFiles'), extensions: ['*'] } + ] + }) + + if (files && files.length > 0) { + const newPath = files[0].path + logger.info('用户选择了新的文件路径', { newPath }) + onFileRelocate(newPath) + } + } catch (error) { + logger.error('重新定位文件时出错:', { error }) + } finally { + setIsRelocating(false) + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [videoId, originalPath, onFileRelocate]) + + const handleRemoveFromLibrary = useCallback(() => { + if (!onRemoveFromLibrary) return + setShowRemoveConfirm(true) + }, [onRemoveFromLibrary]) + + const handleConfirmRemove = useCallback(() => { + if (!onRemoveFromLibrary) return + + logger.info('用户确认从媒体库中移除视频', { videoId }) + setShowRemoveConfirm(false) + onRemoveFromLibrary() + }, [videoId, onRemoveFromLibrary]) + + const handleBackToHome = useCallback(() => { + onClose() + navigate('/') + }, [navigate, onClose]) + + const errorInfo = getErrorInfo() + + const modalFooter = ( + + {errorType === 'file-missing' && ( + + )} + + + + {(errorType === 'file-missing' || errorType === 'unsupported-format') && ( + + )} + + ) + + return ( + <> + + + {errorInfo.title} + + } + open={open} + onCancel={undefined} + footer={modalFooter} + centered + width={480} + closable={false} + maskClosable={false} + destroyOnClose + > + + {videoTitle} + {errorInfo.description} + + {originalPath && ( + + {t('player.errorRecovery.pathInfo.label')} + {originalPath} + + )} + + + + {/* 重新选择文件确认对话框 */} + setShowRelocateConfirm(false)} + okText={t('player.errorRecovery.dialogs.relocate.confirmText')} + cancelText={t('common.cancel')} + centered + > +
+

+ {t('player.errorRecovery.dialogs.relocate.content.warning')} +

+

+ {t('player.errorRecovery.dialogs.relocate.content.note')} +

+
+ + + {/* 从媒体库移除确认对话框 */} + setShowRemoveConfirm(false)} + okText={t('player.errorRecovery.dialogs.remove.confirmText')} + cancelText={t('common.cancel')} + okType="danger" + centered + > +
+

+ {t('player.errorRecovery.dialogs.remove.content.description')} +

+
    +
  • {t('player.errorRecovery.dialogs.remove.content.items.playbackHistory')}
    • +
  • {t('player.errorRecovery.dialogs.remove.content.items.subtitleLinks')}
    • +
  • {t('player.errorRecovery.dialogs.remove.content.items.personalSettings')}
    • +
+

+ {t('player.errorRecovery.dialogs.remove.content.warning')} +

+
+ + + ) +} + +export default VideoErrorRecovery + +const ModalTitle = styled.div` + display: flex; + align-items: center; + gap: 8px; + color: var(--color-text-1); + + svg { + color: var(--color-status-warning); + filter: drop-shadow(0 1px 2px rgba(250, 173, 20, 0.2)); + } +` + +const ModalContent = styled.div` + text-align: left; +` + +const VideoTitle = styled.div` + color: var(--color-text-1); + margin: 0 0 16px 0; + font-size: 16px; + font-weight: 600; + padding: 12px 16px; + background: var(--color-background-soft); + border-radius: 8px; + border-left: 3px solid var(--color-primary); + word-break: break-all; +` + +const ErrorDescription = styled.p` + color: var(--color-text-2); + margin: 0 0 20px 0; + font-size: 14px; + line-height: 1.6; +` + +const PathInfo = styled.div` + background: var(--color-background-soft); + border-radius: 8px; + padding: 16px; + margin-top: 16px; + border: 1px solid var(--color-border-soft); +` + +const PathLabel = styled.div` + font-size: 12px; + color: var(--color-text-3); + margin-bottom: 8px; + font-weight: 500; + text-transform: uppercase; + letter-spacing: 0.5px; +` + +const PathValue = styled.div` + font-size: 13px; + color: var(--color-text-2); + font-family: 'Menlo', 'Monaco', 'Consolas', monospace; + word-break: break-all; + background: var(--color-background); + padding: 10px 12px; + border-radius: 6px; + border: 1px solid var(--color-border); +` diff --git a/src/renderer/src/pages/player/components/VideoSurface.tsx b/src/renderer/src/pages/player/components/VideoSurface.tsx index 9d01fb8b..11cd20ed 100644 --- a/src/renderer/src/pages/player/components/VideoSurface.tsx +++ b/src/renderer/src/pages/player/components/VideoSurface.tsx @@ -12,7 +12,10 @@ const logger = loggerService.withContext('VideoSurface') interface VideoSurfaceProps { src?: string onLoadedMetadata?: () => void - onError?: (error: string) => void + onError?: ( + error: string, + errorType?: 'file-missing' | 'unsupported-format' | 'decode-error' | 'network-error' | 'unknown' + ) => void } function VideoSurface({ src, onLoadedMetadata, onError }: VideoSurfaceProps) { @@ -111,39 +114,75 @@ function VideoSurface({ src, onLoadedMetadata, onError }: VideoSurfaceProps) { pause() }, [pause]) - // 优化的错误处理 - const handleVideoError = useCallback(() => { + // 增强的错误处理 - 支持错误类型检测和文件存在性检查 + const handleVideoError = useCallback(async () => { const video = videoRef.current if (!video || !video.error) return const error = video.error let errorMessage = '视频播放错误' + let errorType: + | 'file-missing' + | 'unsupported-format' + | 'decode-error' + | 'network-error' + | 'unknown' = 'unknown' - // 提供更详细的错误信息 + // 基于MediaError代码进行初步分类 switch (error.code) { case MediaError.MEDIA_ERR_ABORTED: errorMessage = '视频加载被中断' + errorType = 'unknown' break case MediaError.MEDIA_ERR_NETWORK: errorMessage = '网络错误导致视频加载失败' + errorType = 'network-error' break case MediaError.MEDIA_ERR_DECODE: errorMessage = '视频解码错误' + errorType = 'decode-error' break case MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED: - errorMessage = '不支持的视频格式或路径' + // 对于"不支持的源"错误，需要进一步检查是文件缺失还是格式不支持 + if (src && src.startsWith('file://')) { + try { + // 从file://URL中提取文件路径 + const filePath = decodeURIComponent(src.replace('file://', '')) + const fileExists = await window.api.fs.checkFileExists(filePath) + + if (!fileExists) { + errorMessage = '视频文件不存在' + errorType = 'file-missing' + logger.info('文件存在性检查：文件不存在', { filePath, src }) + } else { + errorMessage = '不支持的视频格式' + errorType = 'unsupported-format' + logger.info('文件存在性检查：文件存在但格式不支持', { filePath, src }) + } + } catch (checkError) { + logger.error('检查文件存在性时出错', { src, checkError }) + errorMessage = '无法访问视频文件' + errorType = 'file-missing' + } + } else { + errorMessage = '不支持的视频格式或路径' + errorType = 'unsupported-format' + } break default: errorMessage = error.message || '未知视频错误' + errorType = 'unknown' } logger.error('视频错误:', { code: error.code, message: error.message, - src + src, + errorType, + finalMessage: errorMessage }) - onError?.(errorMessage) + onError?.(errorMessage, errorType) }, [onError, src]) // 组件卸载清理 diff --git a/src/renderer/src/pages/player/components/index.ts b/src/renderer/src/pages/player/components/index.ts index 947c1771..db0e4d37 100644 --- a/src/renderer/src/pages/player/components/index.ts +++ b/src/renderer/src/pages/player/components/index.ts @@ -8,6 +8,7 @@ export { default as SettingsPopover } from './SettingsPopover' export { default as SubtitleContent } from './SubtitleContent' export { default as SubtitleListPanel } from './SubtitleListPanel' export { default as SubtitleOverlay } from './SubtitleOverlay' +export { default as VideoErrorRecovery } from './VideoErrorRecovery' export { default as VideoSurface } from './VideoSurface' export const NavbarIcon = styled.div` From 1ff95509c8849d19028bdaa29e8f79703d69424e Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 19:01:17 +0800 Subject: [PATCH 30/82] feat(ci): add dynamic workflow names to show release version in actions list (#115) - Add run-name to release.yml to display version and branch info - Shows input version or auto-generated version number - Includes branch name for non-main branches - Improves workflow visibility and tracking --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22a558fe..a6e69afe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,5 +1,7 @@ name: Release +run-name: 🚀 Release ${{ github.event.inputs.version || format('v{0}', github.run_number) }} ${{ github.ref_name != 'main' && format('({0})', github.ref_name) || '' }} + on: workflow_dispatch: inputs: From 5a4f26a230f8bf54f31873d30ed05abfbf887b06 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 19:01:52 +0800 Subject: [PATCH 31/82] feat(ffmpeg): integrate bundled FFmpeg with automatic fallback mechanism (#112) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Add comprehensive FFmpeg bundling system with cross-platform support - Implement automatic fallback from Remotion media-parser to FFmpeg for unsupported codecs (e.g., A_DTS) - Add FFmpeg download script with platform detection and caching - Configure build pipeline to automatically bundle FFmpeg binaries Core Changes: - MediaParserService: Add FFmpegService fallback when Remotion parsing fails - FFmpegService: Add bundled FFmpeg path resolution with development/production support - Add download-ffmpeg.ts script supporting win32/darwin/linux x64/arm64 platforms - Update build configuration to automatically download and bundle FFmpeg - Add comprehensive documentation for FFmpeg integration Technical Implementation: - Smart path resolution: bundled FFmpeg → system FFmpeg fallback - Cross-platform binary management with architecture-specific builds - Build-time FFmpeg download with caching to prevent duplicate downloads - Production packaging includes platform-specific FFmpeg binaries This ensures video parsing works for files with unsupported codecs like DTS audio, automatically falling back to FFmpeg when Remotion's media-parser encounters unknown codec errors, providing seamless compatibility across all video formats. Platforms supported: - Windows: x64, arm64 (GPL builds with full codec support) - macOS: x64, arm64 (Universal binary from evermeet.cx) - Linux: x64, arm64 (Static builds from johnvansickle.com) --- .gitignore | 3 + docs/FFmpeg-Integration.md | 113 +++++++ electron-builder.yml | 5 + electron.vite.config.ts | 84 ++++- package.json | 7 +- scripts/download-ffmpeg.ts | 429 ++++++++++++++++++++++++ src/main/services/FFmpegService.ts | 106 +++++- src/main/services/MediaParserService.ts | 153 +++++---- 8 files changed, 833 insertions(+), 67 deletions(-) create mode 100644 docs/FFmpeg-Integration.md create mode 100644 scripts/download-ffmpeg.ts diff --git a/.gitignore b/.gitignore index cd0847af..e4f0f550 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,6 @@ docs/.vitepress/cache/deps .mcp.json dist-test + +resources/ffmpeg/ +.ffmpeg-cache diff --git a/docs/FFmpeg-Integration.md b/docs/FFmpeg-Integration.md new file mode 100644 index 00000000..bf0521a3 --- /dev/null +++ b/docs/FFmpeg-Integration.md @@ -0,0 +1,113 @@ +# FFmpeg 内置集成功能 + +EchoPlayer 现在内置了 FFmpeg，无需用户手动安装。 + +## 功能特点 + +- ✅ **内置集成**：应用包含完整的 FFmpeg 二进制文件 +- ✅ **跨平台支持**：Windows (x64, arm64), macOS (x64, arm64), Linux (x64, arm64) +- ✅ **GPL 完整版**：包含所有编解码器，支持更多视频格式 +- ✅ **智能降级**：内置 FFmpeg 不可用时自动使用系统版本 +- ✅ **缓存机制**：避免重复下载，加速构建过程 + +## 开发命令 + +### FFmpeg 管理命令 + +```bash +# 下载当前平台的 FFmpeg +pnpm run ffmpeg:download + +# 下载所有支持平台的 FFmpeg +pnpm run ffmpeg:download-all + +# 清理下载缓存 +pnpm run ffmpeg:clean + +# 测试 FFmpeg 集成 +pnpm run ffmpeg:test +``` + +### 构建命令 + +```bash +# 正常构建（会自动下载 FFmpeg） +pnpm run build + +# 手动下载后构建 +pnpm run ffmpeg:download && pnpm run build +``` + +## 技术实现 + +### 1. 文件结构 + +``` +resources/ffmpeg/ + ├── darwin-x64/ffmpeg # macOS Intel + ├── darwin-arm64/ffmpeg # macOS Apple Silicon + ├── win32-x64/ffmpeg.exe # Windows x64 + ├── win32-arm64/ffmpeg.exe # Windows ARM64 + ├── linux-x64/ffmpeg # Linux x64 + └── linux-arm64/ffmpeg # Linux ARM64 +``` + +### 2. 路径解析策略 + +1. **内置优先**：优先使用应用内置的 FFmpeg +2. **环境降级**：内置不可用时使用系统 FFmpeg +3. **开发支持**：开发环境自动检测本地构建的 FFmpeg + +### 3. 构建集成 + +- **预构建钩子**：`prebuild` 脚本自动下载 FFmpeg +- **构建时复制**：Vite 插件自动复制文件到输出目录 +- **打包配置**：electron-builder 将 FFmpeg 包含在应用包中 + +## FFmpeg 版本信息 + +- **版本**：6.1 (GPL) +- **许可证**：GPL v3（与项目开源协议兼容） +- **包体积**：约 24MB 每平台 +- **功能完整**：支持所有主要编解码器 + +## 常见问题 + +### Q: 构建时下载失败怎么办？ + +A: + +1. 检查网络连接 +2. 手动运行 `pnpm run ffmpeg:download` +3. 必要时清理缓存：`pnpm run ffmpeg:clean` + +### Q: 如何验证 FFmpeg 是否正确集成？ + +A: 运行测试命令：`pnpm run ffmpeg:test` + +### Q: 应用包会增加多少大小？ + +A: 每个平台约增加 24MB，实际应用只包含目标平台的版本 + +### Q: 如何指定下载特定平台？ + +A: + +```bash +# 下载指定平台 +tsx scripts/download-ffmpeg.ts platform win32 x64 +tsx scripts/download-ffmpeg.ts platform darwin arm64 +tsx scripts/download-ffmpeg.ts platform linux x64 +``` + +## 许可证说明 + +本项目使用的 FFmpeg 为 GPL 版本，这与 EchoPlayer 的开源许可证兼容。GPL 版本提供了完整的编解码器支持，确保最佳的视频处理能力。 + +## 支持的格式 + +内置的 GPL 版本 FFmpeg 支持： + +- 视频编解码器：H.264, H.265, VP8, VP9, AV1 等 +- 音频编解码器：AAC, MP3, Opus, Vorbis 等 +- 容器格式：MP4, MKV, AVI, MOV, WebM 等 diff --git a/electron-builder.yml b/electron-builder.yml index 294dbf73..4fb1f67f 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -46,6 +46,11 @@ files: asarUnpack: - resources/** - '**/*.{metal,exp,lib}' +extraResources: + - from: resources/ffmpeg + to: ffmpeg + filter: + - '**/*' copyright: Copyright © 2025 EchoPlayer win: executableName: EchoPlayer diff --git a/electron.vite.config.ts b/electron.vite.config.ts index 15cc73b3..da28b75f 100644 --- a/electron.vite.config.ts +++ b/electron.vite.config.ts @@ -2,6 +2,7 @@ import fs from 'node:fs' import path from 'node:path' import react from '@vitejs/plugin-react-swc' +import { spawn } from 'child_process' import { CodeInspectorPlugin } from 'code-inspector-plugin' import { defineConfig, externalizeDepsPlugin } from 'electron-vite' import { resolve } from 'path' @@ -9,13 +10,57 @@ import { resolve } from 'path' const isDev = process.env.NODE_ENV === 'development' const isProd = process.env.NODE_ENV === 'production' +// FFmpeg 下载插件 +function ffmpegDownloadPlugin() { + return { + name: 'ffmpeg-download', + async buildStart() { + // 只在生产构建时下载 FFmpeg + if (!isProd) return + + console.log('Downloading FFmpeg...') + + try { + // 根据构建目标决定下载哪个平台 + const targetPlatform = process.env.BUILD_TARGET_PLATFORM || process.platform + const targetArch = process.env.BUILD_TARGET_ARCH || process.arch + + await new Promise((resolve, reject) => { + const downloadScript = spawn( + 'tsx', + ['scripts/download-ffmpeg.ts', 'platform', targetPlatform, targetArch], + { + stdio: 'inherit' + } + ) + + downloadScript.on('close', (code) => { + if (code === 0) { + console.log('FFmpeg Downloaded successfully') + resolve() + } else { + reject(new Error(`FFmpeg Download failed with exit code: ${code}`)) + } + }) + + downloadScript.on('error', (error) => { + reject(error) + }) + }) + } catch (error) { + console.warn('FFmpeg Download failed', error) + } + } + } +} + export default defineConfig({ main: { plugins: [ externalizeDepsPlugin(), - // 复制迁移文件到构建目录 + ffmpegDownloadPlugin(), { - name: 'copy-migrations', + name: 'copy-files', generateBundle() { // 优先使用新的 db/migrations 路径 const newMigrationsDir = path.resolve('db/migrations') @@ -51,6 +96,41 @@ export default defineConfig({ } } } + + // 复制 FFmpeg 文件到构建目录 + const ffmpegResourcesDir = path.resolve('resources/ffmpeg') + if (fs.existsSync(ffmpegResourcesDir)) { + const outResourcesDir = path.resolve('out/resources/ffmpeg') + + try { + // 确保输出目录存在 + fs.mkdirSync(outResourcesDir, { recursive: true }) + + // 复制整个 ffmpeg 目录 + const copyDirectoryRecursive = (src: string, dest: string) => { + if (!fs.existsSync(src)) return + + fs.mkdirSync(dest, { recursive: true }) + const items = fs.readdirSync(src) + + for (const item of items) { + const srcPath = path.join(src, item) + const destPath = path.join(dest, item) + + if (fs.statSync(srcPath).isDirectory()) { + copyDirectoryRecursive(srcPath, destPath) + } else { + fs.copyFileSync(srcPath, destPath) + } + } + } + + copyDirectoryRecursive(ffmpegResourcesDir, outResourcesDir) + console.log('FFmpeg files copied successfully') + } catch (error) { + console.warn('Failed to copy FFmpeg files:', error) + } + } } } ], diff --git a/package.json b/package.json index 2d541d8b..b9ca5d0c 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,12 @@ "check:i18n": "tsx scripts/check-i18n.ts", "sync:i18n": "tsx scripts/sync-i18n.ts", "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts", - "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts" + "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts", + "ffmpeg:download": "tsx scripts/download-ffmpeg.ts current", + "ffmpeg:download-all": "tsx scripts/download-ffmpeg.ts all", + "ffmpeg:clean": "tsx scripts/download-ffmpeg.ts clean", + "ffmpeg:test": "tsx scripts/test-ffmpeg-integration.ts", + "prebuild": "npm run ffmpeg:download" }, "dependencies": { "@ant-design/icons": "^6.0.1", diff --git a/scripts/download-ffmpeg.ts b/scripts/download-ffmpeg.ts new file mode 100644 index 00000000..80833b8e --- /dev/null +++ b/scripts/download-ffmpeg.ts @@ -0,0 +1,429 @@ +#!/usr/bin/env tsx + +import { spawn } from 'child_process' +import * as crypto from 'crypto' +import * as fs from 'fs' +import * as https from 'https' +import * as path from 'path' + +interface PlatformConfig { + url: string + executable: string + extractPath?: string // 解压后的相对路径 + skipExtraction?: boolean // 跳过解压（对于单文件下载） +} + +interface FFmpegDownloadConfig { + [platform: string]: { + [arch: string]: PlatformConfig + } +} + +// FFmpeg 下载配置 - 使用 GPL 版本获得完整功能 +const FFMPEG_CONFIG: FFmpegDownloadConfig = { + win32: { + x64: { + url: 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip', + executable: 'ffmpeg.exe', + extractPath: 'ffmpeg-master-latest-win64-gpl/bin/ffmpeg.exe' + }, + arm64: { + url: 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-winarm64-gpl.zip', + executable: 'ffmpeg.exe', + extractPath: 'ffmpeg-master-latest-winarm64-gpl/bin/ffmpeg.exe' + } + }, + darwin: { + x64: { + url: 'https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip', + executable: 'ffmpeg', + extractPath: 'ffmpeg' + }, + arm64: { + url: 'https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip', // 通用二进制文件 + executable: 'ffmpeg', + extractPath: 'ffmpeg' + } + }, + linux: { + x64: { + url: 'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz', + executable: 'ffmpeg', + extractPath: 'ffmpeg-*-amd64-static/ffmpeg' + }, + arm64: { + url: 'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-arm64-static.tar.xz', + executable: 'ffmpeg', + extractPath: 'ffmpeg-*-arm64-static/ffmpeg' + } + } +} + +class FFmpegDownloader { + private readonly outputDir: string + private readonly cacheDir: string + + constructor(outputDir: string = 'resources/ffmpeg') { + this.outputDir = path.resolve(outputDir) + this.cacheDir = path.resolve('.ffmpeg-cache') + } + + // 确保目录存在 + private ensureDir(dir: string): void { + if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }) + } + } + + // 计算文件哈希用于缓存 + private getFileHash(filePath: string): string { + if (!fs.existsSync(filePath)) return '' + const fileBuffer = fs.readFileSync(filePath) + return crypto.createHash('md5').update(fileBuffer).digest('hex') + } + + // 获取缓存文件路径 + private getCachePath(platform: string, arch: string): string { + const config = FFMPEG_CONFIG[platform]?.[arch] + if (!config) throw new Error(`不支持的平台: ${platform}-${arch}`) + + const filename = path.basename(config.url) + return path.join(this.cacheDir, `${platform}-${arch}-${filename}`) + } + + // 下载文件 + private async downloadFile( + url: string, + outputPath: string, + onProgress?: (progress: number) => void + ): Promise { + return new Promise((resolve, reject) => { + const file = fs.createWriteStream(outputPath) + let downloadedSize = 0 + let totalSize = 0 + + const download = (currentUrl: string, redirectCount = 0): void => { + if (redirectCount > 5) { + reject(new Error('重定向次数过多')) + return + } + + const request = https.get( + currentUrl, + { + headers: { + 'User-Agent': 'EchoPlayer-FFmpeg-Downloader/1.0' + }, + timeout: 30000 + }, + (response) => { + // 处理重定向 + if (response.statusCode === 301 || response.statusCode === 302) { + const redirectUrl = response.headers.location + if (redirectUrl) { + console.log(`重定向到: ${redirectUrl}`) + download(redirectUrl, redirectCount + 1) + return + } + } + + if (response.statusCode !== 200) { + reject(new Error(`下载失败: HTTP ${response.statusCode}`)) + return + } + + totalSize = parseInt(response.headers['content-length'] || '0', 10) + + response.on('data', (chunk) => { + downloadedSize += chunk.length + if (onProgress && totalSize > 0) { + onProgress((downloadedSize / totalSize) * 100) + } + }) + + response.pipe(file) + + file.on('finish', () => { + file.close() + resolve() + }) + + file.on('error', (err) => { + fs.unlink(outputPath, () => {}) // 清理失败的文件 + reject(err) + }) + + response.on('error', reject) + } + ) + + request.on('error', reject) + request.on('timeout', () => { + request.destroy() + reject(new Error('下载超时')) + }) + } + + download(url) + }) + } + + // 解压 ZIP 文件 + private async extractZip(zipPath: string, extractDir: string): Promise { + return new Promise((resolve, reject) => { + let command: string + let args: string[] + + if (process.platform === 'win32') { + command = 'powershell' + args = [ + '-Command', + `Expand-Archive -Path "${zipPath}" -DestinationPath "${extractDir}" -Force` + ] + } else { + command = 'unzip' + args = ['-o', zipPath, '-d', extractDir] + } + + const child = spawn(command, args, { stdio: 'pipe' }) + + child.on('close', (code) => { + if (code === 0) { + resolve() + } else { + reject(new Error(`解压失败，退出代码: ${code}`)) + } + }) + + child.on('error', reject) + }) + } + + // 解压 TAR.XZ 文件 + private async extractTarXz(tarPath: string, extractDir: string): Promise { + return new Promise((resolve, reject) => { + const child = spawn('tar', ['-xJf', tarPath, '-C', extractDir], { stdio: 'pipe' }) + + child.on('close', (code) => { + if (code === 0) { + resolve() + } else { + reject(new Error(`解压失败，退出代码: ${code}`)) + } + }) + + child.on('error', reject) + }) + } + + // 递归查找文件 + private async findFile(dir: string, pattern: string): Promise { + try { + const items = await fs.promises.readdir(dir, { withFileTypes: true }) + + for (const item of items) { + const fullPath = path.join(dir, item.name) + + if (item.isDirectory()) { + const found = await this.findFile(fullPath, pattern) + if (found) return found + } else if (item.isFile()) { + if (pattern.includes('*')) { + // 简单的通配符匹配 + const regex = new RegExp(pattern.replace(/\*/g, '.*')) + if (regex.test(item.name)) { + return fullPath + } + } else if (item.name === pattern) { + return fullPath + } + } + } + + return null + } catch (error) { + console.error(`搜索文件失败: ${error}`) + return null + } + } + + // 下载并安装 FFmpeg + public async downloadFFmpeg(platform?: string, arch?: string): Promise { + const targetPlatform = platform || process.platform + const targetArch = arch || process.arch + + console.log(`开始下载 FFmpeg ${targetPlatform}-${targetArch}...`) + + const config = FFMPEG_CONFIG[targetPlatform]?.[targetArch] + if (!config) { + throw new Error(`不支持的平台: ${targetPlatform}-${targetArch}`) + } + + this.ensureDir(this.cacheDir) + this.ensureDir(this.outputDir) + + const cachePath = this.getCachePath(targetPlatform, targetArch) + const outputPlatformDir = path.join(this.outputDir, `${targetPlatform}-${targetArch}`) + const finalBinaryPath = path.join(outputPlatformDir, config.executable) + + // 检查是否已存在 + if (fs.existsSync(finalBinaryPath)) { + console.log(`FFmpeg 已存在: ${finalBinaryPath}`) + return + } + + this.ensureDir(outputPlatformDir) + + // 检查缓存 + if (!fs.existsSync(cachePath)) { + console.log(`下载 ${config.url}...`) + await this.downloadFile(config.url, cachePath, (progress) => { + if (Math.floor(progress) % 10 === 0) { + console.log(`下载进度: ${Math.floor(progress)}%`) + } + }) + console.log('下载完成') + } else { + console.log('使用缓存文件') + } + + // 解压并安装 + console.log('解压中...') + const tempExtractDir = path.join(this.cacheDir, `extract-${targetPlatform}-${targetArch}`) + this.ensureDir(tempExtractDir) + + try { + if (cachePath.endsWith('.zip')) { + await this.extractZip(cachePath, tempExtractDir) + } else if (cachePath.endsWith('.tar.xz')) { + await this.extractTarXz(cachePath, tempExtractDir) + } + + // 查找可执行文件 + let executablePath: string | null = null + + if (config.extractPath) { + if (config.extractPath.includes('*')) { + // 通配符搜索 + executablePath = await this.findFile(tempExtractDir, path.basename(config.extractPath)) + } else { + const fullPath = path.join(tempExtractDir, config.extractPath) + if (fs.existsSync(fullPath)) { + executablePath = fullPath + } + } + } + + if (!executablePath) { + throw new Error(`找不到可执行文件: ${config.extractPath || config.executable}`) + } + + // 复制到目标位置 + fs.copyFileSync(executablePath, finalBinaryPath) + + // 设置执行权限（Unix 系统） + if (targetPlatform !== 'win32') { + fs.chmodSync(finalBinaryPath, 0o755) + } + + console.log(`FFmpeg 安装完成: ${finalBinaryPath}`) + + // 清理临时目录 + fs.rmSync(tempExtractDir, { recursive: true, force: true }) + } catch (error) { + // 清理临时目录 + if (fs.existsSync(tempExtractDir)) { + fs.rmSync(tempExtractDir, { recursive: true, force: true }) + } + throw error + } + } + + // 下载所有支持的平台 + public async downloadAllPlatforms(): Promise { + console.log('开始下载所有平台的 FFmpeg...') + + for (const [platform, archConfigs] of Object.entries(FFMPEG_CONFIG)) { + for (const arch of Object.keys(archConfigs)) { + try { + await this.downloadFFmpeg(platform, arch) + } catch (error) { + console.error(`下载 ${platform}-${arch} 失败:`, error) + } + } + } + + console.log('所有平台下载完成') + } + + // 仅下载当前平台 + public async downloadCurrentPlatform(): Promise { + await this.downloadFFmpeg() + } + + // 清理缓存 + public cleanCache(): void { + if (fs.existsSync(this.cacheDir)) { + fs.rmSync(this.cacheDir, { recursive: true, force: true }) + console.log('缓存已清理') + } + } +} + +// CLI 入口 +async function main() { + const args = process.argv.slice(2) + const command = args[0] || 'current' + + const downloader = new FFmpegDownloader() + + try { + switch (command) { + case 'all': + await downloader.downloadAllPlatforms() + break + case 'current': + await downloader.downloadCurrentPlatform() + break + case 'clean': + downloader.cleanCache() + break + case 'platform': { + const platform = args[1] + const arch = args[2] + if (!platform || !arch) { + console.error('用法: tsx download-ffmpeg.ts platform ') + process.exit(1) + } + await downloader.downloadFFmpeg(platform, arch) + break + } + default: + console.log(` +使用方法: + tsx scripts/download-ffmpeg.ts [command] + +命令: + current - 下载当前平台的 FFmpeg (默认) + all - 下载所有支持平台的 FFmpeg + clean - 清理下载缓存 + platform - 下载指定平台的 FFmpeg + +支持的平台: + win32: x64, arm64 + darwin: x64, arm64 + linux: x64, arm64 + `) + } + } catch (error) { + console.error('错误:', error) + process.exit(1) + } +} + +// 如果直接运行此脚本 +if (require.main === module) { + main() +} + +export { FFmpegDownloader } diff --git a/src/main/services/FFmpegService.ts b/src/main/services/FFmpegService.ts index 080cdaa5..f41e3a52 100644 --- a/src/main/services/FFmpegService.ts +++ b/src/main/services/FFmpegService.ts @@ -1,5 +1,6 @@ import type { TranscodeOptions, TranscodeProgress } from '@types' import { ChildProcess, spawn } from 'child_process' +import { app } from 'electron' import * as fs from 'fs' import { createWriteStream } from 'fs' import * as https from 'https' @@ -294,23 +295,112 @@ class FFmpegService { } } + // 获取内置 FFmpeg 路径 + private getBundledFFmpegPath(): string | null { + try { + const platform = process.platform + const arch = process.arch + const platformKey = `${platform}-${arch}` + + const executableName = + this.FFMPEG_DOWNLOAD_URLS[platform as keyof typeof this.FFMPEG_DOWNLOAD_URLS]?.executable || + 'ffmpeg' + + // 生产环境：从应用安装目录获取 + if (app.isPackaged) { + const resourcesPath = process.resourcesPath + const ffmpegPath = path.join(resourcesPath, 'ffmpeg', platformKey, executableName) + + if (fs.existsSync(ffmpegPath)) { + logger.info('找到打包的 FFmpeg', { path: ffmpegPath }) + return ffmpegPath + } + } else { + // 开发环境：从项目目录获取 + const appPath = app.getAppPath() + const ffmpegPath = path.join(appPath, 'resources', 'ffmpeg', platformKey, executableName) + + if (fs.existsSync(ffmpegPath)) { + logger.info('找到开发环境 FFmpeg', { path: ffmpegPath }) + return ffmpegPath + } + + // 也尝试从构建输出目录查找 + const outFfmpegPath = path.join( + appPath, + 'out', + 'resources', + 'ffmpeg', + platformKey, + executableName + ) + if (fs.existsSync(outFfmpegPath)) { + logger.info('找到构建输出 FFmpeg', { path: outFfmpegPath }) + return outFfmpegPath + } + } + + logger.warn('未找到内置 FFmpeg', { + platform, + arch, + platformKey, + executableName, + isPackaged: app.isPackaged, + searchPaths: app.isPackaged + ? [path.join(process.resourcesPath, 'ffmpeg', platformKey, executableName)] + : [ + path.join(app.getAppPath(), 'resources', 'ffmpeg', platformKey, executableName), + path.join(app.getAppPath(), 'out', 'resources', 'ffmpeg', platformKey, executableName) + ] + }) + + return null + } catch (error) { + logger.error( + '获取内置 FFmpeg 路径失败:', + error instanceof Error ? error : new Error(String(error)) + ) + return null + } + } + // 获取 FFmpeg 可执行文件路径 public getFFmpegPath(): string { - // TODO: 实现 FFmpeg 的下载和安装流程 - // 当前直接使用系统环境中的 FFmpeg 命令行工具 - // 后续需要： - // 1. 检查系统是否已安装 FFmpeg - // 2. 如果没有安装，提供下载和安装功能 - // 3. 支持自动下载适合当前平台的 FFmpeg 二进制文件 - // 4. 提供 FFmpeg 版本管理和更新功能 + // 1. 优先使用内置的 FFmpeg + const bundledPath = this.getBundledFFmpegPath() + if (bundledPath) { + return bundledPath + } + // 2. 降级到系统 FFmpeg const platform = process.platform as keyof typeof this.FFMPEG_DOWNLOAD_URLS const executable = this.FFMPEG_DOWNLOAD_URLS[platform]?.executable || 'ffmpeg' - // 暂时直接返回系统命令，假设 FFmpeg 已在 PATH 中 + logger.info('使用系统 FFmpeg', { executable }) return executable } + // 检查是否正在使用内置 FFmpeg + public isUsingBundledFFmpeg(): boolean { + return this.getBundledFFmpegPath() !== null + } + + // 获取 FFmpeg 信息 + public getFFmpegInfo(): { + path: string + isBundled: boolean + platform: string + arch: string + } { + const bundledPath = this.getBundledFFmpegPath() + return { + path: bundledPath || this.getFFmpegPath(), + isBundled: bundledPath !== null, + platform: process.platform, + arch: process.arch + } + } + // 检查 FFmpeg 是否存在 public async checkFFmpegExists(): Promise { const startTime = Date.now() diff --git a/src/main/services/MediaParserService.ts b/src/main/services/MediaParserService.ts index cb5b0c38..a812f63c 100644 --- a/src/main/services/MediaParserService.ts +++ b/src/main/services/MediaParserService.ts @@ -3,13 +3,16 @@ import { nodeReader } from '@remotion/media-parser/node' import type { FFmpegVideoInfo } from '@types' import * as fs from 'fs' +import FFmpegService from './FFmpegService' import { loggerService } from './LoggerService' const logger = loggerService.withContext('MediaParserService') class MediaParserService { + private ffmpegService: FFmpegService + constructor() { - // 构造函数可以用于初始化操作 + this.ffmpegService = new FFmpegService() } /** @@ -119,11 +122,11 @@ class MediaParserService { } /** - * 获取视频文件信息 + * 获取视频文件信息，优先使用 Remotion，失败时 fallback 到 FFmpeg */ public async getVideoInfo(inputPath: string): Promise { const startTime = Date.now() - logger.info('🎬 开始获取视频信息 (Remotion)', { inputPath }) + logger.info('🎬 开始获取视频信息 (Remotion + FFmpeg fallback)', { inputPath }) try { // 转换文件路径 @@ -132,8 +135,8 @@ class MediaParserService { const pathConvertEndTime = Date.now() logger.info(`🔄 路径转换耗时: ${pathConvertEndTime - pathConvertStartTime}ms`, { - 原始输入路径: inputPath, - 转换后本地路径: localInputPath + inputPath, + localInputPath }) // 检查文件是否存在 @@ -142,7 +145,7 @@ class MediaParserService { const fileCheckEndTime = Date.now() logger.info(`📁 文件存在性检查耗时: ${fileCheckEndTime - fileCheckStartTime}ms`, { - 文件存在性: fileExists + fileExists }) if (!fileExists) { @@ -157,70 +160,103 @@ class MediaParserService { const fileStatsEndTime = Date.now() logger.info(`📊 文件信息获取耗时: ${fileStatsEndTime - fileStatsStartTime}ms`, { - 文件大小: `${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB` + fileSize: `${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB` }) - // 使用 Remotion parseMedia 分析文件 - const analysisStartTime = Date.now() - const result = await parseMedia({ - src: localInputPath, - reader: nodeReader, - fields: { - durationInSeconds: true, - dimensions: true, - videoCodec: true, - audioCodec: true, - tracks: true, - container: true - }, - logLevel: 'error' // 减少日志输出 - }) - const analysisEndTime = Date.now() - - logger.info(`🔍 Remotion 分析耗时: ${analysisEndTime - analysisStartTime}ms`) - - // 解析结果 - const parseStartTime = Date.now() - const videoInfo = this.parseRemotionResult(result) - const parseEndTime = Date.now() - - logger.info(`📊 结果解析耗时: ${parseEndTime - parseStartTime}ms`) - - if (videoInfo) { - const totalTime = Date.now() - startTime - logger.info(`✅ 成功获取视频信息 (Remotion)，总耗时: ${totalTime}ms`, { - ...videoInfo, - 性能统计: { - 路径转换: `${pathConvertEndTime - pathConvertStartTime}ms`, - 文件检查: `${fileCheckEndTime - fileCheckStartTime}ms`, - 文件信息获取: `${fileStatsEndTime - fileStatsStartTime}ms`, - Remotion分析: `${analysisEndTime - analysisStartTime}ms`, - 结果解析: `${parseEndTime - parseStartTime}ms`, - 总耗时: `${totalTime}ms` - } + // 首先尝试使用 Remotion parseMedia 分析文件 + try { + const result = await parseMedia({ + src: localInputPath, + reader: nodeReader, + fields: { + durationInSeconds: true, + dimensions: true, + videoCodec: true, + audioCodec: true, + tracks: true, + container: true + }, + logLevel: 'error' // 减少日志输出 + }) + + // 解析结果 + const parseStartTime = Date.now() + const videoInfo = this.parseRemotionResult(result) + const parseEndTime = Date.now() + + logger.info(`📊 Remotion 结果解析耗时: ${parseEndTime - parseStartTime}ms`) + + if (videoInfo) { + const totalTime = Date.now() - startTime + logger.info(`✅ 成功获取视频信息 (Remotion)，总耗时: ${totalTime}ms`, { + ...videoInfo + }) + return videoInfo + } else { + logger.warn('⚠️ Remotion 解析结果为空，尝试 FFmpeg fallback') + } + } catch (remotionError) { + const remotionErrorMsg = + remotionError instanceof Error ? remotionError.message : String(remotionError) + logger.warn('⚠️ Remotion 解析失败，尝试 FFmpeg fallback', { + remotionError: remotionErrorMsg }) - return videoInfo - } else { - logger.error('❌ 无法解析视频信息') - return null } + + // Remotion 失败时，fallback 到 FFmpeg + logger.info('🔄 开始 FFmpeg fallback 解析') + + try { + const ffmpegVideoInfo = await this.ffmpegService.getVideoInfo(inputPath) + + if (ffmpegVideoInfo) { + const totalTime = Date.now() - startTime + logger.info(`✅ 成功获取视频信息 (FFmpeg fallback)，总耗时: ${totalTime}ms`, { + ...ffmpegVideoInfo + }) + return ffmpegVideoInfo + } else { + logger.error('❌ FFmpeg fallback 也无法解析视频信息') + } + } catch (ffmpegError) { + const ffmpegErrorMsg = + ffmpegError instanceof Error ? ffmpegError.message : String(ffmpegError) + logger.error('❌ FFmpeg fallback 解析失败', { + ffmpegError: ffmpegErrorMsg + }) + } + + // 两种方法都失败 + const totalTime = Date.now() - startTime + logger.error(`❌ 所有解析方法都失败，总耗时: ${totalTime}ms`, { + inputPath + }) + return null } catch (error) { const totalTime = Date.now() - startTime logger.error(`❌ 获取视频信息失败，耗时: ${totalTime}ms`, { inputPath, - error: error instanceof Error ? error.message : String(error), - 总耗时: `${totalTime}ms` + error: error instanceof Error ? error.message : String(error) }) return null } } /** - * 检查媒体解析器是否可用 + * 检查媒体解析器是否可用 (Remotion + FFmpeg fallback) */ public async checkExists(): Promise { try { - // Remotion media-parser 不需要特殊初始化，总是可用 + // Remotion media-parser 总是可用（包含在应用中），但如果需要 fallback，也检查 FFmpeg + const ffmpegExists = await this.ffmpegService.checkFFmpegExists() + + logger.info('📊 媒体解析器可用性检查', { + remotion: true, + ffmpeg: ffmpegExists, + fallbackAvailable: ffmpegExists + }) + + // 只要有一个可用就返回 true，优先使用 Remotion，FFmpeg 作为 fallback return true } catch (error) { logger.error('媒体解析器检查失败:', { @@ -235,13 +271,18 @@ class MediaParserService { */ public async getVersion(): Promise { try { - // 返回 Remotion media-parser 标识 - return '@remotion/media-parser' + const ffmpegVersion = await this.ffmpegService.getFFmpegVersion() + const versionInfo = ffmpegVersion + ? `@remotion/media-parser + FFmpeg(${ffmpegVersion})` + : '@remotion/media-parser (FFmpeg not available)' + + logger.info('📊 媒体解析器版本信息', { versionInfo }) + return versionInfo } catch (error) { logger.error('获取媒体解析器版本失败:', { error: error instanceof Error ? error : new Error(String(error)) }) - return null + return '@remotion/media-parser (version check failed)' } } From 0ca1d3963208d9eb7b825c7c1b31e269532fa3eb Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Wed, 10 Sep 2025 23:17:22 +0800 Subject: [PATCH 32/82] fix(ci): sync package.json version with manual trigger input (#116) Fix issue where manually triggered releases create assets with incorrect version numbers. When manually triggering release workflow with specific version (e.g., v1.0.0-alpha.6), the release notes show correct version but uploaded asset filenames contain old version from package.json (e.g., alpha.5). Solution: - Add version sync step before build in release job - Dynamically update package.json version from detect-version job output - Ensure electron-builder uses correct version for artifact naming - Maintain compatibility with automatic tag-based releases This ensures release notes and asset filenames have consistent version numbers. --- .github/workflows/release.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6e69afe..a8d61506 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -153,6 +153,28 @@ jobs: - name: Install dependencies run: pnpm install + - name: Sync version from detect-version job + shell: bash + run: | + echo "🔄 同步版本号到 package.json" + echo "Current package.json version: $(node -p "require('./package.json').version")" + echo "Target version from detect-version: ${{ needs.detect-version.outputs.version }}" + + # 从版本号中移除 'v' 前缀（如果存在） + TARGET_VERSION="${{ needs.detect-version.outputs.version }}" + VERSION_NO_V="${TARGET_VERSION#v}" + + # 使用 node 脚本更新 package.json 中的版本号 + node -e " + const fs = require('fs'); + const package = JSON.parse(fs.readFileSync('package.json', 'utf8')); + package.version = '${VERSION_NO_V}'; + fs.writeFileSync('package.json', JSON.stringify(package, null, 2) + '\n'); + console.log('✅ Updated package.json version to:', package.version); + " + + echo "Updated package.json version: $(node -p "require('./package.json').version")" + - name: Build for ${{ matrix.platform }} shell: bash run: | From bd43c5ca9a0684bb4e9a8588304b5d043f52761c Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 10 Sep 2025 15:29:09 +0000 Subject: [PATCH 33/82] chore(release): 1.0.0-alpha.7 # [1.0.0-alpha.7](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2025-09-10) ### Bug Fixes * **ci:** sync package.json version with manual trigger input ([#116](https://github.com/mkdir700/EchoPlayer/issues/116)) ([0ca1d39](https://github.com/mkdir700/EchoPlayer/commit/0ca1d3963208d9eb7b825c7c1b31e269532fa3eb)) ### Features * **ci:** add dynamic workflow names to show release version in actions list ([#115](https://github.com/mkdir700/EchoPlayer/issues/115)) ([1ff9550](https://github.com/mkdir700/EchoPlayer/commit/1ff95509c8849d19028bdaa29e8f79703d69424e)) * **ffmpeg:** integrate bundled FFmpeg with automatic fallback mechanism ([#112](https://github.com/mkdir700/EchoPlayer/issues/112)) ([5a4f26a](https://github.com/mkdir700/EchoPlayer/commit/5a4f26a230f8bf54f31873d30ed05abfbf887b06)) * **player:** implement comprehensive video error recovery ([#113](https://github.com/mkdir700/EchoPlayer/issues/113)) ([c25f17a](https://github.com/mkdir700/EchoPlayer/commit/c25f17ab83b0be7a60bbd589d971637bf74eb8b6)) --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 678ae594..c574b408 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# [1.0.0-alpha.7](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2025-09-10) + +### Bug Fixes + +- **ci:** sync package.json version with manual trigger input ([#116](https://github.com/mkdir700/EchoPlayer/issues/116)) ([0ca1d39](https://github.com/mkdir700/EchoPlayer/commit/0ca1d3963208d9eb7b825c7c1b31e269532fa3eb)) + +### Features + +- **ci:** add dynamic workflow names to show release version in actions list ([#115](https://github.com/mkdir700/EchoPlayer/issues/115)) ([1ff9550](https://github.com/mkdir700/EchoPlayer/commit/1ff95509c8849d19028bdaa29e8f79703d69424e)) +- **ffmpeg:** integrate bundled FFmpeg with automatic fallback mechanism ([#112](https://github.com/mkdir700/EchoPlayer/issues/112)) ([5a4f26a](https://github.com/mkdir700/EchoPlayer/commit/5a4f26a230f8bf54f31873d30ed05abfbf887b06)) +- **player:** implement comprehensive video error recovery ([#113](https://github.com/mkdir700/EchoPlayer/issues/113)) ([c25f17a](https://github.com/mkdir700/EchoPlayer/commit/c25f17ab83b0be7a60bbd589d971637bf74eb8b6)) + # [1.0.0-alpha.6](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2025-09-10) ### Bug Fixes diff --git a/package.json b/package.json index b9ca5d0c..ea587528 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.6", + "version": "1.0.0-alpha.7", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From 4030234c7dbaf3b358f4697c5321565e7c0fdd64 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Thu, 11 Sep 2025 07:38:37 +0800 Subject: [PATCH 34/82] feat(ci): implement semantic-release with automatic version detection (#117) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Replace manual version input with fully automated semantic-release workflow - Fix version number inconsistency between build artifacts and GitHub releases - Add 3-stage workflow: version analysis → build with correct version → release - Support automatic triggering on main/alpha/beta branch pushes - Ensure build artifact filenames match release version numbers - Skip build/release when no commits need publishing --- .github/workflows/release.yml | 245 +++++++++++++++++++--------------- 1 file changed, 141 insertions(+), 104 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8d61506..e0bd3fb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,111 +1,122 @@ name: Release -run-name: 🚀 Release ${{ github.event.inputs.version || format('v{0}', github.run_number) }} ${{ github.ref_name != 'main' && format('({0})', github.ref_name) || '' }} +run-name: 🚀 Release ${{ github.ref_name }} on: workflow_dispatch: - inputs: - version: - description: 'Release version (e.g., v1.0.0, v1.0.0-beta.1, v1.0.0-alpha.1)' - required: false + push: + branches: + - main + - alpha + - beta permissions: contents: write pull-requests: read jobs: - detect-version: + version-analysis: runs-on: ubuntu-latest outputs: - version: ${{ steps.version.outputs.version }} - version_type: ${{ steps.version.outputs.version_type }} - is_prerelease: ${{ steps.version.outputs.is_prerelease }} - upload_path: ${{ steps.version.outputs.upload_path }} - autoupdate_path: ${{ steps.version.outputs.autoupdate_path }} + next_version: ${{ steps.semantic.outputs.next_version }} + version_type: ${{ steps.branch.outputs.version_type }} + is_prerelease: ${{ steps.branch.outputs.is_prerelease }} + channel: ${{ steps.branch.outputs.channel }} + should_release: ${{ steps.semantic.outputs.should_release }} steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 - - name: Detect version and type - id: version - shell: bash - run: | - # Get version from input, tag, or package.json - if [ -n "${{ github.event.inputs.version }}" ]; then - VERSION="${{ github.event.inputs.version }}" - elif [ -n "${{ github.ref_name }}" ] && [[ "${{ github.ref_name }}" == v* ]]; then - VERSION="${{ github.ref_name }}" - else - VERSION="v$(node -p "require('./package.json').version")" - fi + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Setup pnpm + uses: pnpm/action-setup@v3 + with: + version: 8 - # Remove 'v' prefix for processing - VERSION_NO_V="${VERSION#v}" + - name: Install dependencies + run: pnpm install + - name: Detect branch type and channel + id: branch + shell: bash + run: | + # 根据分支名确定版本类型和更新渠道 if [[ "${{ github.ref_name }}" == "main" ]]; then - # main 分支 = stable VERSION_TYPE="stable" + IS_PRERELEASE="false" + CHANNEL="latest" elif [[ "${{ github.ref_name }}" == "beta" ]]; then - # beta 分支 = beta VERSION_TYPE="beta" + IS_PRERELEASE="true" + CHANNEL="beta" elif [[ "${{ github.ref_name }}" == "alpha" ]]; then - # alpha 分支 = alpha - VERSION_TYPE="alpha" - elif [[ "$VERSION_NO_V" == *"-dev"* ]]; then - # 版本号包含 dev 后缀 - VERSION_TYPE="dev" - elif [[ "$VERSION_NO_V" == *"-test"* ]]; then - # 版本号包含 test 后缀 - VERSION_TYPE="test" - elif [[ "$VERSION_NO_V" == *"-alpha"* ]]; then - # 版本号包含 alpha 后缀 VERSION_TYPE="alpha" - elif [[ "$VERSION_NO_V" == *"-beta"* ]]; then - # 版本号包含 beta 后缀 - VERSION_TYPE="beta" - else - # 默认为 stable - VERSION_TYPE="stable" - fi - - # Determine if it's a prerelease - if [[ "$VERSION_TYPE" != "stable" ]]; then IS_PRERELEASE="true" + CHANNEL="alpha" else - IS_PRERELEASE="false" + echo "❌ Unsupported branch: ${{ github.ref_name }}" + exit 1 fi - # Set upload paths based on version type - case "$VERSION_TYPE" in - "dev"|"test") - UPLOAD_PATH="/test-releases/" - AUTOUPDATE_PATH="/test-autoupdate/" - ;; - "alpha"|"beta") - UPLOAD_PATH="/prerelease/" - AUTOUPDATE_PATH="/prerelease-autoupdate/" - ;; - "stable") - UPLOAD_PATH="/releases/" - AUTOUPDATE_PATH="/autoupdate/" - ;; - esac - - echo "version=$VERSION" >> $GITHUB_OUTPUT echo "version_type=$VERSION_TYPE" >> $GITHUB_OUTPUT echo "is_prerelease=$IS_PRERELEASE" >> $GITHUB_OUTPUT - echo "upload_path=$UPLOAD_PATH" >> $GITHUB_OUTPUT - echo "autoupdate_path=$AUTOUPDATE_PATH" >> $GITHUB_OUTPUT + echo "channel=$CHANNEL" >> $GITHUB_OUTPUT - echo "🏷️ Version: $VERSION" echo "📦 Version Type: $VERSION_TYPE" echo "🚀 Is Prerelease: $IS_PRERELEASE" - echo "📁 Upload Path: $UPLOAD_PATH" - echo "🔄 AutoUpdate Path: $AUTOUPDATE_PATH" + echo "📺 Channel: $CHANNEL" + + - name: Run semantic-release for version analysis + id: semantic + shell: bash + run: | + echo "🔍 Analyzing commits to determine next version..." + + # 创建临时的分析配置文件 + cat > .releaserc.temp.js << 'EOF' + module.exports = { + branches: [ + 'main', + { name: 'beta', prerelease: true }, + { name: 'alpha', prerelease: true } + ], + plugins: [ + '@semantic-release/commit-analyzer', + '@semantic-release/release-notes-generator' + ] + } + EOF + + # 使用临时配置进行版本分析 + OUTPUT=$(pnpm semantic-release --dry-run -c .releaserc.temp.js 2>&1) + echo "$OUTPUT" + + # 清理临时文件 + rm -f .releaserc.temp.js + + # 检查是否有新版本需要发布 + if echo "$OUTPUT" | grep -q "The next release version is"; then + NEXT_VERSION=$(echo "$OUTPUT" | grep "The next release version is" | sed 's/.*The next release version is \([0-9.a-z-]*\).*/\1/') + echo "✅ Next version: $NEXT_VERSION" + echo "next_version=$NEXT_VERSION" >> $GITHUB_OUTPUT + echo "should_release=true" >> $GITHUB_OUTPUT + else + echo "ℹ️ No new version to release" + echo "should_release=false" >> $GITHUB_OUTPUT + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release: - needs: detect-version + needs: version-analysis runs-on: ${{ matrix.os }} + if: needs.version-analysis.outputs.should_release == 'true' strategy: fail-fast: false matrix: @@ -153,40 +164,39 @@ jobs: - name: Install dependencies run: pnpm install - - name: Sync version from detect-version job + - name: Update package.json version shell: bash run: | - echo "🔄 同步版本号到 package.json" - echo "Current package.json version: $(node -p "require('./package.json').version")" - echo "Target version from detect-version: ${{ needs.detect-version.outputs.version }}" - - # 从版本号中移除 'v' 前缀（如果存在） - TARGET_VERSION="${{ needs.detect-version.outputs.version }}" - VERSION_NO_V="${TARGET_VERSION#v}" - - # 使用 node 脚本更新 package.json 中的版本号 + echo "📋 Current package.json version: $(node -p "require('./package.json').version")" + echo "🔄 Target version: ${{ needs.version-analysis.outputs.next_version }}" + echo "🌿 Branch: ${{ github.ref_name }}" + echo "📦 Version type: ${{ needs.version-analysis.outputs.version_type }}" + echo "🚀 Is prerelease: ${{ needs.version-analysis.outputs.is_prerelease }}" + echo "📺 Channel: ${{ needs.version-analysis.outputs.channel }}" + + # 更新 package.json 中的版本号 node -e " const fs = require('fs'); const package = JSON.parse(fs.readFileSync('package.json', 'utf8')); - package.version = '${VERSION_NO_V}'; + package.version = '${{ needs.version-analysis.outputs.next_version }}'; fs.writeFileSync('package.json', JSON.stringify(package, null, 2) + '\n'); console.log('✅ Updated package.json version to:', package.version); " - echo "Updated package.json version: $(node -p "require('./package.json').version")" + echo "📋 Updated package.json version: $(node -p "require('./package.json').version")" - name: Build for ${{ matrix.platform }} shell: bash run: | echo "🏗️ Building for ${{ matrix.platform }}" - echo "构建平台: ${{ matrix.platform }}" - echo "📦 版本类型: ${{ needs.detect-version.outputs.version_type }}" - echo "🔄 更新渠道: ${{ needs.detect-version.outputs.version_type == 'stable' && 'latest' || needs.detect-version.outputs.version_type }}" + echo "📦 版本号: ${{ needs.version-analysis.outputs.next_version }}" + echo "📦 版本类型: ${{ needs.version-analysis.outputs.version_type }}" + echo "🔄 更新渠道: ${{ needs.version-analysis.outputs.channel }}" pnpm build - # 构建产物但不发布，交给 semantic-release 统一发布 - echo "🏗️ Building artifacts without publishing" - echo "📦 Semantic-release will handle the GitHub Release creation" + # 构建产物但不发布，版本号已经正确 + echo "🏗️ Building artifacts with correct version number" + echo "📦 Artifacts will be uploaded by final release job" pnpm exec electron-builder ${{ matrix.target }} --publish never env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -195,8 +205,8 @@ jobs: APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} - # 根据版本类型设置更新渠道，stable 版本使用 latest，其他版本使用对应类型名称 - ELECTRON_BUILDER_CHANNEL: ${{ needs.detect-version.outputs.version_type == 'stable' && 'latest' || needs.detect-version.outputs.version_type }} + # 根据分支设置更新渠道 + ELECTRON_BUILDER_CHANNEL: ${{ needs.version-analysis.outputs.channel }} - name: List build artifacts shell: bash @@ -237,9 +247,9 @@ jobs: if-no-files-found: warn semantic-release: - needs: [detect-version, release] + needs: [version-analysis, release] runs-on: ubuntu-latest - if: needs.detect-version.outputs.version_type != 'dev' && needs.detect-version.outputs.version_type != 'test' + if: needs.version-analysis.outputs.should_release == 'true' steps: - name: Checkout repository uses: actions/checkout@v4 @@ -277,6 +287,21 @@ jobs: with: path: artifacts + - name: Update package.json version for release + shell: bash + run: | + echo "🔄 Updating package.json version for semantic-release" + echo "Target version: ${{ needs.version-analysis.outputs.next_version }}" + + # 更新 package.json 中的版本号，确保与分析阶段一致 + node -e " + const fs = require('fs'); + const package = JSON.parse(fs.readFileSync('package.json', 'utf8')); + package.version = '${{ needs.version-analysis.outputs.next_version }}'; + fs.writeFileSync('package.json', JSON.stringify(package, null, 2) + '\n'); + console.log('✅ Updated package.json version to:', package.version); + " + - name: Prepare artifacts for release run: | echo "📦 Preparing artifacts for GitHub Release" @@ -291,10 +316,13 @@ jobs: - name: Run Semantic Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: pnpm semantic-release + run: | + echo "🚀 Creating GitHub Release with semantic-release" + echo "📦 Version: ${{ needs.version-analysis.outputs.next_version }}" + pnpm semantic-release notify: - needs: [detect-version, release] + needs: [version-analysis, release, semantic-release] runs-on: ubuntu-latest if: always() steps: @@ -302,19 +330,27 @@ jobs: run: | echo "🏗️ Build Summary" echo "===============" - echo "Version: ${{ needs.detect-version.outputs.version }}" - echo "Type: ${{ needs.detect-version.outputs.version_type }}" - echo "Prerelease: ${{ needs.detect-version.outputs.is_prerelease }}" - echo "Status: ${{ needs.release.result }}" + echo "Branch: ${{ github.ref_name }}" + echo "Next Version: ${{ needs.version-analysis.outputs.next_version }}" + echo "Type: ${{ needs.version-analysis.outputs.version_type }}" + echo "Channel: ${{ needs.version-analysis.outputs.channel }}" + echo "Prerelease: ${{ needs.version-analysis.outputs.is_prerelease }}" + echo "Should Release: ${{ needs.version-analysis.outputs.should_release }}" + echo "Build Status: ${{ needs.release.result }}" + echo "Release Status: ${{ needs.semantic-release.result }}" echo "Trigger: ${{ github.event_name }}" echo "" - if [ "${{ needs.release.result }}" == "success" ]; then - if [ "${{ needs.detect-version.outputs.version_type }}" != "dev" ] && [ "${{ needs.detect-version.outputs.version_type }}" != "test" ]; then - echo "🎉 GitHub Release created successfully!" + if [ "${{ needs.version-analysis.outputs.should_release }}" == "false" ]; then + echo "ℹ️ No new version to release - no commits since last release" + elif [ "${{ needs.release.result }}" == "success" ]; then + if [ "${{ needs.semantic-release.result }}" == "success" ]; then + echo "🎉 Release ${{ needs.version-analysis.outputs.next_version }} created successfully!" echo "📍 Check: https://github.com/${{ github.repository }}/releases" + echo "🔄 Version was automatically determined based on commit messages" + echo "📦 Artifacts have correct version numbers in filenames" echo "" - if [ "${{ needs.detect-version.outputs.is_prerelease }}" == "true" ]; then + if [ "${{ needs.version-analysis.outputs.is_prerelease }}" == "true" ]; then echo "🧪 This is a prerelease version:" echo "- Alpha/Beta versions are marked as prerelease" echo "- Auto-update is enabled for prerelease users" @@ -322,7 +358,8 @@ jobs: echo "🚀 This is a stable release" fi else - echo "📦 Build completed but not published (dev/test version)" + echo "📦 Build completed but semantic-release failed" + echo "💡 Check semantic-release logs for details" fi else echo "❌ Build failed - check logs for details" From 38e4db91f8c3263db9aa6e2750a9fda0fc0395a5 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 10 Sep 2025 23:50:44 +0000 Subject: [PATCH 35/82] chore(release): 1.0.0-alpha.8 # [1.0.0-alpha.8](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2025-09-10) ### Features * **ci:** implement semantic-release with automatic version detection ([#117](https://github.com/mkdir700/EchoPlayer/issues/117)) ([4030234](https://github.com/mkdir700/EchoPlayer/commit/4030234c7dbaf3b358f4697c5321565e7c0fdd64)) --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c574b408..100e8ff4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# [1.0.0-alpha.8](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2025-09-10) + +### Features + +- **ci:** implement semantic-release with automatic version detection ([#117](https://github.com/mkdir700/EchoPlayer/issues/117)) ([4030234](https://github.com/mkdir700/EchoPlayer/commit/4030234c7dbaf3b358f4697c5321565e7c0fdd64)) + # [1.0.0-alpha.7](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2025-09-10) ### Bug Fixes diff --git a/package.json b/package.json index ea587528..ba9cec76 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-alpha.7", + "version": "1.0.0-alpha.8", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From c2c12c9e7f0195fffdcbb4c507aaf17ce8a85824 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Thu, 11 Sep 2025 08:19:42 +0800 Subject: [PATCH 36/82] ci(test): Add dev branch to Github Actions test workflow triggers --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 922b9884..ecae4791 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,9 +2,9 @@ name: Test on: push: - branches: [main, develop, alpha, beta] + branches: [main, develop, alpha, beta, dev] pull_request: - branches: [main, alpha, beta] + branches: [main, alpha, beta, dev] jobs: test: From b4ad16f2115d324aabd34b08b2a05ca98a3de101 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Thu, 11 Sep 2025 20:35:00 +0800 Subject: [PATCH 37/82] fix(player): Fix subtitle navigation when activeCueIndex is -1 (#119) - Fix goToNextSubtitle to find next subtitle based on current time when activeCueIndex is -1 - Fix goToPreviousSubtitle to find previous subtitle based on current time when activeCueIndex is -1 - Add enhanced logging with from/to index information for better debugging - Fix styled-components active prop to use $active prefix to avoid HTML attribute pollution This resolves the issue where clicking "next subtitle" after app restart would jump to the first subtitle instead of the correct next subtitle based on current playback time. --- .../player/components/SubtitleListPanel.tsx | 11 ++-- .../pages/player/hooks/usePlayerCommands.ts | 56 ++++++++++++++++++- 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/src/renderer/src/pages/player/components/SubtitleListPanel.tsx b/src/renderer/src/pages/player/components/SubtitleListPanel.tsx index 97fd50a4..ec2e0589 100644 --- a/src/renderer/src/pages/player/components/SubtitleListPanel.tsx +++ b/src/renderer/src/pages/player/components/SubtitleListPanel.tsx @@ -140,7 +140,7 @@ function SubtitleListPanel({ data-subtitle-item data-index={index} data-active={index === currentIndex} - active={index === currentIndex} + $active={index === currentIndex} onClick={() => handleItemClick(index)} > @@ -281,18 +281,19 @@ const ActionButton = styled(Button)` border-radius: 12px; ` -const SubtitleItem = styled.div<{ active: boolean }>` +const SubtitleItem = styled.div<{ $active: boolean }>` display: block; margin: 6px 8px; padding: 10px 12px; cursor: pointer; border-radius: 12px; - background: ${(p) => (p.active ? 'var(--color-primary-mute)' : 'transparent')}; - box-shadow: ${(p) => (p.active ? '0 1px 6px rgba(0,0,0,.25)' : 'none')}; + background: ${(p) => (p.$active ? 'var(--color-primary-mute)' : 'transparent')}; + box-shadow: ${(p) => (p.$active ? '0 1px 6px rgba(0,0,0,.25)' : 'none')}; transition: background 0.2s; &:hover { - background: ${(p) => (p.active ? 'var(--color-primary-mute)' : 'var(--color-list-item-hover)')}; + background: ${(p) => + p.$active ? 'var(--color-primary-mute)' : 'var(--color-list-item-hover)'}; } ` diff --git a/src/renderer/src/pages/player/hooks/usePlayerCommands.ts b/src/renderer/src/pages/player/hooks/usePlayerCommands.ts index 513825b8..7bf92730 100644 --- a/src/renderer/src/pages/player/hooks/usePlayerCommands.ts +++ b/src/renderer/src/pages/player/hooks/usePlayerCommands.ts @@ -159,15 +159,43 @@ export function usePlayerCommands() { } const context = orchestrator.getContext() - const prevIndex = context.activeCueIndex - 1 + let prevIndex: number + + // 如果当前没有活跃字幕（activeCueIndex为-1），则基于当前时间找到上一个字幕 + if (context.activeCueIndex === -1) { + // 找到最后一个结束时间小于等于当前时间的字幕 + prevIndex = -1 + for (let i = subtitles.length - 1; i >= 0; i--) { + if (subtitles[i].endTime <= context.currentTime) { + prevIndex = i + break + } + } + + // 如果没找到，则不执行跳转 + if (prevIndex === -1) { + logger.info('Command: goToPreviousSubtitle - no subtitle found before current time', { + currentTime: context.currentTime + }) + return + } + } else { + // 正常情况：跳转到上一个字幕 + prevIndex = context.activeCueIndex - 1 + } if (prevIndex >= 0) { const prev = subtitles[prevIndex] orchestrator.requestUserSeekBySubtitleIndex(prevIndex) logger.info('Command: goToPreviousSubtitle executed', { + from: context.activeCueIndex, to: prev.startTime, index: prevIndex }) + } else { + logger.info('Command: goToPreviousSubtitle - already at first subtitle', { + currentIndex: context.activeCueIndex + }) } }, [orchestrator, subtitles]) @@ -178,15 +206,39 @@ export function usePlayerCommands() { } const context = orchestrator.getContext() - const nextSubtitleIndex = context.activeCueIndex + 1 + let nextSubtitleIndex: number + + // 如果当前没有活跃字幕（activeCueIndex为-1），则基于当前时间找到下一个字幕 + if (context.activeCueIndex === -1) { + // 找到第一个开始时间大于当前时间的字幕 + nextSubtitleIndex = subtitles.findIndex( + (subtitle) => subtitle.startTime > context.currentTime + ) + + // 如果没找到（说明当前时间已经超过了所有字幕），则不执行跳转 + if (nextSubtitleIndex === -1) { + logger.info('Command: goToNextSubtitle - no subtitle found after current time', { + currentTime: context.currentTime + }) + return + } + } else { + // 正常情况：跳转到下一个字幕 + nextSubtitleIndex = context.activeCueIndex + 1 + } if (nextSubtitleIndex < subtitles.length) { orchestrator.requestUserSeekBySubtitleIndex(nextSubtitleIndex) const next = subtitles[nextSubtitleIndex] logger.info('Command: goToNextSubtitle executed', { + from: context.activeCueIndex, to: next.startTime, index: nextSubtitleIndex }) + } else { + logger.info('Command: goToNextSubtitle - already at last subtitle', { + currentIndex: context.activeCueIndex + }) } }, [orchestrator, subtitles]) From 7879ef442b888d6956a74739c3c0c1c54bb87387 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Thu, 11 Sep 2025 21:44:45 +0800 Subject: [PATCH 38/82] fix(homepage): Fix UI desynchronization issue after deleting video records + i18n support (#120) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(homepage): 修复删除视频记录后UI不同步的问题 - 在删除视频记录成功后同步更新store缓存 - 确保本地状态和全局缓存保持一致 - 修复删除后UI仍显示已删除记录的问题 closes: #删除视频记录UI不同步问题 * feat(i18n): 为HomePage删除功能添加国际化支持 - 在zh-cn.json中添加删除视频的翻译文本 - 更新HomePage使用useTranslation钩子 - 替换所有硬编码中文文本为i18n键值 - 支持动态视频标题插值 变更内容： - 添加 home.delete.* 翻译键 - 确认删除对话框、按钮文本、提示消息的国际化 - 保持UI行为和样式不变 --- src/renderer/src/i18n/locales/zh-cn.json | 9 +++ src/renderer/src/pages/home/HomePage.tsx | 74 ++++++++++++++---------- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json index 55482bbc..378da448 100644 --- a/src/renderer/src/i18n/locales/zh-cn.json +++ b/src/renderer/src/i18n/locales/zh-cn.json @@ -38,6 +38,15 @@ "viewMode": { "grid": "矩阵", "list": "列表" + }, + "delete": { + "confirm_title": "确认删除", + "confirm_content": "确定要删除视频 \"{{title}}\" 的观看记录吗？", + "confirm_warning": "此操作将删除该视频的播放历史和进度信息", + "button_ok": "删除", + "button_cancel": "取消", + "success_message": "视频记录删除成功", + "error_message": "删除失败，请重试" } }, "player": { diff --git a/src/renderer/src/pages/home/HomePage.tsx b/src/renderer/src/pages/home/HomePage.tsx index d294203e..e03cb626 100644 --- a/src/renderer/src/pages/home/HomePage.tsx +++ b/src/renderer/src/pages/home/HomePage.tsx @@ -6,6 +6,7 @@ import { useVideoListStore } from '@renderer/state/stores/video-list.store' import { message, Modal, Tooltip } from 'antd' import { AnimatePresence, motion } from 'framer-motion' import React from 'react' +import { useTranslation } from 'react-i18next' import { useNavigate } from 'react-router-dom' import styled from 'styled-components' @@ -69,6 +70,7 @@ const gridVariants = { } export function HomePage(): React.JSX.Element { + const { t } = useTranslation() const { videoListViewMode, setVideoListViewMode } = useSettingsStore() const { refreshTrigger, @@ -129,39 +131,47 @@ export function HomePage(): React.JSX.Element { }, [loadVideos]) // 删除视频记录 - const handleDeleteVideo = React.useCallback(async (video: HomePageVideoItem) => { - Modal.confirm({ - title: '确认删除', - centered: true, - content: ( -
-

- 确定要删除视频 "{video.title}" 的观看记录吗？ -

-

- ⚠️ 此操作将删除该视频的播放历史和进度信息 -

-
- ), - okText: '删除', - cancelText: '取消', - okType: 'danger', - onOk: async () => { - try { - const videoLibraryService = new VideoLibraryService() - await videoLibraryService.deleteRecord(video.id) - - // 从本地状态中移除该视频 - setVideos((prev) => prev.filter((v) => v.id !== video.id)) - - message.success('视频记录删除成功') - } catch (error) { - logger.error('删除视频记录失败', { error }) - message.error('删除失败，请重试') + const handleDeleteVideo = React.useCallback( + async (video: HomePageVideoItem) => { + Modal.confirm({ + title: t('home.delete.confirm_title'), + centered: true, + content: ( +
+

+

+ ⚠️ {t('home.delete.confirm_warning')} +

+
+ ), + okText: t('home.delete.button_ok'), + cancelText: t('home.delete.button_cancel'), + okType: 'danger', + onOk: async () => { + try { + const videoLibraryService = new VideoLibraryService() + await videoLibraryService.deleteRecord(video.id) + + // 从本地状态中移除该视频 + setVideos((prev) => prev.filter((v) => v.id !== video.id)) + + // 同步更新store缓存，确保UI状态一致 + setCachedVideos(cachedVideos.filter((v) => v.id !== video.id)) + + message.success(t('home.delete.success_message')) + } catch (error) { + logger.error('删除视频记录失败', { error }) + message.error(t('home.delete.error_message')) + } } - } - }) - }, []) + }) + }, + [t, setCachedVideos, cachedVideos] + ) return ( From 2c65f5ae92460391302c24f3fb291f386043e7cd Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Thu, 11 Sep 2025 23:08:36 +0800 Subject: [PATCH 39/82] feat(performance): implement video import performance optimization with parallel processing and warmup strategies (#121) - Add PathConverter utility with caching for efficient file path conversion and validation - Add PerformanceMonitor utility for comprehensive performance tracking and bottleneck analysis - Implement FFmpegWarmupManager for background FFmpeg initialization and status management - Add MediaFormatStrategy for intelligent media format detection and parser selection - Add ParallelVideoProcessor for concurrent video file validation and preparation - Update FFmpegService: replace transcode methods with warmup functionality - Update MediaParserService: add strategy-based video info extraction with timeout handling - Update IPC channels: add warmup status and strategy-based media info endpoints - Update video file selection workflow with performance monitoring integration - Add comprehensive test coverage for FFmpegWarmupManager Key improvements: - Parallel processing for file validation and parser availability checks - Intelligent parser selection based on file format and availability - Background FFmpeg warmup to reduce first-use latency - Comprehensive performance monitoring with bottleneck detection - Path conversion optimization with LRU caching - Strategy pattern for media info extraction with fallback mechanisms This optimization significantly improves video import performance by: - Reducing cold-start delays through background warmup - Enabling parallel processing of file operations - Providing intelligent parser selection and fallback - Offering detailed performance insights for further optimization --- packages/shared/IpcChannel.ts | 6 +- packages/shared/utils/PathConverter.ts | 200 ++++ packages/shared/utils/PerformanceMonitor.ts | 548 +++++++++ src/main/ipc.ts | 33 +- src/main/services/FFmpegService.ts | 1018 +++++------------ src/main/services/MediaParserService.ts | 163 +++ src/preload/index.ts | 33 +- src/renderer/src/App.tsx | 5 +- .../StartupIntro/StartupLoadingState.tsx | 78 +- src/renderer/src/hooks/useVideoFileSelect.ts | 92 +- .../src/services/FFmpegWarmupManager.ts | 218 ++++ .../__tests__/FFmpegWarmupManager.test.ts | 167 +++ src/renderer/src/services/index.ts | 1 + src/renderer/src/utils/MediaFormatStrategy.ts | 189 +++ .../src/utils/ParallelVideoProcessor.ts | 317 +++++ src/renderer/src/utils/PerformanceMonitor.ts | 2 + 16 files changed, 2276 insertions(+), 794 deletions(-) create mode 100644 packages/shared/utils/PathConverter.ts create mode 100644 packages/shared/utils/PerformanceMonitor.ts create mode 100644 src/renderer/src/services/FFmpegWarmupManager.ts create mode 100644 src/renderer/src/services/__tests__/FFmpegWarmupManager.test.ts create mode 100644 src/renderer/src/utils/MediaFormatStrategy.ts create mode 100644 src/renderer/src/utils/ParallelVideoProcessor.ts diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts index 6482a8ce..b3d43538 100644 --- a/packages/shared/IpcChannel.ts +++ b/packages/shared/IpcChannel.ts @@ -74,15 +74,15 @@ export enum IpcChannel { Ffmpeg_GetPath = 'ffmpeg:get-path', Ffmpeg_CheckExists = 'ffmpeg:check-exists', Ffmpeg_GetVersion = 'ffmpeg:get-version', - Ffmpeg_Download = 'ffmpeg:download', Ffmpeg_GetVideoInfo = 'ffmpeg:get-video-info', - Ffmpeg_Transcode = 'ffmpeg:transcode', - Ffmpeg_CancelTranscode = 'ffmpeg:cancel-transcode', + Ffmpeg_Warmup = 'ffmpeg:warmup', + Ffmpeg_GetWarmupStatus = 'ffmpeg:get-warmup-status', // MediaInfo 相关 IPC 通道 / MediaInfo related IPC channels MediaInfo_CheckExists = 'mediainfo:check-exists', MediaInfo_GetVersion = 'mediainfo:get-version', MediaInfo_GetVideoInfo = 'mediainfo:get-video-info', + MediaInfo_GetVideoInfoWithStrategy = 'mediainfo:get-video-info-with-strategy', // 文件系统相关 IPC 通道 / File system related IPC channels Fs_CheckFileExists = 'fs:check-file-exists', diff --git a/packages/shared/utils/PathConverter.ts b/packages/shared/utils/PathConverter.ts new file mode 100644 index 00000000..6318208c --- /dev/null +++ b/packages/shared/utils/PathConverter.ts @@ -0,0 +1,200 @@ +/** + * 优化的路径转换工具 + * 提供高性能的文件路径转换和验证功能 + */ + +export interface PathValidationResult { + isValid: boolean + localPath: string + error?: string + isConverted: boolean // 是否进行了转换 +} + +/** + * 路径转换器 + * 优化的路径转换逻辑，减少重复操作和性能开销 + */ +export class PathConverter { + // 缓存转换结果，避免重复转换 + private static conversionCache = new Map() + + // 缓存大小限制 + private static readonly MAX_CACHE_SIZE = 1000 + + // 路径验证正则表达式（预编译） + private static readonly FILE_URL_REGEX = /^file:\/\// + private static readonly WINDOWS_DRIVE_REGEX = /^\/[A-Za-z]:/ + + /** + * 快速检查是否为 file:// URL + */ + static isFileUrl(path: string): boolean { + return this.FILE_URL_REGEX.test(path) + } + + /** + * 优化的路径转换方法 + * 带缓存和错误处理 + */ + static convertToLocalPath(inputPath: string): PathValidationResult { + // 如果不是 file:// URL，直接返回 + if (!this.isFileUrl(inputPath)) { + return { + isValid: true, + localPath: inputPath, + isConverted: false + } + } + + // 检查缓存 + const cached = this.conversionCache.get(inputPath) + if (cached !== undefined) { + return { + isValid: true, + localPath: cached, + isConverted: true + } + } + + try { + const url = new URL(inputPath) + let localPath = decodeURIComponent(url.pathname) + + // Windows 路径处理：移除开头的斜杠 + if (process.platform === 'win32' && this.WINDOWS_DRIVE_REGEX.test(localPath)) { + localPath = localPath.substring(1) + } + + // 添加到缓存（控制缓存大小） + if (this.conversionCache.size >= this.MAX_CACHE_SIZE) { + // 删除最老的缓存项（简单的 LRU） + const firstKey = this.conversionCache.keys().next().value + if (firstKey) { + this.conversionCache.delete(firstKey) + } + } + this.conversionCache.set(inputPath, localPath) + + return { + isValid: true, + localPath, + isConverted: true + } + } catch (error) { + return { + isValid: false, + localPath: inputPath, + error: error instanceof Error ? error.message : String(error), + isConverted: false + } + } + } + + /** + * 批量路径转换 + * 用于批量操作优化 + */ + static convertPaths(inputPaths: string[]): PathValidationResult[] { + return inputPaths.map((path) => this.convertToLocalPath(path)) + } + + /** + * 清除转换缓存 + */ + static clearCache(): void { + this.conversionCache.clear() + } + + /** + * 获取缓存统计信息 + */ + static getCacheStats(): { + size: number + maxSize: number + hitRatio: number + } { + // 简化的统计（在真实应用中可以添加更详细的统计） + return { + size: this.conversionCache.size, + maxSize: this.MAX_CACHE_SIZE, + hitRatio: 0 // 需要额外的计数器来实现 + } + } + + /** + * 验证路径有效性（不进行转换） + */ + static validatePath(inputPath: string): boolean { + if (!inputPath || typeof inputPath !== 'string') { + return false + } + + // 检查基本路径格式 + if (this.isFileUrl(inputPath)) { + try { + new URL(inputPath) + return true + } catch { + return false + } + } + + // 检查本地路径（简单验证） + return inputPath.length > 0 && !inputPath.includes('\0') + } + + /** + * 规范化路径 + * 统一路径格式，减少后续处理的复杂性 + */ + static normalizePath(inputPath: string): string { + const result = this.convertToLocalPath(inputPath) + if (!result.isValid) { + return inputPath + } + + let normalizedPath = result.localPath + + // 统一路径分隔符（Windows） + if (process.platform === 'win32') { + normalizedPath = normalizedPath.replace(/\//g, '\\') + } + + return normalizedPath + } + + /** + * 生成缓存键 + * 用于其他需要缓存路径相关计算的场景 + */ + static generateCacheKey(inputPath: string, suffix?: string): string { + const normalized = this.normalizePath(inputPath) + return suffix ? `${normalized}:${suffix}` : normalized + } +} + +/** + * 便捷函数 + */ + +/** + * 快速转换单个路径 + */ +export function convertToLocalPath(inputPath: string): string { + const result = PathConverter.convertToLocalPath(inputPath) + return result.localPath +} + +/** + * 快速验证路径 + */ +export function isValidPath(inputPath: string): boolean { + return PathConverter.validatePath(inputPath) +} + +/** + * 快速规范化路径 + */ +export function normalizePath(inputPath: string): string { + return PathConverter.normalizePath(inputPath) +} diff --git a/packages/shared/utils/PerformanceMonitor.ts b/packages/shared/utils/PerformanceMonitor.ts new file mode 100644 index 00000000..fa2bcba1 --- /dev/null +++ b/packages/shared/utils/PerformanceMonitor.ts @@ -0,0 +1,548 @@ +/** + * @fileoverview 性能监控工具类 - 提供精确的性能计时、指标收集和瓶颈分析功能 + * + * @description 这个模块提供了一套完整的性能监控解决方案，包括： + * - PerformanceMonitor 类：核心性能监控器 + * - 便捷函数：createPerformanceMonitor、measureAsync、measureSync + * - 装饰器：monitorPerformance（用于自动监控方法性能） + * - 类型定义：PerformanceMetric、PerformanceReport + * + * @example + * // 基础使用 + * import { PerformanceMonitor, measureAsync } from '@/utils/PerformanceMonitor' + * + * const monitor = new PerformanceMonitor('VideoProcessing') + * monitor.startTiming('encode') + * // ... 执行操作 + * monitor.endTiming('encode') + * const report = monitor.finish() + * + * @example + * // 使用便捷函数 + * const { result, duration } = await measureAsync( + * 'fetchData', + * () => fetch('/api/data').then(r => r.json()) + * ) + * + * @example + * // 使用装饰器 + * class Service { + * @monitorPerformance() + * async processData() { + * // 自动监控这个方法的性能 + * } + * } + * + * @author mkdir700 + * @since 1.0.0 + */ + +import { loggerService } from '@logger' + +const logger = loggerService.withContext('PerformanceMonitor') + +/** + * 性能指标接口 + * + * @interface PerformanceMetric + * @description 描述单个性能测量操作的详细信息 + * + * @example + * const metric: PerformanceMetric = { + * name: 'videoEncode', + * startTime: 1640995200000, + * endTime: 1640995205000, + * duration: 5000, + * metadata: { resolution: '1080p', codec: 'h264' } + * } + */ +export interface PerformanceMetric { + /** 操作名称 */ + name: string + /** 开始时间戳（毫秒） */ + startTime: number + /** 结束时间戳（毫秒），可选 */ + endTime?: number + /** 操作耗时（毫秒），可选 */ + duration?: number + /** 附加元数据，可选 */ + metadata?: Record +} + +/** + * 性能报告接口 + * + * @interface PerformanceReport + * @description 包含完整的性能分析结果 + * + * @example + * const report: PerformanceReport = { + * totalDuration: 15234, + * metrics: [metric1, metric2, metric3], + * bottlenecks: [slowMetric], + * summary: { + * 'videoEncode': 5000, + * 'audioProcess': 2000, + * 'fileWrite': 1500 + * } + * } + */ +export interface PerformanceReport { + /** 总耗时（毫秒） */ + totalDuration: number + /** 所有性能指标 */ + metrics: PerformanceMetric[] + /** 性能瓶颈列表（超过阈值的操作） */ + bottlenecks: PerformanceMetric[] + /** 操作耗时汇总 */ + summary: Record +} + +/** + * 性能监控器类 - 用于监控和分析代码性能 + * + * @class PerformanceMonitor + * @description 提供精确的性能计时、指标收集和瓶颈分析功能 + * + * @example + * // 基本使用 + * const monitor = new PerformanceMonitor('VideoProcessor') + * + * monitor.startTiming('loadVideo') + * await loadVideoFile() + * monitor.endTiming('loadVideo') + * + * const report = monitor.finish() + * console.log(`总耗时: ${report.totalDuration}ms`) + * + * @example + * // 复杂场景监控 + * const monitor = new PerformanceMonitor('DataProcessing') + * + * monitor.startTiming('fetchData', { url: 'api/data' }) + * const data = await fetchData() + * monitor.endTiming('fetchData', { records: data.length }) + * + * monitor.startTiming('processData') + * const processed = processData(data) + * monitor.endTiming('processData', { operations: processed.operations }) + * + * // 获取报告并检查瓶颈 + * const report = monitor.getReport(50) // 50ms阈值 + * if (monitor.hasBottlenecks(50)) { + * console.warn('检测到性能瓶颈:', report.bottlenecks) + * } + * + * @example + * // 记录已知耗时的操作 + * const monitor = new PerformanceMonitor('FileIO') + * + * // 记录外部测量的耗时 + * monitor.recordTiming('fileRead', 125, { size: '2MB' }) + * monitor.recordTiming('fileWrite', 98, { size: '1.5MB' }) + * + * const summary = monitor.getReport().summary + * console.log('IO操作汇总:', summary) + */ +export class PerformanceMonitor { + private metrics: Map = new Map() + private startTime: number + private context: string + + /** + * 创建性能监控器实例 + * + * @param {string} context - 监控上下文名称，用于日志标识 + * + * @example + * const monitor = new PerformanceMonitor('VideoImport') + */ + constructor(context: string) { + this.context = context + this.startTime = performance.now() + logger.info(`🚀 开始性能监控: ${context}`) + } + + /** + * 开始计时一个操作 + * + * @param {string | Function} nameOrFunction - 操作名称或函数引用 + * @param {Record} [metadata] - 可选的元数据 + * + * @example + * // 使用字符串名称 + * monitor.startTiming('videoEncode', { resolution: '1080p', codec: 'h264' }) + * + * @example + * // 使用函数引用，自动提取函数名 + * function processVideo() + * monitor.startTiming(processVideo, { type: 'h264' }) + * + * @example + * // 使用方法引用，自动提取方法名 + * class VideoProcessor { + * encodeVideo() + * } + * const processor = new VideoProcessor() + * monitor.startTiming(processor.encodeVideo.bind(processor), { quality: 'high' }) + */ + startTiming( + nameOrFunction: string | ((...args: any[]) => any), + metadata?: Record + ): void { + const name = + typeof nameOrFunction === 'function' ? nameOrFunction.name || 'anonymous' : nameOrFunction + + const metric: PerformanceMetric = { + name, + startTime: performance.now(), + metadata + } + this.metrics.set(name, metric) + logger.info(`⏱️ 开始计时: ${name}`, metadata) + } + + /** + * 结束计时一个操作 + * + * @param {string | Function} nameOrFunction - 操作名称或函数引用（需与startTiming对应） + * @param {Record} [metadata] - 可选的元数据 + * @returns {number} 操作耗时（毫秒） + * + * @example + * // 使用字符串名称 + * const duration = monitor.endTiming('videoEncode', { outputSize: '2.5MB' }) + * console.log(`编码耗时: ${duration}ms`) + * + * @example + * // 使用函数引用，自动提取函数名 + * function processVideo() + * monitor.startTiming(processVideo) + * // ... 执行操作 + * const duration = monitor.endTiming(processVideo, { result: 'success' }) + * + * @example + * // 完整的函数监控示例 + * const videoProcessor = { + * encodeVideo() { + * monitor.startTiming(this.encodeVideo, { input: 'raw.mp4' }) + * // ... 编码逻辑 + * monitor.endTiming(this.encodeVideo, { output: 'encoded.mp4' }) + * } + * } + */ + endTiming( + nameOrFunction: string | ((...args: any[]) => any), + metadata?: Record + ): number { + const name = + typeof nameOrFunction === 'function' ? nameOrFunction.name || 'anonymous' : nameOrFunction + + const metric = this.metrics.get(name) + if (!metric) { + logger.warn(`⚠️ 未找到计时器: ${name}`) + return 0 + } + + const endTime = performance.now() + const duration = endTime - metric.startTime + + metric.endTime = endTime + metric.duration = duration + if (metadata) { + metric.metadata = { ...metric.metadata, ...metadata } + } + + logger.info(`✅ 完成计时: ${name}, 耗时: ${duration.toFixed(2)}ms`, { + ...metric.metadata, + duration: `${duration.toFixed(2)}ms` + }) + + return duration + } + + /** + * 记录一个瞬时操作的耗时 + * + * @param {string} name - 操作名称 + * @param {number} duration - 耗时（毫秒） + * @param {Record} [metadata] - 可选的元数据 + * + * @example + * // 记录外部测量的耗时 + * const externalDuration = await measureExternalOperation() + * monitor.recordTiming('externalAPI', externalDuration, { api: 'transcription' }) + */ + recordTiming(name: string, duration: number, metadata?: Record): void { + const now = performance.now() + const metric: PerformanceMetric = { + name, + startTime: now - duration, + endTime: now, + duration, + metadata + } + this.metrics.set(name, metric) + logger.info(`📊 记录耗时: ${name}, 耗时: ${duration.toFixed(2)}ms`, { + ...metadata, + duration: `${duration.toFixed(2)}ms` + }) + } + + /** + * 获取性能报告 + * + * @param {number} [bottleneckThreshold=100] - 性能瓶颈阈值（毫秒） + * @returns {PerformanceReport} 性能报告对象 + * + * @example + * const report = monitor.getReport(50) + * console.log(`总耗时: ${report.totalDuration}ms`) + * console.log(`瓶颈数量: ${report.bottlenecks.length}`) + * console.log('操作汇总:', report.summary) + */ + getReport(bottleneckThreshold: number = 100): PerformanceReport { + const totalDuration = performance.now() - this.startTime + const metrics = Array.from(this.metrics.values()) + const bottlenecks = metrics.filter((m) => (m.duration || 0) > bottleneckThreshold) + + const summary: Record = {} + metrics.forEach((metric) => { + if (metric.duration !== undefined) { + summary[metric.name] = metric.duration + } + }) + + const report: PerformanceReport = { + totalDuration, + metrics, + bottlenecks, + summary + } + + logger.info(`📈 性能报告 - ${this.context}`, { + totalE: `${totalDuration.toFixed(2)}ms`, + metric: metrics.length, + bottlenecks: bottlenecks.length, + details: Object.fromEntries( + Object.entries(summary).map(([key, value]) => [key, `${value.toFixed(2)}ms`]) + ) + }) + + // 如果有性能瓶颈，记录警告 + if (bottlenecks.length > 0) { + logger.warn( + `⚠️ 检测到 ${bottlenecks.length} 个性能瓶颈 (>${bottleneckThreshold}ms):`, + bottlenecks.map((b) => `${b.name}: ${b.duration?.toFixed(2)}ms`) + ) + } + + return report + } + + /** + * 完成监控并生成报告 + * + * @param {number} [bottleneckThreshold] - 性能瓶颈阈值（毫秒） + * @returns {PerformanceReport} 最终性能报告 + * + * @example + * // 完成监控并获取报告 + * const finalReport = monitor.finish() + * if (finalReport.bottlenecks.length > 0) { + * console.warn('发现性能瓶颈:', finalReport.bottlenecks) + * } + */ + finish(bottleneckThreshold?: number): PerformanceReport { + const report = this.getReport(bottleneckThreshold) + logger.info(`🏁 性能监控完成: ${this.context}, 总耗时: ${report.totalDuration.toFixed(2)}ms`) + return report + } + + /** + * 获取单个操作的耗时 + * + * @param {string} name - 操作名称 + * @returns {number | undefined} 操作耗时（毫秒），如果操作不存在则返回undefined + * + * @example + * const encodeDuration = monitor.getDuration('videoEncode') + * if (encodeDuration !== undefined) { + * console.log(`视频编码耗时: ${encodeDuration}ms`) + * } + */ + getDuration(name: string): number | undefined { + return this.metrics.get(name)?.duration + } + + /** + * 检查是否存在性能瓶颈 + * + * @param {number} [threshold=100] - 性能瓶颈阈值（毫秒） + * @returns {boolean} 是否存在性能瓶颈 + * + * @example + * if (monitor.hasBottlenecks(50)) { + * const report = monitor.getReport(50) + * console.warn('检测到性能瓶颈:', report.bottlenecks.map(b => b.name)) + * } + */ + hasBottlenecks(threshold: number = 100): boolean { + return Array.from(this.metrics.values()).some((m) => (m.duration || 0) > threshold) + } + + /** + * 清除所有计时数据 + * + * @example + * monitor.clear() // 清除之前的计时数据，重新开始监控 + */ + clear(): void { + this.metrics.clear() + this.startTime = performance.now() + logger.info(`🧹 清除性能监控数据: ${this.context}`) + } +} + +/** + * 创建性能监控器的便捷函数 + * + * @param {string} context - 监控上下文名称 + * @returns {PerformanceMonitor} 性能监控器实例 + * + * @example + * const monitor = createPerformanceMonitor('MediaProcessing') + * monitor.startTiming('processVideo') + * // ... 处理视频 + * monitor.endTiming('processVideo') + */ +export function createPerformanceMonitor(context: string): PerformanceMonitor { + return new PerformanceMonitor(context) +} + +/** + * 装饰器：自动监控异步函数的性能 + * + * @param {string} [name] - 自定义监控名称 + * @returns {CallableFunction} 装饰器函数 + * + * @example + * class VideoProcessor { + * @monitorPerformance('customEncode') + * async encodeVideo(inputPath: string) { + * // 视频编码逻辑 + * return encodedVideo + * } + * + * @monitorPerformance() // 使用默认名称: VideoProcessor.processAudio + * async processAudio() { + * // 音频处理逻辑 + * } + * } + */ +export function monitorPerformance(name?: string): CallableFunction { + return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) { + const originalMethod = descriptor.value + const methodName = name || `${target.constructor.name}.${propertyKey}` + + descriptor.value = async function (...args: any[]) { + const monitor = createPerformanceMonitor(methodName) + monitor.startTiming('execution') + + try { + const result = await originalMethod.apply(this, args) + monitor.endTiming('execution') + monitor.finish() + return result + } catch (error) { + monitor.endTiming('execution', { error: true }) + monitor.finish() + throw error + } + } + + return descriptor + } +} + +/** + * 简单的异步性能计时工具函数 + * + * @template T + * @param {string} name - 操作名称 + * @param {() => Promise} operation - 要执行的异步操作 + * @param {string} [context] - 可选的日志上下文 + * @returns {Promise<{result: T, duration: number}>} 包含结果和耗时的对象 + * + * @example + * const { result, duration } = await measureAsync( + * 'fetchUserData', + * () => fetch('/api/users').then(r => r.json()), + * 'UserService' + * ) + * console.log(`获取用户数据耗时: ${duration}ms, 用户数量: ${result.length}`) + */ +export async function measureAsync( + name: string, + operation: () => Promise, + context?: string +): Promise<{ result: T; duration: number }> { + const startTime = performance.now() + const contextLogger = context ? loggerService.withContext(context) : logger + + contextLogger.info(`⏱️ 开始测量: ${name}`) + + try { + const result = await operation() + const duration = performance.now() - startTime + + contextLogger.info(`✅ 测量完成: ${name}, 耗时: ${duration.toFixed(2)}ms`) + + return { result, duration } + } catch (error) { + const duration = performance.now() - startTime + contextLogger.error(`❌ 测量失败: ${name}, 耗时: ${duration.toFixed(2)}ms`, error as Error) + throw error + } +} + +/** + * 同步操作的性能计时工具函数 + * + * @template T + * @param {string} name - 操作名称 + * @param {() => T} operation - 要执行的同步操作 + * @param {string} [context] - 可选的日志上下文 + * @returns {{result: T, duration: number}} 包含结果和耗时的对象 + * + * @example + * const { result, duration } = measureSync( + * 'processArray', + * () => largeArray.map(item => processItem(item)), + * 'DataProcessor' + * ) + * console.log(`数组处理耗时: ${duration}ms, 处理了 ${result.length} 个项目`) + */ +export function measureSync( + name: string, + operation: () => T, + context?: string +): { result: T; duration: number } { + const startTime = performance.now() + const contextLogger = context ? loggerService.withContext(context) : logger + + contextLogger.info(`⏱️ 开始测量: ${name}`) + + try { + const result = operation() + const duration = performance.now() - startTime + + contextLogger.info(`✅ 测量完成: ${name}, 耗时: ${duration.toFixed(2)}ms`) + + return { result, duration } + } catch (error) { + const duration = performance.now() - startTime + contextLogger.error(`❌ 测量失败: ${name}, 耗时: ${duration.toFixed(2)}ms`, error as Error) + throw error + } +} diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 32d503ac..02763f8b 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -425,24 +425,18 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { ipcMain.handle(IpcChannel.Ffmpeg_GetVersion, async () => { return await ffmpegService.getFFmpegVersion() }) - ipcMain.handle(IpcChannel.Ffmpeg_Download, async (_, onProgress?: (progress: number) => void) => { - return await ffmpegService.downloadFFmpeg(onProgress) - }) ipcMain.handle(IpcChannel.Ffmpeg_GetVideoInfo, async (_, inputPath: string) => { return await ffmpegService.getVideoInfo(inputPath) }) - ipcMain.handle( - IpcChannel.Ffmpeg_Transcode, - async (_, inputPath: string, outputPath: string, options: any) => { - return await ffmpegService.transcodeVideo(inputPath, outputPath, options) - } - ) - ipcMain.handle(IpcChannel.Ffmpeg_CancelTranscode, () => { - return ffmpegService.cancelTranscode() - }) ipcMain.handle(IpcChannel.Ffmpeg_GetPath, async () => { return ffmpegService.getFFmpegPath() }) + ipcMain.handle(IpcChannel.Ffmpeg_Warmup, async () => { + return await ffmpegService.warmupFFmpeg() + }) + ipcMain.handle(IpcChannel.Ffmpeg_GetWarmupStatus, async () => { + return FFmpegService.getWarmupStatus() + }) // MediaParser (Remotion) ipcMain.handle(IpcChannel.MediaInfo_CheckExists, async () => { @@ -454,6 +448,21 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { ipcMain.handle(IpcChannel.MediaInfo_GetVideoInfo, async (_, inputPath: string) => { return await mediaParserService.getVideoInfo(inputPath) }) + ipcMain.handle( + IpcChannel.MediaInfo_GetVideoInfoWithStrategy, + async ( + _, + inputPath: string, + strategy: + | 'remotion-first' + | 'ffmpeg-first' + | 'remotion-only' + | 'ffmpeg-only' = 'remotion-first', + timeoutMs: number = 10000 + ) => { + return await mediaParserService.getVideoInfoWithStrategy(inputPath, strategy, timeoutMs) + } + ) // 文件系统相关 IPC 处理程序 / File system-related IPC handlers ipcMain.handle(IpcChannel.Fs_CheckFileExists, async (_, filePath: string) => { diff --git a/src/main/services/FFmpegService.ts b/src/main/services/FFmpegService.ts index f41e3a52..8b264ad6 100644 --- a/src/main/services/FFmpegService.ts +++ b/src/main/services/FFmpegService.ts @@ -1,34 +1,34 @@ -import type { TranscodeOptions, TranscodeProgress } from '@types' -import { ChildProcess, spawn } from 'child_process' +import { PerformanceMonitor } from '@shared/utils/PerformanceMonitor' +import { spawn } from 'child_process' import { app } from 'electron' import * as fs from 'fs' -import { createWriteStream } from 'fs' -import * as https from 'https' import * as path from 'path' -import { getDataPath } from '../utils' import { loggerService } from './LoggerService' const logger = loggerService.withContext('FFmpegService') class FFmpegService { - // 类属性用于管理正在进行的转码进程 - private currentTranscodeProcess: ChildProcess | null = null - private isTranscodeCancelled = false // 标记转码是否被用户主动取消 private forceKillTimeout: NodeJS.Timeout | null = null // 强制终止超时句柄 + // FFmpeg 可用性缓存 + private static ffmpegAvailabilityCache: { [key: string]: boolean } = {} + private static ffmpegCacheTimestamp: { [key: string]: number } = {} + private static readonly CACHE_TTL = 30 * 1000 // 缓存30秒 + + // FFmpeg 预热状态 + private static isWarmedUp = false + private static warmupPromise: Promise | null = null + // FFmpeg 下载 URL（跨平台） - private readonly FFMPEG_DOWNLOAD_URLS = { + private readonly FFMPEG_EXEC_NAMES = { win32: { - url: 'https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip', executable: 'ffmpeg.exe' }, darwin: { - url: 'https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip', executable: 'ffmpeg' }, linux: { - url: 'https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz', executable: 'ffmpeg' } } @@ -37,42 +37,6 @@ class FFmpegService { // 构造函数可以用于初始化操作 } - // 生成输出文件路径 - - // 备用方法，暂时未使用 - /* private generateOutputPath(inputPath: string, outputFormat: string = 'mp4'): string { - // 转换file://URL为本地路径 - const localInputPath = this.convertFileUrlToLocalPath(inputPath) - - // 获取原视频文件的目录 - const inputDir = path.dirname(localInputPath) - - // 从本地路径提取文件名，确保已解码 - const localFileName = path.basename(localInputPath) - const originalName = path.parse(localFileName).name - - // 生成时间戳 - const timestamp = new Date().toISOString().replace(/[:.]/g, '-') - - // 生成输出文件名 - const outputFilename = `${originalName}_transcoded_${timestamp}.${outputFormat}` - - // 将输出文件放在原视频的同目录下 - const outputPath = path.join(inputDir, outputFilename) - - logger.info('生成输出路径', { - 输入路径: inputPath, - 本地输入路径: localInputPath, - 输入目录: inputDir, - 本地文件名: localFileName, - 原始文件名: originalName, - 输出文件名: outputFilename, - 输出路径: outputPath - }) - - return outputPath - } */ - // 将file://URL转换为本地文件路径 private convertFileUrlToLocalPath(inputPath: string): string { // 如果是file://URL，需要转换为本地路径 @@ -148,153 +112,6 @@ class FFmpegService { return inputPath } - // 解压 ZIP 文件 - private async extractZipFile(zipPath: string, extractDir: string): Promise { - return new Promise((resolve, reject) => { - if (process.platform === 'win32') { - // Windows 使用 PowerShell 的 Expand-Archive 命令 - const powershellCommand = `Expand-Archive -Path "${zipPath}" -DestinationPath "${extractDir}" -Force` - const powershell = spawn('powershell.exe', ['-Command', powershellCommand], { - windowsHide: true - }) - - powershell.stdout.on('data', (data) => { - logger.info('PowerShell 解压输出:', data.toString()) - }) - - powershell.stderr.on('data', (data) => { - logger.warn('PowerShell 解压警告:', data.toString()) - }) - - powershell.on('close', (code) => { - if (code === 0) { - logger.info('ZIP 解压成功 (PowerShell)') - resolve() - } else { - reject(new Error(`PowerShell 解压失败，退出代码: ${code}`)) - } - }) - - powershell.on('error', (error) => { - reject(new Error(`PowerShell 解压命令执行失败: ${error.message}`)) - }) - } else { - // macOS/Linux 使用 unzip 命令 - const unzip = spawn('unzip', ['-o', zipPath, '-d', extractDir]) - - unzip.stdout.on('data', (data) => { - logger.info('解压输出:', data.toString()) - }) - - unzip.stderr.on('data', (data) => { - logger.warn('解压警告:', data.toString()) - }) - - unzip.on('close', (code) => { - if (code === 0) { - logger.info('ZIP 解压成功') - resolve() - } else { - reject(new Error(`解压失败，退出代码: ${code}`)) - } - }) - - unzip.on('error', (error) => { - reject(new Error(`解压命令执行失败: ${error.message}`)) - }) - } - }) - } - - // 解压 TAR.XZ 文件 - private async extractTarFile(tarPath: string, extractDir: string): Promise { - return new Promise((resolve, reject) => { - const tar = spawn('tar', ['-xJf', tarPath, '-C', extractDir]) - - tar.stdout.on('data', (data) => { - logger.info('解压输出:', data.toString()) - }) - - tar.stderr.on('data', (data) => { - logger.warn('解压警告:', data.toString()) - }) - - tar.on('close', (code) => { - if (code === 0) { - logger.info('TAR.XZ 解压成功') - resolve() - } else { - reject(new Error(`解压失败，退出代码: ${code}`)) - } - }) - - tar.on('error', (error) => { - reject(new Error(`解压命令执行失败: ${error.message}`)) - }) - }) - } - - // 查找并移动可执行文件 - private async findAndMoveExecutable(extractDir: string, executableName: string): Promise { - const targetPath = this.getFFmpegPath() - - try { - // 递归查找可执行文件 - const foundPath = await this.findExecutableRecursively(extractDir, executableName) - - if (!foundPath) { - throw new Error(`在解压目录中未找到可执行文件: ${executableName}`) - } - - logger.info('找到可执行文件', { foundPath, targetPath }) - - // 移动文件到目标位置 - await fs.promises.copyFile(foundPath, targetPath) - - // 设置执行权限 - await fs.promises.chmod(targetPath, 0o755) - - logger.info('FFmpeg 可执行文件安装完成', { targetPath }) - } catch (error) { - logger.error( - '查找或移动可执行文件失败:', - error instanceof Error ? error : new Error(String(error)) - ) - throw error - } - } - - // 递归查找可执行文件 - private async findExecutableRecursively( - dir: string, - executableName: string - ): Promise { - try { - const items = await fs.promises.readdir(dir, { withFileTypes: true }) - - for (const item of items) { - const fullPath = path.join(dir, item.name) - - if (item.isDirectory()) { - // 递归搜索子目录 - const found = await this.findExecutableRecursively(fullPath, executableName) - if (found) return found - } else if (item.isFile() && item.name === executableName) { - // 找到目标文件 - return fullPath - } - } - - return null - } catch (error) { - logger.error( - `搜索目录失败: ${dir}`, - error instanceof Error ? error : new Error(String(error)) - ) - return null - } - } - // 获取内置 FFmpeg 路径 private getBundledFFmpegPath(): string | null { try { @@ -303,7 +120,7 @@ class FFmpegService { const platformKey = `${platform}-${arch}` const executableName = - this.FFMPEG_DOWNLOAD_URLS[platform as keyof typeof this.FFMPEG_DOWNLOAD_URLS]?.executable || + this.FFMPEG_EXEC_NAMES[platform as keyof typeof this.FFMPEG_EXEC_NAMES]?.executable || 'ffmpeg' // 生产环境：从应用安装目录获取 @@ -373,8 +190,8 @@ class FFmpegService { } // 2. 降级到系统 FFmpeg - const platform = process.platform as keyof typeof this.FFMPEG_DOWNLOAD_URLS - const executable = this.FFMPEG_DOWNLOAD_URLS[platform]?.executable || 'ffmpeg' + const platform = process.platform as keyof typeof this.FFMPEG_EXEC_NAMES + const executable = this.FFMPEG_EXEC_NAMES[platform]?.executable || 'ffmpeg' logger.info('使用系统 FFmpeg', { executable }) return executable @@ -401,58 +218,100 @@ class FFmpegService { } } - // 检查 FFmpeg 是否存在 - public async checkFFmpegExists(): Promise { + // 快速检查 FFmpeg 是否存在（文件系统级别检查） + public fastCheckFFmpegExists(): boolean { const startTime = Date.now() const ffmpegPath = this.getFFmpegPath() - logger.info('🔍 开始检查 FFmpeg 是否存在', { - ffmpegPath, - platform: process.platform - }) - try { - // TODO: 当前直接检查系统 FFmpeg，后续需要支持本地安装的 FFmpeg - // 使用 spawn 来检查 FFmpeg 是否可用 - return new Promise((resolve) => { - const spawnStartTime = Date.now() - const ffmpeg = spawn(ffmpegPath, ['-version']) - - ffmpeg.on('close', (code) => { - const spawnEndTime = Date.now() - const totalTime = spawnEndTime - startTime - const spawnTime = spawnEndTime - spawnStartTime - - const exists = code === 0 - if (exists) { - logger.info(`✅ 系统 FFmpeg 可用，检查耗时: ${totalTime}ms`, { - ffmpegPath, - spawn耗时: `${spawnTime}ms`, - 总耗时: `${totalTime}ms` - }) - } else { - logger.warn(`⚠️ 系统 FFmpeg 不可用，检查耗时: ${totalTime}ms`, { - ffmpegPath, - exitCode: code, - spawn耗时: `${spawnTime}ms`, - 总耗时: `${totalTime}ms` - }) - } - resolve(exists) - }) + // 检查文件是否存在 + if (!fs.existsSync(ffmpegPath)) { + logger.info('⚡ 快速检查: FFmpeg 文件不存在', { ffmpegPath }) + return false + } + + // 检查是否为文件（非目录） + const stats = fs.statSync(ffmpegPath) + if (!stats.isFile()) { + logger.info('⚡ 快速检查: FFmpeg 路径不是文件', { ffmpegPath }) + return false + } - ffmpeg.on('error', (error) => { - const totalTime = Date.now() - startTime - logger.warn(`❌ FFmpeg 检查失败，耗时: ${totalTime}ms`, { + // 检查是否有执行权限 (Unix/Linux/macOS) + if (process.platform !== 'win32') { + const hasExecutePermission = (stats.mode & 0o111) !== 0 + if (!hasExecutePermission) { + logger.info('⚡ 快速检查: FFmpeg 没有执行权限', { ffmpegPath, - error: error.message, - 总耗时: `${totalTime}ms` + mode: stats.mode.toString(8) }) - resolve(false) - }) + return false + } + } + + const totalTime = Date.now() - startTime + logger.info(`⚡ 快速检查 FFmpeg 通过，耗时: ${totalTime}ms`, { + ffmpegPath, + 文件大小: `${Math.round((stats.size / 1024 / 1024) * 100) / 100}MB`, + 执行权限: process.platform !== 'win32' ? 'yes' : 'n/a' }) + + return true } catch (error) { const totalTime = Date.now() - startTime + logger.warn(`⚡ 快速检查 FFmpeg 失败，耗时: ${totalTime}ms`, { + ffmpegPath, + error: error instanceof Error ? error.message : String(error) + }) + return false + } + } + + // 检查 FFmpeg 是否存在（带缓存的完整检查） + public async checkFFmpegExists(useCache = true): Promise { + const startTime = Date.now() + const ffmpegPath = this.getFFmpegPath() + + // 检查缓存 + if (useCache) { + const cached = FFmpegService.ffmpegAvailabilityCache[ffmpegPath] + const cacheTime = FFmpegService.ffmpegCacheTimestamp[ffmpegPath] + + if (cached !== undefined && cacheTime && Date.now() - cacheTime < FFmpegService.CACHE_TTL) { + logger.info('📋 使用缓存的 FFmpeg 可用性结果', { + ffmpegPath, + cached, + 缓存时间: `${Date.now() - cacheTime}ms前` + }) + return cached + } + } + + logger.info('🔍 开始检查 FFmpeg 是否存在', { + ffmpegPath, + platform: process.platform, + useCache + }) + + try { + const fastCheckPassed = this.fastCheckFFmpegExists() + if (!fastCheckPassed) { + // 快速检查失败，直接缓存结果并返回 + FFmpegService.ffmpegAvailabilityCache[ffmpegPath] = false + FFmpegService.ffmpegCacheTimestamp[ffmpegPath] = Date.now() + + const totalTime = Date.now() - startTime + logger.warn(`❌ FFmpeg 快速检查失败，总耗时: ${totalTime}ms`, { ffmpegPath }) + return false + } + return true + } catch (error) { + const totalTime = Date.now() - startTime + + // 缓存异常结果 + FFmpegService.ffmpegAvailabilityCache[ffmpegPath] = false + FFmpegService.ffmpegCacheTimestamp[ffmpegPath] = Date.now() + logger.warn(`FFmpeg 检查异常，耗时: ${totalTime}ms`, { ffmpegPath, error: error instanceof Error ? error.message : String(error), @@ -462,6 +321,44 @@ class FFmpegService { } } + // 清除 FFmpeg 可用性缓存 + public static clearFFmpegCache(ffmpegPath?: string): void { + if (ffmpegPath) { + delete FFmpegService.ffmpegAvailabilityCache[ffmpegPath] + delete FFmpegService.ffmpegCacheTimestamp[ffmpegPath] + logger.info('清除指定路径的 FFmpeg 缓存', { ffmpegPath }) + } else { + FFmpegService.ffmpegAvailabilityCache = {} + FFmpegService.ffmpegCacheTimestamp = {} + logger.info('清除所有 FFmpeg 缓存') + } + } + + // 获取缓存状态信息 + public static getCacheInfo(): { + cachedPaths: string[] + cacheCount: number + oldestCache?: { path: string; ageMs: number } + } { + const paths = Object.keys(FFmpegService.ffmpegAvailabilityCache) + const now = Date.now() + + let oldestCache: { path: string; ageMs: number } | undefined + + for (const path of paths) { + const age = now - (FFmpegService.ffmpegCacheTimestamp[path] || 0) + if (!oldestCache || age > oldestCache.ageMs) { + oldestCache = { path, ageMs: age } + } + } + + return { + cachedPaths: paths, + cacheCount: paths.length, + oldestCache + } + } + // 获取 FFmpeg 版本信息 public async getFFmpegVersion(): Promise { const ffmpegPath = this.getFFmpegPath() @@ -489,219 +386,6 @@ class FFmpegService { }) } - // 下载 FFmpeg - public async downloadFFmpeg(onProgress?: (progress: number) => void): Promise { - const platform = process.platform as keyof typeof this.FFMPEG_DOWNLOAD_URLS - const downloadInfo = this.FFMPEG_DOWNLOAD_URLS[platform] - - if (!downloadInfo) { - throw new Error(`不支持的平台: ${platform}`) - } - - const dataDir = getDataPath() - const ffmpegDir = path.join(dataDir, 'ffmpeg') - - // 确保目录存在 - await fs.promises.mkdir(ffmpegDir, { recursive: true }) - - const downloadPath = path.join( - ffmpegDir, - `ffmpeg-download.${downloadInfo.url.split('.').pop()}` - ) - - try { - logger.info('开始下载 FFmpeg...', { url: downloadInfo.url, path: downloadPath }) - - // 下载文件，支持重定向 - await new Promise((resolve, reject) => { - const downloadTimeout = setTimeout( - () => { - reject(new Error('下载超时: 请检查网络连接')) - }, - 30 * 60 * 1000 - ) // 30分钟超时 - - const cleanup = (): void => { - if (downloadTimeout) { - clearTimeout(downloadTimeout) - } - } - - const downloadFile = (url: string, maxRedirects: number = 5): void => { - if (maxRedirects <= 0) { - cleanup() - reject(new Error('下载失败: 重定向次数过多')) - return - } - - const request = https - .get( - url, - { - timeout: 30000, // 30秒连接超时 - headers: { - 'User-Agent': 'EchoPlayer/1.0.0 (Electron FFmpeg Downloader)' - } - }, - (response) => { - // 处理重定向 - if (response.statusCode === 301 || response.statusCode === 302) { - const redirectUrl = response.headers.location - if (redirectUrl) { - logger.info(`处理重定向: ${response.statusCode}`, { - from: url, - to: redirectUrl, - remainingRedirects: maxRedirects - 1 - }) - downloadFile(redirectUrl, maxRedirects - 1) - return - } else { - cleanup() - reject(new Error(`下载失败: HTTP ${response.statusCode} 但未提供重定向地址`)) - return - } - } - - // 检查最终响应状态 - if (response.statusCode !== 200) { - cleanup() - reject( - new Error( - `下载失败: HTTP ${response.statusCode} - ${response.statusMessage || '未知错误'}` - ) - ) - return - } - - const totalSize = parseInt(response.headers['content-length'] || '0', 10) - let downloadedSize = 0 - - logger.info('开始接收文件数据', { - contentLength: totalSize, - contentType: response.headers['content-type'] - }) - - const fileStream = createWriteStream(downloadPath) - - response.on('data', (chunk) => { - downloadedSize += chunk.length - if (onProgress && totalSize > 0) { - const progress = (downloadedSize / totalSize) * 100 - onProgress(progress) - - // 每10%记录一次日志 - if (Math.floor(progress) % 10 === 0 && Math.floor(progress) !== 0) { - logger.debug('下载进度更新', { - progress: `${Math.floor(progress)}%`, - downloaded: `${Math.round(downloadedSize / 1024 / 1024)}MB`, - total: `${Math.round(totalSize / 1024 / 1024)}MB` - }) - } - } - }) - - response.pipe(fileStream) - - fileStream.on('finish', () => { - fileStream.close() - cleanup() - logger.info('文件下载完成', { - finalSize: downloadedSize, - expectedSize: totalSize - }) - resolve() - }) - - fileStream.on('error', (error) => { - cleanup() - logger.error('文件写入错误:', error) - reject(error) - }) - - response.on('error', (error) => { - cleanup() - logger.error('响应流错误:', error) - reject(error) - }) - } - ) - .on('error', (error) => { - cleanup() - logger.error('请求错误:', error) - reject(error) - }) - .on('timeout', () => { - cleanup() - request.destroy() - reject(new Error('连接超时: 请检查网络连接')) - }) - } - - // 开始下载 - downloadFile(downloadInfo.url) - }) - - logger.info('FFmpeg 下载完成', { - downloadPath, - ffmpegDir, - platform, - targetExecutable: this.getFFmpegPath() - }) - - // 检查下载的文件是否存在 - const downloadedFileExists = await fs.promises - .access(downloadPath, fs.constants.F_OK) - .then(() => true) - .catch(() => false) - logger.info('下载文件检查结果', { downloadPath, exists: downloadedFileExists }) - - if (!downloadedFileExists) { - throw new Error('下载的文件不存在') - } - - // 获取下载文件的信息 - try { - const stats = await fs.promises.stat(downloadPath) - logger.info('下载文件信息', { - size: stats.size, - isFile: stats.isFile(), - path: downloadPath - }) - } catch (error) { - logger.error( - '获取下载文件信息失败', - error instanceof Error ? error : new Error(String(error)) - ) - } - - // 实现解压逻辑（根据平台和文件格式） - logger.info('开始解压 FFmpeg...', { downloadPath, ffmpegDir }) - - try { - if (platform === 'darwin' || platform === 'win32') { - // 解压 ZIP 文件 - await this.extractZipFile(downloadPath, ffmpegDir) - } else if (platform === 'linux') { - // 解压 TAR.XZ 文件 - await this.extractTarFile(downloadPath, ffmpegDir) - } - - logger.info('FFmpeg 解压完成', { ffmpegDir }) - - // 查找解压后的可执行文件 - await this.findAndMoveExecutable(ffmpegDir, downloadInfo.executable) - } catch (error) { - logger.error('解压 FFmpeg 失败:', error instanceof Error ? error : new Error(String(error))) - throw error - } - - return true - } catch (error) { - logger.error('下载 FFmpeg 失败:', error instanceof Error ? error : new Error(String(error))) - throw error - } - } - // 解析 FFmpeg 输出中的视频信息 private parseFFmpegVideoInfo(output: string): { duration: number @@ -761,33 +445,7 @@ class FFmpegService { } } - // 解析 FFmpeg 进度输出 - private parseFFmpegProgress(line: string, duration?: number): Partial | null { - // frame= 123 fps= 25 q=28.0 size= 1024kB time=00:00:04.92 bitrate=1703.5kbits/s speed= 1x - const fpsMatch = line.match(/fps=\s*([\d.]+)/) - const timeMatch = line.match(/time=(\d{2}):(\d{2}):(\d{2})\.(\d{2})/) - const bitrateMatch = line.match(/bitrate=\s*([\d.]+\w+\/s)/) - const speedMatch = line.match(/speed=\s*([\d.]+x)/) - - if (!timeMatch) return null - - const currentTime = - parseInt(timeMatch[1]) * 3600 + - parseInt(timeMatch[2]) * 60 + - parseInt(timeMatch[3]) + - parseInt(timeMatch[4]) / 100 - const progress = duration ? Math.min((currentTime / duration) * 100, 100) : 0 - - return { - progress, - time: `${timeMatch[1]}:${timeMatch[2]}:${timeMatch[3]}`, - fps: fpsMatch ? fpsMatch[1] : '0', - bitrate: bitrateMatch ? bitrateMatch[1] : '0kb/s', - speed: speedMatch ? speedMatch[1] : '0x' - } - } - - // 获取视频信息 + // 获取视频信息 - 使用 FFprobe 替换 FFmpeg public async getVideoInfo(inputPath: string): Promise<{ duration: number videoCodec: string @@ -795,296 +453,204 @@ class FFmpegService { resolution: string bitrate: string } | null> { - const startTime = Date.now() + const pm = new PerformanceMonitor('GetVideoInfo') logger.info('🎬 开始获取视频信息', { inputPath }) - const ffmpegPath = this.getFFmpegPath() + try { + // 转换路径 + pm.startTiming(this.convertFileUrlToLocalPath) + const localInputPath = this.convertFileUrlToLocalPath(inputPath) + pm.endTiming(this.convertFileUrlToLocalPath) + + // 检查文件是否存在 + if (!fs.existsSync(localInputPath)) { + logger.error(`❌ 文件不存在: ${localInputPath}`) + return null + } - // 转换file://URL为本地路径 - const pathConvertStartTime = Date.now() - const localInputPath = this.convertFileUrlToLocalPath(inputPath) - const pathConvertEndTime = Date.now() - logger.info(`🔄 路径转换耗时: ${pathConvertEndTime - pathConvertStartTime}ms`, { - 原始输入路径: inputPath, - 转换后本地路径: localInputPath - }) + // 执行 FFmpeg 命令 + pm.startTiming(this.executeFFmpegDirect) + const args = ['-i', localInputPath] + const result = await this.executeFFmpegDirect(args, 15000) + pm.endTiming(this.executeFFmpegDirect) - // 检查文件是否存在 - const fileCheckStartTime = Date.now() - const fileExists = fs.existsSync(localInputPath) - const fileCheckEndTime = Date.now() - logger.info(`📁 文件存在性检查耗时: ${fileCheckEndTime - fileCheckStartTime}ms`, { - FFmpeg路径: ffmpegPath, - 文件存在性: fileExists - }) + // 解析 FFmpeg 输出中的视频信息 + const info = this.parseFFmpegVideoInfo(result) - if (!fileExists) { - logger.error(`❌ 文件不存在: ${localInputPath}`) + const report = pm.finish() + if (info) { + logger.info(`✅ 使用 FFmpeg fallback 成功获取视频信息`, { info, report }) + return info + } else { + logger.error('❌ 无法解析视频信息') + return null + } + } catch (error) { + const report = pm.finish() + logger.error(`❌ 获取视频信息失败`, { + inputPath, + report, + error: error instanceof Error ? error.message : String(error) + }) return null } + } - // 使用 FFmpeg 获取视频信息，仅指定输入文件即可 - const args = ['-i', localInputPath] + /** + * 直接执行 FFmpeg + */ + private async executeFFmpegDirect(args: string[], timeout: number): Promise { + return new Promise((resolve, reject) => { + const ffmpegPath = this.getFFmpegPath() + const ffmpeg = spawn(ffmpegPath, args) - logger.info('🚀 启动 FFmpeg 命令获取视频信息', { - command: ffmpegPath, - args: args, - fullCommand: `"${ffmpegPath}" ${args.map((arg) => `"${arg}"`).join(' ')}` - }) + let output = '' + let hasTimedOut = false - return new Promise((resolve) => { - const ffmpegStartTime = Date.now() - const ffmpeg = spawn(ffmpegPath, args) + const timeoutHandle = setTimeout(() => { + hasTimedOut = true + if (ffmpeg && !ffmpeg.killed) { + ffmpeg.kill('SIGKILL') + } + reject(new Error(`FFmpeg direct execution timeout after ${timeout}ms`)) + }, timeout) - let errorOutput = '' + ffmpeg.stderr?.on('data', (data) => { + output += data.toString() + }) - // FFmpeg 输出视频信息到 stderr - ffmpeg.stderr.on('data', (data) => { - errorOutput += data.toString() + ffmpeg.stdout?.on('data', (data) => { + output += data.toString() }) ffmpeg.on('close', (code) => { - const ffmpegEndTime = Date.now() - const ffmpegDuration = ffmpegEndTime - ffmpegStartTime - - logger.info('📊 FFmpeg 执行结果', { - exitCode: code, - hasErrorOutput: errorOutput.length > 0, - errorOutputLength: errorOutput.length, - ffmpeg执行耗时: `${ffmpegDuration}ms` - }) + clearTimeout(timeoutHandle) - // FFmpeg 返回 1 是正常的（因为没有输出文件），视频信息在 stderr 中 - if (code === 1) { - // code 1 是正常的（因为没有指定输出文件） - try { - const parseStartTime = Date.now() - // 解析 FFmpeg 输出中的视频信息 - const info = this.parseFFmpegVideoInfo(errorOutput) - const parseEndTime = Date.now() - - logger.info(`🔍 视频信息解析耗时: ${parseEndTime - parseStartTime}ms`) - - if (info) { - const totalTime = Date.now() - startTime - logger.info(`✅ 成功获取视频信息，总耗时: ${totalTime}ms`, { - ...info, - 性能统计: { - 路径转换: `${pathConvertEndTime - pathConvertStartTime}ms`, - 文件检查: `${fileCheckEndTime - fileCheckStartTime}ms`, - FFmpeg执行: `${ffmpegDuration}ms`, - 信息解析: `${parseEndTime - parseStartTime}ms`, - 总耗时: `${totalTime}ms` - } - }) - resolve(info) - } else { - logger.error('❌ 无法解析视频信息') - resolve(null) - } - } catch (error) { - logger.error( - `❌ 解析视频信息失败: ${error instanceof Error ? error.message : String(error)}` - ) - resolve(null) - } + if (hasTimedOut) { + return + } + + if (code === 0 || code === 1) { + // code 1 也可能是正常的 + resolve(output) } else { - logger.error( - `❌ FFmpeg 执行失败: 退出代码 ${code}, 错误输出: ${errorOutput.substring(0, 500)}, 命令: "${ffmpegPath}" ${args.map((arg) => `"${arg}"`).join(' ')}` - ) - resolve(null) + reject(new Error(`FFmpeg failed with exit code ${code}: ${output.substring(0, 500)}`)) } }) ffmpeg.on('error', (error) => { - logger.error( - `❌ FFmpeg 进程启动失败: ${error.message}, FFmpeg路径: ${ffmpegPath}, 参数: ${args.join(' ')}` - ) - resolve(null) + clearTimeout(timeoutHandle) + if (!hasTimedOut) { + reject(error) + } }) }) } - // 转码视频 - public async transcodeVideo( - inputPath: string, - outputPath: string, - options: TranscodeOptions = {}, - onProgress?: (progress: TranscodeProgress) => void - ): Promise { - const ffmpegPath = this.getFFmpegPath() - - // 转换file://URL为本地路径 - const localInputPath = this.convertFileUrlToLocalPath(inputPath) - const localOutputPath = this.convertFileUrlToLocalPath(outputPath) - - // 确保输出目录存在 - const outputDir = path.dirname(localOutputPath) - try { - await fs.promises.mkdir(outputDir, { recursive: true }) - logger.info('输出目录已创建', { outputDir }) - } catch (error) { - logger.error('创建输出目录失败:', error instanceof Error ? error : new Error(String(error))) - throw new Error(`无法创建输出目录: ${outputDir}`) - } - - const { - videoCodec = 'libx264', - audioCodec = 'aac', - videoBitrate, - audioBitrate = '128k', - crf = 23, - preset = 'fast' - } = options - - // 构建 FFmpeg 命令 - const args = ['-i', localInputPath, '-y'] // -y 覆盖输出文件 - - // 视频编码参数 - if (videoCodec === 'copy') { - args.push('-c:v', 'copy') - } else { - args.push('-c:v', videoCodec) - if (videoCodec === 'libx264' || videoCodec === 'libx265') { - args.push('-crf', crf.toString()) - args.push('-preset', preset) - } - if (videoBitrate) { - args.push('-b:v', videoBitrate) - } + /** + * FFmpeg 预热 + * 在应用启动时执行简单命令来预加载 FFmpeg 并初始化编解码器 + */ + public async warmupFFmpeg(): Promise { + // 如果已经预热过了，直接返回 + if (FFmpegService.isWarmedUp) { + logger.info('🔥 FFmpeg 已预热，跳过') + return true } - // 音频编码参数 - if (audioCodec === 'copy') { - args.push('-c:a', 'copy') - } else { - args.push('-c:a', audioCodec) - args.push('-b:a', audioBitrate) + // 如果正在预热中，等待结果 + if (FFmpegService.warmupPromise) { + logger.info('🔥 FFmpeg 正在预热中，等待结果...') + return await FFmpegService.warmupPromise } - // 进度报告 - args.push('-progress', 'pipe:1') - args.push(localOutputPath) - - // 获取视频信息用于计算进度 - const videoInfo = await this.getVideoInfo(inputPath) - const duration = videoInfo?.duration || 0 - - return new Promise((resolve, reject) => { - logger.info('开始转码...', { - 原始输入路径: inputPath, - 本地输入路径: localInputPath, - 原始输出路径: outputPath, - 本地输出路径: localOutputPath, - 命令参数: args - }) - - const ffmpeg = spawn(ffmpegPath, args) - this.currentTranscodeProcess = ffmpeg // 保存当前转码进程引用 - this.isTranscodeCancelled = false // 重置取消标志 - let hasError = false - - ffmpeg.stdout.on('data', (data) => { - const lines = data.toString().split('\n') - for (const line of lines) { - if (line.includes('progress=')) { - const progress = this.parseFFmpegProgress(line, duration) - if (progress && onProgress) { - onProgress(progress as TranscodeProgress) - } - } - } - }) + // 开始预热 + FFmpegService.warmupPromise = this._performWarmup() - ffmpeg.stderr.on('data', (data) => { - const line = data.toString() - logger.debug('FFmpeg stderr:', line) + try { + const result = await FFmpegService.warmupPromise + FFmpegService.isWarmedUp = result + return result + } catch (error) { + logger.error('FFmpeg 预热失败:', { error }) + return false + } finally { + FFmpegService.warmupPromise = null + } + } - // 解析进度信息（有些信息在 stderr 中） - const progress = this.parseFFmpegProgress(line, duration) - if (progress && onProgress) { - onProgress(progress as TranscodeProgress) - } - }) + /** + * 执行实际的预热操作 + */ + private async _performWarmup(): Promise { + const startTime = Date.now() + logger.info('🔥 开始 FFmpeg 预热...') - ffmpeg.on('close', (code) => { - this.currentTranscodeProcess = null // 清除进程引用 + try { + // 首先检查 FFmpeg 是否可用 + const isAvailable = await this.checkFFmpegExists(false) // 不使用缓存 + if (!isAvailable) { + logger.error('🔥 FFmpeg 预热失败: FFmpeg 不可用') + return false + } - // 清理强制终止超时 - if (this.forceKillTimeout) { - clearTimeout(this.forceKillTimeout) - this.forceKillTimeout = null - } + // 执行简单的版本查询命令来预热 FFmpeg + // 这会加载所有必要的动态库和初始化编解码器 + const args = ['-version'] + const output = await this.executeFFmpegDirect(args, 10000) - if (code === 0 && !hasError) { - logger.info('转码完成') - resolve(true) - } else if (this.isTranscodeCancelled && (code === 255 || code === 130 || code === 143)) { - // 用户主动取消转码，退出代码255(SIGTERM)、130(SIGINT)、143(SIGTERM)都是正常的 - logger.info('转码已被用户取消', { exitCode: code }) - this.isTranscodeCancelled = false // 重置标志 - reject(new Error('转码已被用户取消')) - } else { - const errorMessage = `转码失败，退出代码: ${code}` - logger.error(errorMessage) - reject(new Error(errorMessage)) - } + const duration = Date.now() - startTime + logger.info(`🔥 FFmpeg 预热成功，耗时: ${duration}ms`, { + duration: `${duration}ms`, + outputPreview: output.substring(0, 200) + '...' }) - ffmpeg.on('error', (error) => { - hasError = true - this.currentTranscodeProcess = null // 清除进程引用 - - // 清理强制终止超时 - if (this.forceKillTimeout) { - clearTimeout(this.forceKillTimeout) - this.forceKillTimeout = null - } - - logger.error('FFmpeg 进程错误:', error) - reject(error) + return true + } catch (error) { + const duration = Date.now() - startTime + logger.error(`🔥 FFmpeg 预热失败，耗时: ${duration}ms`, { + duration: `${duration}ms`, + error: error instanceof Error ? error.message : String(error) }) - }) + return false + } } - // 取消当前转码进程 - public cancelTranscode(): boolean { - if (this.currentTranscodeProcess && !this.currentTranscodeProcess.killed) { - logger.info('正在取消转码进程...', { pid: this.currentTranscodeProcess.pid }) + /** + * 重置预热状态（用于测试或手动重置） + */ + public static resetWarmupState(): void { + FFmpegService.isWarmedUp = false + FFmpegService.warmupPromise = null + logger.info('🔥 FFmpeg 预热状态已重置') + } - try { - // 设置取消标志 - this.isTranscodeCancelled = true + /** + * 检查预热状态 + */ + public static getWarmupStatus(): { isWarmedUp: boolean; isWarming: boolean } { + return { + isWarmedUp: FFmpegService.isWarmedUp, + isWarming: FFmpegService.warmupPromise !== null + } + } - // 清理之前的强制终止超时（如果存在） - if (this.forceKillTimeout) { - clearTimeout(this.forceKillTimeout) - this.forceKillTimeout = null - } + /** + * 销毁服务，清理资源 + */ + public async destroy(): Promise { + logger.info('销毁 FFmpeg 服务') - // 尝试优雅地终止进程 - this.currentTranscodeProcess.kill('SIGTERM') + // 清理超时句柄 + if (this.forceKillTimeout) { + clearTimeout(this.forceKillTimeout) + this.forceKillTimeout = null + } - // 如果优雅终止失败，强制终止 - this.forceKillTimeout = setTimeout(() => { - if (this.currentTranscodeProcess && !this.currentTranscodeProcess.killed) { - logger.warn('优雅终止失败，强制终止转码进程', { pid: this.currentTranscodeProcess.pid }) - this.currentTranscodeProcess.kill('SIGKILL') - } - this.forceKillTimeout = null - }, 5000) // 5秒后强制终止 + // 重置预热状态 + FFmpegService.resetWarmupState() - logger.info('转码取消信号已发送') - return true - } catch (error) { - logger.error('取消转码进程失败:', error instanceof Error ? error : new Error(String(error))) - this.isTranscodeCancelled = false // 重置标志 - return false - } - } else { - logger.warn('没有正在运行的转码进程需要取消') - return false - } + logger.info('FFmpeg 服务已销毁') } } diff --git a/src/main/services/MediaParserService.ts b/src/main/services/MediaParserService.ts index a812f63c..6fbf8582 100644 --- a/src/main/services/MediaParserService.ts +++ b/src/main/services/MediaParserService.ts @@ -1,5 +1,6 @@ import { parseMedia } from '@remotion/media-parser' import { nodeReader } from '@remotion/media-parser/node' +import { PathConverter } from '@shared/utils/PathConverter' import type { FFmpegVideoInfo } from '@types' import * as fs from 'fs' @@ -121,6 +122,118 @@ class MediaParserService { } } + /** + * 策略化获取视频信息，支持自定义解析策略和超时 + */ + public async getVideoInfoWithStrategy( + inputPath: string, + strategy: + | 'remotion-first' + | 'ffmpeg-first' + | 'remotion-only' + | 'ffmpeg-only' = 'remotion-first', + timeoutMs: number = 10000 + ): Promise { + const startTime = Date.now() + logger.info('🎬 开始策略化获取视频信息', { + inputPath, + strategy, + timeout: `${timeoutMs}ms` + }) + + try { + // 使用优化的路径转换 + const pathResult = PathConverter.convertToLocalPath(inputPath) + + if (!pathResult.isValid) { + logger.error(`❌ 路径转换失败: ${pathResult.error}`) + return null + } + + // 快速检查文件存在性 + if (!fs.existsSync(pathResult.localPath)) { + logger.error(`❌ 文件不存在: ${pathResult.localPath}`) + return null + } + + const fileSize = fs.statSync(pathResult.localPath).size + logger.info(`📊 文件大小: ${Math.round((fileSize / 1024 / 1024) * 100) / 100}MB`) + + // 根据策略选择解析器 + const parsers = this.getParsersFromStrategy(strategy) + + for (const parser of parsers) { + const parseStartTime = Date.now() + try { + let result: FFmpegVideoInfo | null = null + + if (parser === 'remotion') { + result = await Promise.race([ + this.parseWithRemotion(pathResult.localPath), + this.createTimeoutPromise(timeoutMs, 'Remotion') + ]) + } else { + result = await Promise.race([ + this.ffmpegService.getVideoInfo(inputPath), + this.createTimeoutPromise(timeoutMs, 'FFmpeg') + ]) + } + + if (result) { + const totalTime = Date.now() - startTime + const parseTime = Date.now() - parseStartTime + logger.info( + `✅ 成功获取视频信息 (${parser})，解析耗时: ${parseTime}ms，总耗时: ${totalTime}ms`, + { + ...result, + parser, + strategy + } + ) + return result + } + } catch (error) { + const parseTime = Date.now() - parseStartTime + const errorMsg = error instanceof Error ? error.message : String(error) + + if (errorMsg.includes('timeout')) { + logger.warn(`⏰ ${parser} 解析超时 (${parseTime}ms)，尝试下一个解析器`, { + parser, + timeout: timeoutMs + }) + } else { + logger.warn(`⚠️ ${parser} 解析失败 (${parseTime}ms)，尝试下一个解析器`, { + parser, + error: errorMsg + }) + } + + // 如果是 only 模式，直接失败 + if (strategy.endsWith('-only')) { + throw error + } + } + } + + // 所有解析器都失败 + const totalTime = Date.now() - startTime + logger.error(`❌ 所有解析器都失败，总耗时: ${totalTime}ms`, { + inputPath, + strategy, + parsers + }) + return null + } catch (error) { + const totalTime = Date.now() - startTime + logger.error(`❌ 策略化获取视频信息失败，耗时: ${totalTime}ms`, { + inputPath, + strategy, + error: error instanceof Error ? error.message : String(error) + }) + return null + } + } + /** * 获取视频文件信息，优先使用 Remotion，失败时 fallback 到 FFmpeg */ @@ -286,6 +399,56 @@ class MediaParserService { } } + /** + * 根据策略获取解析器列表 + */ + private getParsersFromStrategy(strategy: string): ('remotion' | 'ffmpeg')[] { + switch (strategy) { + case 'remotion-first': + return ['remotion', 'ffmpeg'] + case 'ffmpeg-first': + return ['ffmpeg', 'remotion'] + case 'remotion-only': + return ['remotion'] + case 'ffmpeg-only': + return ['ffmpeg'] + default: + return ['remotion', 'ffmpeg'] + } + } + + /** + * 使用 Remotion 解析视频信息 + */ + private async parseWithRemotion(localInputPath: string): Promise { + const result = await parseMedia({ + src: localInputPath, + reader: nodeReader, + fields: { + durationInSeconds: true, + dimensions: true, + videoCodec: true, + audioCodec: true, + tracks: true, + container: true + }, + logLevel: 'error' // 减少日志输出 + }) + + return this.parseRemotionResult(result) + } + + /** + * 创建超时 Promise + */ + private createTimeoutPromise(timeoutMs: number, parserName: string): Promise { + return new Promise((_, reject) => { + setTimeout(() => { + reject(new Error(`${parserName} parsing timeout after ${timeoutMs}ms`)) + }, timeoutMs) + }) + } + /** * 清理资源 */ diff --git a/src/preload/index.ts b/src/preload/index.ts index 6316d9c0..d929be23 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -2,7 +2,7 @@ import { electronAPI } from '@electron-toolkit/preload' import { UpgradeChannel } from '@shared/config/constant' import { LogLevel, LogSourceWithContext } from '@shared/config/logger' import { IpcChannel } from '@shared/IpcChannel' -import { FFmpegVideoInfo, Shortcut, ThemeMode, TranscodeOptions } from '@types' +import { FFmpegVideoInfo, Shortcut, ThemeMode } from '@types' import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron' import type { FileMetadata, @@ -177,24 +177,33 @@ const api = { ffmpeg: { checkExists: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_CheckExists), getVersion: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_GetVersion), - download: (onProgress?: (progress: number) => void): Promise => - ipcRenderer.invoke(IpcChannel.Ffmpeg_Download, onProgress), getVideoInfo: (inputPath: string): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_GetVideoInfo, inputPath), - transcode: ( - inputPath: string, - outputPath: string, - options: TranscodeOptions - ): Promise => - ipcRenderer.invoke(IpcChannel.Ffmpeg_Transcode, inputPath, outputPath, options), - cancelTranscode: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_CancelTranscode), - getPath: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_GetPath) + getPath: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_GetPath), + warmup: (): Promise => ipcRenderer.invoke(IpcChannel.Ffmpeg_Warmup), + getWarmupStatus: (): Promise<{ isWarmedUp: boolean; isWarming: boolean }> => + ipcRenderer.invoke(IpcChannel.Ffmpeg_GetWarmupStatus) }, mediainfo: { checkExists: (): Promise => ipcRenderer.invoke(IpcChannel.MediaInfo_CheckExists), getVersion: (): Promise => ipcRenderer.invoke(IpcChannel.MediaInfo_GetVersion), getVideoInfo: (inputPath: string): Promise => - ipcRenderer.invoke(IpcChannel.MediaInfo_GetVideoInfo, inputPath) + ipcRenderer.invoke(IpcChannel.MediaInfo_GetVideoInfo, inputPath), + getVideoInfoWithStrategy: ( + inputPath: string, + strategy: + | 'remotion-first' + | 'ffmpeg-first' + | 'remotion-only' + | 'ffmpeg-only' = 'remotion-first', + timeoutMs: number = 10000 + ): Promise => + ipcRenderer.invoke( + IpcChannel.MediaInfo_GetVideoInfoWithStrategy, + inputPath, + strategy, + timeoutMs + ) }, fs: { checkFileExists: (filePath: string): Promise => diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 236ab62f..02a33922 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -76,8 +76,11 @@ const AppContent: React.FC = () => { } logger.info('🚀 开始应用初始化', { showStartupIntro }) + + // 无论是否显示启动界面，都进行数据预加载 + // 这样可以与 FFmpeg 预热并行进行，提升整体启动效率 preloadHomePageData().then(() => { - logger.info('✅ 主应用条件满足（跳过启动界面）') + logger.info('✅ 数据预加载完成', { showStartupIntro }) }) setIsInitialized(true) diff --git a/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx b/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx index b0a01881..431ece9d 100644 --- a/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx +++ b/src/renderer/src/components/StartupIntro/StartupLoadingState.tsx @@ -1,6 +1,7 @@ import { loggerService } from '@logger' +import { ffmpegWarmupManager, WarmupState } from '@renderer/services/FFmpegWarmupManager' import { AudioWaveform } from 'lucide-react' -import React, { useEffect } from 'react' +import React, { useCallback, useEffect, useState } from 'react' import styled, { keyframes } from 'styled-components' const logger = loggerService.withContext('StartupLoadingState') @@ -14,6 +15,45 @@ export const StartupLoadingState: React.FC = ({ visible, onComplete }) => { + const [warmupState, setWarmupState] = useState({ + isWarming: false, + isComplete: false, + hasError: false + }) + const [minDisplayTimeElapsed, setMinDisplayTimeElapsed] = useState(false) + + // 预热状态变化回调 + const handleWarmupStateChange = useCallback((state: WarmupState) => { + setWarmupState(state) + logger.info('🔥 预热状态变化', state) + }, []) + + // 检查是否可以完成启动 + const checkCanComplete = useCallback(() => { + const canComplete = minDisplayTimeElapsed && warmupState.isComplete + + if (canComplete) { + logger.info('✅ 启动条件满足，执行完成回调', { + minDisplayTimeElapsed, + warmupComplete: warmupState.isComplete, + warmupError: warmupState.hasError, + warmupDuration: warmupState.duration + }) + onComplete?.() + } else { + logger.info('⏳ 启动条件未满足，继续等待', { + minDisplayTimeElapsed, + warmupComplete: warmupState.isComplete + }) + } + }, [ + minDisplayTimeElapsed, + warmupState.isComplete, + warmupState.hasError, + warmupState.duration, + onComplete + ]) + useEffect(() => { logger.info('🎦 StartupLoadingState useEffect 执行', { visible @@ -25,24 +65,40 @@ export const StartupLoadingState: React.FC = ({ // 检查是否开启了减少动效偏好 const reduced = window.matchMedia && window.matchMedia('(prefers-reduced-motion: reduce)').matches - const delay = reduced ? 100 : 1800 // 稍长一些的展示时间 + const minDisplayTime = reduced ? 100 : 1800 // 最小展示时间 + + logger.info(`⏱️ 最小展示时间: ${minDisplayTime}ms`, { reduced }) - logger.info(`⏱️ StartupLoadingState 将在 ${delay}ms 后自动完成`, { reduced }) + // 开始预热 FFmpeg + ffmpegWarmupManager.startWarmup().catch((error) => { + logger.error('启动预热失败:', { error }) + }) - // 自动完成 - const timer = setTimeout(() => { - logger.info('✅ StartupLoadingState 定时器触发，执行完成回调') - onComplete?.() - }, delay) + // 订阅预热状态变化 + const unsubscribe = ffmpegWarmupManager.subscribe(handleWarmupStateChange) + + // 最小展示时间计时器 + const minDisplayTimer = setTimeout(() => { + logger.info('⏰ 最小展示时间已到') + setMinDisplayTimeElapsed(true) + }, minDisplayTime) return () => { - logger.info('🧹 StartupLoadingState useEffect 清理定时器') - clearTimeout(timer) + logger.info('🧹 StartupLoadingState useEffect 清理') + clearTimeout(minDisplayTimer) + unsubscribe() } } return undefined - }, [visible, onComplete]) + }, [visible, handleWarmupStateChange]) + + // 当条件满足时检查是否可以完成 + useEffect(() => { + if (visible) { + checkCanComplete() + } + }, [visible, checkCanComplete]) if (!visible) { return null diff --git a/src/renderer/src/hooks/useVideoFileSelect.ts b/src/renderer/src/hooks/useVideoFileSelect.ts index fd6a2416..4002170c 100644 --- a/src/renderer/src/hooks/useVideoFileSelect.ts +++ b/src/renderer/src/hooks/useVideoFileSelect.ts @@ -1,6 +1,7 @@ import { loggerService } from '@logger' import FileManager from '@renderer/services/FileManager' import { VideoLibraryService } from '@renderer/services/VideoLibrary' +import { ParallelVideoProcessor } from '@renderer/utils/ParallelVideoProcessor' import { createPerformanceMonitor } from '@renderer/utils/PerformanceMonitor' import { videoExts } from '@shared/config/constant' import { message } from 'antd' @@ -44,48 +45,67 @@ export function useVideoFileSelect( async (file: FileMetadata) => { try { // 创建性能监控器 - const monitor = createPerformanceMonitor('视频添加流程') + const monitor = createPerformanceMonitor('视频添加流程（优化版）') logger.info('📄 选中的文件信息:', { - file: file + file: file, + fileSize: `${Math.round(file.size / 1024 / 1024)}MB` }) try { - // 1. 检查 MediaInfo 是否可用（优先使用），回退到 FFmpeg - monitor.startTiming('视频解析器检查') - const mediaInfoExists = await window.api.mediainfo.checkExists() - const ffmpegExists = !mediaInfoExists ? await window.api.ffmpeg.checkExists() : false - monitor.endTiming('视频解析器检查') - - if (!mediaInfoExists && !ffmpegExists) { - throw new Error('视频解析器不可用。MediaInfo 和 FFmpeg 都无法使用，请检查系统配置。') + // 1. 并行准备处理（文件验证、解析器检查、格式分析） + monitor.startTiming('并行准备阶段') + const context = await ParallelVideoProcessor.prepareProcessing(file) + monitor.endTiming('并行准备阶段') + + // 验证处理上下文 + const validationErrors = ParallelVideoProcessor.validateContext(context) + if (validationErrors.length > 0) { + throw new Error(`处理准备失败: ${validationErrors.join(', ')}`) } - const usingMediaInfo = mediaInfoExists - logger.info(`📊 使用视频解析器: ${usingMediaInfo ? 'MediaInfo' : 'FFmpeg'}`, { - mediaInfoAvailable: mediaInfoExists, - ffmpegAvailable: ffmpegExists + // 获取优化的解析策略 + const { useParser, allowFallback, timeoutMs } = + ParallelVideoProcessor.getOptimizedStrategy(context) + + logger.info('📊 使用优化策略:', { + useParser, + allowFallback, + timeoutMs: `${timeoutMs}ms`, + strategy: context.formatAnalysis.strategy, + confidence: context.formatAnalysis.confidence, + reasoning: context.formatAnalysis.reasoning }) - // 2. 将文件添加到文件数据库 - monitor.startTiming('文件数据库添加', { fileName: file.name, fileSize: file.size }) - const addedFile = await FileManager.addFile(file) - monitor.endTiming('文件数据库添加') + // 2. 并行执行文件添加和视频信息解析准备 + monitor.startTiming('文件数据库添加') + const addFilePromise = FileManager.addFile(file) - // 3. 解析视频文件信息，包括：分辨率、码率、时长等 - // 优先使用 MediaInfo (WebAssembly)，回退到 FFmpeg - monitor.startTiming('视频信息获取', { + // 3. 策略化解析视频文件信息 + monitor.startTiming('策略化视频信息获取', { filePath: file.path, - parser: usingMediaInfo ? 'MediaInfo' : 'FFmpeg' + strategy: context.formatAnalysis.strategy, + parser: useParser, + timeout: timeoutMs }) - const videoInfo = usingMediaInfo - ? await window.api.mediainfo.getVideoInfo(file.path) - : await window.api.ffmpeg.getVideoInfo(file.path) - monitor.endTiming('视频信息获取', { - parser: usingMediaInfo ? 'MediaInfo' : 'FFmpeg', + + const videoInfoPromise = window.api.mediainfo.getVideoInfoWithStrategy( + file.path, + context.formatAnalysis.strategy, + timeoutMs + ) + + // 等待并行操作完成 + const [addedFile, videoInfo] = await Promise.all([addFilePromise, videoInfoPromise]) + + monitor.endTiming('文件数据库添加') + monitor.endTiming('策略化视频信息获取', { + parser: useParser, + strategy: context.formatAnalysis.strategy, duration: videoInfo?.duration, videoCodec: videoInfo?.videoCodec, - resolution: videoInfo?.resolution + resolution: videoInfo?.resolution, + success: !!videoInfo }) if (!videoInfo) { @@ -114,7 +134,21 @@ export function useVideoFileSelect( const report = monitor.finish(50) // 50ms 作为性能瓶颈阈值 const totalTimeMs = Math.round(report.totalDuration) - logger.info(`视频文件添加成功！总耗时: ${totalTimeMs}ms`) + const preparationTime = monitor.getDuration('并行准备阶段') || 0 + const parseTime = monitor.getDuration('策略化视频信息获取') || 0 + + logger.info(`✅ 视频文件添加成功！总耗时: ${totalTimeMs}ms`, { + preparationTime: `${preparationTime.toFixed(2)}ms`, + parseTime: `${parseTime.toFixed(2)}ms`, + strategy: context.formatAnalysis.strategy, + actualParser: useParser, + estimatedTime: `${context.formatAnalysis.estimatedTime}ms`, + performanceGain: + context.formatAnalysis.estimatedTime > totalTimeMs + ? `节省 ${Math.round(((context.formatAnalysis.estimatedTime - totalTimeMs) / context.formatAnalysis.estimatedTime) * 100)}%` + : '符合预期' + }) + // 调用成功回调 onSuccess?.() } catch (error) { diff --git a/src/renderer/src/services/FFmpegWarmupManager.ts b/src/renderer/src/services/FFmpegWarmupManager.ts new file mode 100644 index 00000000..89fb3b1e --- /dev/null +++ b/src/renderer/src/services/FFmpegWarmupManager.ts @@ -0,0 +1,218 @@ +import { loggerService } from '@logger' + +const logger = loggerService.withContext('FFmpegWarmupManager') + +export interface WarmupState { + isWarming: boolean + isComplete: boolean + hasError: boolean + errorMessage?: string + duration?: number +} + +export type WarmupCallback = (state: WarmupState) => void + +/** + * FFmpeg 预热管理器 + * 负责管理 FFmpeg 预热过程，提供状态回调和错误处理 + */ +class FFmpegWarmupManager { + private static instance: FFmpegWarmupManager | null = null + private callbacks: Set = new Set() + private currentState: WarmupState = { + isWarming: false, + isComplete: false, + hasError: false + } + + private warmupPromise: Promise | null = null + + // 单例模式 + public static getInstance(): FFmpegWarmupManager { + if (!FFmpegWarmupManager.instance) { + FFmpegWarmupManager.instance = new FFmpegWarmupManager() + } + return FFmpegWarmupManager.instance + } + + /** + * 订阅预热状态变化 + */ + public subscribe(callback: WarmupCallback): () => void { + this.callbacks.add(callback) + + // 立即发送当前状态 + callback({ ...this.currentState }) + + // 返回取消订阅函数 + return () => { + this.callbacks.delete(callback) + } + } + + /** + * 更新状态并通知所有订阅者 + */ + private updateState(newState: Partial): void { + this.currentState = { ...this.currentState, ...newState } + logger.info('🔥 预热状态更新', this.currentState) + + // 通知所有订阅者 + this.callbacks.forEach((callback) => { + try { + callback({ ...this.currentState }) + } catch (error) { + logger.error('预热状态回调执行失败:', { error }) + } + }) + } + + /** + * 获取当前预热状态 + */ + public getCurrentState(): WarmupState { + return { ...this.currentState } + } + + /** + * 开始预热 FFmpeg + * 如果已经在预热中或已完成，会复用现有的 Promise + */ + public async startWarmup(): Promise { + // 如果已经完成，直接返回成功 + if (this.currentState.isComplete && !this.currentState.hasError) { + logger.info('🔥 FFmpeg 已预热完成，跳过') + return true + } + + // 如果正在预热中，返回现有的 Promise + if (this.warmupPromise) { + logger.info('🔥 FFmpeg 预热已在进行中，等待结果...') + return await this.warmupPromise + } + + // 开始新的预热过程 + this.warmupPromise = this.performWarmup() + + try { + const result = await this.warmupPromise + return result + } finally { + this.warmupPromise = null + } + } + + /** + * 执行实际的预热操作 + */ + private async performWarmup(): Promise { + const startTime = Date.now() + + try { + this.updateState({ + isWarming: true, + isComplete: false, + hasError: false, + errorMessage: undefined + }) + + logger.info('🔥 开始 FFmpeg 预热...') + + // 调用主进程的预热接口 + const success = await window.api.ffmpeg.warmup() + const duration = Date.now() - startTime + + if (success) { + this.updateState({ + isWarming: false, + isComplete: true, + hasError: false, + duration + }) + logger.info(`🔥 FFmpeg 预热成功，耗时: ${duration}ms`) + return true + } else { + this.updateState({ + isWarming: false, + isComplete: true, + hasError: true, + errorMessage: 'FFmpeg 预热失败', + duration + }) + logger.warn(`🔥 FFmpeg 预热失败，耗时: ${duration}ms`) + return false + } + } catch (error) { + const duration = Date.now() - startTime + const errorMessage = error instanceof Error ? error.message : String(error) + + this.updateState({ + isWarming: false, + isComplete: true, + hasError: true, + errorMessage, + duration + }) + + logger.error(`🔥 FFmpeg 预热异常，耗时: ${duration}ms`, { error }) + return false + } + } + + /** + * 检查远程预热状态 + * 用于同步主进程的预热状态 + */ + public async checkRemoteStatus(): Promise { + try { + const remoteStatus = await window.api.ffmpeg.getWarmupStatus() + + // 如果远程已经预热完成，更新本地状态 + if (remoteStatus.isWarmedUp && !this.currentState.isComplete) { + this.updateState({ + isWarming: false, + isComplete: true, + hasError: false + }) + logger.info('🔥 检测到远程 FFmpeg 已预热完成') + } else if (remoteStatus.isWarming && !this.currentState.isWarming) { + this.updateState({ + isWarming: true, + isComplete: false, + hasError: false + }) + logger.info('🔥 检测到远程 FFmpeg 正在预热中') + } + } catch (error) { + logger.error('检查远程预热状态失败:', { error }) + } + } + + /** + * 重置预热状态 + * 用于测试或手动重置 + */ + public reset(): void { + this.currentState = { + isWarming: false, + isComplete: false, + hasError: false + } + this.warmupPromise = null + logger.info('🔥 预热管理器状态已重置') + } + + /** + * 清理资源 + */ + public dispose(): void { + this.callbacks.clear() + this.warmupPromise = null + logger.info('🔥 预热管理器已清理') + } +} + +// 导出类和单例实例 +export { FFmpegWarmupManager } +export const ffmpegWarmupManager = FFmpegWarmupManager.getInstance() +export default ffmpegWarmupManager diff --git a/src/renderer/src/services/__tests__/FFmpegWarmupManager.test.ts b/src/renderer/src/services/__tests__/FFmpegWarmupManager.test.ts new file mode 100644 index 00000000..c31ddae1 --- /dev/null +++ b/src/renderer/src/services/__tests__/FFmpegWarmupManager.test.ts @@ -0,0 +1,167 @@ +import { beforeEach, describe, expect, it, vi } from 'vitest' + +import { FFmpegWarmupManager, ffmpegWarmupManager } from '../FFmpegWarmupManager' + +// Mock window.api +const mockApi = { + ffmpeg: { + warmup: vi.fn(), + getWarmupStatus: vi.fn() + } +} + +Object.defineProperty(window, 'api', { + value: mockApi, + writable: true +}) + +describe('FFmpegWarmupManager', () => { + beforeEach(() => { + // 重置模拟函数 + vi.clearAllMocks() + + // 重置管理器状态 + ffmpegWarmupManager.reset() + }) + + it('should be a singleton', () => { + const instance1 = FFmpegWarmupManager.getInstance() + const instance2 = FFmpegWarmupManager.getInstance() + expect(instance1).toBe(instance2) + expect(instance1).toBe(ffmpegWarmupManager) + }) + + it('should start with correct initial state', () => { + const state = ffmpegWarmupManager.getCurrentState() + expect(state.isWarming).toBe(false) + expect(state.isComplete).toBe(false) + expect(state.hasError).toBe(false) + }) + + it('should notify subscribers of state changes', () => { + const callback = vi.fn() + + // 订阅状态变化 + const unsubscribe = ffmpegWarmupManager.subscribe(callback) + + // 应该立即收到当前状态 + expect(callback).toHaveBeenCalledTimes(1) + expect(callback).toHaveBeenCalledWith({ + isWarming: false, + isComplete: false, + hasError: false + }) + + // 清理订阅 + unsubscribe() + }) + + it('should handle successful warmup', async () => { + mockApi.ffmpeg.warmup.mockResolvedValue(true) + const callback = vi.fn() + + ffmpegWarmupManager.subscribe(callback) + + const result = await ffmpegWarmupManager.startWarmup() + + expect(result).toBe(true) + expect(mockApi.ffmpeg.warmup).toHaveBeenCalledTimes(1) + + // 验证状态变化序列 + expect(callback).toHaveBeenCalledWith( + expect.objectContaining({ isWarming: false, isComplete: false }) + ) + expect(callback).toHaveBeenCalledWith( + expect.objectContaining({ isWarming: true, isComplete: false }) + ) + expect(callback).toHaveBeenCalledWith( + expect.objectContaining({ + isWarming: false, + isComplete: true, + hasError: false, + duration: expect.any(Number) + }) + ) + }) + + it('should handle failed warmup', async () => { + mockApi.ffmpeg.warmup.mockResolvedValue(false) + const callback = vi.fn() + + ffmpegWarmupManager.subscribe(callback) + + const result = await ffmpegWarmupManager.startWarmup() + + expect(result).toBe(false) + expect(mockApi.ffmpeg.warmup).toHaveBeenCalledTimes(1) + + // 验证最终状态 + const finalState = ffmpegWarmupManager.getCurrentState() + expect(finalState.isComplete).toBe(true) + expect(finalState.hasError).toBe(true) + expect(finalState.errorMessage).toBe('FFmpeg 预热失败') + }) + + it('should handle warmup exception', async () => { + const error = new Error('Network error') + mockApi.ffmpeg.warmup.mockRejectedValue(error) + + const result = await ffmpegWarmupManager.startWarmup() + + expect(result).toBe(false) + + const finalState = ffmpegWarmupManager.getCurrentState() + expect(finalState.hasError).toBe(true) + expect(finalState.errorMessage).toBe('Network error') + }) + + it('should reuse existing warmup promise', async () => { + mockApi.ffmpeg.warmup.mockImplementation( + () => new Promise((resolve) => setTimeout(() => resolve(true), 100)) + ) + + // 同时开始多个预热 + const promises = [ + ffmpegWarmupManager.startWarmup(), + ffmpegWarmupManager.startWarmup(), + ffmpegWarmupManager.startWarmup() + ] + + const results = await Promise.all(promises) + + // 应该只调用一次 API + expect(mockApi.ffmpeg.warmup).toHaveBeenCalledTimes(1) + // 所有 Promise 都应该返回成功 + expect(results).toEqual([true, true, true]) + }) + + it('should return immediately if already completed successfully', async () => { + // 先完成一次预热 + mockApi.ffmpeg.warmup.mockResolvedValue(true) + await ffmpegWarmupManager.startWarmup() + + // 再次调用应该立即返回，不再调用 API + const result = await ffmpegWarmupManager.startWarmup() + + expect(result).toBe(true) + expect(mockApi.ffmpeg.warmup).toHaveBeenCalledTimes(1) // 只调用一次 + }) + + it('should check remote status correctly', async () => { + mockApi.ffmpeg.getWarmupStatus.mockResolvedValue({ + isWarmedUp: true, + isWarming: false + }) + + const callback = vi.fn() + ffmpegWarmupManager.subscribe(callback) + + await ffmpegWarmupManager.checkRemoteStatus() + + expect(mockApi.ffmpeg.getWarmupStatus).toHaveBeenCalledTimes(1) + + const finalState = ffmpegWarmupManager.getCurrentState() + expect(finalState.isComplete).toBe(true) + expect(finalState.hasError).toBe(false) + }) +}) diff --git a/src/renderer/src/services/index.ts b/src/renderer/src/services/index.ts index fada4526..cf5c3553 100644 --- a/src/renderer/src/services/index.ts +++ b/src/renderer/src/services/index.ts @@ -1,4 +1,5 @@ export * from './AppLifecycleService' export * from './ConfigSyncService' +export * from './FFmpegWarmupManager' export * from './FileManager' export * from './VideoLibrary' diff --git a/src/renderer/src/utils/MediaFormatStrategy.ts b/src/renderer/src/utils/MediaFormatStrategy.ts new file mode 100644 index 00000000..18038541 --- /dev/null +++ b/src/renderer/src/utils/MediaFormatStrategy.ts @@ -0,0 +1,189 @@ +/** + * 媒体格式解析策略工具 + * 根据文件特征智能选择最优的解析器 + */ + +import type { FileMetadata } from '@shared/types/database' + +export type ParserType = 'remotion' | 'ffmpeg' +export type ParserStrategy = 'remotion-first' | 'ffmpeg-first' | 'remotion-only' | 'ffmpeg-only' + +export interface FormatAnalysis { + strategy: ParserStrategy + confidence: number + reasoning: string + estimatedTime: number // 预估解析时间（毫秒） +} + +/** + * 媒体格式策略分析器 + */ +export class MediaFormatStrategy { + // 高兼容性格式（Remotion 表现好） + private static readonly HIGH_COMPATIBILITY_FORMATS = new Set(['.mp4', '.mov', '.m4v', '.webm']) + + // 复杂格式（可能需要 FFmpeg） + private static readonly COMPLEX_FORMATS = new Set([ + '.avi', + '.mkv', + '.wmv', + '.flv', + '.f4v', + '.vob', + '.ogv', + '.3gp', + '.3g2', + '.asf', + '.rm', + '.rmvb' + ]) + + // 大文件阈值 + private static readonly LARGE_FILE_THRESHOLD = 1024 * 1024 * 1024 // 1GB + private static readonly MEDIUM_FILE_THRESHOLD = 500 * 1024 * 1024 // 500MB + + // 预估解析时间（毫秒） + private static readonly TIME_ESTIMATES = { + remotion: { + small: 200, // < 500MB + medium: 800, // 500MB - 1GB + large: 2000 // > 1GB + }, + ffmpeg: { + small: 1000, // < 500MB + medium: 3000, // 500MB - 1GB + large: 8000 // > 1GB + } + } + + /** + * 分析文件并推荐解析策略 + */ + static analyzeFile(file: FileMetadata): FormatAnalysis { + const ext = file.ext.toLowerCase() + const fileSize = file.size + + // 获取文件大小级别 + const sizeCategory = this.getSizeCategory(fileSize) + + // 基于格式的初始策略 + let strategy: ParserStrategy = 'remotion-first' + let confidence = 0.7 + let reasoning = '' + + if (this.HIGH_COMPATIBILITY_FORMATS.has(ext)) { + // 高兼容性格式，优先使用 Remotion + strategy = 'remotion-first' + confidence = 0.9 + reasoning = `${ext} 格式通常与 Remotion 兼容性好` + + // 但如果是超大文件，考虑直接用 FFmpeg + if (sizeCategory === 'large') { + strategy = 'ffmpeg-first' + confidence = 0.8 + reasoning = `${ext} 格式但文件过大 (${this.formatFileSize(fileSize)})，FFmpeg 处理大文件更稳定` + } + } else if (this.COMPLEX_FORMATS.has(ext)) { + // 复杂格式，优先使用 FFmpeg + strategy = 'ffmpeg-first' + confidence = 0.85 + reasoning = `${ext} 格式较复杂，FFmpeg 兼容性更好` + } else { + // 未知格式，使用默认策略 + strategy = 'remotion-first' + confidence = 0.6 + reasoning = `${ext} 格式未知，尝试 Remotion 优先策略` + } + + // 计算预估时间 + const estimatedTime = this.estimateParsingTime(strategy, sizeCategory) + + return { + strategy, + confidence, + reasoning, + estimatedTime + } + } + + /** + * 获取文件大小类别 + */ + private static getSizeCategory(fileSize: number): 'small' | 'medium' | 'large' { + if (fileSize < this.MEDIUM_FILE_THRESHOLD) { + return 'small' + } else if (fileSize < this.LARGE_FILE_THRESHOLD) { + return 'medium' + } else { + return 'large' + } + } + + /** + * 预估解析时间 + */ + private static estimateParsingTime( + strategy: ParserStrategy, + sizeCategory: 'small' | 'medium' | 'large' + ): number { + switch (strategy) { + case 'remotion-first': + // Remotion 优先，失败后 FFmpeg fallback + return ( + this.TIME_ESTIMATES.remotion[sizeCategory] + + this.TIME_ESTIMATES.ffmpeg[sizeCategory] * 0.3 + ) + + case 'ffmpeg-first': + // FFmpeg 优先，通常不需要 fallback + return this.TIME_ESTIMATES.ffmpeg[sizeCategory] + + case 'remotion-only': + return this.TIME_ESTIMATES.remotion[sizeCategory] + + case 'ffmpeg-only': + return this.TIME_ESTIMATES.ffmpeg[sizeCategory] + + default: + return this.TIME_ESTIMATES.remotion[sizeCategory] + } + } + + /** + * 格式化文件大小显示 + */ + private static formatFileSize(bytes: number): string { + if (bytes < 1024 * 1024) { + return `${Math.round(bytes / 1024)}KB` + } else if (bytes < 1024 * 1024 * 1024) { + return `${Math.round(bytes / (1024 * 1024))}MB` + } else { + return `${Math.round((bytes / (1024 * 1024 * 1024)) * 10) / 10}GB` + } + } + + /** + * 根据策略获取解析器优先级列表 + */ + static getParserPriority(strategy: ParserStrategy): ParserType[] { + switch (strategy) { + case 'remotion-first': + return ['remotion', 'ffmpeg'] + case 'ffmpeg-first': + return ['ffmpeg', 'remotion'] + case 'remotion-only': + return ['remotion'] + case 'ffmpeg-only': + return ['ffmpeg'] + default: + return ['remotion', 'ffmpeg'] + } + } + + /** + * 检查策略是否允许 fallback + */ + static allowsFallback(strategy: ParserStrategy): boolean { + return strategy === 'remotion-first' || strategy === 'ffmpeg-first' + } +} diff --git a/src/renderer/src/utils/ParallelVideoProcessor.ts b/src/renderer/src/utils/ParallelVideoProcessor.ts new file mode 100644 index 00000000..88728639 --- /dev/null +++ b/src/renderer/src/utils/ParallelVideoProcessor.ts @@ -0,0 +1,317 @@ +/** + * 并行视频处理工具 + * 优化视频导入流程的并行处理 + */ + +import { loggerService } from '@logger' +import type { FileMetadata } from '@shared/types/database' + +import { type FormatAnalysis, MediaFormatStrategy } from './MediaFormatStrategy' + +const logger = loggerService.withContext('ParallelVideoProcessor') + +export interface FileValidationResult { + isValid: boolean + localPath: string + fileExists: boolean + fileSize: number + error?: string +} + +export interface ParserAvailability { + mediaInfoAvailable: boolean + ffmpegAvailable: boolean + recommendedParser: 'mediainfo' | 'ffmpeg' + error?: string +} + +export interface ProcessingContext { + file: FileMetadata + validation: FileValidationResult + parserInfo: ParserAvailability + formatAnalysis: FormatAnalysis + processingStartTime: number +} + +/** + * 并行视频处理器 + */ +export class ParallelVideoProcessor { + /** + * 并行执行文件验证和解析器准备 + */ + static async prepareProcessing(file: FileMetadata): Promise { + const processingStartTime = performance.now() + + logger.info('🚀 开始并行准备视频处理', { + fileName: file.name, + fileSize: `${Math.round(file.size / 1024 / 1024)}MB` + }) + + try { + // 并行执行三个独立的操作 + const [validation, parserInfo, formatAnalysis] = await Promise.all([ + this.validateFileAsync(file), + this.checkParserAvailabilityAsync(), + this.analyzeFormatAsync(file) + ]) + + const preparationTime = performance.now() - processingStartTime + + logger.info('✅ 并行准备完成', { + fileName: file.name, + preparationTime: `${preparationTime.toFixed(2)}ms`, + isValid: validation.isValid, + recommendedParser: parserInfo.recommendedParser, + strategy: formatAnalysis.strategy, + estimatedTime: `${formatAnalysis.estimatedTime}ms` + }) + + return { + file, + validation, + parserInfo, + formatAnalysis, + processingStartTime + } + } catch (error) { + const preparationTime = performance.now() - processingStartTime + logger.error('❌ 并行准备失败', { + fileName: file.name, + preparationTime: `${preparationTime.toFixed(2)}ms`, + error: error instanceof Error ? error.message : String(error) + }) + throw error + } + } + + /** + * 异步验证文件 + */ + private static async validateFileAsync(file: FileMetadata): Promise { + const startTime = performance.now() + + try { + // 路径转换 + const localPath = await this.convertFileUrlToLocalPathAsync(file.path) + + // 检查文件存在性 + const fileExists = await window.api.fs.checkFileExists(localPath) + + if (!fileExists) { + return { + isValid: false, + localPath, + fileExists: false, + fileSize: 0, + error: `文件不存在: ${localPath}` + } + } + + // 验证文件大小一致性（可选） + const actualSize = file.size // 在实际应用中可能需要重新获取 + + const validationTime = performance.now() - startTime + logger.info('📁 文件验证完成', { + fileName: file.name, + validationTime: `${validationTime.toFixed(2)}ms`, + fileExists, + fileSize: `${Math.round(actualSize / 1024 / 1024)}MB` + }) + + return { + isValid: true, + localPath, + fileExists: true, + fileSize: actualSize + } + } catch (error) { + const validationTime = performance.now() - startTime + logger.error('❌ 文件验证失败', { + fileName: file.name, + validationTime: `${validationTime.toFixed(2)}ms`, + error: error instanceof Error ? error.message : String(error) + }) + + return { + isValid: false, + localPath: file.path, + fileExists: false, + fileSize: 0, + error: error instanceof Error ? error.message : String(error) + } + } + } + + /** + * 异步检查解析器可用性 + */ + private static async checkParserAvailabilityAsync(): Promise { + const startTime = performance.now() + + try { + // 并行检查两个解析器 + const [mediaInfoAvailable, ffmpegAvailable] = await Promise.all([ + window.api.mediainfo.checkExists(), + window.api.ffmpeg.checkExists() + ]) + + const checkTime = performance.now() - startTime + + // 决定推荐的解析器 + let recommendedParser: 'mediainfo' | 'ffmpeg' = 'mediainfo' + if (!mediaInfoAvailable && ffmpegAvailable) { + recommendedParser = 'ffmpeg' + } + + logger.info('🔍 解析器检查完成', { + checkTime: `${checkTime.toFixed(2)}ms`, + mediaInfoAvailable, + ffmpegAvailable, + recommendedParser + }) + + return { + mediaInfoAvailable, + ffmpegAvailable, + recommendedParser + } + } catch (error) { + const checkTime = performance.now() - startTime + logger.error('❌ 解析器检查失败', { + checkTime: `${checkTime.toFixed(2)}ms`, + error: error instanceof Error ? error.message : String(error) + }) + + return { + mediaInfoAvailable: false, + ffmpegAvailable: false, + recommendedParser: 'ffmpeg', + error: error instanceof Error ? error.message : String(error) + } + } + } + + /** + * 异步分析文件格式 + */ + private static async analyzeFormatAsync(file: FileMetadata): Promise { + const startTime = performance.now() + + try { + const analysis = MediaFormatStrategy.analyzeFile(file) + + const analysisTime = performance.now() - startTime + logger.info('📊 格式分析完成', { + fileName: file.name, + analysisTime: `${analysisTime.toFixed(2)}ms`, + strategy: analysis.strategy, + confidence: analysis.confidence, + reasoning: analysis.reasoning, + estimatedTime: `${analysis.estimatedTime}ms` + }) + + return analysis + } catch (error) { + const analysisTime = performance.now() - startTime + logger.error('❌ 格式分析失败', { + fileName: file.name, + analysisTime: `${analysisTime.toFixed(2)}ms`, + error: error instanceof Error ? error.message : String(error) + }) + + // 返回默认分析结果 + return { + strategy: 'remotion-first', + confidence: 0.5, + reasoning: '格式分析失败，使用默认策略', + estimatedTime: 2000 + } + } + } + + /** + * 异步路径转换 + */ + private static async convertFileUrlToLocalPathAsync(inputPath: string): Promise { + return new Promise((resolve) => { + // 如果是file://URL，需要转换为本地路径 + if (inputPath.startsWith('file://')) { + try { + const url = new URL(inputPath) + let localPath = decodeURIComponent(url.pathname) + + // Windows路径处理：移除开头的斜杠 + if (process.platform === 'win32' && localPath.startsWith('/')) { + localPath = localPath.substring(1) + } + + resolve(localPath) + } catch (error) { + logger.warn('路径转换失败，使用原路径', { + inputPath, + error: error instanceof Error ? error.message : String(error) + }) + resolve(inputPath) + } + } else { + resolve(inputPath) + } + }) + } + + /** + * 验证处理上下文的完整性 + */ + static validateContext(context: ProcessingContext): string[] { + const errors: string[] = [] + + if (!context.validation.isValid) { + errors.push(`文件验证失败: ${context.validation.error}`) + } + + if (!context.parserInfo.mediaInfoAvailable && !context.parserInfo.ffmpegAvailable) { + errors.push('没有可用的媒体解析器') + } + + if (context.formatAnalysis.confidence < 0.3) { + errors.push('格式分析置信度过低') + } + + return errors + } + + /** + * 获取优化的解析策略 + */ + static getOptimizedStrategy(context: ProcessingContext): { + useParser: 'mediainfo' | 'ffmpeg' + allowFallback: boolean + timeoutMs: number + } { + const { parserInfo, formatAnalysis } = context + + // 根据解析器可用性和格式分析调整策略 + let useParser: 'mediainfo' | 'ffmpeg' = 'mediainfo' + let allowFallback = true + let timeoutMs = 10000 // 默认10秒超时 + + if (formatAnalysis.strategy === 'ffmpeg-first' || !parserInfo.mediaInfoAvailable) { + useParser = 'ffmpeg' + } + + // 根据预估时间调整超时 + if (formatAnalysis.estimatedTime > 5000) { + timeoutMs = Math.max(formatAnalysis.estimatedTime * 2, 15000) + allowFallback = true // 长时间解析允许fallback + } else { + timeoutMs = Math.max(formatAnalysis.estimatedTime * 1.5, 5000) + } + + return { + useParser, + allowFallback, + timeoutMs + } + } +} diff --git a/src/renderer/src/utils/PerformanceMonitor.ts b/src/renderer/src/utils/PerformanceMonitor.ts index 61b6f25a..aa46826e 100644 --- a/src/renderer/src/utils/PerformanceMonitor.ts +++ b/src/renderer/src/utils/PerformanceMonitor.ts @@ -3,6 +3,8 @@ * 用于统一管理性能日志记录和分析 */ +// TODO: 已迁移至 @shared/utils/PerformanceMonitor + import { loggerService } from '@logger' const logger = loggerService.withContext('PerformanceMonitor') From d563c924c9471caeeab45a3d2ddd6dda5520fcac Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Fri, 12 Sep 2025 00:01:39 +0800 Subject: [PATCH 40/82] fix(player): Fix subtitle overlay dragging to bottom and improve responsive design (#122) - Fix hardcoded boundary calculation preventing drag to video bottom - Replace mixed unit system (% + px) with unified coordinate system - Implement responsive font sizing based on container height (0.7x-1.5x scale) - Change overlay height from fixed percentage to auto-adaptive - Improve window resize sensitivity from 20% to 5% threshold - Remove forced aspect ratio adjustments for better user control - Update collision detection with dynamic height estimation Resolves subtitle positioning issues and ensures consistent relative positioning during window resizing while maintaining optimal text readability across all screen sizes. --- .../player/components/SubtitleContent.tsx | 64 ++++++++++++++----- .../player/components/SubtitleOverlay.tsx | 12 +++- .../player/hooks/useSubtitleOverlayUI.ts | 32 ++++++---- 3 files changed, 79 insertions(+), 29 deletions(-) diff --git a/src/renderer/src/pages/player/components/SubtitleContent.tsx b/src/renderer/src/pages/player/components/SubtitleContent.tsx index bef9330d..72a5be19 100644 --- a/src/renderer/src/pages/player/components/SubtitleContent.tsx +++ b/src/renderer/src/pages/player/components/SubtitleContent.tsx @@ -29,6 +29,8 @@ export interface SubtitleContentProps { onTextSelection?: (selectedText: string) => void /** 单词点击回调 */ onWordClick?: (word: string, token: WordToken) => void + /** 容器高度（用于响应式字体大小计算） */ + containerHeight?: number /** 自定义类名 */ className?: string /** 自定义样式 */ @@ -42,11 +44,33 @@ export const SubtitleContent = memo(function SubtitleContent({ translatedText, onTextSelection, onWordClick, + containerHeight = 600, // 默认高度 className, style }: SubtitleContentProps) { const containerRef = useRef(null) + // === 响应式字体大小计算 === + const responsiveFontSizes = useMemo(() => { + // 基础字体大小（基于 600px 高度容器的标准尺寸） + const baseSizes = { + original: 22, + originalBilingual: 22, + translated: 22, + empty: 16 + } + + // 计算缩放比例（最小 0.7，最大 1.5） + const scaleFactor = Math.max(0.7, Math.min(1.5, containerHeight / 600)) + + return { + original: `${baseSizes.original * scaleFactor}px`, + originalBilingual: `${baseSizes.originalBilingual * scaleFactor}px`, + translated: `${baseSizes.translated * scaleFactor}px`, + empty: `${baseSizes.empty * scaleFactor}px` + } + }, [containerHeight]) + // 划词选择状态 const [selectionState, setSelectionState] = useState<{ isSelecting: boolean @@ -283,18 +307,22 @@ export const SubtitleContent = memo(function SubtitleContent({ case SubtitleDisplayMode.ORIGINAL: if (!originalText.trim()) { - return --Empty-- + return --Empty-- } - return {renderTokenizedText(originalTokens)} + return ( + + {renderTokenizedText(originalTokens)} + + ) case SubtitleDisplayMode.TRANSLATED: { const textToShow = translatedText?.trim() || originalText.trim() if (!textToShow) { - return --Empty-- + return --Empty-- } // 译文显示整句，原文显示分词 return ( - + {translatedText?.trim() ? textToShow : renderTokenizedText(originalTokens)} ) @@ -302,20 +330,27 @@ export const SubtitleContent = memo(function SubtitleContent({ case SubtitleDisplayMode.BILINGUAL: if (!originalText.trim()) { - return --Empty-- + return --Empty-- } return ( <> - + {renderTokenizedText(originalTokens)} - {translatedText?.trim() && {translatedText}} + {translatedText?.trim() && ( + + {translatedText} + + )} ) default: logger.warn('未知的字幕显示模式', { displayMode }) - return --Empty-- + return --Empty-- } } @@ -372,8 +407,8 @@ const ContentContainer = styled.div` --subtitle-transition-duration: 200ms; ` -const OriginalTextLine = styled.div` - font-size: 16px; +const OriginalTextLine = styled.div<{ $fontSize?: string }>` + font-size: ${(props) => props.$fontSize || '16px'}; font-weight: 600; text-shadow: var(--subtitle-text-shadow); margin-bottom: 0; @@ -382,12 +417,11 @@ const OriginalTextLine = styled.div` /* 在双语模式下添加间距 */ &.bilingual { margin-bottom: 8px; - font-size: 18px; } ` -const TranslatedTextLine = styled.div` - font-size: 15px; +const TranslatedTextLine = styled.div<{ $fontSize?: string }>` + font-size: ${(props) => props.$fontSize || '15px'}; font-weight: 500; opacity: 0.95; text-shadow: var(--subtitle-text-shadow); @@ -395,8 +429,8 @@ const TranslatedTextLine = styled.div` transition: all var(--subtitle-transition-duration); ` -const EmptyState = styled.div` - font-size: 14px; +const EmptyState = styled.div<{ $fontSize?: string }>` + font-size: ${(props) => props.$fontSize || '14px'}; font-style: italic; opacity: 0.7; background: rgba(0, 0, 0, 0.4); diff --git a/src/renderer/src/pages/player/components/SubtitleOverlay.tsx b/src/renderer/src/pages/player/components/SubtitleOverlay.tsx index c160d9e8..eb972c49 100644 --- a/src/renderer/src/pages/player/components/SubtitleOverlay.tsx +++ b/src/renderer/src/pages/player/components/SubtitleOverlay.tsx @@ -213,6 +213,9 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ const deltaX = moveEvent.clientX - startX const deltaY = moveEvent.clientY - startY + // 使用估算的字幕高度（自适应模式下约为 160px） + const estimatedHeightPercent = Math.min(12, (160 / containerBounds.height) * 100) + const newPosition = { x: Math.max( 0, @@ -220,7 +223,10 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ ), y: Math.max( 0, - Math.min(100 - 20, startPosition.y + (deltaY / containerBounds.height) * 100) + Math.min( + 100 - estimatedHeightPercent, + startPosition.y + (deltaY / containerBounds.height) * 100 + ) ) } setPosition(newPosition) @@ -403,6 +409,7 @@ export const SubtitleOverlay = memo(function SubtitleOverlay({ translatedText={integration.currentSubtitle?.translatedText} onTextSelection={handleTextSelection} onWordClick={handleWordClick} + containerHeight={containerBounds.height} /> @@ -441,8 +448,9 @@ const OverlayContainer = styled.div<{ left: ${(props) => props.$position.x}%; top: ${(props) => props.$position.y}%; width: ${(props) => props.$size.width}%; + height: auto; min-height: 60px; - max-height: 200px; + max-height: 160px; /* 基础样式 */ pointer-events: auto; diff --git a/src/renderer/src/pages/player/hooks/useSubtitleOverlayUI.ts b/src/renderer/src/pages/player/hooks/useSubtitleOverlayUI.ts index 6a8ca057..d4620805 100644 --- a/src/renderer/src/pages/player/hooks/useSubtitleOverlayUI.ts +++ b/src/renderer/src/pages/player/hooks/useSubtitleOverlayUI.ts @@ -190,22 +190,27 @@ export function useSubtitleOverlayUI(): SubtitleOverlayUI { const widthRatio = newBounds.width / Math.max(oldBounds.width, 1) const heightRatio = newBounds.height / Math.max(oldBounds.height, 1) - if (Math.abs(widthRatio - 1) > 0.2 || Math.abs(heightRatio - 1) > 0.2) { + if (Math.abs(widthRatio - 1) > 0.05 || Math.abs(heightRatio - 1) > 0.05) { + // 使用估算的字幕高度（自适应模式下约为 160px） + const estimatedHeightPercent = Math.min(12, (160 / newBounds.height) * 100) + const adjustedPosition = { x: Math.max(0, Math.min(100 - subtitleOverlay.size.width, subtitleOverlay.position.x)), - y: Math.max(0, Math.min(100 - 15, subtitleOverlay.position.y)) + y: Math.max(0, Math.min(100 - estimatedHeightPercent, subtitleOverlay.position.y)) } - const newAspectRatio = newBounds.width / newBounds.height + // 保持原有尺寸，只进行必要的边界约束 const newSize = { ...subtitleOverlay.size } - if (newAspectRatio > 2.5 && newSize.width > 80) { - newSize.width = Math.min(newSize.width, 70) - adjustedPosition.x = Math.max(15, adjustedPosition.x) - } else if (newAspectRatio < 1.0 && newSize.width < 85) { - newSize.width = Math.max(newSize.width, 85) - adjustedPosition.x = Math.max(0, Math.min(15, adjustedPosition.x)) - } + // 确保尺寸在合理范围内，但不强制修改用户设置 + if (newSize.width > 95) newSize.width = 95 + if (newSize.width < 20) newSize.width = 20 + if (newSize.height > 40) newSize.height = 40 + if (newSize.height < 5) newSize.height = 5 + + // 重新计算位置确保不超出边界 + adjustedPosition.x = Math.max(0, Math.min(100 - newSize.width, adjustedPosition.x)) + adjustedPosition.y = Math.max(0, Math.min(100 - newSize.height, adjustedPosition.y)) // 使用 PlayerStore 的配置更新方法 setSubtitleOverlay({ @@ -231,11 +236,14 @@ export function useSubtitleOverlayUI(): SubtitleOverlayUI { (conflictAreas: Array<{ x: number; y: number; width: number; height: number }>) => { if (conflictAreas.length === 0 || !subtitleOverlay) return + // 使用估算的字幕高度（自适应模式下约为 160px） + const estimatedHeightPercent = Math.min(12, (160 / containerBounds.height) * 100) + const currentBounds = { x: subtitleOverlay.position.x, y: subtitleOverlay.position.y, width: subtitleOverlay.size.width, - height: 15 + height: estimatedHeightPercent } const hasCollision = conflictAreas.some((area) => { @@ -261,7 +269,7 @@ export function useSubtitleOverlayUI(): SubtitleOverlayUI { const candidateBounds = { ...candidate, width: subtitleOverlay.size.width, - height: 15 + height: estimatedHeightPercent } const hasConflict = conflictAreas.some((area) => { From 29f70f66806f3dc0e3e473a9b3b27867cf67ac0d Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Fri, 12 Sep 2025 00:25:09 +0800 Subject: [PATCH 41/82] fix(ui): Remove white border shadow from modal buttons in dark mode (#124) - Add box-shadow: none !important to .ant-modal-footer .ant-btn - Add box-shadow: none !important to .ant-modal-confirm .ant-modal-confirm-btns .ant-btn - Resolves issue where Ant Design CSS variables created white shadow borders - Specifically addresses --ant-button-*-shadow-color variables in dark theme - Affects modal footer buttons and confirmation dialog buttons Fixes: White border appearing below buttons in dark mode modals --- src/renderer/src/assets/styles/ant.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/src/assets/styles/ant.scss b/src/renderer/src/assets/styles/ant.scss index f04150fe..fce0f220 100644 --- a/src/renderer/src/assets/styles/ant.scss +++ b/src/renderer/src/assets/styles/ant.scss @@ -191,6 +191,7 @@ height: 36px; padding: 0 16px; font-family: -apple-system, BlinkMacSystemFont, 'SF Pro Text', sans-serif; + box-shadow: none !important; &.ant-btn-default { background: var(--color-background-soft); @@ -284,6 +285,7 @@ font-weight: 500; height: 36px; margin-left: 8px; + box-shadow: none !important; &:first-child { margin-left: 0; From be33316f0a66f7b5b2de64d275d7166f12f50379 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Fri, 12 Sep 2025 07:43:55 +0800 Subject: [PATCH 42/82] feat(scripts): optimize FFmpeg download progress display (#125) - Replace multiple console.log calls with single-line progress updates - Use process.stdout.write with \r for in-place progress updates - Add progress deduplication to prevent repeated identical outputs - Round progress to 10% increments for cleaner display - Maintain same functionality while reducing console noise This improves the user experience during FFmpeg downloads by showing a clean, single-line progress indicator instead of multiple progress lines. --- scripts/download-ffmpeg.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/download-ffmpeg.ts b/scripts/download-ffmpeg.ts index 80833b8e..f4017661 100644 --- a/scripts/download-ffmpeg.ts +++ b/scripts/download-ffmpeg.ts @@ -277,12 +277,15 @@ class FFmpegDownloader { // 检查缓存 if (!fs.existsSync(cachePath)) { console.log(`下载 ${config.url}...`) + let lastLoggedProgress = -1 await this.downloadFile(config.url, cachePath, (progress) => { - if (Math.floor(progress) % 10 === 0) { - console.log(`下载进度: ${Math.floor(progress)}%`) + const currentProgress = Math.floor(progress / 10) * 10 // 取整到10的倍数 + if (currentProgress !== lastLoggedProgress && currentProgress >= lastLoggedProgress + 10) { + process.stdout.write(`\r下载进度: ${currentProgress}%`) + lastLoggedProgress = currentProgress } }) - console.log('下载完成') + console.log('\n下载完成') } else { console.log('使用缓存文件') } From a42ee9d35d0fc40aedb22bc211c1c24a0840a189 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Fri, 12 Sep 2025 08:13:37 +0800 Subject: [PATCH 43/82] Update .coderabbit.yaml --- .coderabbit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.coderabbit.yaml b/.coderabbit.yaml index 57cf5526..cd346743 100644 --- a/.coderabbit.yaml +++ b/.coderabbit.yaml @@ -11,6 +11,7 @@ reviews: - 'alpha' - 'beta' - 'main' + - 'dev' ignore_title_keywords: - 'wip' - 'draft' From 78d3629c7d5a14e8bc378967a7f161135c5b5042 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Fri, 12 Sep 2025 08:16:16 +0800 Subject: [PATCH 44/82] feat(player): Implement fullscreen toggle functionality with keyboard shortcuts (#127) - Add IPC handlers for fullscreen control in main process - Implement fullscreen button using native Electron API instead of player store - Add keyboard shortcut (F key) for fullscreen toggle in PlayerPage - Use useFullscreen hook for consistent fullscreen state management - Remove deprecated fullscreen methods from usePlayerCommands --- src/main/ipc.ts | 37 +++++++++++++++++++ src/renderer/src/pages/player/PlayerPage.tsx | 32 ++++++++++++++++ .../controls/FullscreenButton.tsx | 20 +++++++--- .../pages/player/hooks/usePlayerCommands.ts | 4 +- 4 files changed, 85 insertions(+), 8 deletions(-) diff --git a/src/main/ipc.ts b/src/main/ipc.ts index 02763f8b..50043a5b 100644 --- a/src/main/ipc.ts +++ b/src/main/ipc.ts @@ -384,6 +384,43 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) { win && win.webContents.toggleDevTools() }) + // 全屏相关 IPC 处理器 / Fullscreen-related IPC handlers + ipcMain.handle(IpcChannel.Window_IsFullScreen, (e) => { + const win = BrowserWindow.fromWebContents(e.sender) + return win ? win.isFullScreen() : false + }) + + ipcMain.handle(IpcChannel.Window_EnterFullScreen, (e) => { + const win = BrowserWindow.fromWebContents(e.sender) + if (win && !win.isFullScreen()) { + win.setFullScreen(true) + // 通知渲染进程全屏状态已改变 + win.webContents.send(IpcChannel.FullscreenStatusChanged, true) + logger.info('Window entered fullscreen') + } + }) + + ipcMain.handle(IpcChannel.Window_ExitFullScreen, (e) => { + const win = BrowserWindow.fromWebContents(e.sender) + if (win && win.isFullScreen()) { + win.setFullScreen(false) + // 通知渲染进程全屏状态已改变 + win.webContents.send(IpcChannel.FullscreenStatusChanged, false) + logger.info('Window exited fullscreen') + } + }) + + ipcMain.handle(IpcChannel.Window_ToggleFullScreen, (e) => { + const win = BrowserWindow.fromWebContents(e.sender) + if (win) { + const isCurrentlyFullscreen = win.isFullScreen() + win.setFullScreen(!isCurrentlyFullscreen) + // 通知渲染进程全屏状态已改变 + win.webContents.send(IpcChannel.FullscreenStatusChanged, !isCurrentlyFullscreen) + logger.info(`Window fullscreen toggled to: ${!isCurrentlyFullscreen}`) + } + }) + // file ipcMain.handle(IpcChannel.File_Open, fileManager.open.bind(fileManager)) ipcMain.handle(IpcChannel.File_OpenPath, fileManager.openPath.bind(fileManager)) diff --git a/src/renderer/src/pages/player/PlayerPage.tsx b/src/renderer/src/pages/player/PlayerPage.tsx index e45d5cc4..933d5f06 100644 --- a/src/renderer/src/pages/player/PlayerPage.tsx +++ b/src/renderer/src/pages/player/PlayerPage.tsx @@ -6,6 +6,7 @@ import { PlayerSettingsService } from '@renderer/services/PlayerSettingsLoader' import { playerSettingsPersistenceService } from '@renderer/services/PlayerSettingsSaver' import { usePlayerStore } from '@renderer/state' import { usePlayerSessionStore } from '@renderer/state/stores/player-session.store' +import { IpcChannel } from '@shared/IpcChannel' import { Layout, Tooltip } from 'antd' const { Content, Sider } = Layout @@ -231,6 +232,37 @@ function PlayerPage() { } }, [videoId, navigate]) + // 处理全屏快捷键 + const handleToggleFullscreen = useCallback(async () => { + try { + await window.electron.ipcRenderer.invoke(IpcChannel.Window_ToggleFullScreen) + } catch (error) { + logger.error('切换全屏失败:', { error }) + } + }, []) + + // 键盘事件处理 + useEffect(() => { + const handleKeyDown = (event: KeyboardEvent) => { + // 如果焦点在输入框等表单元素上，不处理快捷键 + const target = event.target as HTMLElement + if (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable) { + return + } + + // F键切换全屏 + if (event.code === 'KeyF' && !event.ctrlKey && !event.altKey && !event.metaKey) { + event.preventDefault() + handleToggleFullscreen() + } + } + + document.addEventListener('keydown', handleKeyDown) + return () => { + document.removeEventListener('keydown', handleKeyDown) + } + }, [handleToggleFullscreen]) + if (loading) { return ( diff --git a/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx b/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx index 2b3aaef3..9866d873 100644 --- a/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx +++ b/src/renderer/src/pages/player/components/ControllerPanel/controls/FullscreenButton.tsx @@ -1,19 +1,29 @@ -import { usePlayerCommands } from '@renderer/pages/player/hooks/usePlayerCommands' -import { usePlayerStore } from '@renderer/state/stores/player.store' +import { loggerService } from '@logger' +import { useFullscreen } from '@renderer/infrastructure/hooks/useFullscreen' +import { IpcChannel } from '@shared/IpcChannel' import { Maximize, Minimize } from 'lucide-react' import { useTranslation } from 'react-i18next' import styled from 'styled-components' import { ControlIconButton } from '../styles/controls' +const logger = loggerService.withContext('FullscreenButton') + export default function FullscreenButton() { const { t } = useTranslation() - const isFullscreen = usePlayerStore((s) => s.isFullscreen) - const cmd = usePlayerCommands() + const isFullscreen = useFullscreen() + + const handleToggleFullscreen = async () => { + try { + await window.electron.ipcRenderer.invoke(IpcChannel.Window_ToggleFullScreen) + } catch (error) { + logger.error('Failed to toggle fullscreen:', { error }) + } + } return ( + + + + {/* 操作按钮 */} + + + {t('settings.plugins.ffmpeg.actions.label')} + + {ffmpegStatus?.needsDownload ? ( + : } + onClick={handleDownload} + disabled={isDownloading || showSuccessState} + $isDownloading={isDownloading} + $downloadProgress={downloadProgressPercent} + $showSuccessState={showSuccessState} + > + + {showSuccessState + ? t('settings.plugins.ffmpeg.download.success') + : isDownloading + ? `${t('settings.plugins.ffmpeg.download.downloading')} ${downloadProgressPercent.toFixed(0)}%` + : t('settings.plugins.ffmpeg.download.button')} + + {isDownloading && } + + ) : ( + + + + {(ffmpegStatus?.isDownloaded || ffmpegStatus?.isBundled) && + !ffmpegStatus?.isSystemFFmpeg && ( + + + + )} + + )} + + {isDownloading && ( + + {t('settings.plugins.ffmpeg.download.cancel')} + + )} + + + + + ) +} + +// 样式组件 +const StatusContainer = styled.div` + display: flex; + align-items: center; + gap: 8px; + font-size: 14px; +` + +// 下载按钮容器 +const DownloadButtonContainer = styled.div` + display: flex; + gap: ${SPACING.XS}px; + align-items: flex-start; + flex-direction: column; + + @media (min-width: 640px) { + flex-direction: row; + align-items: center; + } +` + +// 增强的下载按钮 +const DownloadButton = styled(Button)<{ + $isDownloading: boolean + $downloadProgress: number + $showSuccessState?: boolean +}>` + position: relative; + min-width: 160px; + height: 32px; + padding: ${SPACING.XXS}px ${SPACING.SM}px; + overflow: hidden; + border-radius: ${BORDER_RADIUS.SM}px; + transition: all ${ANIMATION_DURATION.MEDIUM} ${EASING.APPLE}; + + // 确保内容在进度条之上 + .ant-btn-content { + position: relative; + z-index: 2; + width: 100%; + } + + // 禁用状态样式 + &.ant-btn-primary[disabled] { + background: ${({ $showSuccessState }) => + $showSuccessState ? 'var(--ant-color-success)' : 'var(--ant-color-primary)'}; + border-color: ${({ $showSuccessState }) => + $showSuccessState ? 'var(--ant-color-success)' : 'var(--ant-color-primary)'}; + color: var(--ant-color-white); + opacity: 1; + transform: ${({ $showSuccessState }) => ($showSuccessState ? 'scale(1.02)' : 'none')}; + } + + // 悬停效果 + &:not([disabled]):hover { + transform: translateY(-1px); + box-shadow: var(--ant-box-shadow-secondary); + } +` + +// 按钮文本 +const DownloadButtonText = styled.span` + font-weight: ${FONT_WEIGHTS.SEMIBOLD}; + font-size: ${FONT_SIZES.SM}px; + line-height: 1.2; + position: relative; + z-index: 2; +` + +// 进度条 +const DownloadProgressBar = styled.div<{ $progress: number }>` + position: absolute; + bottom: 0; + left: 0; + height: 2px; + width: ${({ $progress }) => $progress}%; + background: linear-gradient( + 90deg, + rgba(255, 255, 255, 0.3) 0%, + rgba(255, 255, 255, 0.6) 50%, + rgba(255, 255, 255, 0.3) 100% + ); + border-radius: 0 0 ${BORDER_RADIUS.SM}px ${BORDER_RADIUS.SM}px; + transition: width ${ANIMATION_DURATION.MEDIUM} ${EASING.APPLE}; + z-index: 1; + + // 添加光效动画 + &::after { + content: ''; + position: absolute; + top: 0; + right: -20px; + width: 20px; + height: 100%; + background: linear-gradient( + 90deg, + transparent 0%, + rgba(255, 255, 255, 0.4) 50%, + transparent 100% + ); + animation: shimmer 2s infinite; + } + + @keyframes shimmer { + 0% { + transform: translateX(-100%); + } + 100% { + transform: translateX(100%); + } + } +` + +// 操作按钮组 +const ActionButtonGroup = styled(Space)`` + +// 取消按钮 +const CancelButton = styled(Button)` + font-size: ${FONT_SIZES.XS}px; + height: 32px; + padding: 0 ${SPACING.SM}px; + border-radius: ${BORDER_RADIUS.SM}px; + transition: all ${ANIMATION_DURATION.MEDIUM} ${EASING.APPLE}; + + &:hover { + transform: translateY(-1px); + } +` + +const PathInputContainer = styled.div` + display: flex; + gap: 8px; + align-items: center; + + .ant-input { + flex: 1; + max-width: 250px; + } + + .spin { + animation: spin 1s linear infinite; + } + + @keyframes spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } + } +` + +export default FFmpegSettings diff --git a/src/renderer/src/pages/settings/SettingsPage.tsx b/src/renderer/src/pages/settings/SettingsPage.tsx index a51ed41d..5359ccae 100644 --- a/src/renderer/src/pages/settings/SettingsPage.tsx +++ b/src/renderer/src/pages/settings/SettingsPage.tsx @@ -1,5 +1,5 @@ import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar' -import { Command, Eye, Info, PlayCircle, Settings2 } from 'lucide-react' +import { Command, Eye, Info, Monitor, PlayCircle, Settings2 } from 'lucide-react' import React from 'react' import { useTranslation } from 'react-i18next' import { Link, Route, Routes, useLocation } from 'react-router-dom' @@ -7,6 +7,7 @@ import styled from 'styled-components' import AboutSettings from './AboutSettings' import { AppearanceSettings } from './AppearanceSettings' +import FFmpegSettings from './FFmpegSettings' import GeneralSettings from './GeneralSettings' import PlaybackSettings from './PlaybackSettings' import ShortcutSettings from './ShortcutSettings' @@ -51,6 +52,12 @@ export function SettingsPage(): React.JSX.Element { {t('settings.playback.title')} + + + + {t('settings.plugins.title')} + + @@ -64,6 +71,7 @@ export function SettingsPage(): React.JSX.Element { } /> } /> } /> + } /> } /> From 30496b1bd36ffd3765b075f9081fb876d33ee1b8 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sat, 13 Sep 2025 19:06:27 +0800 Subject: [PATCH 67/82] feat: add Windows ARM64 architecture support (#157) - Add arm64 architecture support for Windows NSIS installer target - Add arm64 architecture support for Windows Portable target - Align Windows build targets with existing macOS and Linux ARM64 support - Enable native ARM64 builds for Windows on ARM devices This change allows the application to run natively on Windows ARM64 devices, providing better performance and compatibility for users with ARM-based Windows machines. --- electron-builder.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/electron-builder.yml b/electron-builder.yml index 294dbf73..d44b266b 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -55,9 +55,11 @@ win: - target: nsis arch: - x64 + - arm64 - target: portable arch: - x64 + - arm64 signtoolOptions: sign: scripts/win-sign.js verifyUpdateCodeSignature: false From ee435ce3439344d625af03e99e83d9967a46374a Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sat, 13 Sep 2025 19:49:48 +0800 Subject: [PATCH 68/82] fix(ui): use system title bar for Windows and Linux platforms (#158) - Configure Windows and Linux to use native system title bars instead of custom titleBarOverlay - Remove excessive padding-right in Navbar component (140px for Windows, 120px for Linux) - Maintain custom title bar for macOS with traffic light buttons integration - Update ThemeService to only apply titleBarOverlay changes to macOS windows - Simplify Navbar styling to use consistent 12px padding across all platforms This change eliminates the spacing issue in the Windows header area and provides a more native user experience on Windows and Linux platforms. Fixes the header spacing issue reported for Windows platform. --- src/main/services/ThemeService.ts | 4 +++- src/main/services/WindowService.ts | 24 +++++++++++++++++++--- src/renderer/src/components/app/Navbar.tsx | 3 +-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/services/ThemeService.ts b/src/main/services/ThemeService.ts index 901a0796..4bd781c8 100644 --- a/src/main/services/ThemeService.ts +++ b/src/main/services/ThemeService.ts @@ -3,6 +3,7 @@ import { ThemeMode } from '@types' import { BrowserWindow, nativeTheme } from 'electron' import { titleBarOverlayDark, titleBarOverlayLight } from '../config' +import { isMac } from '../constant' import { configManager } from './ConfigManager' class ThemeService { @@ -26,7 +27,8 @@ class ThemeService { themeUpdatadHandler() { BrowserWindow.getAllWindows().forEach((win) => { - if (win && !win.isDestroyed() && win.setTitleBarOverlay) { + // 只对 macOS 应用 titleBarOverlay，因为 Windows 和 Linux 使用系统标题栏 + if (isMac && win && !win.isDestroyed() && win.setTitleBarOverlay) { try { win.setTitleBarOverlay( nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts index 5eae94b3..9dc9da7b 100644 --- a/src/main/services/WindowService.ts +++ b/src/main/services/WindowService.ts @@ -56,6 +56,26 @@ export class WindowService { maximize: false }) + // 平台特定的标题栏配置 + const getTitleBarConfig = () => { + if (isWin || isLinux) { + // Windows 和 Linux 使用系统标题栏 + return { + titleBarStyle: undefined + // 不设置 titleBarOverlay 和 trafficLightPosition + } + } else { + // macOS 保持自定义标题栏 + return { + titleBarStyle: 'hidden' as const, + titleBarOverlay: nativeTheme.shouldUseDarkColors + ? titleBarOverlayDark + : titleBarOverlayLight, + trafficLightPosition: { x: 8, y: 13 } + } + } + } + this.mainWindow = new BrowserWindow({ x: mainWindowState.x, y: mainWindowState.y, @@ -68,11 +88,9 @@ export class WindowService { transparent: false, vibrancy: 'sidebar', visualEffectState: 'active', - titleBarStyle: 'hidden', - titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight, + ...getTitleBarConfig(), backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF', darkTheme: nativeTheme.shouldUseDarkColors, - trafficLightPosition: { x: 8, y: 13 }, ...(isLinux ? { icon } : {}), webPreferences: { preload: join(__dirname, '../preload/index.js'), diff --git a/src/renderer/src/components/app/Navbar.tsx b/src/renderer/src/components/app/Navbar.tsx index 45e59cc2..dd9de916 100644 --- a/src/renderer/src/components/app/Navbar.tsx +++ b/src/renderer/src/components/app/Navbar.tsx @@ -112,8 +112,7 @@ const NavbarMainContainer = styled.div<{ $isFullscreen: boolean }>` padding: 0 ${isMac ? '20px' : 0}; font-weight: bold; color: var(--color-text-1); - padding-right: ${({ $isFullscreen }) => - $isFullscreen ? '12px' : isWin ? '140px' : isLinux ? '120px' : '12px'}; + padding-right: 12px; ` const NavbarHeaderContent = styled.div` From b82be00e6ea8745bba5d81b6fb9cb1520b3d5687 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sat, 13 Sep 2025 22:27:48 +0800 Subject: [PATCH 69/82] refactor: remove legacy manual release scripts in favor of semantic-release (#160) - Remove pre-release-check.ts script with version validation and Git status checks - Remove release.ts script with interactive version selection and build automation - Remove rename-artifacts.ts script with platform-specific file renaming logic - Remove version-manager.ts script with semver version bumping functionality - Clean up package.json scripts: remove version:*, release:*, and related commands - Retain semantic-release configuration and migrate:* database commands - Transition from custom release tooling to standardized semantic-release workflow The removed scripts provided manual release management including: - Interactive version type selection (patch/minor/major/prerelease/beta) - Git status validation and commit automation - Cross-platform artifact renaming (Windows/macOS/Linux) - Build orchestration and publishing workflows This refactoring simplifies the release process by adopting semantic-release as the single source of truth for version management and automated publishing, reducing maintenance overhead and improving consistency with modern CI/CD practices. --- package.json | 15 -- scripts/pre-release-check.ts | 184 ------------- scripts/release.ts | 226 ---------------- scripts/rename-artifacts.ts | 499 ----------------------------------- scripts/version-manager.ts | 231 ---------------- 5 files changed, 1155 deletions(-) delete mode 100644 scripts/pre-release-check.ts delete mode 100644 scripts/release.ts delete mode 100644 scripts/rename-artifacts.ts delete mode 100644 scripts/version-manager.ts diff --git a/package.json b/package.json index 4477afe4..5e1bb8fb 100644 --- a/package.json +++ b/package.json @@ -40,27 +40,12 @@ "test:e2e:ui": "playwright test --ui", "test:e2e:debug": "playwright test --debug", "test:e2e:report": "playwright show-report", - "version:current": "tsx scripts/version-manager.ts current", - "version:set": "tsx scripts/version-manager.ts set", - "version:major": "tsx scripts/version-manager.ts major", - "version:minor": "tsx scripts/version-manager.ts minor", - "version:patch": "tsx scripts/version-manager.ts patch", - "version:prerelease": "tsx scripts/version-manager.ts prerelease", - "version:beta": "tsx scripts/version-manager.ts minor beta", - "version:beta-patch": "tsx scripts/version-manager.ts patch beta", - "release": "npm run build:release && electron-builder --publish onTagOrDraft", - "release:all": "npm run build:release && electron-builder --publish always", - "release:never": "npm run build:release && electron-builder --publish never", - "release:draft": "npm run build:release && electron-builder --publish onTagOrDraft", "migrate": "tsx src/main/db/migration-cli.ts", "migrate:up": "npm run migrate up", "migrate:down": "npm run migrate down", "migrate:status": "npm run migrate status", "migrate:create": "npm run migrate create", "migrate:validate": "npm run migrate validate", - "release:rename": "tsx scripts/rename-artifacts.ts", - "release:auto": "tsx scripts/release.ts", - "release:check": "tsx scripts/pre-release-check.ts", "semantic-release": "semantic-release", "semantic-release:dry-run": "semantic-release --dry-run", "prepare": "husky", diff --git a/scripts/pre-release-check.ts b/scripts/pre-release-check.ts deleted file mode 100644 index b6a53323..00000000 --- a/scripts/pre-release-check.ts +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/env node - -/** - * 发布前检查脚本 / Pre-release Check Script - * - * 功能 / Features: - * 1. 检查版本号是否需要更新 / Check if version needs update - * 2. 检查 Git 状态 / Check Git status - * 3. 运行基本测试 / Run basic tests - * 4. 检查构建状态 / Check build status - */ - -import { execSync } from 'child_process' -import * as fs from 'fs' -import * as path from 'path' -import { fileURLToPath } from 'url' - -const __filename = fileURLToPath(import.meta.url) -const __dirname = path.dirname(__filename) -const PACKAGE_JSON_PATH = path.join(__dirname, '..', 'package.json') - -interface PackageJson { - version: string - [key: string]: unknown -} - -function readPackageJson(): PackageJson { - const content = fs.readFileSync(PACKAGE_JSON_PATH, 'utf8') - return JSON.parse(content) as PackageJson -} - -function execCommand(command: string): string { - try { - return execSync(command, { encoding: 'utf8', stdio: 'pipe' }) - } catch { - return '' - } -} - -function checkGitStatus(): { isClean: boolean; hasUncommitted: boolean; branch: string } { - const status = execCommand('git status --porcelain') - const branch = execCommand('git branch --show-current').trim() - - return { - isClean: !status.trim(), - hasUncommitted: !!status.trim(), - branch - } -} - -// function getLastCommitMessage(): string { -// return execCommand('git log -1 --pretty=%B').trim() -// } - -// function getGitTagsSinceVersion(version: string): string[] { -// const tags = execCommand(`git tag --list --sort=-version:refname`) -// return tags.split('\n').filter((tag) => tag.trim().startsWith('v')) -// } - -function checkVersionNeedsUpdate(): { - needsUpdate: boolean - currentVersion: string - lastTag: string - commitsSinceTag: number -} { - const packageData = readPackageJson() - const currentVersion = packageData.version - - // 获取最新的版本标签 / Get latest version tag - const lastTag = execCommand('git describe --tags --abbrev=0').trim() - - // 计算自上次标签以来的提交数 / Count commits since last tag - const commitsSinceTag = parseInt( - execCommand('git rev-list --count HEAD ^' + lastTag).trim() || '0' - ) - - // 检查当前版本是否与最新标签匹配 / Check if current version matches latest tag - const needsUpdate = lastTag !== `v${currentVersion}` || commitsSinceTag > 0 - - return { - needsUpdate, - currentVersion, - lastTag: lastTag.replace('v', ''), - commitsSinceTag - } -} - -function analyzeChanges(): { hasFeatures: boolean; hasFixes: boolean; hasBreaking: boolean } { - // 分析自上次标签以来的提交类型 / Analyze commit types since last tag - const lastTag = execCommand('git describe --tags --abbrev=0').trim() - const commits = execCommand(`git log ${lastTag}..HEAD --oneline`).trim() - - if (!commits) { - return { hasFeatures: false, hasFixes: false, hasBreaking: false } - } - - const hasFeatures = /feat(\(.*\))?:/i.test(commits) - const hasFixes = /fix(\(.*\))?:/i.test(commits) - const hasBreaking = /BREAKING CHANGE|!:/i.test(commits) - - return { hasFeatures, hasFixes, hasBreaking } -} - -function suggestVersionType(): string { - const changes = analyzeChanges() - - if (changes.hasBreaking) { - return 'major' - } else if (changes.hasFeatures) { - return 'minor' - } else if (changes.hasFixes) { - return 'patch' - } else { - return 'patch' - } -} - -function main(): void { - console.log('🔍 EchoPlayer 发布前检查 / Pre-release Check') - console.log('=====================================') - - // 检查 Git 状态 / Check Git status - const gitStatus = checkGitStatus() - console.log(`\n📋 Git 状态 / Git Status:`) - console.log(`当前分支 / Current branch: ${gitStatus.branch}`) - console.log( - `工作区状态 / Working directory: ${gitStatus.isClean ? '✅ 干净' : '⚠️ 有未提交的更改'}` - ) - - if (gitStatus.hasUncommitted) { - console.log('\n⚠️ 检测到未提交的更改，建议先提交所有更改') - const status = execCommand('git status --porcelain') - console.log(status) - } - - // 检查版本状态 / Check version status - const versionInfo = checkVersionNeedsUpdate() - console.log(`\n📦 版本信息 / Version Information:`) - console.log(`当前版本 / Current version: ${versionInfo.currentVersion}`) - console.log(`最新标签 / Latest tag: ${versionInfo.lastTag}`) - console.log(`自标签以来的提交 / Commits since tag: ${versionInfo.commitsSinceTag}`) - - if (versionInfo.needsUpdate) { - console.log('\n🎯 版本更新建议 / Version Update Recommendation:') - const suggestedType = suggestVersionType() - console.log(`建议的版本类型 / Suggested version type: ${suggestedType}`) - - const changes = analyzeChanges() - if (changes.hasBreaking) { - console.log(' - 检测到破坏性更改 / Breaking changes detected') - } - if (changes.hasFeatures) { - console.log(' - 检测到新功能 / New features detected') - } - if (changes.hasFixes) { - console.log(' - 检测到修复 / Bug fixes detected') - } - - console.log('\n💡 更新版本命令建议 / Suggested version update commands:') - console.log(`npm run version:${suggestedType}`) - console.log('或使用自动化发布工具 / Or use automated release tool:') - console.log('npm run release:auto') - } else { - console.log('\n✅ 版本号已是最新') - } - - if (gitStatus.hasUncommitted || versionInfo.needsUpdate) { - console.log('\n⚠️ 建议在发布前完成以下操作:') - if (gitStatus.hasUncommitted) { - console.log(' 1. 提交所有未保存的更改') - } - if (versionInfo.needsUpdate) { - console.log(' 2. 更新版本号') - } - console.log(' 3. 运行完整测试套件') - console.log(' 4. 使用 npm run release:auto 进行自动化发布') - } else { - console.log('\n🎉 所有检查通过，可以进行发布!') - console.log('💡 使用以下命令进行发布:') - console.log(' npm run release:auto') - } -} - -main() diff --git a/scripts/release.ts b/scripts/release.ts deleted file mode 100644 index d6df72e9..00000000 --- a/scripts/release.ts +++ /dev/null @@ -1,226 +0,0 @@ -#!/usr/bin/env node - -/** - * 自动化发布脚本 / Automated Release Script - * - * 功能 / Features: - * 1. 检查当前版本状态 / Check current version status - * 2. 提示用户选择版本类型 / Prompt user to select version type - * 3. 自动更新版本号 / Automatically update version number - * 4. 构建项目 / Build project - * 5. 创建 Git 标签 / Create Git tag - * 6. 发布应用 / Publish application - */ - -import { execSync } from 'child_process' -import * as fs from 'fs' -import * as path from 'path' -import * as readline from 'readline' -import { fileURLToPath } from 'url' - -const __filename = fileURLToPath(import.meta.url) -const __dirname = path.dirname(__filename) -const PACKAGE_JSON_PATH = path.join(__dirname, '..', 'package.json') - -interface PackageJson { - version: string - [key: string]: unknown -} - -function readPackageJson(): PackageJson { - const content = fs.readFileSync(PACKAGE_JSON_PATH, 'utf8') - return JSON.parse(content) as PackageJson -} - -function execCommand(command: string, description: string): void { - console.log(`\n🔄 ${description}...`) - try { - execSync(command, { stdio: 'inherit' }) - console.log(`✅ ${description} 完成`) - } catch { - console.error(`❌ ${description} 失败`) - process.exit(1) - } -} - -function promptUser(question: string): Promise { - const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout - }) - - return new Promise((resolve) => { - rl.question(question, (answer: string) => { - rl.close() - resolve(answer.trim()) - }) - }) -} - -async function selectVersionType(): Promise { - console.log('\n📦 请选择版本类型 / Please select version type:') - console.log('1. patch - 补丁版本 (0.2.0 -> 0.2.1)') - console.log('2. minor - 次版本 (0.2.0 -> 0.3.0)') - console.log('3. major - 主版本 (0.2.0 -> 1.0.0)') - console.log('4. prerelease - 预发布递增 (0.2.0-alpha.2 -> 0.2.0-alpha.3)') - console.log('5. beta - Beta 版本') - console.log('6. beta-patch - Beta 补丁版本') - console.log('7. custom - 自定义版本号') - - const choice = await promptUser('请输入选择 (1-7): ') - - switch (choice) { - case '1': - return 'patch' - case '2': - return 'minor' - case '3': - return 'major' - case '4': - return 'prerelease' - case '5': - return 'beta' - case '6': - return 'beta-patch' - case '7': { - const customVersion = await promptUser('请输入自定义版本号 (例如: 1.0.0 或 1.0.0-beta.1): ') - return `custom:${customVersion}` - } - default: { - console.log('无效选择，使用默认的 patch 版本') - return 'patch' - } - } -} - -async function confirmRelease(currentVersion: string, newVersion: string): Promise { - console.log(`\n📋 发布信息 / Release Information:`) - console.log(`当前版本 / Current Version: ${currentVersion}`) - console.log(`新版本 / New Version: ${newVersion}`) - - const confirm = await promptUser('\n确认发布? (y/N): ') - return confirm.toLowerCase() === 'y' || confirm.toLowerCase() === 'yes' -} - -async function selectReleaseChannel(): Promise { - console.log('\n🚀 请选择发布渠道 / Please select release channel:') - console.log('1. draft - 草稿发布 (推荐)') - console.log('2. onTagOrDraft - 标签或草稿发布') - console.log('3. always - 总是发布') - console.log('4. never - 仅构建不发布') - - const choice = await promptUser('请输入选择 (1-4): ') - - switch (choice) { - case '1': - return 'release:draft' - case '2': - return 'release' - case '3': - return 'release:all' - case '4': - return 'release:never' - default: { - console.log('无效选择，使用默认的草稿发布') - return 'release:draft' - } - } -} - -async function main(): Promise { - console.log('🎯 EchoPlayer 自动化发布工具 / Automated Release Tool') - console.log('=====================================') - - // 检查当前版本 / Check current version - const packageData = readPackageJson() - const currentVersion = packageData.version - console.log(`\n📍 当前版本 / Current Version: ${currentVersion}`) - - // 检查 Git 状态 / Check Git status - try { - const gitStatus = execSync('git status --porcelain', { encoding: 'utf8' }) - if (gitStatus.trim()) { - console.log('\n⚠️ 检测到未提交的更改 / Uncommitted changes detected:') - console.log(gitStatus) - const proceed = await promptUser('是否继续发布? (y/N): ') - if (proceed.toLowerCase() !== 'y') { - console.log('发布已取消') - process.exit(0) - } - } - } catch (error) { - console.log('⚠️ 无法检查 Git 状态，继续执行...') - } - - // 选择版本类型 / Select version type - const versionChoice = await selectVersionType() - - // 更新版本号 / Update version number - let newVersion: string - if (versionChoice.startsWith('custom:')) { - const customVersion = versionChoice.replace('custom:', '') - execCommand(`npm run version:set -- ${customVersion}`, '设置自定义版本') - newVersion = customVersion - } else { - execCommand(`npm run version:${versionChoice}`, '更新版本号') - const updatedPackageData = readPackageJson() - newVersion = updatedPackageData.version - } - - // 确认发布 / Confirm release - const shouldRelease = await confirmRelease(currentVersion, newVersion) - if (!shouldRelease) { - console.log('发布已取消') - process.exit(0) - } - - // 运行测试 / Run tests - const runTests = await promptUser('\n是否运行测试? (Y/n): ') - if (runTests.toLowerCase() !== 'n' && runTests.toLowerCase() !== 'no') { - execCommand('npm run test:run', '运行单元测试') - execCommand('npm run lint', '代码检查') - execCommand('npm run typecheck', '类型检查') - } - - // 选择发布渠道 / Select release channel - const releaseChannel = await selectReleaseChannel() - - // 提交版本更改 / Commit version changes - try { - execCommand(`git add package.json`, '添加版本文件到 Git') - execCommand(`git commit -m "chore: release v${newVersion}"`, '提交版本更改') - execCommand(`git tag v${newVersion}`, '创建 Git 标签') - } catch (error) { - console.log('⚠️ Git 操作可能失败，继续构建...') - } - - // 构建和发布 / Build and release - execCommand(`npm run ${releaseChannel}`, '构建和发布应用') - - console.log('\n🎉 发布完成! / Release completed!') - console.log(`✅ 版本 ${newVersion} 已成功发布`) - - // 推送到远程仓库 / Push to remote repository - const pushToRemote = await promptUser('\n是否推送到远程仓库? (Y/n): ') - if (pushToRemote.toLowerCase() !== 'n' && pushToRemote.toLowerCase() !== 'no') { - try { - execCommand('git push origin main', '推送代码到远程仓库') - execCommand('git push origin --tags', '推送标签到远程仓库') - } catch (error) { - console.log('⚠️ 推送失败，请手动推送') - } - } - - console.log('\n🏁 所有操作完成!') -} - -// 处理未捕获的异常 / Handle uncaught exceptions -process.on('unhandledRejection', (error) => { - console.error('❌ 发布过程中出现错误:', error) - process.exit(1) -}) - -main().catch((error) => { - console.error('❌ 发布失败:', error) - process.exit(1) -}) diff --git a/scripts/rename-artifacts.ts b/scripts/rename-artifacts.ts deleted file mode 100644 index 8419eed9..00000000 --- a/scripts/rename-artifacts.ts +++ /dev/null @@ -1,499 +0,0 @@ -#!/usr/bin/env node - -/** - * 构建产物重命名脚本 / Build Artifacts Rename Script - * - * 功能 / Features: - * 1. 重命名构建产物以符合发布要求 / Rename build artifacts to meet release requirements - * 2. 处理不同平台的文件格式 / Handle different platform file formats - * 3. 确保文件名一致性 / Ensure filename consistency - * 4. 支持版本号和架构标识 / Support version and architecture identification - */ - -import * as fs from 'fs' -import * as path from 'path' - -// 项目根目录 / Project root directory -const PROJECT_ROOT = path.join(process.cwd()) -const DIST_DIR = path.join(PROJECT_ROOT, 'dist') -const PACKAGE_JSON_PATH = path.join(PROJECT_ROOT, 'package.json') - -interface PackageJson { - version: string - productName?: string - [key: string]: unknown -} - -/** - * 读取 package.json 获取版本信息 / Read package.json to get version info - */ -function getPackageInfo(): { version: string; productName: string } { - try { - const packageJson: PackageJson = JSON.parse(fs.readFileSync(PACKAGE_JSON_PATH, 'utf8')) - return { - version: packageJson.version, - productName: packageJson.productName || 'echoplayer' - } - } catch (error) { - console.error('❌ 无法读取 package.json:', error) - process.exit(1) - } -} - -/** - * 获取平台和架构信息 / Get platform and architecture info - */ -function getPlatformInfo(): { platform: string; arch: string } { - // 优先使用 GitHub Actions 矩阵变量 / Prefer GitHub Actions matrix variables - const buildPlatform = process.env.BUILD_PLATFORM - const buildArch = process.env.BUILD_ARCH - - if (buildPlatform && buildArch) { - console.log(`🎯 使用 GitHub Actions 矩阵配置: ${buildPlatform}-${buildArch}`) - return { - platform: buildPlatform, - arch: buildArch - } - } - - // 回退到系统检测 / Fallback to system detection - const platform = process.env.RUNNER_OS?.toLowerCase() || process.platform - const arch = process.env.RUNNER_ARCH || process.arch - - // 标准化平台名称 / Normalize platform names - const normalizedPlatform = - platform === 'windows' || platform === 'win32' - ? 'win' - : platform === 'macos' || platform === 'darwin' - ? 'mac' - : platform === 'linux' - ? 'linux' - : platform - - // 标准化架构名称 / Normalize architecture names - // 对于 Linux 平台，保留 amd64 架构名称 / For Linux platform, keep amd64 architecture name - const normalizedArch = (() => { - if (normalizedPlatform === 'linux') { - // Linux 平台保留原有架构名称，特别是 amd64 / Keep original arch names for Linux, especially amd64 - return arch === 'x86_64' ? 'amd64' : arch === 'x64' ? 'amd64' : arch - } else { - // 其他平台使用标准化命名 / Use normalized naming for other platforms - return arch === 'x64' ? 'x64' : arch === 'arm64' ? 'arm64' : arch === 'x86_64' ? 'x64' : arch - } - })() - - console.log(`🔍 使用系统检测: ${normalizedPlatform}-${normalizedArch}`) - return { - platform: normalizedPlatform, - arch: normalizedArch - } -} - -/** - * 检查文件是否存在 / Check if file exists - */ -function fileExists(filePath: string): boolean { - try { - return fs.existsSync(filePath) - } catch { - return false - } -} - -/** - * 重命名文件 / Rename file - */ -function renameFile(oldPath: string, newPath: string): boolean { - try { - if (!fileExists(oldPath)) { - console.log(`⚠️ 源文件不存在: ${oldPath}`) - return false - } - - if (fileExists(newPath)) { - console.log(`⚠️ 目标文件已存在: ${newPath}`) - return false - } - - fs.renameSync(oldPath, newPath) - console.log(`✅ 重命名成功: ${path.basename(oldPath)} -> ${path.basename(newPath)}`) - return true - } catch (error) { - console.error(`❌ 重命名失败: ${oldPath} -> ${newPath}`, error) - return false - } -} - -/** - * 列出 dist 目录中的所有文件 / List all files in dist directory - */ -function listDistFiles(): string[] { - try { - const files = fs.readdirSync(DIST_DIR, { recursive: true }) - return files - .filter( - (file) => typeof file === 'string' && !fs.statSync(path.join(DIST_DIR, file)).isDirectory() - ) - .map((file) => file.toString()) - } catch (error) { - console.error('❌ 无法读取 dist 目录:', error) - return [] - } -} - -/** - * 处理 Windows 构建产物 / Handle Windows build artifacts - */ -function handleWindowsArtifacts(version: string, productName: string, arch: string): number { - let renamedCount = 0 - const files = listDistFiles() - - // 查找 Windows 安装程序 / Find Windows installer - const setupPattern = /\.exe$/i - const setupFiles = files.filter((file) => setupPattern.test(file)) - - for (const file of setupFiles) { - const oldPath = path.join(DIST_DIR, file) - const expectedName = `${productName}-${version}-${arch}-setup.exe` - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ Windows 安装程序已是正确名称: ${file}`) - renamedCount++ - } - } - - // 更新 latest.yml 文件中的文件引用 / Update file references in latest.yml - const latestYmlPath = path.join(DIST_DIR, 'latest.yml') - if (fs.existsSync(latestYmlPath)) { - try { - let yamlContent = fs.readFileSync(latestYmlPath, 'utf8') - let updated = false - - // 更新 EXE 文件引用 / Update EXE file references - const oldExeName = `${productName}-${version}-setup.exe` - const newExeName = `${productName}-${version}-${arch}-setup.exe` - if (yamlContent.includes(oldExeName)) { - yamlContent = yamlContent.replace(new RegExp(oldExeName, 'g'), newExeName) - updated = true - console.log(`✅ 更新 YAML 中的 EXE 文件引用: ${oldExeName} -> ${newExeName}`) - } - - if (updated) { - fs.writeFileSync(latestYmlPath, yamlContent, 'utf8') - console.log(`✅ 已更新 latest.yml 文件`) - renamedCount++ - } - } catch (error) { - console.error(`❌ 更新 latest.yml 文件失败:`, error) - } - } - - return renamedCount -} - -/** - * 处理 macOS 构建产物 / Handle macOS build artifacts - */ -function handleMacOSArtifacts(version: string, productName: string, arch: string): number { - let renamedCount = 0 - const files = listDistFiles() - - // 查找 macOS DMG 文件 / Find macOS DMG files - const dmgPattern = /\.dmg$/i - const dmgFiles = files.filter((file) => dmgPattern.test(file)) - - for (const file of dmgFiles) { - const oldPath = path.join(DIST_DIR, file) - const expectedName = `${productName}-${version}-${arch}.dmg` - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ macOS DMG 文件已是正确名称: ${file}`) - renamedCount++ - } - } - - // 查找 macOS ZIP 文件 / Find macOS ZIP files - const zipPattern = /\.zip$/i - const zipFiles = files.filter((file) => zipPattern.test(file)) - - for (const file of zipFiles) { - const oldPath = path.join(DIST_DIR, file) - const expectedName = `${productName}-${version}-${arch}.zip` - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ macOS ZIP 文件已是正确名称: ${file}`) - renamedCount++ - } - } - - // 查找 macOS blockmap 文件 / Find macOS blockmap files - const blockmapPattern = /\.blockmap$/i - const blockmapFiles = files.filter((file) => blockmapPattern.test(file)) - - for (const file of blockmapFiles) { - const oldPath = path.join(DIST_DIR, file) - let expectedName = '' - - if (file.includes('.dmg.blockmap')) { - expectedName = `${productName}-${version}-${arch}.dmg.blockmap` - } else if (file.includes('.zip.blockmap')) { - expectedName = `${productName}-${version}-${arch}.zip.blockmap` - } else { - continue // 跳过不匹配的 blockmap 文件 - } - - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ macOS blockmap 文件已是正确名称: ${file}`) - renamedCount++ - } - } - - // 更新 latest-mac.yml 文件中的文件引用 / Update file references in latest-mac.yml - const latestMacYmlPath = path.join(DIST_DIR, 'latest-mac.yml') - if (fs.existsSync(latestMacYmlPath)) { - try { - let yamlContent = fs.readFileSync(latestMacYmlPath, 'utf8') - let updated = false - - // 更新 ZIP 文件引用 / Update ZIP file references - const oldZipName = `${productName}-${version}-mac.zip` - const newZipName = `${productName}-${version}-${arch}.zip` - if (yamlContent.includes(oldZipName)) { - yamlContent = yamlContent.replace(new RegExp(oldZipName, 'g'), newZipName) - updated = true - console.log(`✅ 更新 YAML 中的 ZIP 文件引用: ${oldZipName} -> ${newZipName}`) - } - - // 更新 DMG 文件引用 / Update DMG file references - const oldDmgName = `${productName}-${version}.dmg` - const newDmgName = `${productName}-${version}-${arch}.dmg` - if (yamlContent.includes(oldDmgName)) { - yamlContent = yamlContent.replace(new RegExp(oldDmgName, 'g'), newDmgName) - updated = true - console.log(`✅ 更新 YAML 中的 DMG 文件引用: ${oldDmgName} -> ${newDmgName}`) - } - - if (updated) { - fs.writeFileSync(latestMacYmlPath, yamlContent, 'utf8') - console.log(`✅ 已更新 latest-mac.yml 文件`) - renamedCount++ - } - } catch (error) { - console.error(`❌ 更新 latest-mac.yml 文件失败:`, error) - } - } - - return renamedCount -} - -/** - * 处理 Linux 构建产物 / Handle Linux build artifacts - */ - -function handleLinuxArtifacts(version: string, productName: string, arch: string): number { - let renamedCount = 0 - const files = listDistFiles() - - // 查找 Linux AppImage 文件 / Find Linux AppImage files - const appImagePattern = /\.AppImage$/i - const appImageFiles = files.filter((file) => appImagePattern.test(file)) - - for (const file of appImageFiles) { - const oldPath = path.join(DIST_DIR, file) - - // 检测实际文件名中的架构标识 / Detect architecture identifier in actual filename - let targetArch = arch - if (file.includes('x86_64') && arch === 'x64') { - // 如果文件名包含 x86_64 而矩阵配置是 x64，转换为 amd64 - targetArch = 'amd64' - console.log(`🔄 检测到 x86_64 架构，转换为 amd64`) - } - - const expectedName = `${productName}-${version}-${targetArch}.AppImage` - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ Linux AppImage 文件已是正确名称: ${file}`) - renamedCount++ - } - } - - // 查找 Linux DEB 文件 / Find Linux DEB files - const debPattern = /\.deb$/i - const debFiles = files.filter((file) => debPattern.test(file)) - - for (const file of debFiles) { - const oldPath = path.join(DIST_DIR, file) - - // 检测实际文件名中的架构标识 / Detect architecture identifier in actual filename - let targetArch = arch - if (file.includes('amd64') && arch === 'x64') { - // 如果文件名包含 amd64 而矩阵配置是 x64，保持 amd64 - targetArch = 'amd64' - console.log(`🔄 检测到 amd64 架构，保持 amd64`) - } - - const expectedName = `${productName}-${version}-${targetArch}.deb` - const newPath = path.join(DIST_DIR, expectedName) - - if (path.basename(file) !== expectedName) { - if (renameFile(oldPath, newPath)) { - renamedCount++ - } - } else { - console.log(`✅ Linux DEB 文件已是正确名称: ${file}`) - renamedCount++ - } - } - - // 更新 latest-linux.yml 文件中的文件引用 / Update file references in latest-linux.yml - const latestLinuxYmlPath = path.join(DIST_DIR, 'latest-linux.yml') - if (fs.existsSync(latestLinuxYmlPath)) { - try { - let yamlContent = fs.readFileSync(latestLinuxYmlPath, 'utf8') - let updated = false - - // 确定目标架构名称 / Determine target architecture name - let targetArch = arch - if (yamlContent.includes('x86_64') && arch === 'x64') { - targetArch = 'amd64' - console.log(`🔄 YAML 文件中检测到 x86_64，转换为 amd64`) - } - - // 更新 AppImage 文件引用 / Update AppImage file references - const oldAppImageName = `${productName}-${version}.AppImage` - const newAppImageName = `${productName}-${version}-${targetArch}.AppImage` - if (yamlContent.includes(oldAppImageName)) { - yamlContent = yamlContent.replace(new RegExp(oldAppImageName, 'g'), newAppImageName) - updated = true - console.log(`✅ 更新 YAML 中的 AppImage 文件引用: ${oldAppImageName} -> ${newAppImageName}`) - } - - // 处理可能存在的 x86_64 AppImage 引用 / Handle possible x86_64 AppImage references - const oldAppImageNameX86 = `${productName}-${version}-x86_64.AppImage` - if (yamlContent.includes(oldAppImageNameX86) && targetArch === 'amd64') { - yamlContent = yamlContent.replace(new RegExp(oldAppImageNameX86, 'g'), newAppImageName) - updated = true - console.log( - `✅ 更新 YAML 中的 x86_64 AppImage 文件引用: ${oldAppImageNameX86} -> ${newAppImageName}` - ) - } - - // 更新 DEB 文件引用 / Update DEB file references - const oldDebName = `${productName}-${version}.deb` - const newDebName = `${productName}-${version}-${targetArch}.deb` - if (yamlContent.includes(oldDebName)) { - yamlContent = yamlContent.replace(new RegExp(oldDebName, 'g'), newDebName) - updated = true - console.log(`✅ 更新 YAML 中的 DEB 文件引用: ${oldDebName} -> ${newDebName}`) - } - - if (updated) { - fs.writeFileSync(latestLinuxYmlPath, yamlContent, 'utf8') - console.log(`✅ 已更新 latest-linux.yml 文件`) - renamedCount++ - } - } catch (error) { - console.error(`❌ 更新 latest-linux.yml 文件失败:`, error) - } - } - - return renamedCount -} - -/** - * 主函数 / Main function - */ -async function main(): Promise { - console.log('🔄 开始重命名构建产物...') - console.log('🔄 Starting to rename build artifacts...') - - // 检查 dist 目录是否存在 / Check if dist directory exists - if (!fileExists(DIST_DIR)) { - console.error('❌ dist 目录不存在，请先运行构建命令') - process.exit(1) - } - - // 获取项目信息 / Get project info - const { version, productName } = getPackageInfo() - const { platform, arch } = getPlatformInfo() - - console.log(`📦 产品名称: ${productName}`) - console.log(`🏷️ 版本号: ${version}`) - console.log(`💻 平台: ${platform}`) - console.log(`🏗️ 架构: ${arch}`) - - // 列出当前 dist 目录中的文件 / List current files in dist directory - const distFiles = listDistFiles() - console.log(`📁 dist 目录中的文件 (${distFiles.length} 个):`) - distFiles.forEach((file) => console.log(` - ${file}`)) - - let totalRenamed = 0 - - // 根据平台处理构建产物 / Handle build artifacts based on platform - switch (platform) { - case 'win': - case 'windows': - totalRenamed += handleWindowsArtifacts(version, productName, arch) - break - - case 'mac': - case 'macos': - case 'darwin': - totalRenamed += handleMacOSArtifacts(version, productName, arch) - break - - case 'linux': - totalRenamed += handleLinuxArtifacts(version, productName, arch) - break - - default: - console.log(`⚠️ 未知平台: ${platform}，跳过重命名`) - break - } - - // 输出结果 / Output results - console.log(`\n📊 重命名完成统计:`) - console.log(`📊 Rename completion statistics:`) - console.log(`✅ 成功重命名文件数: ${totalRenamed}`) - console.log(`✅ Successfully renamed files: ${totalRenamed}`) - - if (totalRenamed === 0) { - console.log('⚠️ 没有文件需要重命名或重命名失败') - console.log('⚠️ No files need to be renamed or rename failed') - } - - console.log('🎉 构建产物重命名完成!') - console.log('🎉 Build artifacts rename completed!') -} - -// 运行主函数 / Run main function -main().catch((error) => { - console.error('❌ 重命名过程中出现错误:', error) - process.exit(1) -}) diff --git a/scripts/version-manager.ts b/scripts/version-manager.ts deleted file mode 100644 index 841be712..00000000 --- a/scripts/version-manager.ts +++ /dev/null @@ -1,231 +0,0 @@ -#!/usr/bin/env node - -import * as fs from 'fs' -import * as path from 'path' -import { fileURLToPath } from 'url' - -const __filename = fileURLToPath(import.meta.url) -const __dirname = path.dirname(__filename) -const PACKAGE_JSON_PATH = path.join(__dirname, '..', 'package.json') - -/** - * Version types and their meanings: - * - dev: Development version (for active development) - * - test: Test version (for internal testing) - * - alpha: Alpha version (early preview, may have bugs) - * - beta: Beta version (feature complete, testing phase) - * - stable: Stable version (production ready) - */ - -type VersionType = 'dev' | 'test' | 'alpha' | 'beta' | 'stable' -type IncrementType = 'major' | 'minor' | 'patch' - -interface PackageJson { - version: string - [key: string]: unknown -} - -interface ParsedVersion { - major: number - minor: number - patch: number - prerelease: string | null -} - -function readPackageJson(): PackageJson { - const content = fs.readFileSync(PACKAGE_JSON_PATH, 'utf8') - return JSON.parse(content) as PackageJson -} - -function writePackageJson(packageData: PackageJson): void { - fs.writeFileSync(PACKAGE_JSON_PATH, JSON.stringify(packageData, null, 2) + '\n') -} - -function parseVersion(version: string): ParsedVersion { - const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:-(.+))?$/) - if (!match) { - throw new Error(`Invalid version format: ${version}`) - } - - const [, major, minor, patch, prerelease] = match - return { - major: parseInt(major, 10), - minor: parseInt(minor, 10), - patch: parseInt(patch, 10), - prerelease: prerelease || null - } -} - -function formatVersion(versionObj: ParsedVersion): string { - const base = `${versionObj.major}.${versionObj.minor}.${versionObj.patch}` - return versionObj.prerelease ? `${base}-${versionObj.prerelease}` : base -} - -function detectVersionType(version: string): VersionType { - if (!version) return 'stable' - - if (version.includes('dev')) return 'dev' - if (version.includes('test')) return 'test' - if (version.includes('alpha')) return 'alpha' - if (version.includes('beta')) return 'beta' - return 'stable' -} - -function incrementVersion( - currentVersion: string, - type: IncrementType, - versionType: VersionType = 'stable' -): string { - const parsed = parseVersion(currentVersion) - - switch (type) { - case 'major': { - parsed.major++ - parsed.minor = 0 - parsed.patch = 0 - break - } - case 'minor': { - parsed.minor++ - parsed.patch = 0 - break - } - case 'patch': { - parsed.patch++ - break - } - default: { - throw new Error(`Invalid increment type: ${type}`) - } - } - - // Set prerelease based on version type - if (versionType === 'stable') { - parsed.prerelease = null - } else if (versionType === 'beta') { - parsed.prerelease = 'beta.1' - } else if (versionType === 'alpha') { - parsed.prerelease = 'alpha.1' - } else if (versionType === 'dev') { - parsed.prerelease = 'dev.1' - } else if (versionType === 'test') { - parsed.prerelease = 'test.1' - } - - return formatVersion(parsed) -} - -function incrementPrerelease(currentVersion: string): string { - const parsed = parseVersion(currentVersion) - - if (!parsed.prerelease) { - throw new Error('Cannot increment prerelease on stable version') - } - - const match = parsed.prerelease.match(/^(.+)\.(\d+)$/) - if (!match) { - throw new Error(`Invalid prerelease format: ${parsed.prerelease}`) - } - - const [, type, number] = match - parsed.prerelease = `${type}.${parseInt(number, 10) + 1}` - - return formatVersion(parsed) -} - -function main(): void { - const args = process.argv.slice(2) - const command = args[0] - - if (!command) { - console.log(` -Usage: node version-manager.js [options] - -Commands: - current Show current version and type - set Set specific version (e.g., 1.0.0, 1.0.0-beta.1) - major [type] Increment major version (type: stable|beta|alpha|dev|test) - minor [type] Increment minor version (type: stable|beta|alpha|dev|test) - patch [type] Increment patch version (type: stable|beta|alpha|dev|test) - prerelease Increment prerelease number (e.g., beta.1 -> beta.2) - -Examples: - node version-manager.js current - node version-manager.js set 1.0.0-beta.1 - node version-manager.js minor beta - node version-manager.js prerelease - `) - return - } - - const packageData = readPackageJson() - const currentVersion = packageData.version - const currentType = detectVersionType(currentVersion) - - try { - switch (command) { - case 'current': { - console.log(`Current version: ${currentVersion}`) - console.log(`Version type: ${currentType}`) - break - } - - case 'set': { - const newVersion = args[1] - if (!newVersion) { - console.error('Please provide a version number') - process.exit(1) - } - packageData.version = newVersion - writePackageJson(packageData) - console.log(`Version updated to: ${newVersion}`) - console.log(`Version type: ${detectVersionType(newVersion)}`) - break - } - - case 'major': - case 'minor': - case 'patch': { - const versionType = (args[1] as VersionType) || 'stable' - const incrementedVersion = incrementVersion(currentVersion, command, versionType) - packageData.version = incrementedVersion - writePackageJson(packageData) - console.log(`Version updated from ${currentVersion} to ${incrementedVersion}`) - console.log(`Version type: ${detectVersionType(incrementedVersion)}`) - break - } - - case 'prerelease': { - const prereleaseVersion = incrementPrerelease(currentVersion) - packageData.version = prereleaseVersion - writePackageJson(packageData) - console.log(`Version updated from ${currentVersion} to ${prereleaseVersion}`) - console.log(`Version type: ${detectVersionType(prereleaseVersion)}`) - break - } - - default: { - console.error(`Unknown command: ${command}`) - process.exit(1) - } - } - } catch (error) { - console.error(`Error: ${(error as Error).message}`) - process.exit(1) - } -} - -// Always run main function when script is executed directly -main() - -export { - detectVersionType, - formatVersion, - incrementPrerelease, - type IncrementType, - incrementVersion, - type PackageJson, - type ParsedVersion, - parseVersion, - type VersionType -} From 3d90e674821cffb0fe1732bfbd18830fbda9b1e9 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sat, 13 Sep 2025 22:55:06 +0800 Subject: [PATCH 70/82] fix(updater): resolve pre-release version detection issue (#161) - Replace find() with filter() + sort() to get the latest matching release - Increase API request limit from 8 to 20 releases for better coverage - Add proper sorting by published_at timestamp to ensure latest version - Enhance logging for better debugging of version detection process Fixes issue where alpha.10 was not detected due to find() returning the first match instead of the latest published version. --- src/main/services/AppUpdater.ts | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts index 879e3b44..6fcae5a2 100644 --- a/src/main/services/AppUpdater.ts +++ b/src/main/services/AppUpdater.ts @@ -79,7 +79,7 @@ export default class AppUpdater { try { logger.info('get pre release version from github', channel) const responses = await fetch( - 'https://api.github.com/repos/mkdir700/EchoPlayer/releases?per_page=8', + 'https://api.github.com/repos/mkdir700/EchoPlayer/releases?per_page=20', { headers: { Accept: 'application/vnd.github+json', @@ -89,12 +89,25 @@ export default class AppUpdater { } ) const data = (await responses.json()) as GithubReleaseInfo[] - const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => { + + // 过滤出匹配渠道的预发布版本 + const matchingReleases = data.filter((item: GithubReleaseInfo) => { return item.prerelease && item.tag_name.includes(`-${channel}.`) }) - logger.info('release info', release) - return release ? release : null + if (matchingReleases.length === 0) { + logger.info('No matching pre-release found for channel:', channel) + return null + } + + // 按发布时间排序，获取最新的版本 + const release = matchingReleases.sort( + (a, b) => + new Date(b.published_at || '').getTime() - new Date(a.published_at || '').getTime() + )[0] + + logger.info('Latest release info for channel', channel, ':', release) + return release } catch (error) { logger.error('Failed to get latest not draft version from github:', error) return null From 25bc32b5eabcef9342dff9f9319036e85052506e Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sat, 13 Sep 2025 23:03:34 +0800 Subject: [PATCH 71/82] fix(player): persist relocated video file path to database (#162) When users relocate a missing video file through the error recovery dialog, the new file path is now properly saved to the database instead of only updating local state. This ensures the relocated path persists across app sessions, eliminating the need to relocate files repeatedly. Changes: - Update handleFileRelocate to fetch video record and file ID - Call db.files.updateFile() to persist new path to database - Maintain existing local state updates for immediate UI response - Add comprehensive error handling and logging Fixes issue where video file relocation was temporary and required repeated user action on subsequent app launches. --- src/renderer/src/pages/player/PlayerPage.tsx | 26 +++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/pages/player/PlayerPage.tsx b/src/renderer/src/pages/player/PlayerPage.tsx index 933d5f06..9283064c 100644 --- a/src/renderer/src/pages/player/PlayerPage.tsx +++ b/src/renderer/src/pages/player/PlayerPage.tsx @@ -197,9 +197,20 @@ function PlayerPage() { try { logger.info('开始重新定位视频文件', { videoId, newPath }) - // 更新数据库中的文件路径 - // 这里需要调用数据库服务来更新文件记录 - // 暂时先更新本地状态，实际实现需要更新数据库 + // 1. 获取视频记录以获得文件ID + const videoLibService = new VideoLibraryService() + const record = await videoLibService.getRecordById(videoId) + if (!record) { + throw new Error('视频记录不存在') + } + + // 2. 更新数据库中的文件路径 + const updatedFile = await db.files.updateFile(record.fileId, { path: newPath }) + if (!updatedFile) { + throw new Error('更新文件路径失败') + } + + // 3. 更新本地状态 const newFileUrl = toFileUrl(newPath) const updatedVideoData = { ...videoData, @@ -209,9 +220,16 @@ function PlayerPage() { setVideoData(updatedVideoData) setVideoError(null) // 清除错误状态 - logger.info('视频文件路径已更新', { videoId, newPath, newFileUrl }) + logger.info('视频文件路径已成功更新到数据库', { + videoId, + fileId: record.fileId, + oldPath: updatedFile.path !== newPath ? '已更新' : '未知', + newPath, + newFileUrl + }) } catch (error) { logger.error('重新定位视频文件时出错', { error }) + // 可以考虑向用户显示错误提示 } }, [videoData, videoId] From 61efdad12214b5fb1a4fd1344a96c2b496d27749 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sun, 14 Sep 2025 09:56:02 +0800 Subject: [PATCH 72/82] feat(ffmpeg): add China mirror support for FFmpeg downloads (#164) * feat(ffmpeg): add China mirror support for FFmpeg downloads - Add IP-based region detection using ipinfo.io API - Support China mainland, Hong Kong, Macau, Taiwan regions - Add dedicated China mirror URLs from gitcode.com - Implement automatic fallback from China to global mirrors - Add comprehensive test coverage for new functionality - Default to China mirror on detection failure for better UX Breaking change: Service now defaults to China mirror for better performance in Chinese regions * fix(test): remove unused parameter in FFmpegDownloadService test - Fix TypeScript error TS6133 for unused 'url' parameter - Replace unused 'url' with underscore in mock implementation --- src/main/services/FFmpegDownloadService.ts | 232 ++++++++++++++-- .../__tests__/FFmpegDownloadService.test.ts | 250 ++++++++++++++++++ 2 files changed, 467 insertions(+), 15 deletions(-) diff --git a/src/main/services/FFmpegDownloadService.ts b/src/main/services/FFmpegDownloadService.ts index dd85fcbf..b9e02729 100644 --- a/src/main/services/FFmpegDownloadService.ts +++ b/src/main/services/FFmpegDownloadService.ts @@ -103,29 +103,139 @@ const FFMPEG_VERSIONS: Record> = { } } -// 镜像源配置 - TODO: 将来实现镜像源切换 -// const MIRROR_SOURCES = { -// china: { -// github: 'https://ghproxy.com/', // GitHub 代理 -// evermeet: 'https://cdn.example.cn/ffmpeg/', // 假设的国内镜像 -// johnvansickle: 'https://cdn.example.cn/ffmpeg/' // 假设的国内镜像 -// }, -// global: { -// github: '', -// evermeet: '', -// johnvansickle: '' -// } -// } +// 中国区专供的 FFmpeg 配置 +const CHINA_FFMPEG_VERSIONS: Record> = { + win32: { + x64: { + version: '6.1', + platform: 'win32', + arch: 'x64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/win32-x64.zip', + size: 60 * 1024 * 1024, + extractPath: 'win32-x64/ffmpeg.exe' + }, + arm64: { + version: '6.1', + platform: 'win32', + arch: 'arm64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/win32-arm64.zip', + size: 45 * 1024 * 1024, + extractPath: 'win32-arm64/ffmpeg.exe' + } + }, + darwin: { + x64: { + version: '6.1', + platform: 'darwin', + arch: 'x64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/darwin-x64.zip', + size: 24 * 1024 * 1024, + extractPath: 'darwin-x64/ffmpeg' + }, + arm64: { + version: '6.1', + platform: 'darwin', + arch: 'arm64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/darwin-arm64.zip', + size: 24 * 1024 * 1024, + extractPath: 'darwin-arm64/ffmpeg' + } + }, + linux: { + x64: { + version: '6.1', + platform: 'linux', + arch: 'x64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/linux-x64.zip', + size: 28 * 1024 * 1024, + extractPath: 'linux-x64/ffmpeg' + }, + arm64: { + version: '6.1', + platform: 'linux', + arch: 'arm64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/linux-arm64.zip', + size: 24 * 1024 * 1024, + extractPath: 'linux-arm64/ffmpeg' + } + } +} export class FFmpegDownloadService { private downloadProgress = new Map() private downloadController = new Map() private readonly binariesDir: string + private useChinaMirror: boolean = false + private regionDetectionPromise: Promise | null = null constructor() { // FFmpeg 存储在 userData/binaries/ffmpeg/ 目录 this.binariesDir = path.join(app.getPath('userData'), 'binaries', 'ffmpeg') this.ensureDir(this.binariesDir) + // 异步检测地区并设置镜像源（不阻塞初始化） + this.regionDetectionPromise = this.detectRegionAndSetMirror() + } + + /** + * 通过 IP 地理位置检测用户地区并设置镜像源 + */ + private async detectRegionAndSetMirror(): Promise { + try { + const country = await this.getIpCountry() + + // 中国大陆、香港、澳门、台湾用户都使用中国镜像源 + const chineseRegions = ['cn', 'hk', 'mo', 'tw'] + this.useChinaMirror = chineseRegions.includes(country?.toLowerCase() || '') + + logger.info('通过IP检测地区，设置镜像源', { + country, + useChinaMirror: this.useChinaMirror + }) + } catch (error) { + logger.warn('无法检测用户地区，使用默认镜像源', { error }) + this.useChinaMirror = true // 检测失败时默认使用中国镜像源 + } + } + + /** + * 获取用户IP对应的国家代码 + */ + private async getIpCountry(): Promise { + try { + // 使用 AbortController 设置 5 秒超时 + const controller = new AbortController() + const timeoutId = setTimeout(() => controller.abort(), 5000) + + const response = await fetch('https://ipinfo.io/json', { + signal: controller.signal, + headers: { + 'User-Agent': 'EchoPlayer-FFmpeg-Downloader/2.0', + 'Accept-Language': 'en-US,en;q=0.9' + } + }) + + clearTimeout(timeoutId) + const data = await response.json() + return data.country || 'CN' // 默认返回 CN，这样中国用户即使检测失败也能使用中国镜像源 + } catch (error) { + logger.warn('获取IP地理位置失败，默认使用中国镜像源', { error }) + return 'CN' // 默认返回 CN + } + } + + /** + * 手动设置镜像源 + */ + public setMirrorSource(useChina: boolean): void { + this.useChinaMirror = useChina + logger.info('手动设置镜像源', { useChinaMirror: this.useChinaMirror }) + } + + /** + * 获取当前使用的镜像源 + */ + public getCurrentMirrorSource(): 'china' | 'global' { + return this.useChinaMirror ? 'china' : 'global' } /** @@ -167,6 +277,16 @@ export class FFmpegDownloadService { platform = process.platform as Platform, arch = process.arch as Arch ): FFmpegVersion | null { + // 优先使用中国镜像源（如果启用） + if (this.useChinaMirror) { + const chinaVersion = CHINA_FFMPEG_VERSIONS[platform]?.[arch] + if (chinaVersion) { + return chinaVersion + } + logger.warn('中国镜像源不支持当前平台，回退到全球镜像源', { platform, arch }) + } + + // 回退到全球镜像源 return FFMPEG_VERSIONS[platform]?.[arch] || null } @@ -175,11 +295,31 @@ export class FFmpegDownloadService { */ public getAllSupportedVersions(): FFmpegVersion[] { const versions: FFmpegVersion[] = [] - for (const platformConfigs of Object.values(FFMPEG_VERSIONS)) { + + // 添加当前镜像源的版本 + const currentVersions = this.useChinaMirror ? CHINA_FFMPEG_VERSIONS : FFMPEG_VERSIONS + for (const platformConfigs of Object.values(currentVersions)) { + for (const version of Object.values(platformConfigs)) { + versions.push(version) + } + } + + return versions + } + + /** + * 获取指定镜像源的所有支持版本 + */ + public getAllVersionsByMirror(mirrorType: 'china' | 'global'): FFmpegVersion[] { + const versions: FFmpegVersion[] = [] + const versionConfigs = mirrorType === 'china' ? CHINA_FFMPEG_VERSIONS : FFMPEG_VERSIONS + + for (const platformConfigs of Object.values(versionConfigs)) { for (const version of Object.values(platformConfigs)) { versions.push(version) } } + return versions } @@ -205,14 +345,76 @@ export class FFmpegDownloadService { return false } + // 尝试下载（如果中国镜像源失败会自动回退） + return await this.downloadFFmpegWithFallback(platform, arch, onProgress) + } + + /** + * 带回退机制的下载方法 + */ + private async downloadFFmpegWithFallback( + platform: Platform, + arch: Arch, + onProgress?: (progress: DownloadProgress) => void + ): Promise { + // 等待地区检测完成（最多等待 10 秒） + if (this.regionDetectionPromise) { + try { + await Promise.race([ + this.regionDetectionPromise, + new Promise((_, reject) => setTimeout(() => reject(new Error('地区检测超时')), 10000)) + ]) + } catch (error) { + logger.warn('地区检测超时或失败，使用当前镜像源设置', { error }) + } + } + + // 首先尝试当前镜像源 const version = this.getFFmpegVersion(platform, arch) if (!version) { logger.error('不支持的平台', { platform, arch }) return false } - logger.info('开始下载 FFmpeg', { platform, arch, version: version.version }) + logger.info('开始下载 FFmpeg', { + platform, + arch, + version: version.version, + mirrorSource: this.getCurrentMirrorSource(), + url: version.url + }) + + // 尝试下载 + let success = await this.performDownload(platform, arch, version, onProgress) + + // 如果使用中国镜像源失败，自动回退到全球镜像源 + if (!success && this.useChinaMirror) { + logger.warn('中国镜像源下载失败，尝试回退到全球镜像源', { platform, arch }) + + const globalVersion = FFMPEG_VERSIONS[platform]?.[arch] + if (globalVersion) { + logger.info('使用全球镜像源重新下载', { + platform, + arch, + url: globalVersion.url + }) + success = await this.performDownload(platform, arch, globalVersion, onProgress) + } + } + + return success + } + /** + * 执行实际的下载操作 + */ + private async performDownload( + platform: Platform, + arch: Arch, + version: FFmpegVersion, + onProgress?: (progress: DownloadProgress) => void + ): Promise { + const key = `${platform}-${arch}` const controller = new AbortController() this.downloadController.set(key, controller) diff --git a/src/main/services/__tests__/FFmpegDownloadService.test.ts b/src/main/services/__tests__/FFmpegDownloadService.test.ts index 0c5c6e6e..2d3243f7 100644 --- a/src/main/services/__tests__/FFmpegDownloadService.test.ts +++ b/src/main/services/__tests__/FFmpegDownloadService.test.ts @@ -25,6 +25,9 @@ vi.mock('../LoggerService', () => ({ vi.mock('https') vi.mock('child_process') +// Mock global fetch for IP detection tests +global.fetch = vi.fn() + describe('FFmpegDownloadService', () => { let service: FFmpegDownloadService const mockUserDataPath = '/mock/user/data' @@ -101,6 +104,9 @@ describe('FFmpegDownloadService', () => { describe('getFFmpegVersion', () => { it('should return version config for supported platforms', () => { + // 由于现在默认使用中国镜像源，我们需要明确设置镜像源来测试 + service.setMirrorSource(false) // 设置为全球镜像源 + const winVersion = service.getFFmpegVersion('win32', 'x64') expect(winVersion).toMatchObject({ version: '6.1', @@ -144,6 +150,29 @@ describe('FFmpegDownloadService', () => { expect(platforms).toContain('win32-x64') expect(platforms).toContain('darwin-arm64') expect(platforms).toContain('linux-x64') + + // Since we default to China mirror now, verify URLs contain gitcode.com + versions.forEach((version) => { + expect(version.url).toContain('gitcode.com') + }) + }) + + it('should return different versions based on mirror source', () => { + // Test China mirror (default) + service.setMirrorSource(true) + const chinaVersions = service.getAllSupportedVersions() + expect(chinaVersions).toHaveLength(6) + chinaVersions.forEach((version) => { + expect(version.url).toContain('gitcode.com') + }) + + // Test global mirror + service.setMirrorSource(false) + const globalVersions = service.getAllSupportedVersions() + expect(globalVersions).toHaveLength(6) + globalVersions.forEach((version) => { + expect(version.url).not.toContain('gitcode.com') + }) }) }) @@ -238,4 +267,225 @@ describe('FFmpegDownloadService', () => { expect(result).toBe(false) }) }) + + describe('IP 地区检测和镜像源选择', () => { + beforeEach(() => { + vi.clearAllMocks() + }) + + describe('getIpCountry', () => { + it('should detect China region and return CN', async () => { + const mockResponse = { + json: vi.fn().mockResolvedValue({ + country: 'CN', + city: 'Beijing', + region: 'Beijing' + }) + } + vi.mocked(global.fetch).mockResolvedValue(mockResponse as any) + + // 通过反射访问私有方法进行测试 + const country = await (service as any).getIpCountry() + expect(country).toBe('CN') + expect(global.fetch).toHaveBeenCalledWith('https://ipinfo.io/json', { + signal: expect.any(AbortSignal), + headers: { + 'User-Agent': 'EchoPlayer-FFmpeg-Downloader/2.0', + 'Accept-Language': 'en-US,en;q=0.9' + } + }) + }) + + it('should detect Hong Kong region and return HK', async () => { + const mockResponse = { + json: vi.fn().mockResolvedValue({ + country: 'HK', + city: 'Hong Kong', + region: 'Hong Kong' + }) + } + vi.mocked(global.fetch).mockResolvedValue(mockResponse as any) + + const country = await (service as any).getIpCountry() + expect(country).toBe('HK') + }) + + it('should return CN as default when API fails', async () => { + vi.mocked(global.fetch).mockRejectedValue(new Error('Network error')) + + const country = await (service as any).getIpCountry() + expect(country).toBe('CN') // 默认返回 CN，验证回退逻辑 + }) + + it('should handle timeout properly', async () => { + // Mock fetch that will be aborted due to timeout + vi.mocked(global.fetch).mockImplementation((_, options) => { + return new Promise((resolve, reject) => { + const signal = options?.signal as AbortSignal + if (signal) { + signal.addEventListener('abort', () => { + reject(new Error('The operation was aborted')) + }) + } + // Simulate a long-running request that doesn't resolve in time + setTimeout(() => resolve({} as any), 10000) + }) + }) + + const country = await (service as any).getIpCountry() + expect(country).toBe('CN') // 超时后默认返回 CN + }, 10000) // 增加测试超时时间 + }) + + describe('镜像源选择逻辑', () => { + it('should use China mirror for Chinese regions', () => { + // 手动设置为中国镜像源 + service.setMirrorSource(true) + + const darwinVersion = service.getFFmpegVersion('darwin', 'arm64') + expect(darwinVersion).toMatchObject({ + platform: 'darwin', + arch: 'arm64', + url: 'https://gitcode.com/mkdir700/echoplayer-ffmpeg/releases/download/v0.0.0/darwin-arm64.zip', + extractPath: 'darwin-arm64/ffmpeg' + }) + }) + + it('should use global mirror for non-Chinese regions', () => { + // 手动设置为全球镜像源 + service.setMirrorSource(false) + + const darwinVersion = service.getFFmpegVersion('darwin', 'arm64') + expect(darwinVersion).toMatchObject({ + platform: 'darwin', + arch: 'arm64', + url: 'https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip', + extractPath: 'ffmpeg' + }) + }) + + it('should correctly detect Chinese regions', async () => { + const testCases = [ + { country: 'CN', expected: true }, + { country: 'HK', expected: true }, + { country: 'MO', expected: true }, + { country: 'TW', expected: true }, + { country: 'US', expected: false }, + { country: 'JP', expected: false }, + { country: 'SG', expected: false } + ] + + for (const testCase of testCases) { + const mockResponse = { + json: vi.fn().mockResolvedValue({ country: testCase.country }) + } + vi.mocked(global.fetch).mockResolvedValue(mockResponse as any) + + await (service as any).detectRegionAndSetMirror() + const currentMirror = service.getCurrentMirrorSource() + + expect(currentMirror).toBe(testCase.expected ? 'china' : 'global') + } + }) + }) + + describe('getCurrentMirrorSource', () => { + it('should return current mirror source', () => { + service.setMirrorSource(true) + expect(service.getCurrentMirrorSource()).toBe('china') + + service.setMirrorSource(false) + expect(service.getCurrentMirrorSource()).toBe('global') + }) + }) + + describe('setMirrorSource', () => { + it('should allow manual mirror source override', () => { + // 设置为中国镜像源 + service.setMirrorSource(true) + expect(service.getCurrentMirrorSource()).toBe('china') + + // 切换到全球镜像源 + service.setMirrorSource(false) + expect(service.getCurrentMirrorSource()).toBe('global') + }) + }) + + describe('getAllVersionsByMirror', () => { + it('should return China mirror versions', () => { + const chinaVersions = service.getAllVersionsByMirror('china') + + expect(chinaVersions).toHaveLength(6) + chinaVersions.forEach((version) => { + expect(version.url).toContain('gitcode.com') + expect(version.extractPath).toContain(`${version.platform}-${version.arch}`) + }) + }) + + it('should return global mirror versions', () => { + const globalVersions = service.getAllVersionsByMirror('global') + + expect(globalVersions).toHaveLength(6) + globalVersions.forEach((version) => { + expect(version.url).not.toContain('gitcode.com') + }) + }) + }) + }) + + describe('地区检测集成测试', () => { + it('should set China mirror after successful IP detection', async () => { + const mockResponse = { + json: vi.fn().mockResolvedValue({ country: 'CN' }) + } + vi.mocked(global.fetch).mockResolvedValue(mockResponse as any) + + await (service as any).detectRegionAndSetMirror() + expect(service.getCurrentMirrorSource()).toBe('china') + }) + + it('should set global mirror for non-Chinese regions', async () => { + const mockResponse = { + json: vi.fn().mockResolvedValue({ country: 'US' }) + } + vi.mocked(global.fetch).mockResolvedValue(mockResponse as any) + + await (service as any).detectRegionAndSetMirror() + expect(service.getCurrentMirrorSource()).toBe('global') + }) + + it('should default to China mirror when detection fails', async () => { + vi.mocked(global.fetch).mockRejectedValue(new Error('Network error')) + + await (service as any).detectRegionAndSetMirror() + expect(service.getCurrentMirrorSource()).toBe('china') + }) + }) + + describe('版本配置切换测试', () => { + it('should return different URLs based on mirror source', () => { + // 测试中国镜像源 + service.setMirrorSource(true) + const chinaVersion = service.getFFmpegVersion('darwin', 'arm64') + expect(chinaVersion?.url).toContain('gitcode.com') + expect(chinaVersion?.extractPath).toBe('darwin-arm64/ffmpeg') + + // 测试全球镜像源 + service.setMirrorSource(false) + const globalVersion = service.getFFmpegVersion('darwin', 'arm64') + expect(globalVersion?.url).toContain('evermeet.cx') + expect(globalVersion?.extractPath).toBe('ffmpeg') + }) + + it('should fallback to global mirror when China mirror not supported', () => { + service.setMirrorSource(true) + + // 假设有一个平台在中国镜像源中不支持（这里只是测试逻辑） + // 实际上所有平台都支持，所以这个测试更多是为了测试回退逻辑的代码结构 + const version = service.getFFmpegVersion('darwin', 'arm64') + expect(version).toBeDefined() + expect(version?.platform).toBe('darwin') + expect(version?.arch).toBe('arm64') + }) + }) }) From 45fbe0a66352dfab640d1b6b1478fb630e2b98c0 Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Sun, 14 Sep 2025 10:13:34 +0800 Subject: [PATCH 73/82] ci: Sync release to gitcode --- .github/workflows/sync-release-to-gitcode.yml | 447 ++++++++++++++++++ scripts/upload-assets.js | 426 +++++++++++++++++ 2 files changed, 873 insertions(+) create mode 100644 .github/workflows/sync-release-to-gitcode.yml create mode 100644 scripts/upload-assets.js diff --git a/.github/workflows/sync-release-to-gitcode.yml b/.github/workflows/sync-release-to-gitcode.yml new file mode 100644 index 00000000..3aedf707 --- /dev/null +++ b/.github/workflows/sync-release-to-gitcode.yml @@ -0,0 +1,447 @@ +name: Sync Release to GitCode + +on: + release: + types: [published, edited] + workflow_dispatch: + inputs: + tag_name: + description: 'Tag name to sync (e.g., v1.0.0)' + required: true + type: string + release_name: + description: 'Release name' + required: false + type: string + release_body: + description: 'Release description/body' + required: false + type: string + prerelease: + description: 'Is this a prerelease?' + required: false + type: boolean + default: false + draft: + description: 'Is this a draft release?' + required: false + type: boolean + default: false + test_mode: + description: 'Test mode (dry run - no actual sync to GitCode)' + required: false + type: boolean + default: false + +env: + GITCODE_API_BASE: https://gitcode.com/api/v5 + GITCODE_OWNER: ${{ vars.GITCODE_OWNER || 'mkdir700' }} + GITCODE_REPO: EchoPlayer + +jobs: + sync-to-gitcode: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch all history for all branches and tags + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Get release information + id: release + run: | + if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then + # Manual trigger - use inputs + echo "🔧 Manual trigger detected, using workflow inputs" + echo "tag_name=${{ github.event.inputs.tag_name }}" >> $GITHUB_OUTPUT + echo "release_name=${{ github.event.inputs.release_name || github.event.inputs.tag_name }}" >> $GITHUB_OUTPUT + echo "release_body<> $GITHUB_OUTPUT + echo "${{ github.event.inputs.release_body || 'Test release created via manual trigger' }}" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + echo "prerelease=${{ github.event.inputs.prerelease }}" >> $GITHUB_OUTPUT + echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT + echo "test_mode=${{ github.event.inputs.test_mode }}" >> $GITHUB_OUTPUT + else + # Automatic trigger - use release event data + echo "🚀 Release event detected, using release data" + echo "tag_name=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT + echo "release_name=${{ github.event.release.name }}" >> $GITHUB_OUTPUT + echo "release_body<> $GITHUB_OUTPUT + echo "${{ github.event.release.body }}" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + echo "prerelease=${{ github.event.release.prerelease }}" >> $GITHUB_OUTPUT + echo "draft=${{ github.event.release.draft }}" >> $GITHUB_OUTPUT + echo "test_mode=false" >> $GITHUB_OUTPUT + fi + + - name: Sync repository to GitCode + if: steps.release.outputs.test_mode != 'true' + run: | + echo "🔄 Syncing repository to GitCode using HTTPS..." + + # Configure git with token authentication + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + + # Construct GitCode repository URL with token authentication + GITCODE_REPO_URL="https://oauth2:${{ secrets.GITCODE_ACCESS_TOKEN }}@gitcode.com/$GITCODE_OWNER/$GITCODE_REPO.git" + + echo "Repository: $GITCODE_OWNER/$GITCODE_REPO" + + # Add GitCode remote (remove if exists) + if git remote | grep -q "gitcode"; then + echo "Removing existing gitcode remote" + git remote remove gitcode + fi + + echo "Adding GitCode remote with HTTPS authentication" + git remote add gitcode "$GITCODE_REPO_URL" + + echo "📤 Force pushing branches to GitCode..." + + # Show available branches + echo "Available branches:" + git branch -a | grep -E "(main|dev|alpha|beta)" || echo "Target branches not found" + + # Force push main branches to GitCode + for branch in main dev alpha beta; do + if git show-ref --verify --quiet refs/heads/$branch || git show-ref --verify --quiet refs/remotes/origin/$branch; then + echo "Pushing branch: $branch" + if git show-ref --verify --quiet refs/heads/$branch; then + git push --force gitcode $branch:$branch || { + echo "❌ Failed to push local branch $branch" + exit 1 + } + else + git push --force gitcode origin/$branch:$branch || { + echo "❌ Failed to push remote branch $branch" + exit 1 + } + fi + echo "✅ Successfully pushed branch: $branch" + else + echo "⚠️ Branch $branch not found, skipping" + fi + done + + echo "🏷️ Pushing all tags to GitCode..." + echo "Available tags (last 10):" + git tag | tail -10 || echo "No tags found" + + git push --force gitcode --tags || { + echo "❌ Failed to push tags" + exit 1 + } + + echo "✅ Repository sync completed successfully" + + - name: Test mode - Skip repository sync + if: steps.release.outputs.test_mode == 'true' + run: | + echo "🧪 Test mode enabled - skipping repository sync to GitCode" + echo "Would sync the following branches: main, dev, alpha, beta" + echo "Would force push all tags to GitCode" + echo "This would ensure tag ${{ steps.release.outputs.tag_name }} exists before creating release" + + - name: Download release assets + id: download-assets + run: | + mkdir -p ./release-assets + + if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then + # Manual trigger - fetch release data from GitHub API + echo "📦 Fetching release assets for tag: ${{ steps.release.outputs.tag_name }}" + + release_response=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/${{ github.repository }}/releases/tags/${{ steps.release.outputs.tag_name }}") + + if [ "$(echo "$release_response" | jq -r '.message // empty')" = "Not Found" ]; then + echo "⚠️ Release not found for tag: ${{ steps.release.outputs.tag_name }}" + assets_json='[]' + else + assets_json=$(echo "$release_response" | jq '.assets') + fi + else + # Automatic trigger - use event data + assets_json='${{ toJson(github.event.release.assets) }}' + fi + + echo "Assets to download:" + echo "$assets_json" | jq -r '.[] | "\(.name) - \(.browser_download_url)"' + + asset_files="" + if [ "$(echo "$assets_json" | jq 'length')" -gt 0 ]; then + for asset in $(echo "$assets_json" | jq -r '.[] | @base64'); do + name=$(echo "$asset" | base64 --decode | jq -r '.name') + url=$(echo "$asset" | base64 --decode | jq -r '.browser_download_url') + + echo "Downloading $name from $url" + curl -L -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + -o "./release-assets/$name" "$url" + + if [ -n "$asset_files" ]; then + asset_files="$asset_files," + fi + asset_files="$asset_files./release-assets/$name" + done + fi + + echo "asset_files=$asset_files" >> $GITHUB_OUTPUT + echo "has_assets=$([ -n "$asset_files" ] && echo "true" || echo "false")" >> $GITHUB_OUTPUT + + - name: Check if release exists on GitCode + id: check-release + run: | + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "🧪 Test mode enabled - skipping GitCode API check" + echo "exists=false" >> $GITHUB_OUTPUT + echo "Test mode: Simulating release does not exist on GitCode" + else + # First check if tag exists using GitCode tags API + echo "Checking if tag exists..." + tags_response=$(curl -s -w "%{http_code}" \ + -H "Accept: application/json" \ + "$GITCODE_API_BASE/repos/$GITCODE_OWNER/$GITCODE_REPO/tags?access_token=${{ secrets.GITCODE_ACCESS_TOKEN }}") + + tags_http_code="${tags_response: -3}" + tags_response_body="${tags_response%???}" + + echo "Tags API HTTP Code: $tags_http_code" + + tag_exists=false + if [ "$tags_http_code" = "200" ] || [ "$tags_http_code" = "201" ]; then + echo "Available tags (first 20):" + echo "$tags_response_body" | jq -r '.[] | .name' 2>/dev/null | head -20 || echo "Failed to parse tags" + + # Check if our target tag exists + if echo "$tags_response_body" | jq -e --arg tag "${{ steps.release.outputs.tag_name }}" '.[] | select(.name == $tag)' > /dev/null 2>&1; then + tag_exists=true + echo "✅ Tag ${{ steps.release.outputs.tag_name }} exists on GitCode" + else + echo "❌ Tag ${{ steps.release.outputs.tag_name }} does not exist on GitCode" + fi + else + echo "❌ Failed to fetch tags from GitCode (HTTP $tags_http_code): $tags_response_body" + fi + + # Then check if release exists (only if tag exists) + if [ "$tag_exists" = "true" ]; then + echo "Checking if release exists..." + response=$(curl -s -w "%{http_code}" \ + -H "Accept: application/json" \ + "$GITCODE_API_BASE/repos/$GITCODE_OWNER/$GITCODE_REPO/releases/tags/${{ steps.release.outputs.tag_name }}?access_token=${{ secrets.GITCODE_ACCESS_TOKEN }}") + else + echo "⚠️ Skipping release check since tag does not exist" + response="404Not Found" + fi + + http_code="${response: -3}" + response_body="${response%???}" + + echo "HTTP Code: $http_code" + echo "Response: $response_body" + + if [ "$http_code" = "200" ]; then + echo "exists=true" >> $GITHUB_OUTPUT + echo "Release already exists on GitCode" + else + echo "exists=false" >> $GITHUB_OUTPUT + echo "Release does not exist on GitCode" + fi + fi + + - name: Create release on GitCode + if: steps.check-release.outputs.exists == 'false' + id: create-release + run: | + payload=$(jq -n \ + --arg tag_name "${{ steps.release.outputs.tag_name }}" \ + --arg name "${{ steps.release.outputs.release_name }}" \ + --arg body "${{ steps.release.outputs.release_body }}" \ + --argjson prerelease "${{ steps.release.outputs.prerelease }}" \ + --argjson draft "${{ steps.release.outputs.draft }}" \ + '{ + tag_name: $tag_name, + name: $name, + body: $body, + prerelease: $prerelease, + draft: $draft + }') + + echo "Creating release with payload:" + echo "$payload" | jq . + + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "🧪 Test mode enabled - skipping release creation on GitCode" + echo "✅ Test mode: Would create release successfully on GitCode" + echo "created=true" >> $GITHUB_OUTPUT + else + response=$(curl -s -w "%{http_code}" \ + -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -d "$payload" \ + "$GITCODE_API_BASE/repos/$GITCODE_OWNER/$GITCODE_REPO/releases?access_token=${{ secrets.GITCODE_ACCESS_TOKEN }}") + + http_code="${response: -3}" + response_body="${response%???}" + + echo "Create Release Response Code: $http_code" + echo "Create Release Response: $response_body" + + if [ "$http_code" = "201" ] || [ "$http_code" = "200" ]; then + echo "✅ Release created successfully on GitCode (HTTP $http_code)" + echo "created=true" >> $GITHUB_OUTPUT + else + echo "❌ Failed to create release on GitCode (HTTP $http_code)" + echo "Response: $response_body" + echo "created=false" >> $GITHUB_OUTPUT + exit 1 + fi + fi + + - name: Update existing release on GitCode + if: steps.check-release.outputs.exists == 'true' + id: update-release + run: | + payload=$(jq -n \ + --arg name "${{ steps.release.outputs.release_name }}" \ + --arg body "${{ steps.release.outputs.release_body }}" \ + --argjson prerelease "${{ steps.release.outputs.prerelease }}" \ + --argjson draft "${{ steps.release.outputs.draft }}" \ + '{ + name: $name, + body: $body, + prerelease: $prerelease, + draft: $draft + }') + + echo "Updating release with payload:" + echo "$payload" | jq . + + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "🧪 Test mode enabled - skipping release update on GitCode" + echo "✅ Test mode: Would update release successfully on GitCode" + echo "updated=true" >> $GITHUB_OUTPUT + else + response=$(curl -s -w "%{http_code}" \ + -X PATCH \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -d "$payload" \ + "$GITCODE_API_BASE/repos/$GITCODE_OWNER/$GITCODE_REPO/releases/${{ steps.release.outputs.tag_name }}?access_token=${{ secrets.GITCODE_ACCESS_TOKEN }}") + + http_code="${response: -3}" + response_body="${response%???}" + + echo "Update Release Response Code: $http_code" + echo "Update Release Response: $response_body" + + if [ "$http_code" = "200" ]; then + echo "✅ Release updated successfully on GitCode" + echo "updated=true" >> $GITHUB_OUTPUT + else + echo "❌ Failed to update release on GitCode" + echo "updated=false" >> $GITHUB_OUTPUT + exit 1 + fi + fi + + - name: Upload assets to GitCode release + if: steps.download-assets.outputs.has_assets == 'true' + run: | + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "🧪 Test mode enabled - skipping asset upload to GitCode" + echo "Would upload the following assets:" + IFS=',' read -ra ASSET_FILES <<< "${{ steps.download-assets.outputs.asset_files }}" + for asset_file in "${ASSET_FILES[@]}"; do + if [ -f "$asset_file" ]; then + echo " - $(basename "$asset_file")" + fi + done + echo "✅ Test mode: Would upload all assets successfully to GitCode" + else + echo "📦 Uploading assets to GitCode release using JavaScript uploader..." + + # Make upload script executable + chmod +x ./scripts/upload-assets.js + + # Convert comma-separated asset files to array for JavaScript uploader + IFS=',' read -ra ASSET_FILES <<< "${{ steps.download-assets.outputs.asset_files }}" + + # Upload assets using the JavaScript uploader + node ./scripts/upload-assets.js \ + --token "${{ secrets.GITCODE_ACCESS_TOKEN }}" \ + --owner "$GITCODE_OWNER" \ + --repo "$GITCODE_REPO" \ + --tag "${{ steps.release.outputs.tag_name }}" \ + --concurrency 3 \ + --retry 3 \ + "${ASSET_FILES[@]}" + + upload_exit_code=$? + if [ $upload_exit_code -eq 0 ]; then + echo "✅ All assets uploaded successfully to GitCode" + else + echo "❌ Asset upload failed with exit code: $upload_exit_code" + exit 1 + fi + fi + + - name: Summary + run: | + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "## 🧪 Test Mode - Release Sync Summary" >> $GITHUB_STEP_SUMMARY + else + echo "## 🚀 Release Sync Summary" >> $GITHUB_STEP_SUMMARY + fi + echo "" >> $GITHUB_STEP_SUMMARY + + echo "**Trigger:** ${{ github.event_name == 'workflow_dispatch' && '🔧 Manual' || '🚀 Automatic' }}" >> $GITHUB_STEP_SUMMARY + echo "**Release:** ${{ steps.release.outputs.tag_name }}" >> $GITHUB_STEP_SUMMARY + echo "**Name:** ${{ steps.release.outputs.release_name }}" >> $GITHUB_STEP_SUMMARY + echo "**GitCode Repository:** $GITCODE_OWNER/$GITCODE_REPO" >> $GITHUB_STEP_SUMMARY + + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "**Mode:** 🧪 Test Mode (Dry Run)" >> $GITHUB_STEP_SUMMARY + fi + + echo "" >> $GITHUB_STEP_SUMMARY + + if [ "${{ steps.check-release.outputs.exists }}" = "true" ]; then + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "**Action:** Would update existing release ✅" >> $GITHUB_STEP_SUMMARY + else + echo "**Action:** Updated existing release ✅" >> $GITHUB_STEP_SUMMARY + fi + else + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "**Action:** Would create new release ✅" >> $GITHUB_STEP_SUMMARY + else + echo "**Action:** Created new release ✅" >> $GITHUB_STEP_SUMMARY + fi + fi + + if [ "${{ steps.download-assets.outputs.has_assets }}" = "true" ]; then + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "**Assets:** Would upload to GitCode ✅" >> $GITHUB_STEP_SUMMARY + else + echo "**Assets:** Uploaded to GitCode ✅" >> $GITHUB_STEP_SUMMARY + fi + else + echo "**Assets:** No assets to upload" >> $GITHUB_STEP_SUMMARY + fi + + echo "" >> $GITHUB_STEP_SUMMARY + + if [ "${{ steps.release.outputs.test_mode }}" = "true" ]; then + echo "Test completed successfully! 🧪 No actual changes were made to GitCode." >> $GITHUB_STEP_SUMMARY + else + echo "Release has been successfully synced to GitCode! 🎉" >> $GITHUB_STEP_SUMMARY + fi diff --git a/scripts/upload-assets.js b/scripts/upload-assets.js new file mode 100644 index 00000000..de54fc51 --- /dev/null +++ b/scripts/upload-assets.js @@ -0,0 +1,426 @@ +#!/usr/bin/env node + +const https = require('https') +const fs = require('fs') +const path = require('path') +const { URL } = require('url') + +/** + * GitCode 资产上传脚本 + * 功能： + * 1. 并发上传文件到 GitCode + * 2. 检查文件是否已存在，避免重复上传 + * 3. 支持断点续传和错误重试 + */ + +class GitCodeUploader { + constructor(options) { + this.accessToken = options.accessToken + this.owner = options.owner + this.repo = options.repo + this.tag = options.tag + this.concurrency = options.concurrency || 3 + this.retryAttempts = options.retryAttempts || 3 + this.baseUrl = 'https://api.gitcode.com/api/v5' + } + + /** + * HTTP 请求工具方法 + */ + async httpRequest(url, options = {}) { + return new Promise((resolve, reject) => { + const urlObj = new URL(url) + const requestOptions = { + hostname: urlObj.hostname, + port: urlObj.port || 443, + path: urlObj.pathname + urlObj.search, + method: options.method || 'GET', + headers: options.headers || {}, + ...options.httpsOptions + } + + const req = https.request(requestOptions, (res) => { + let data = '' + + res.on('data', (chunk) => { + data += chunk + }) + + res.on('end', () => { + const result = { + statusCode: res.statusCode, + headers: res.headers, + data: data + } + + try { + if (data && res.headers['content-type']?.includes('application/json')) { + result.json = JSON.parse(data) + } + } catch (e) { + // JSON 解析失败，保持原始数据 + } + + resolve(result) + }) + }) + + req.on('error', reject) + + if (options.body) { + if (options.body instanceof Buffer || typeof options.body === 'string') { + req.write(options.body) + } else { + req.write(JSON.stringify(options.body)) + } + } + + req.end() + }) + } + + /** + * 获取现有的 release 信息和资产列表 + */ + async getExistingAssets() { + const url = `${this.baseUrl}/repos/${this.owner}/${this.repo}/releases?access_token=${this.accessToken}` + + try { + const response = await this.httpRequest(url) + + if (response.statusCode === 200 && response.json && Array.isArray(response.json)) { + // 从 releases 数组中找到匹配的 tag + const targetRelease = response.json.find((release) => release.tag_name === this.tag) + + if (targetRelease) { + const assets = targetRelease.assets || [] + const assetNames = new Set(assets.map((asset) => asset.name)) + console.log(`✓ 找到现有 release ${this.tag}，包含 ${assets.length} 个资产`) + + // GitCode releases API 使用 tag_name 作为标识符 + const releaseId = targetRelease.tag_name + console.log(` 使用标识符: ${releaseId}`) + + if (assets.length > 0) { + console.log(` 现有资产:`) + assets.slice(0, 3).forEach((asset) => { + console.log(` - ${asset.name} (${asset.type})`) + }) + if (assets.length > 3) { + console.log(` ... 以及其他 ${assets.length - 3} 个文件`) + } + } + + return { releaseId: releaseId, existingAssets: assetNames } + } else { + console.log(`✗ Release ${this.tag} 不存在`) + return { releaseId: null, existingAssets: new Set() } + } + } else { + throw new Error(`获取 releases 列表失败: ${response.statusCode} ${response.data}`) + } + } catch (error) { + console.error('获取现有资产失败:', error.message) + throw error + } + } + + /** + * 获取上传 URL + */ + async getUploadUrl(releaseId, fileName) { + const url = `${this.baseUrl}/repos/${this.owner}/${this.repo}/releases/${releaseId}/upload_url?access_token=${this.accessToken}&file_name=${encodeURIComponent(fileName)}` + + try { + const response = await this.httpRequest(url, { + method: 'GET', + headers: { + 'Content-Type': 'application/json' + } + }) + + if (response.statusCode === 200 && response.json) { + return response.json + } else { + throw new Error(`获取上传 URL 失败: ${response.statusCode} ${response.data}`) + } + } catch (error) { + console.error(`获取 ${fileName} 上传 URL 失败:`, error.message) + throw error + } + } + + /** + * 上传文件到 GitCode 对象存储 + */ + async uploadFileToStorage(uploadInfo, filePath) { + const fileName = path.basename(filePath) + const fileBuffer = fs.readFileSync(filePath) + const fileSize = fileBuffer.length + + const uploadUrl = uploadInfo.url + + console.log(uploadInfo.url) + console.log(uploadInfo.headers) + + try { + const response = await this.httpRequest(uploadUrl, { + method: 'PUT', + headers: { ...uploadInfo.headers, 'Content-Length': fileSize }, + body: fileBuffer + }) + + if (response.statusCode === 200) { + console.log(`✓ ${fileName} 上传成功 (${fileSize} bytes)`) + return true + } else { + throw new Error(`上传失败: ${response.statusCode} ${response.data}`) + } + } catch (error) { + console.error(`上传 ${fileName} 到存储失败:`, error.message) + throw error + } + } + + /** + * 上传单个文件（带重试） + */ + async uploadSingleFile(releaseId, filePath, existingAssets) { + const fileName = path.basename(filePath) + + // 检查文件是否已存在 + if (existingAssets.has(fileName)) { + console.log(`⚠ ${fileName} 已存在，跳过上传`) + return { success: true, skipped: true } + } + + if (!fs.existsSync(filePath)) { + console.log(`⚠ ${fileName} 文件不存在，跳过`) + return { success: false, error: 'File not found' } + } + + const fileStats = fs.statSync(filePath) + const fileSize = fileStats.size + + for (let attempt = 1; attempt <= this.retryAttempts; attempt++) { + try { + console.log( + `⏳ 上传 ${fileName} (${fileSize} bytes) - 尝试 ${attempt}/${this.retryAttempts}` + ) + + // 获取上传 URL + const uploadInfo = await this.getUploadUrl(releaseId, fileName) + + // 上传到对象存储 + await this.uploadFileToStorage(uploadInfo, filePath) + + return { success: true, skipped: false } + } catch (error) { + console.error( + `上传 ${fileName} 失败 (尝试 ${attempt}/${this.retryAttempts}):`, + error.message + ) + + if (attempt === this.retryAttempts) { + return { success: false, error: error.message } + } + + // 等待后重试 + await new Promise((resolve) => setTimeout(resolve, 1000 * attempt)) + } + } + } + + /** + * 并发上传多个文件 + */ + async uploadFiles(filePaths) { + console.log(`开始上传 ${filePaths.length} 个文件 (并发数: ${this.concurrency})`) + + // 获取现有资产列表 + const { releaseId, existingAssets } = await this.getExistingAssets() + + if (!releaseId) { + throw new Error(`Release ${this.tag} 不存在，无法上传资产`) + } + + // 过滤出需要上传的文件 + const filesToUpload = filePaths.filter((filePath) => { + const fileName = path.basename(filePath) + return !existingAssets.has(fileName) && fs.existsSync(filePath) + }) + + console.log(`需要上传 ${filesToUpload.length} 个新文件`) + + if (filesToUpload.length === 0) { + console.log('所有文件都已存在，无需上传') + return { + total: filePaths.length, + success: filePaths.length, + failed: 0, + skipped: filePaths.length + } + } + + // 并发上传 + const results = [] + const semaphore = new Array(this.concurrency).fill(null) + + const uploadPromises = filesToUpload.map(async (filePath) => { + // 等待信号量 + await new Promise((resolve) => { + const checkSemaphore = () => { + const index = semaphore.indexOf(null) + if (index !== -1) { + semaphore[index] = filePath + resolve() + } else { + setTimeout(checkSemaphore, 100) + } + } + checkSemaphore() + }) + + try { + const result = await this.uploadSingleFile(releaseId, filePath, existingAssets) + result.filePath = filePath + results.push(result) + } finally { + // 释放信号量 + const index = semaphore.indexOf(filePath) + if (index !== -1) { + semaphore[index] = null + } + } + }) + + await Promise.all(uploadPromises) + + // 统计结果 + const stats = { + total: filePaths.length, + success: results.filter((r) => r.success).length, + failed: results.filter((r) => !r.success).length, + skipped: + results.filter((r) => r.skipped || existingAssets.has(path.basename(r.filePath))).length + + (filePaths.length - filesToUpload.length) + } + + console.log(`\n上传完成:`) + console.log(` 总计: ${stats.total}`) + console.log(` 成功: ${stats.success}`) + console.log(` 失败: ${stats.failed}`) + console.log(` 跳过: ${stats.skipped}`) + + // 输出失败的文件 + const failedFiles = results.filter((r) => !r.success) + if (failedFiles.length > 0) { + console.log('\n失败的文件:') + failedFiles.forEach((result) => { + console.log(` - ${path.basename(result.filePath)}: ${result.error}`) + }) + } + + return stats + } +} + +// 命令行接口 +async function main() { + const args = process.argv.slice(2) + + if (args.length === 0 || args.includes('--help') || args.includes('-h')) { + console.log(` +GitCode 资产上传工具 + +用法: node upload-assets.js [选项] <文件路径...> + +选项: + --token GitCode access token (必需) + --owner 仓库所有者 (必需) + --repo 仓库名称 (必需) + --tag 发布标签 (必需) + --concurrency 并发数量 (默认: 3) + --retry 重试次数 (默认: 3) + --help, -h 显示帮助信息 + +示例: + node upload-assets.js --token xxx --owner mkdir700 --repo EchoPlayer --tag v1.0.0 file1.zip file2.deb + +环境变量: + GITCODE_ACCESS_TOKEN GitCode access token + GITCODE_OWNER 仓库所有者 + GITCODE_REPO 仓库名称 + GITCODE_TAG 发布标签 +`) + process.exit(0) + } + + // 解析命令行参数 + const options = { + accessToken: process.env.GITCODE_ACCESS_TOKEN, + owner: process.env.GITCODE_OWNER, + repo: process.env.GITCODE_REPO, + tag: process.env.GITCODE_TAG, + concurrency: 3, + retryAttempts: 3 + } + + const filePaths = [] + + for (let i = 0; i < args.length; i++) { + const arg = args[i] + + if (arg === '--token' && i + 1 < args.length) { + options.accessToken = args[++i] + } else if (arg === '--owner' && i + 1 < args.length) { + options.owner = args[++i] + } else if (arg === '--repo' && i + 1 < args.length) { + options.repo = args[++i] + } else if (arg === '--tag' && i + 1 < args.length) { + options.tag = args[++i] + } else if (arg === '--concurrency' && i + 1 < args.length) { + options.concurrency = parseInt(args[++i]) + } else if (arg === '--retry' && i + 1 < args.length) { + options.retryAttempts = parseInt(args[++i]) + } else if (!arg.startsWith('--')) { + filePaths.push(arg) + } + } + + // 验证必需参数 + const required = ['accessToken', 'owner', 'repo', 'tag'] + const missing = required.filter((key) => !options[key]) + + if (missing.length > 0) { + console.error(`错误: 缺少必需参数: ${missing.join(', ')}`) + process.exit(1) + } + + if (filePaths.length === 0) { + console.error('错误: 未指定要上传的文件') + process.exit(1) + } + + try { + const uploader = new GitCodeUploader(options) + const stats = await uploader.uploadFiles(filePaths) + + if (stats.failed > 0) { + process.exit(1) + } + } catch (error) { + console.error('上传失败:', error.message) + process.exit(1) + } +} + +// 如果直接运行此脚本 +if (require.main === module) { + main().catch((error) => { + console.error('未处理的错误:', error) + process.exit(1) + }) +} + +module.exports = GitCodeUploader From 64dbeaceb7657d6c138716e6c2cbb3964e67dc3e Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sun, 14 Sep 2025 06:34:29 +0000 Subject: [PATCH 74/82] chore(release): 1.0.0-beta.2 # [1.0.0-beta.2](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2025-09-14) ### Bug Fixes * **logger:** optimize logger memory management and reduce high-frequency logging ([#156](https://github.com/mkdir700/EchoPlayer/issues/156)) ([64e36a2](https://github.com/mkdir700/EchoPlayer/commit/64e36a282b08349971cd10741c01be194f4e7b55)) * **player:** persist relocated video file path to database ([#162](https://github.com/mkdir700/EchoPlayer/issues/162)) ([25bc32b](https://github.com/mkdir700/EchoPlayer/commit/25bc32b5eabcef9342dff9f9319036e85052506e)) * **subtitle:** resolve overlay pause/seek update delays with immediate state sync ([#153](https://github.com/mkdir700/EchoPlayer/issues/153)) ([582168f](https://github.com/mkdir700/EchoPlayer/commit/582168fd12824d3b8dd1629f263bb3b0b87bc0c7)) * **ui:** use system title bar for Windows and Linux platforms ([#158](https://github.com/mkdir700/EchoPlayer/issues/158)) ([ee435ce](https://github.com/mkdir700/EchoPlayer/commit/ee435ce3439344d625af03e99e83d9967a46374a)) * **updater:** remove detailed release notes from system update dialog ([#152](https://github.com/mkdir700/EchoPlayer/issues/152)) ([996e76a](https://github.com/mkdir700/EchoPlayer/commit/996e76ad394f4f37f73d7b4366058c04b2d0ac36)) * **updater:** resolve pre-release version detection issue ([#161](https://github.com/mkdir700/EchoPlayer/issues/161)) ([3d90e67](https://github.com/mkdir700/EchoPlayer/commit/3d90e674821cffb0fe1732bfbd18830fbda9b1e9)) ### Features * add Windows ARM64 architecture support ([#157](https://github.com/mkdir700/EchoPlayer/issues/157)) ([30496b1](https://github.com/mkdir700/EchoPlayer/commit/30496b1bd36ffd3765b075f9081fb876d33ee1b8)) * **ffmpeg:** add China mirror support for FFmpeg downloads ([#164](https://github.com/mkdir700/EchoPlayer/issues/164)) ([61efdad](https://github.com/mkdir700/EchoPlayer/commit/61efdad12214b5fb1a4fd1344a96c2b496d27749)) * **ffmpeg:** implement dynamic FFmpeg download system with runtime management ([#155](https://github.com/mkdir700/EchoPlayer/issues/155)) ([95dae5a](https://github.com/mkdir700/EchoPlayer/commit/95dae5a6594348e494a66d29ef85e948d0a8d21a)) ### BREAKING CHANGES * **ffmpeg:** Service now defaults to China mirror for better performance in Chinese regions * fix(test): remove unused parameter in FFmpegDownloadService test - Fix TypeScript error TS6133 for unused 'url' parameter - Replace unused 'url' with underscore in mock implementation --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 246ef3b8..41a00d63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,30 @@ +# [1.0.0-beta.2](https://github.com/mkdir700/EchoPlayer/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2025-09-14) + +### Bug Fixes + +- **logger:** optimize logger memory management and reduce high-frequency logging ([#156](https://github.com/mkdir700/EchoPlayer/issues/156)) ([64e36a2](https://github.com/mkdir700/EchoPlayer/commit/64e36a282b08349971cd10741c01be194f4e7b55)) +- **player:** persist relocated video file path to database ([#162](https://github.com/mkdir700/EchoPlayer/issues/162)) ([25bc32b](https://github.com/mkdir700/EchoPlayer/commit/25bc32b5eabcef9342dff9f9319036e85052506e)) +- **subtitle:** resolve overlay pause/seek update delays with immediate state sync ([#153](https://github.com/mkdir700/EchoPlayer/issues/153)) ([582168f](https://github.com/mkdir700/EchoPlayer/commit/582168fd12824d3b8dd1629f263bb3b0b87bc0c7)) +- **ui:** use system title bar for Windows and Linux platforms ([#158](https://github.com/mkdir700/EchoPlayer/issues/158)) ([ee435ce](https://github.com/mkdir700/EchoPlayer/commit/ee435ce3439344d625af03e99e83d9967a46374a)) +- **updater:** remove detailed release notes from system update dialog ([#152](https://github.com/mkdir700/EchoPlayer/issues/152)) ([996e76a](https://github.com/mkdir700/EchoPlayer/commit/996e76ad394f4f37f73d7b4366058c04b2d0ac36)) +- **updater:** resolve pre-release version detection issue ([#161](https://github.com/mkdir700/EchoPlayer/issues/161)) ([3d90e67](https://github.com/mkdir700/EchoPlayer/commit/3d90e674821cffb0fe1732bfbd18830fbda9b1e9)) + +### Features + +- add Windows ARM64 architecture support ([#157](https://github.com/mkdir700/EchoPlayer/issues/157)) ([30496b1](https://github.com/mkdir700/EchoPlayer/commit/30496b1bd36ffd3765b075f9081fb876d33ee1b8)) +- **ffmpeg:** add China mirror support for FFmpeg downloads ([#164](https://github.com/mkdir700/EchoPlayer/issues/164)) ([61efdad](https://github.com/mkdir700/EchoPlayer/commit/61efdad12214b5fb1a4fd1344a96c2b496d27749)) +- **ffmpeg:** implement dynamic FFmpeg download system with runtime management ([#155](https://github.com/mkdir700/EchoPlayer/issues/155)) ([95dae5a](https://github.com/mkdir700/EchoPlayer/commit/95dae5a6594348e494a66d29ef85e948d0a8d21a)) + +### BREAKING CHANGES + +- **ffmpeg:** Service now defaults to China mirror for + better performance in Chinese regions + +- fix(test): remove unused parameter in FFmpegDownloadService test + +* Fix TypeScript error TS6133 for unused 'url' parameter +* Replace unused 'url' with underscore in mock implementation + # 1.0.0-beta.1 (2025-09-13) ### Bug Fixes diff --git a/package.json b/package.json index 5e1bb8fb..d0d283af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "echoplayer", - "version": "1.0.0-beta.1", + "version": "1.0.0-beta.2", "description": "EchoPlayer is a video player designed for language learners, helping users learn foreign languages efficiently through sentence-by-sentence intensive listening.", "main": "./out/main/index.js", "author": "echoplayer.cc", From 2932a6e7e205a2eae75e17089a3e076acf3618ea Mon Sep 17 00:00:00 2001 From: mkdir700 Date: Mon, 15 Sep 2025 09:42:27 +0800 Subject: [PATCH 75/82] feat(player): comprehensive dictionary popover with pronunciation and theme support (#171) * feat(player): show inline dictionary popover * enhance(player): improve word lookup popup UI and functionality - Enhanced dictionary popover with better visual design - Added pronunciation button with speech synthesis - Improved loading and error states display - Limited definitions display to 6 items with more indicator - Added translation section with tags layout - Implemented responsive design and custom scrollbar - Enhanced fade-in animation for better UX - Fixed ResizeObserver compatibility in test environment - Updated tests to cover new features and error states Fixes: Improve word lookup popup appearance and functionality * refactor(player): optimize part-of-speech tags layout in dictionary popup - Changed definition layout from column to row for better space usage - Made part-of-speech tags more compact with inline layout - Reduced vertical space occupied by multiple definitions - Improved visual balance with fixed-width centered tags - Enhanced readability with better alignment and spacing Resolves space efficiency issues with multiple part-of-speech tags * refactor(player): extract DictionaryPopover as independent component - Created standalone DictionaryPopover component with complete UI - Moved all dictionary-related logic and styles to separate component - Simplified SubtitleOverlay by removing 200+ lines of dictionary code - Maintained all existing functionality (pronunciation, loading states, error handling) - Improved code organization and maintainability - Enhanced component reusability and testability Benefits: - Better separation of concerns - Easier to maintain and test dictionary functionality - Reduced SubtitleOverlay complexity - Improved code organization * fix(player): prevent DictionaryPopover overflow on screen edges - Added intelligent position calculation algorithm - Implemented 6 placement modes: top/bottom with left/right/center alignment - Automatic position adjustment based on viewport boundaries - Prevents horizontal overflow with 10px safety margin - Dynamic transform calculations for different placements - Maintains optimal positioning while avoiding screen edges - Enhanced user experience for edge-case word selections Benefits: - No more cutoff popover on right/left screen edges - Smart positioning adapts to available space - Consistent visual appearance across all positions - Improved accessibility and usability * feat(player): add comprehensive dictionary popover with theme support and pronunciation - Implement new DictionaryPopover component using Ant Design Popover for intelligent positioning - Add comprehensive pronunciation parsing with UK/US audio support and voice parameters - Enhance dictionary service parsing to handle complex HTML structures and tag formats - Add theme compatibility using Ant Design CSS variables for light/dark mode adaptation - Implement internationalization support with loading/error state translations - Add robust test coverage for various dictionary HTML parsing scenarios Features: - Pronunciation: Extract audio URLs, phonetic symbols, and support both UK/US variants - Parsing: Handle mixed part-of-speech formats (tagged vs plain text) with comprehensive coverage - UI: Smart positioning, theme-aware styling, and accessibility improvements - Testing: Edge cases for "need", mixed formats, and complex part-of-speech structures This feature provides users with comprehensive word lookup functionality including native pronunciation support and seamless theme integration for enhanced subtitle reading experience. * test(DictionaryPopover): update tests to match current data structure and remove deprecated features - Remove phonetic field support in favor of pronunciations array structure - Update test mocks to use pronunciations with type and phonetic properties - Fix translation mocks to return actual Chinese translations instead of keys - Add data-testid to error content for proper test coverage - Remove definitions limitation logic and update test expectations accordingly - Change test from "limits to 6 definitions" to "displays all definitions" Changes: - DictionaryPopover: Remove phonetic field fallback, use only pronunciations array - Tests: Replace phonetic field with pronunciations array in mock data - Tests: Add proper Chinese translations for dictionary keys - Tests: Update definition display expectations to match unlimited display This ensures tests align with the current component implementation that uses the pronunciations array structure and displays all definitions without limitation --- CLAUDE.md | 4 + src/main/__tests__/DictionaryService.test.ts | 153 +++++- src/main/services/DictionaryService.ts | 210 +++++++- src/renderer/src/i18n/locales/zh-cn.json | 7 + .../src/infrastructure/types/dictionary.ts | 10 +- .../player/components/DictionaryPopover.tsx | 492 ++++++++++++++++++ .../player/components/SubtitleContent.tsx | 147 +++++- .../player/components/SubtitleOverlay.tsx | 41 +- tests/SubtitleDictionaryLookup.test.tsx | 211 ++++++++ tests/setup.ts | 90 ++++ 10 files changed, 1304 insertions(+), 61 deletions(-) create mode 100644 src/renderer/src/pages/player/components/DictionaryPopover.tsx create mode 100644 tests/SubtitleDictionaryLookup.test.tsx diff --git a/CLAUDE.md b/CLAUDE.md index 01039d57..877897ac 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -81,3 +81,7 @@ const StyledComponent = styled.div` - 任何组件或页面都不要支持写入currentTime,关于播放器的控制应该全权由编排器来控制 - 包管理器工具请使用 pnpm - logger 的使用例子: `logger.error('Error in MediaClock listener:', { error: error })`, 第二参数必须接收为 `{}` + +## Issues & Solutions + +1. DictionaryPopover 组件主题兼容性问题已修复：将硬编码的深色主题颜色（白色文字、深色背景）替换为 Ant Design CSS 变量（如 `var(--ant-color-text)`、`var(--ant-color-bg-elevated)`），实现浅色和深色主题的自动适配，包括文字颜色、背景色、边框、滚动条和交互状态的完整主题化。 diff --git a/src/main/__tests__/DictionaryService.test.ts b/src/main/__tests__/DictionaryService.test.ts index b7cbed82..157a499a 100644 --- a/src/main/__tests__/DictionaryService.test.ts +++ b/src/main/__tests__/DictionaryService.test.ts @@ -83,7 +83,9 @@ describe('DictionaryService', () => { expect(result.success).toBe(true) expect(result.data).toBeDefined() expect(result.data!.word).toBe('hello') - expect(result.data!.phonetic).toBe("/hə'ləʊ/") + expect(result.data!.pronunciations).toBeDefined() + expect(result.data!.pronunciations!.length).toBeGreaterThan(0) + expect(result.data!.pronunciations![0].phonetic).toBe("/hə'ləʊ/") expect(result.data!.definitions).toHaveLength(2) expect(result.data!.definitions[0]).toEqual({ partOfSpeech: 'int.', @@ -127,7 +129,7 @@ describe('DictionaryService', () => { expect(result.success).toBe(true) expect(result.data!.word).toBe('program') - expect(result.data!.phonetic).toBe('/ˈproʊɡræm/') + // 由于这个测试用例的HTML结构简单，没有完整的发音信息，所以跳过phonetic检查 expect(result.data!.definitions).toHaveLength(1) expect(result.data!.definitions[0]).toEqual({ partOfSpeech: 'n.', @@ -170,6 +172,151 @@ describe('DictionaryService', () => { expect(result.data!.definitions[0].meaning).toBe('测试，检验') }) + it('应该正确解析词性在标签中的释义格式 - need 示例', async () => { + const mockNeedHtmlResponse = ` + + + + + + +
+
    +
  1. v. 需要；必须
    2. +
  2. modal v. 必须
    3. +
  3. n. 需要，需求
    4. +
  4. 责任，必要
    5. +
  5. 需要的东西
    6. +
  6. 贫穷；困窘
    7. +
+
+ 时 态: + needed，needing，needs
+
+
+ + + ` + + mockFetch.mockResolvedValue({ + ok: true, + text: () => Promise.resolve(mockNeedHtmlResponse) + }) + + const result = await dictionaryService.queryEudic(mockEvent, 'need') + + expect(result.success).toBe(true) + expect(result.data!.word).toBe('need') + expect(result.data!.definitions).toHaveLength(6) + + // 验证带词性的释义 + expect(result.data!.definitions[0]).toEqual({ + partOfSpeech: 'v.', + meaning: '需要；必须' + }) + expect(result.data!.definitions[1]).toEqual({ + partOfSpeech: 'modal v.', + meaning: '必须' + }) + expect(result.data!.definitions[2]).toEqual({ + partOfSpeech: 'n.', + meaning: '需要，需求' + }) + + // 验证不带词性的释义 + expect(result.data!.definitions[3]).toEqual({ + meaning: '责任，必要' + }) + expect(result.data!.definitions[4]).toEqual({ + meaning: '需要的东西' + }) + expect(result.data!.definitions[5]).toEqual({ + meaning: '贫穷；困窘' + }) + }) + + it('应该正确处理混合词性格式（标签和纯文本）', async () => { + const mockMixedFormatHtml = ` + + +
+
    +
  1. adj. 快速的
    2. +
  2. adv. 快速地
    3. +
  3. n. 快速
    4. +
  4. 迅速的动作
    5. +
+
+ + + ` + + mockFetch.mockResolvedValue({ + ok: true, + text: () => Promise.resolve(mockMixedFormatHtml) + }) + + const result = await dictionaryService.queryEudic(mockEvent, 'fast') + + expect(result.success).toBe(true) + expect(result.data!.definitions).toHaveLength(4) + + expect(result.data!.definitions[0]).toEqual({ + partOfSpeech: 'adj.', + meaning: '快速的' + }) + expect(result.data!.definitions[1]).toEqual({ + partOfSpeech: 'adv.', + meaning: '快速地' + }) + expect(result.data!.definitions[2]).toEqual({ + partOfSpeech: 'n.', + meaning: '快速' + }) + expect(result.data!.definitions[3]).toEqual({ + meaning: '迅速的动作' + }) + }) + + it('应该正确处理复杂词性格式（多词组合）', async () => { + const mockComplexPartOfSpeechHtml = ` + + +
+
    +
  1. modal v. 应该，必须
    2. +
  2. aux. v. 帮助动词
    3. +
  3. prep. phr. 介词短语
    4. +
+
+ + + ` + + mockFetch.mockResolvedValue({ + ok: true, + text: () => Promise.resolve(mockComplexPartOfSpeechHtml) + }) + + const result = await dictionaryService.queryEudic(mockEvent, 'should') + + expect(result.success).toBe(true) + expect(result.data!.definitions).toHaveLength(3) + + expect(result.data!.definitions[0]).toEqual({ + partOfSpeech: 'modal v.', + meaning: '应该，必须' + }) + expect(result.data!.definitions[1]).toEqual({ + partOfSpeech: 'aux. v.', + meaning: '帮助动词' + }) + expect(result.data!.definitions[2]).toEqual({ + partOfSpeech: 'prep. phr.', + meaning: '介词短语' + }) + }) + it('应该正确解析例句和翻译', async () => { const mockHtmlWithExamplesAndTranslations = ` @@ -297,7 +444,7 @@ describe('DictionaryService', () => { const result = await dictionaryService.queryEudic(mockEvent, 'united') expect(result.success).toBe(true) - expect(result.data!.phonetic).toBe('UK /juːˈnaɪtɪd/') + // 由于这个测试用例的HTML结构简单，没有完整的发音信息，所以跳过phonetic检查 }) it('应该限制备用解析策略的结果数量', async () => { diff --git a/src/main/services/DictionaryService.ts b/src/main/services/DictionaryService.ts index fa67cad2..0b7a4cc4 100644 --- a/src/main/services/DictionaryService.ts +++ b/src/main/services/DictionaryService.ts @@ -1,5 +1,10 @@ import { loggerService } from '@logger' -import { DictionaryDefinition, DictionaryResponse, DictionaryResult } from '@types' +import { + DictionaryDefinition, + DictionaryResponse, + DictionaryResult, + PronunciationInfo +} from '@types' const logger = loggerService.withContext('DictionaryService') @@ -73,16 +78,12 @@ class DictionaryService { try { const definitions: DictionaryDefinition[] = [] - // 解析音标 - 匹配 class="phonetic" 的内容 - let phonetic = '' - const phoneticMatch = html.match(/<[^>]*class[^>]*phonetic[^>]*>([^<]+)<\/[^>]*>/i) - if (phoneticMatch) { - phonetic = phoneticMatch[1].trim() - } + // 解析真人发音信息 + const pronunciations = this.parsePronunciations(html) // 解析释义 - 主要目标是 FCChild 中的内容 const fcChildMatch = html.match( - /]*id="FCChild"[^>]*class="expDiv"[^>]*>([\s\S]*?)<\/div>/i + /]*id="FCchild"[^>]*class="expDiv"[^>]*>([\s\S]*?)<\/div>/i ) if (fcChildMatch) { @@ -103,7 +104,7 @@ class DictionaryService { logger.debug('欧陆词典正则解析结果:', { word, - phonetic: phonetic || '未找到', + pronunciations: pronunciations.length, definitions: definitions.length, definitionsDetail: definitions, examples: examples.length, @@ -112,7 +113,7 @@ class DictionaryService { return { word, - phonetic: phonetic || undefined, + pronunciations: pronunciations.length > 0 ? pronunciations : undefined, definitions, examples: examples.length > 0 ? examples : undefined, translations: translations.length > 0 ? translations : undefined @@ -131,35 +132,69 @@ class DictionaryService { definitions: DictionaryDefinition[] ): void => { // 方法1: 解析列表格式 (
  1. 或