Skip to content

Commit 156af3b

Browse files
authored
Merge pull request #2 from yibailiu/dev
feat:项目安全性优化
2 parents 0fd9187 + 97cf13b commit 156af3b

13 files changed

Lines changed: 125 additions & 823 deletions

.github/workflows/build-and-release.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@ on:
1010
workflow_dispatch:
1111

1212
permissions:
13-
contents: write
13+
contents: read
14+
15+
env:
16+
VIDEOMERGE_FFMPEG_DARWIN_SHA256: ${{ vars.VIDEOMERGE_FFMPEG_DARWIN_SHA256 }}
17+
VIDEOMERGE_FFPROBE_DARWIN_SHA256: ${{ vars.VIDEOMERGE_FFPROBE_DARWIN_SHA256 }}
18+
VIDEOMERGE_FFMPEG_WINDOWS_SHA256: ${{ vars.VIDEOMERGE_FFMPEG_WINDOWS_SHA256 }}
19+
VIDEOMERGE_FFMPEG_LINUX_SHA256: ${{ vars.VIDEOMERGE_FFMPEG_LINUX_SHA256 }}
1420

1521
jobs:
1622
build:
@@ -78,9 +84,23 @@ jobs:
7884
path: ${{ matrix.package_path }}
7985
if-no-files-found: error
8086

81-
- name: Upload release asset
82-
if: startsWith(github.ref, 'refs/tags/v')
87+
release:
88+
name: Publish GitHub Release
89+
if: startsWith(github.ref, 'refs/tags/v')
90+
needs: build
91+
runs-on: ubuntu-latest
92+
permissions:
93+
actions: read
94+
contents: write
95+
96+
steps:
97+
- name: Download build artifacts
98+
uses: actions/download-artifact@v4
99+
with:
100+
path: release-assets
101+
102+
- name: Upload release assets
83103
uses: softprops/action-gh-release@v2
84104
with:
85-
files: ${{ matrix.package_path }}
105+
files: release-assets/**/*
86106
generate_release_notes: true

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,13 @@ merged/
88
dist/
99
build/
1010
*.spec
11+
.env
12+
.env.*
13+
*.pem
14+
*.key
15+
*.p12
16+
*.pfx
17+
*.cer
18+
*.crt
19+
*.mobileprovision
20+
*.provisionprofile

README.en.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ VideoMergingTool helps you combine many video clips into longer videos without u
2323
The packaged Windows and macOS apps include FFmpeg and FFprobe, so normal users do not need to install FFmpeg manually.
2424

2525
## What It Does
26+
<p align="center">
27+
<img src="assets/screenshots/screenshot_en.png" width="960" alt="VideoMergingTool 图标">
28+
</p>
2629

2730
- Finds common video files in a folder, including `mp4`, `mkv`, `mov`, `avi`, `ts`, `m4v`, `flv`, and `webm`
2831
- Shows useful details such as duration, resolution, codec, FPS, and status
@@ -117,10 +120,6 @@ When running from source, the tool may download FFmpeg if no local FFmpeg is ava
117120

118121
Unsigned builds may trigger Windows SmartScreen or macOS Gatekeeper warnings. These warnings are about publisher signing status, not about the app uploading files.
119122

120-
Fully removing those warnings requires official code signing:
121-
122-
- Windows: Authenticode signing with a trusted certificate
123-
- macOS: Apple Developer ID signing and notarization
124123

125124
## Tips
126125

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ VideoMergingTool 用来把一个文件夹里的多个视频批量合并成更长
2323
Windows 和 macOS 安装包已经内置 FFmpeg / FFprobe,普通用户不需要手动安装 FFmpeg,也不需要配置环境变量。
2424

2525
## 它能做什么
26+
<p align="center">
27+
<img src="assets/screenshots/screenshot_zhCN.png" width="960" alt="VideoMergingTool 图标">
28+
</p>
2629

2730
- 扫描文件夹中的常见视频格式,包括 `mp4``mkv``mov``avi``ts``m4v``flv``webm`
2831
- 显示视频时长、分辨率、编码、帧率和处理状态
@@ -117,10 +120,6 @@ VideoMergingTool 在你的电脑本地处理视频,不会把视频文件上传
117120

118121
未签名版本可能会触发 Windows SmartScreen 或 macOS Gatekeeper 提示。这类提示主要和发布者签名状态有关,并不代表应用会上传你的文件。
119122

120-
如果要彻底消除这些提示,需要正式代码签名:
121-
122-
- Windows:使用受信任证书进行 Authenticode 签名
123-
- macOS:使用 Apple Developer ID 签名并完成 notarization
124123

125124
## 使用建议
126125

README.zh-CN.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ VideoMergingTool 用来把一个文件夹里的多个视频批量合并成更长
2323
Windows 和 macOS 安装包已经内置 FFmpeg / FFprobe,普通用户不需要手动安装 FFmpeg,也不需要配置环境变量。
2424

2525
## 它能做什么
26+
<p align="center">
27+
<img src="assets/screenshots/screenshot_zhCN.png" width="960" alt="VideoMergingTool 图标">
28+
</p>
2629

2730
- 扫描文件夹中的常见视频格式,包括 `mp4``mkv``mov``avi``ts``m4v``flv``webm`
2831
- 显示视频时长、分辨率、编码、帧率和处理状态
@@ -117,10 +120,6 @@ VideoMergingTool 在你的电脑本地处理视频,不会把视频文件上传
117120

118121
未签名版本可能会触发 Windows SmartScreen 或 macOS Gatekeeper 提示。这类提示主要和发布者签名状态有关,并不代表应用会上传你的文件。
119122

120-
如果要彻底消除这些提示,需要正式代码签名:
121-
122-
- Windows:使用受信任证书进行 Authenticode 签名
123-
- macOS:使用 Apple Developer ID 签名并完成 notarization
124123

125124
## 使用建议
126125

0 commit comments

Comments
 (0)