Initial commit: Video Subtitle Merger 2.0

This commit is contained in:
TheMaddax 2024-12-25 16:30:39 -06:00
commit 929cc11ecf
78 changed files with 8230 additions and 0 deletions

33
.gitignore vendored Normal file
View file

@ -0,0 +1,33 @@
# Dependencies
node_modules
.pnpm-store
# Build outputs
dist
dist-ssr
*.local
# Rust build artifacts
src-tauri/target
# Debug logs
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
*.log
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
# Environment variables
.env
.env.*

3
.vscode/extensions.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
}

118
README.md Normal file
View file

@ -0,0 +1,118 @@
# Video Subtitle Merger 2.0
A desktop application that allows you to merge video files with subtitle files using FFmpeg. Built with Tauri (Rust + React), this application provides a modern, efficient interface for combining videos with subtitles.
## Features
- Merge video files with subtitle files (supports MP4, AVI, MOV, MKV videos and SRT, ASS subtitles)
- Option to add black bars for subtitles
- Option to resize videos to 720p resolution
- Real-time progress tracking
- Modern, user-friendly interface
- Native performance with small application size
- Cross-platform support (currently tested on macOS)
## Tech Stack
- **Frontend**:
- React
- TypeScript
- Tailwind CSS
- Vite
- **Backend**:
- Rust
- Tauri
- FFmpeg (required dependency)
## Prerequisites
Before building the application, ensure you have the following installed:
- Node.js (v16 or later)
- Rust (latest stable)
- FFmpeg
- pnpm (package manager)
- Tauri development dependencies
### macOS Setup
1. Install Rust:
```bash
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
```
2. Install Node.js and pnpm:
```bash
brew install node
npm install -g pnpm
```
3. Install FFmpeg:
```bash
brew install ffmpeg
```
4. Install Tauri development dependencies:
```bash
xcode-select --install
```
## Building from Source
1. Clone the repository:
```bash
git clone https://gitea.sigd.net/chaulmark/subtitle-merge.git
cd subtitle-merge
```
2. Install dependencies:
```bash
pnpm install
```
3. Run in development mode:
```bash
pnpm tauri dev
```
4. Build for production:
```bash
pnpm tauri build
```
The built application will be available in `src-tauri/target/release/bundle/`.
## Usage
1. Launch the application
2. Select your video file using the "Select Video" button
3. Select your subtitle file using the "Select Subtitle" button
4. Choose your preferences:
- Add black bar for subtitles (recommended for better readability)
- Resize to 720p resolution (helps with file size)
5. Click "Merge Video and Subtitle"
6. Wait for the process to complete
7. The merged video will be saved in the same directory as the input video
## Development
The project structure follows the standard Tauri + React template:
- `/src` - React frontend code
- `/src-tauri` - Rust backend code
- `/src/components` - React components
- `/src/styles` - CSS and styling files
- `/src-tauri/src` - Rust source files
## Contributing
1. Fork the repository
2. Create your feature branch (`git checkout -b feature/AmazingFeature`)
3. Commit your changes (`git commit -m 'Add some AmazingFeature'`)
4. Push to the branch (`git push origin feature/AmazingFeature`)
5. Open a Pull Request
## License
This project is licensed under the MIT License - see the LICENSE file for details.

14
index.html Normal file
View file

@ -0,0 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tauri + React + Typescript</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>

31
package.json Normal file
View file

@ -0,0 +1,31 @@
{
"name": "subtitle-merge",
"private": true,
"version": "0.1.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"tauri": "tauri"
},
"dependencies": {
"@tauri-apps/api": "^2.1.1",
"@tauri-apps/plugin-dialog": "2",
"@tauri-apps/plugin-opener": "^2",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@tauri-apps/cli": "^2",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.17",
"typescript": "~5.6.2",
"vite": "^6.0.3"
},
"packageManager": "pnpm@9.14.4+sha512.c8180b3fbe4e4bca02c94234717896b5529740a6cbadf19fa78254270403ea2f27d4e1d46a08a0f56c89b63dc8ebfd3ee53326da720273794e6200fcf0d184ab"
}

1956
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load diff

6
postcss.config.js Normal file
View file

@ -0,0 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}

6
public/tauri.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

1
public/vite.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

7
src-tauri/.gitignore vendored Normal file
View file

@ -0,0 +1,7 @@
# Generated by Cargo
# will have compiled files and executables
/target/
# Generated by Tauri
# will have schema files for capabilities auto-completion
/gen/schemas

5240
src-tauri/Cargo.lock generated Normal file

File diff suppressed because it is too large Load diff

30
src-tauri/Cargo.toml Normal file
View file

@ -0,0 +1,30 @@
[package]
name = "subtitle-merge"
version = "0.1.0"
description = "A Tauri app for merging videos with subtitles"
authors = ["you"]
license = ""
repository = ""
edition = "2021"
rust-version = "1.70"
[build-dependencies]
tauri-build = { version = "2.0.0", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "2.0.0", features = [] }
tokio = { version = "1.36", features = ["full"] }
anyhow = "1.0"
thiserror = "1.0"
tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
[features]
custom-protocol = ["tauri/custom-protocol"]
[lib]
name = "subtitle_merge_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

3
src-tauri/build.rs Normal file
View file

@ -0,0 +1,3 @@
fn main() {
tauri_build::build()
}

View file

@ -0,0 +1,38 @@
{
"identifier": "default",
"description": "Default capability for the app",
"windows": ["main"],
"permissions": [
{
"identifier": "fs:allow-read",
"description": "Allows reading video and subtitle files",
"paths": ["**"]
},
{
"identifier": "fs:allow-write",
"description": "Allows writing output video files",
"paths": ["**"]
},
{
"identifier": "fs:scope",
"description": "Allow access to app directory",
"paths": ["$APP", "$APPDATA", "$APPLOCALDATA"]
},
{
"identifier": "dialog:allow-open",
"description": "Allows opening file selection dialogs"
},
{
"identifier": "shell:allow-execute",
"description": "Allows executing FFmpeg commands"
},
{
"identifier": "core:event:allow-emit",
"description": "Allows emitting progress events"
},
{
"identifier": "core:window:allow-set-shadow",
"description": "Allows setting window shadow"
}
]
}

BIN
src-tauri/icons/128x128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
src-tauri/icons/32x32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src-tauri/icons/icon.icns Normal file

Binary file not shown.

BIN
src-tauri/icons/icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
src-tauri/icons/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 774 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

View file

@ -0,0 +1,17 @@
#!/bin/bash
set -e
# Create resources directory if it doesn't exist
mkdir -p resources
# Download FFmpeg for macOS
curl -L https://evermeet.cx/ffmpeg/ffmpeg-6.1.zip -o ffmpeg.zip
# Extract FFmpeg
unzip -o ffmpeg.zip -d resources/
rm ffmpeg.zip
# Make FFmpeg executable
chmod +x resources/ffmpeg
echo "FFmpeg has been downloaded and prepared successfully"

192
src-tauri/src/lib.rs Normal file
View file

@ -0,0 +1,192 @@
use serde::{Deserialize, Serialize};
use std::process::{Command, Stdio};
use std::sync::Mutex;
use std::io::BufRead;
use tauri::{Runtime, State, Emitter};
#[derive(Debug, thiserror::Error)]
pub enum Error {
#[error("Failed to execute FFmpeg: {0}")]
FFmpegError(String),
#[error("IO error: {0}")]
IoError(#[from] std::io::Error),
}
impl serde::Serialize for Error {
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
where
S: serde::ser::Serializer,
{
serializer.serialize_str(self.to_string().as_ref())
}
}
#[derive(Default)]
pub struct ProgressState(pub Mutex<f32>);
#[derive(Debug, Deserialize)]
pub struct MergeArgs {
pub video_path: String,
pub subtitle_path: String,
pub add_black_bar: bool,
pub resize_to_720p: bool,
}
#[derive(Debug, Serialize, Clone)]
pub struct ProgressUpdate {
pub progress: f32,
}
pub async fn check_ffmpeg() -> Result<(), Error> {
println!("Checking FFmpeg installation...");
let output = Command::new("/opt/homebrew/bin/ffmpeg")
.arg("-version")
.output()
.map_err(|e| {
println!("FFmpeg check failed: {}", e);
Error::FFmpegError(format!("FFmpeg is not installed or not found in PATH: {}", e))
})?;
if !output.status.success() {
return Err(Error::FFmpegError("FFmpeg check failed".to_string()));
}
Ok(())
}
async fn get_video_duration(video_path: &str) -> Result<f32, Error> {
let output = Command::new("/opt/homebrew/bin/ffprobe")
.args([
"-v", "error",
"-show_entries", "format=duration",
"-of", "default=noprint_wrappers=1:nokey=1",
video_path
])
.output()
.map_err(|e| Error::FFmpegError(format!("Failed to run ffprobe: {}", e)))?;
if !output.status.success() {
return Err(Error::FFmpegError("Failed to get video duration".to_string()));
}
String::from_utf8_lossy(&output.stdout)
.trim()
.parse::<f32>()
.map_err(|e| Error::FFmpegError(format!("Failed to parse duration: {}", e)))
}
pub async fn merge_video_subtitle_impl<R: Runtime>(
args: MergeArgs,
progress_state: State<'_, ProgressState>,
app_handle: tauri::AppHandle<R>,
) -> Result<String, Error> {
let output_path = format!("{}-subbed.mp4", args.video_path.trim_end_matches(".mp4"));
// Get video duration first
let total_duration = get_video_duration(&args.video_path).await?;
println!("Video duration: {} seconds", total_duration);
// Build filter chain with proper escaping and joining
let mut filters = Vec::new();
if args.add_black_bar {
filters.push("pad=iw:ih+170:0:0:black".to_string());
}
if args.resize_to_720p {
filters.push("scale=-1:720".to_string());
}
// Escape special characters in the subtitle path
let subtitle_path = args.subtitle_path.replace("'", "'\\''").replace(",", "\\,").replace(" ", "\\ ");
filters.push(format!("subtitles='{}'", subtitle_path));
filters.push("format=nv12|qsv".to_string());
let filter_chain = filters.join(",");
println!("Filter chain: {}", filter_chain);
// Verify FFmpeg is installed
check_ffmpeg().await?;
println!("Starting FFmpeg process with paths: video={}, subtitle={}", args.video_path, args.subtitle_path);
let mut command = Command::new("/opt/homebrew/bin/ffmpeg");
command
.arg("-y")
.arg("-hwaccel")
.arg("videotoolbox")
.arg("-i")
.arg(&args.video_path)
.arg("-vf")
.arg(&filter_chain)
.arg("-c:v")
.arg("h264_videotoolbox")
.arg("-b:v")
.arg("5000k")
.arg("-progress")
.arg("pipe:1")
.arg("-loglevel")
.arg("error")
.arg(&output_path)
.stdout(Stdio::piped())
.stderr(Stdio::piped());
println!("FFmpeg command: {:?}", command);
let mut child = command.spawn().map_err(|e| {
println!("Failed to spawn FFmpeg: {}", e);
Error::FFmpegError(format!("Failed to start FFmpeg process: {}", e))
})?;
let stdout = child.stdout.take().unwrap();
let mut reader = std::io::BufReader::new(stdout);
let mut line = String::new();
// Read progress and update state using pre-probed duration
let mut last_progress = 0.0;
while let Ok(bytes) = reader.read_line(&mut line) {
if bytes == 0 {
break;
}
if line.starts_with("out_time=") {
if let Some(time_str) = line.split('=').nth(1) {
// Parse time in format HH:MM:SS.ms
let parts: Vec<&str> = time_str.trim().split(':').collect();
if parts.len() == 3 {
if let (Ok(hours), Ok(minutes), Ok(seconds)) = (
parts[0].parse::<f32>(),
parts[1].parse::<f32>(),
parts[2].parse::<f32>()
) {
let current_seconds = hours * 3600.0 + minutes * 60.0 + seconds;
let progress = ((current_seconds / total_duration) * 100.0).min(100.0).max(0.0);
// Only update if progress has changed significantly (avoid spam)
if progress - last_progress >= 1.0 || progress == 100.0 {
*progress_state.0.lock().unwrap() = progress;
// Emit progress event to frontend
if let Err(e) = app_handle.emit("progress", ProgressUpdate { progress }) {
println!("Failed to emit progress: {}", e);
}
println!("Progress: {:.1}%", progress);
last_progress = progress;
}
}
}
}
}
line.clear();
}
let status = child.wait()?;
if !status.success() {
let error_msg = format!("FFmpeg process failed with status: {}", status);
println!("{}", error_msg);
return Err(Error::FFmpegError(error_msg));
}
println!("FFmpeg process completed successfully");
// Open the output file in Finder
let _ = Command::new("open")
.arg("-R")
.arg(&output_path)
.spawn();
Ok(output_path)
}

38
src-tauri/src/main.rs Normal file
View file

@ -0,0 +1,38 @@
// Prevents additional console window on Windows in release
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
use subtitle_merge_lib::{ProgressState, MergeArgs, Error, merge_video_subtitle_impl, check_ffmpeg};
use tauri::Runtime;
#[tauri::command]
async fn check_dependencies() -> Result<(), Error> {
check_ffmpeg().await
}
#[tauri::command]
fn get_progress(progress_state: tauri::State<'_, ProgressState>) -> f32 {
*progress_state.0.lock().unwrap()
}
#[tauri::command]
async fn merge_video_subtitle<R: Runtime>(
args: MergeArgs,
progress_state: tauri::State<'_, ProgressState>,
app_handle: tauri::AppHandle<R>,
) -> Result<String, Error> {
merge_video_subtitle_impl(args, progress_state, app_handle).await
}
fn main() {
tauri::Builder::default()
.plugin(tauri_plugin_shell::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_fs::init())
.manage(ProgressState::default())
.setup(|_app| {
Ok(())
})
.invoke_handler(tauri::generate_handler![merge_video_subtitle, check_dependencies, get_progress])
.run(tauri::generate_context!())
.expect("error while running tauri application");
}

40
src-tauri/tauri.conf.json Normal file
View file

@ -0,0 +1,40 @@
{
"$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/tooling/cli/schema.json",
"productName": "Video Subtitle Merger 2.0",
"version": "0.1.0",
"identifier": "com.subtitle-merge.app",
"app": {
"security": {
"csp": null,
"capabilities": ["default"]
},
"windows": [
{
"fullscreen": false,
"resizable": true,
"title": "Video Subtitle Merger 2.0",
"width": 800,
"height": 600,
"visible": true,
"label": "main"
}
]
},
"build": {
"frontendDist": "../dist",
"devUrl": "http://localhost:1420",
"beforeDevCommand": "pnpm dev",
"beforeBuildCommand": "pnpm build"
},
"bundle": {
"active": true,
"targets": ["app"],
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
]
}
}

116
src/App.css Normal file
View file

@ -0,0 +1,116 @@
.logo.vite:hover {
filter: drop-shadow(0 0 2em #747bff);
}
.logo.react:hover {
filter: drop-shadow(0 0 2em #61dafb);
}
:root {
font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 400;
color: #0f0f0f;
background-color: #f6f6f6;
font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-text-size-adjust: 100%;
}
.container {
margin: 0;
padding-top: 10vh;
display: flex;
flex-direction: column;
justify-content: center;
text-align: center;
}
.logo {
height: 6em;
padding: 1.5em;
will-change: filter;
transition: 0.75s;
}
.logo.tauri:hover {
filter: drop-shadow(0 0 2em #24c8db);
}
.row {
display: flex;
justify-content: center;
}
a {
font-weight: 500;
color: #646cff;
text-decoration: inherit;
}
a:hover {
color: #535bf2;
}
h1 {
text-align: center;
}
input,
button {
border-radius: 8px;
border: 1px solid transparent;
padding: 0.6em 1.2em;
font-size: 1em;
font-weight: 500;
font-family: inherit;
color: #0f0f0f;
background-color: #ffffff;
transition: border-color 0.25s;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
}
button {
cursor: pointer;
}
button:hover {
border-color: #396cd8;
}
button:active {
border-color: #396cd8;
background-color: #e8e8e8;
}
input,
button {
outline: none;
}
#greet-input {
margin-right: 5px;
}
@media (prefers-color-scheme: dark) {
:root {
color: #f6f6f6;
background-color: #2f2f2f;
}
a:hover {
color: #24c8db;
}
input,
button {
color: #ffffff;
background-color: #0f0f0f98;
}
button:active {
background-color: #0f0f0f69;
}
}

182
src/App.tsx Normal file
View file

@ -0,0 +1,182 @@
import { useState, useEffect } from 'react';
import { invoke } from '@tauri-apps/api/core';
import { FileSelector } from './components/FileSelector';
import './styles/index.css';
interface FileState {
path: string;
name: string;
}
function App() {
const [videoFile, setVideoFile] = useState<FileState | null>(null);
const [subtitleFile, setSubtitleFile] = useState<FileState | null>(null);
const [progress, setProgress] = useState<number>(0);
const [isProcessing, setIsProcessing] = useState(false);
const [error, setError] = useState<string | null>(null);
const [addBlackBar, setAddBlackBar] = useState(true);
const [resizeTo720p, setResizeTo720p] = useState(true);
useEffect(() => {
invoke('check_dependencies')
.catch(err => {
setError(err as string);
console.error('Dependency check failed:', err);
});
}, []);
const handleVideoSelect = (path: string) => {
const name = path.split('/').pop() || '';
setVideoFile({ path, name });
};
const handleSubtitleSelect = (path: string) => {
const name = path.split('/').pop() || '';
setSubtitleFile({ path, name });
};
useEffect(() => {
let intervalId: number | undefined;
if (isProcessing) {
// Poll for progress every 100ms while processing
intervalId = window.setInterval(async () => {
try {
const currentProgress = await invoke<number>('get_progress');
console.log('Progress update:', currentProgress);
setProgress(currentProgress);
} catch (error) {
console.error('Failed to get progress:', error);
}
}, 100);
}
return () => {
if (intervalId !== undefined) {
window.clearInterval(intervalId);
}
};
}, [isProcessing]);
const handleMerge = async () => {
if (!videoFile || !subtitleFile) return;
setIsProcessing(true);
setProgress(0);
try {
console.log('Starting merge with args:', {
videoPath: videoFile.path,
subtitlePath: subtitleFile.path,
addBlackBar,
resizeTo720p
});
const result = await invoke<string>('merge_video_subtitle', {
args: {
video_path: videoFile.path,
subtitle_path: subtitleFile.path,
add_black_bar: addBlackBar,
resize_to_720p: resizeTo720p
}
});
console.log('Merge completed:', result);
setProgress(100);
} catch (error) {
console.error('Error merging files:', error);
setError(error as string);
} finally {
setIsProcessing(false);
}
};
return (
<div className="min-h-screen bg-gray-100 py-8 px-4">
<div className="max-w-2xl mx-auto bg-white rounded-lg shadow-md p-6">
<h1 className="text-2xl font-bold text-center mb-8">Video Subtitle Merger <span className="text-blue-500">2.0</span></h1>
<div className="space-y-6">
<div className="flex items-center justify-between">
<div className="flex-1 mr-4">
<p className="text-sm text-gray-600 mb-2">Video file:</p>
<p className="text-gray-800">{videoFile?.name || 'No file selected'}</p>
</div>
<FileSelector
label="Select Video"
onFileSelect={handleVideoSelect}
accept={['mp4', 'avi', 'mov', 'mkv']}
/>
</div>
<div className="flex items-center justify-between">
<div className="flex-1 mr-4">
<p className="text-sm text-gray-600 mb-2">Subtitle file:</p>
<p className="text-gray-800">{subtitleFile?.name || 'No file selected'}</p>
</div>
<FileSelector
label="Select Subtitle"
onFileSelect={handleSubtitleSelect}
accept={['srt', 'ass']}
/>
</div>
<div className="space-y-3">
<label className="flex items-center space-x-2">
<input
type="checkbox"
checked={addBlackBar}
onChange={(e) => setAddBlackBar(e.target.checked)}
className="input-checkbox"
/>
<span>Add black bar for subtitles</span>
</label>
<label className="flex items-center space-x-2">
<input
type="checkbox"
checked={resizeTo720p}
onChange={(e) => setResizeTo720p(e.target.checked)}
className="input-checkbox"
/>
<span>Resize to 720p resolution</span>
</label>
</div>
<div className="space-y-2">
<div className="h-2.5 bg-gray-200 rounded-full">
<div
className="h-2.5 bg-blue-600 rounded-full transition-all duration-300"
style={{ width: `${progress}%` }}
/>
</div>
<p className="text-center text-sm text-gray-600">
{isProcessing ? `${Math.round(progress)}%` : ''}
</p>
</div>
{error && (
<div className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative mb-4">
<strong className="font-bold">Error: </strong>
<span className="block sm:inline">{error}</span>
</div>
)}
<button
onClick={handleMerge}
disabled={!videoFile || !subtitleFile || isProcessing}
className={`w-full btn ${
!videoFile || !subtitleFile || isProcessing
? 'bg-gray-400 cursor-not-allowed'
: 'btn-primary'
}`}
>
{isProcessing ? 'Processing...' : 'Merge Video and Subtitle'}
</button>
</div>
</div>
</div>
);
}
export default App;

1
src/assets/react.svg Normal file
View file

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

After

Width:  |  Height:  |  Size: 4 KiB

View file

@ -0,0 +1,37 @@
import React from 'react';
import { open } from '@tauri-apps/plugin-dialog';
interface FileSelectorProps {
label: string;
onFileSelect: (path: string) => void;
accept: string[];
}
export const FileSelector: React.FC<FileSelectorProps> = ({ label, onFileSelect, accept }) => {
const handleClick = async () => {
try {
const selected = await open({
multiple: false,
filters: [{
name: 'Files',
extensions: accept
}]
});
if (selected && !Array.isArray(selected)) {
onFileSelect(selected);
}
} catch (err) {
console.error('Error selecting file:', err);
}
};
return (
<button
onClick={handleClick}
className="px-4 py-2 bg-blue-500 text-white rounded hover:bg-blue-600 transition-colors"
>
{label}
</button>
);
};

9
src/main.tsx Normal file
View file

@ -0,0 +1,9 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App";
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
<React.StrictMode>
<App />
</React.StrictMode>,
);

23
src/styles/index.css Normal file
View file

@ -0,0 +1,23 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@layer components {
.btn {
@apply px-4 py-2 rounded transition-colors;
}
.btn-primary {
@apply bg-blue-500 text-white hover:bg-blue-600;
}
.btn-secondary {
@apply bg-gray-500 text-white hover:bg-gray-600;
}
.input-checkbox {
@apply w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500;
}
/* Remove unused progress bar styles since we're using direct classes in App.tsx */
}

1
src/vite-env.d.ts vendored Normal file
View file

@ -0,0 +1 @@
/// <reference types="vite/client" />

21
tailwind.config.js Normal file
View file

@ -0,0 +1,21 @@
/** @type {import('tailwindcss').Config} */
export default {
content: [
"./index.html",
"./src/**/*.{js,ts,jsx,tsx}",
],
theme: {
extend: {
colors: {
primary: {
DEFAULT: '#3498db',
hover: '#2980b9',
},
},
spacing: {
'128': '32rem',
},
},
},
plugins: [],
}

25
tsconfig.json Normal file
View file

@ -0,0 +1,25 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,
/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true
},
"include": ["src"],
"references": [{ "path": "./tsconfig.node.json" }]
}

10
tsconfig.node.json Normal file
View file

@ -0,0 +1,10 @@
{
"compilerOptions": {
"composite": true,
"skipLibCheck": true,
"module": "ESNext",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
}

32
vite.config.ts Normal file
View file

@ -0,0 +1,32 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
// @ts-expect-error process is a nodejs global
const host = process.env.TAURI_DEV_HOST;
// https://vitejs.dev/config/
export default defineConfig(async () => ({
plugins: [react()],
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
//
// 1. prevent vite from obscuring rust errors
clearScreen: false,
// 2. tauri expects a fixed port, fail if that port is not available
server: {
port: 1420,
strictPort: true,
host: host || false,
hmr: host
? {
protocol: "ws",
host,
port: 1421,
}
: undefined,
watch: {
// 3. tell vite to ignore watching `src-tauri`
ignored: ["**/src-tauri/**"],
},
},
}));