Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
447 changes: 447 additions & 0 deletions .github/workflows/sync-release-to-gitcode.yml

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions electron-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ files:
asarUnpack:
- resources/**
- '**/*.{metal,exp,lib}'
extraResources:
- from: resources/ffmpeg
to: ffmpeg
filter:
- '**/*'
copyright: Copyright © 2025 EchoPlayer
win:
executableName: EchoPlayer
Expand All @@ -60,9 +55,11 @@ win:
- target: nsis
arch:
- x64
- arm64
- target: portable
arch:
- x64
- arm64
signtoolOptions:
sign: scripts/win-sign.js
verifyUpdateCodeSignature: false
Expand Down
110 changes: 0 additions & 110 deletions electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,92 +2,17 @@ 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'

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

// 根据构建目标决定下载哪个平台
const targetPlatform = process.env.BUILD_TARGET_PLATFORM || process.platform
const targetArch = process.env.BUILD_TARGET_ARCH || process.arch

// 检查是否已存在,避免重复下载
const ffmpegPath = path.resolve(
'resources/ffmpeg',
`${targetPlatform}-${targetArch}`,
targetPlatform === 'win32' ? 'ffmpeg.exe' : 'ffmpeg'
)

if (fs.existsSync(ffmpegPath)) {
console.log(`FFmpeg already exists for ${targetPlatform}-${targetArch}`)
return
}

console.log(`Downloading FFmpeg for ${targetPlatform}-${targetArch}...`)

try {
await new Promise<void>((resolve, reject) => {
// 在不同环境中使用不同的命令来确保兼容性
let command: string
let args: string[]

if (process.platform === 'win32') {
// Windows 环境:使用 npm run 调用脚本,更可靠
command = 'npm'
args = ['run', 'ffmpeg:download']
} else {
// Unix 环境:直接使用 tsx
command = 'tsx'
args = ['scripts/download-ffmpeg.ts', 'platform', targetPlatform, targetArch]
}

const downloadScript = spawn(command, args, {
stdio: 'inherit',
shell: process.platform === 'win32',
env: {
...process.env,
BUILD_TARGET_PLATFORM: targetPlatform,
BUILD_TARGET_ARCH: targetArch
}
})

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.error('FFmpeg Download failed:', error)
throw new Error(`Failed to download FFmpeg for ${targetPlatform}-${targetArch}: ${error}`)
}
}
}
}

export default defineConfig({
main: {
plugins: [
externalizeDepsPlugin(),
ffmpegDownloadPlugin(),
{
name: 'copy-files',
generateBundle() {
Expand Down Expand Up @@ -125,41 +50,6 @@ 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)
}
}
}
}
],
Expand Down
19 changes: 1 addition & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ffmpeg:download-all && npm run build:release && electron-builder --publish onTagOrDraft",
"release:all": "npm run ffmpeg:download-all && npm run build:release && electron-builder --publish always",
"release:never": "npm run ffmpeg:download-all && npm run build:release && electron-builder --publish never",
"release:draft": "npm run ffmpeg:download-all && 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",
Expand All @@ -71,9 +56,7 @@
"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",
"prebuild:release": "echo 'FFmpeg already downloaded by release script'"
"ffmpeg:test": "tsx scripts/test-ffmpeg-integration.ts"
},
"dependencies": {
"@ant-design/icons": "^6.0.1",
Expand Down
12 changes: 12 additions & 0 deletions packages/shared/IpcChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ export enum IpcChannel {
Ffmpeg_GetVideoInfo = 'ffmpeg:get-video-info',
Ffmpeg_Warmup = 'ffmpeg:warmup',
Ffmpeg_GetWarmupStatus = 'ffmpeg:get-warmup-status',
Ffmpeg_GetInfo = 'ffmpeg:get-info',
Ffmpeg_AutoDetectAndDownload = 'ffmpeg:auto-detect-and-download',

// FFmpeg 下载相关 IPC 通道 / FFmpeg download related IPC channels
FfmpegDownload_CheckExists = 'ffmpeg-download:check-exists',
FfmpegDownload_GetVersion = 'ffmpeg-download:get-version',
FfmpegDownload_Download = 'ffmpeg-download:download',
FfmpegDownload_GetProgress = 'ffmpeg-download:get-progress',
FfmpegDownload_Cancel = 'ffmpeg-download:cancel',
FfmpegDownload_Remove = 'ffmpeg-download:remove',
FfmpegDownload_GetAllVersions = 'ffmpeg-download:get-all-versions',
FfmpegDownload_CleanupTemp = 'ffmpeg-download:cleanup-temp',

// MediaInfo 相关 IPC 通道 / MediaInfo related IPC channels
MediaInfo_CheckExists = 'mediainfo:check-exists',
Expand Down
Loading
Loading