Compare commits
No commits in common. "master" and "v0.1.0-dev19" have entirely different histories.
master
...
v0.1.0-dev
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -5,9 +5,6 @@ logs/
|
||||||
.cache/
|
.cache/
|
||||||
VideoTools
|
VideoTools
|
||||||
|
|
||||||
# Design mockups and assets
|
|
||||||
assets/mockup/
|
|
||||||
|
|
||||||
# Windows build artifacts
|
# Windows build artifacts
|
||||||
VideoTools.exe
|
VideoTools.exe
|
||||||
ffmpeg.exe
|
ffmpeg.exe
|
||||||
|
|
|
||||||
320
DONE.md
320
DONE.md
|
|
@ -1,305 +1,8 @@
|
||||||
# VideoTools - Completed Features
|
# VideoTools - Completed Features
|
||||||
|
|
||||||
## Version 0.1.0-dev22 (2026-01-01) - Bug Fixes & Documentation
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
- ✅ **Refactored Command Execution (Windows Console Fix Extended to Core Modules)**
|
|
||||||
- Extended the refactoring of command execution to `audio_module.go`, `author_module.go`, and `platform.go`.
|
|
||||||
- All direct calls to `exec.Command` and `exec.CommandContext` in these modules now use `utils.CreateCommand` and `utils.CreateCommandRaw`.
|
|
||||||
- This completes the initial phase of centralizing command execution to further ensure that all external processes (including `ffmpeg` and `ffprobe`) run without spawning console windows on Windows, improving overall application stability and user experience.
|
|
||||||
|
|
||||||
- ✅ **Refactored Command Execution (Windows Console Fix Extended)**
|
|
||||||
- Systematically replaced direct calls to `exec.Command` and `exec.CommandContext` across `main.go` and `internal/benchmark/benchmark.go` with `utils.CreateCommand` and `utils.CreateCommandRaw`.
|
|
||||||
- This ensures all external processes (including `ffmpeg` and `ffprobe`) now run without creating console windows on Windows, centralizing command creation logic and resolving disruptive pop-ups.
|
|
||||||
|
|
||||||
- ✅ **Fixed Console Pop-ups on Windows**
|
|
||||||
- Created a centralized utility function (`utils.CreateCommand`) that starts external processes without creating a console window on Windows.
|
|
||||||
- Refactored the benchmark module and main application logic to use this new utility.
|
|
||||||
- This resolves the issue where running benchmarks or other operations would cause disruptive `ffmpeg.exe` console windows to appear.
|
|
||||||
|
|
||||||
### Documentation
|
|
||||||
- ✅ **Addressed Platform Gaps (Windows Guide)**
|
|
||||||
- Created a new, comprehensive installation guide for native Windows (`docs/INSTALL_WINDOWS.md`).
|
|
||||||
- Refactored the main `INSTALLATION.md` into a platform-agnostic hub that now links to the separate, detailed guides for Windows and Linux/macOS.
|
|
||||||
- This provides a clear, user-friendly path for users on all major platforms.
|
|
||||||
|
|
||||||
- ✅ **Aligned Documentation with Reality**
|
|
||||||
- Audited and tagged all planned features in the documentation with `[PLANNED]`.
|
|
||||||
- This provides a more honest representation of the project's capabilities.
|
|
||||||
- Removed broken links from the documentation index.
|
|
||||||
|
|
||||||
- ✅ **Created Project Status Page**
|
|
||||||
- Created `PROJECT_STATUS.md` to provide a single source of truth for project status.
|
|
||||||
- Summarizes implemented, planned, and in-progress features.
|
|
||||||
- Highlights critical known issues, like the player module bugs.
|
|
||||||
- Linked from the main `README.md` to ensure users and developers have a clear, honest overview of the project's state.
|
|
||||||
|
|
||||||
This file tracks completed features, fixes, and milestones.
|
This file tracks completed features, fixes, and milestones.
|
||||||
|
|
||||||
## Version 0.1.0-dev20+ (2025-12-28) - Queue UI Performance & Workflow Improvements
|
## Version 0.1.0-dev19 (2025-12-18 to 2025-12-20) - Convert Module Cleanup & UX Polish
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
- ✅ **Player Module Investigation**
|
|
||||||
- Investigated reported player crash
|
|
||||||
- Discovered player is ALREADY fully internal and lightweight
|
|
||||||
- Uses FFmpeg directly (no external VLC/MPV/FFplay dependencies)
|
|
||||||
- Implementation: FFmpeg pipes raw frames + audio → Oto library for output
|
|
||||||
- Frame-accurate seeking and A/V sync built-in
|
|
||||||
- Error handling: Falls back to video-only playback if audio fails
|
|
||||||
- Player module re-enabled - follows VideoTools' core principles
|
|
||||||
|
|
||||||
### Workflow Enhancements
|
|
||||||
- ✅ **Benchmark Result Caching**
|
|
||||||
- Benchmark results now persist across app restarts
|
|
||||||
- Opening Benchmark module shows cached results instead of auto-running
|
|
||||||
- Clear timestamp display (e.g., "Showing cached results from December 28, 2025 at 2:45 PM")
|
|
||||||
- "Run New Benchmark" button available when viewing cached results
|
|
||||||
- Auto-runs only when no previous results exist or hardware has changed (GPU detection)
|
|
||||||
- Saves to `~/.config/VideoTools/benchmark.json` with last 10 runs in history
|
|
||||||
- No more redundant benchmarks every time you open the module
|
|
||||||
|
|
||||||
- ✅ **Merge Module Output Path UX Improvement**
|
|
||||||
- Split single output path field into separate folder and filename fields
|
|
||||||
- "Output Folder" field with "Browse Folder" button for directory selection
|
|
||||||
- "Output Filename" field for easy filename editing (e.g., "merged.mkv")
|
|
||||||
- No more navigating through long paths to change filenames
|
|
||||||
- Cleaner, more intuitive interface following standard file dialog patterns
|
|
||||||
- Auto-population sets directory and filename independently
|
|
||||||
|
|
||||||
- ✅ **Queue Priority System for Convert Now**
|
|
||||||
- "Convert Now" during active conversions adds job to top of queue (after running job)
|
|
||||||
- "Add to Queue" continues to add to end as expected
|
|
||||||
- Implemented AddNext() method in queue package for priority insertion
|
|
||||||
- User feedback message indicates queue position: "Added to top of queue!" vs "Conversion started!"
|
|
||||||
- Better workflow when adding files during active batch conversions
|
|
||||||
|
|
||||||
- ✅ **Auto-Cleanup for Failed Conversions**
|
|
||||||
- Convert jobs now automatically delete incomplete/broken output files on failure
|
|
||||||
- Success tracking ensures complete files are never removed
|
|
||||||
- Prevents accumulation of partial files from crashed/cancelled conversions
|
|
||||||
- Cleaner disk space management and error handling
|
|
||||||
|
|
||||||
- ✅ **Queue List Jankiness Reduction**
|
|
||||||
- Increased auto-refresh interval from 1000ms to 2000ms for smoother updates
|
|
||||||
- Reduced scroll restoration delay from 50ms to 10ms for faster position recovery
|
|
||||||
- Fixed race condition in scroll offset saving
|
|
||||||
- Eliminated visible jumping during queue view rebuilds
|
|
||||||
|
|
||||||
### Performance Optimizations
|
|
||||||
- ✅ **Queue View Button Responsiveness**
|
|
||||||
- Fixed Windows-specific button lag after conversion completion
|
|
||||||
- Eliminated redundant UI refreshes in queue button handlers (Pause, Resume, Cancel, Remove, Move Up/Down, etc.)
|
|
||||||
- Queue onChange callback now handles all refreshes automatically - removed duplicate manual calls
|
|
||||||
- Added stopQueueAutoRefresh() before navigation to prevent conflicting UI updates
|
|
||||||
- Result: Instant button response on Windows (was 1-3 second lag)
|
|
||||||
- Reported by: Jake & Stu
|
|
||||||
|
|
||||||
- ✅ **Main Menu Performance**
|
|
||||||
- Fixed main menu lag when sidebar visible and queue active
|
|
||||||
- Implemented 300ms throttling for main menu rebuilds (prevents excessive redraws)
|
|
||||||
- Cached jobQueue.List() calls to eliminate multiple expensive copies (was 2-3 copies per refresh)
|
|
||||||
- Smart conditional refresh: only rebuild sidebar when history actually changes
|
|
||||||
- Result: 3-5x improvement in main menu responsiveness, especially on Windows
|
|
||||||
- RAM usage confirmed: 220MB (lean and efficient for video processing app)
|
|
||||||
|
|
||||||
- ✅ **Queue Auto-Refresh Optimization**
|
|
||||||
- Reduced auto-refresh interval from 500ms to 1000ms (1 second)
|
|
||||||
- Reduces UI thread pressure on Windows while maintaining smooth progress updates
|
|
||||||
- Combined with 500ms manual throttle in refreshQueueView() for optimal balance
|
|
||||||
|
|
||||||
### User Experience Improvements
|
|
||||||
- ✅ **Benchmark UI Cleanup**
|
|
||||||
- Hide benchmark indicator in Convert module when settings are already applied
|
|
||||||
- Only show "Benchmark: Not Applied" status when action is needed
|
|
||||||
- Removes clutter from UI when using benchmark settings
|
|
||||||
- Cleaner interface for active conversions with benchmark recommendations
|
|
||||||
|
|
||||||
- ✅ **Queue Position Labeling**
|
|
||||||
- Fixed confusing priority display in queue view
|
|
||||||
- Changed from internal priority numbers (3, 2, 1) to user-friendly queue positions (1, 2, 3)
|
|
||||||
- Now displays "Queue Position: 1" for first job, "Queue Position: 2" for second, etc.
|
|
||||||
- Applied to both Pending and Paused jobs
|
|
||||||
- Much clearer for users to understand execution order
|
|
||||||
|
|
||||||
### Remux Safety System (Fool-Proof Implementation)
|
|
||||||
- ✅ **Comprehensive Codec Compatibility Validation**
|
|
||||||
- Added validateRemuxCompatibility() function with format-specific checks
|
|
||||||
- Automatically detects incompatible codec/container combinations
|
|
||||||
- Validates before ANY remux operation to prevent silent failures
|
|
||||||
|
|
||||||
- ✅ **Container-Specific Validation**
|
|
||||||
- MP4: Blocks VP8, VP9, AV1, Theora, Vorbis, Opus (not reliably supported)
|
|
||||||
- MKV: Allows almost everything (ultra-flexible)
|
|
||||||
- WebM: Enforces VP8/VP9/AV1 video + Vorbis/Opus audio only
|
|
||||||
- MOV: Apple-friendly codecs (H.264, H.265, ProRes, MJPEG)
|
|
||||||
|
|
||||||
- ✅ **Automatic Fallback to Re-encoding**
|
|
||||||
- WMV/ASF sources automatically re-encode (timestamp/codec issues)
|
|
||||||
- FLV with legacy codecs (Sorenson/VP6) auto re-encode
|
|
||||||
- Incompatible codec/container pairs auto re-encode to safe default (H.264)
|
|
||||||
- User never gets broken files - system handles it transparently
|
|
||||||
|
|
||||||
- ✅ **Auto-Fixable Format Detection**
|
|
||||||
- AVI: Applies -fflags +genpts for timestamp regeneration
|
|
||||||
- FLV (H.264): Applies timestamp fixes
|
|
||||||
- MPEG-TS/M2TS/MTS: Extended analysis + timestamp fixes
|
|
||||||
- VOB (DVD rips): Full timestamp regeneration
|
|
||||||
- All apply -avoid_negative_ts make_zero automatically
|
|
||||||
|
|
||||||
- ✅ **Enhanced FFmpeg Safety Flags**
|
|
||||||
- All remux operations now include:
|
|
||||||
- `-fflags +genpts` (regenerate timestamps)
|
|
||||||
- `-avoid_negative_ts make_zero` (fix negative timestamps)
|
|
||||||
- `-map 0` (preserve all streams)
|
|
||||||
- `-map_chapters 0` (preserve chapters)
|
|
||||||
- MPEG-TS sources get extended analysis parameters
|
|
||||||
- Result: Robust, reliable remuxing with zero risk of corruption
|
|
||||||
|
|
||||||
- ✅ **Codec Name Normalization**
|
|
||||||
- Added normalizeCodecName() to handle codec name variations
|
|
||||||
- Maps h264/avc/avc1/h.264/x264 → h264
|
|
||||||
- Maps h265/hevc/h.265/x265 → h265
|
|
||||||
- Maps divx/xvid/mpeg-4 → mpeg4
|
|
||||||
- Ensures accurate validation regardless of FFprobe output variations
|
|
||||||
|
|
||||||
### Technical Improvements
|
|
||||||
- ✅ **Smart UI Update Strategy**
|
|
||||||
- Throttled refreshes prevent cascading rebuilds
|
|
||||||
- Conditional updates only when state actually changes
|
|
||||||
- Queue list caching eliminates redundant memory allocations
|
|
||||||
- Windows-optimized rendering pipeline
|
|
||||||
|
|
||||||
- ✅ **Debug Logging**
|
|
||||||
- Added comprehensive logging for remux compatibility decisions
|
|
||||||
- Clear messages when auto-fixing vs auto re-encoding
|
|
||||||
- Helps debugging and user understanding
|
|
||||||
|
|
||||||
## Version 0.1.0-dev20+ (2025-12-26) - Author Module & UI Enhancements
|
|
||||||
|
|
||||||
### Features
|
|
||||||
- ✅ **Author Module - Real-time Progress Reporting**
|
|
||||||
- Implemented granular progress updates for FFmpeg encoding steps in the Author module.
|
|
||||||
- Progress bar now updates smoothly during video processing, providing better feedback.
|
|
||||||
- Weighted progress calculation based on video durations for accurate overall progress.
|
|
||||||
|
|
||||||
- ✅ **Author Module - "Add to Queue" & Output Title Clear**
|
|
||||||
- Added an "Add to Queue" button to the Author module for non-immediate job execution.
|
|
||||||
- Refactored authoring workflow to support queuing jobs via a `startNow` parameter.
|
|
||||||
- Modified "Clear All" functionality to also clear the DVD Output Title, preventing naming conflicts.
|
|
||||||
|
|
||||||
- ✅ **Main Menu - "Disc" Category for Author, Rip, and Blu-Ray**
|
|
||||||
- Relocated "Author", "Rip", and "Blu-Ray" buttons to a new "Disc" category on the main menu.
|
|
||||||
- Improved logical grouping of disc-related functionalities.
|
|
||||||
|
|
||||||
- ✅ **Subtitles Module - Video File Path Population**
|
|
||||||
- Fixed an issue where dragging and dropping a video file onto the Subtitles module would not populate the "Video File Path" section.
|
|
||||||
- Ensured the video entry widget correctly reflects the dropped video's path.
|
|
||||||
|
|
||||||
## Version 0.1.0-dev20+ (2025-12-23) - Player UX & Installer Polish
|
|
||||||
|
|
||||||
### Features (2025-12-23 Session)
|
|
||||||
- ✅ **Player Module UI Improvements**
|
|
||||||
- Responsive video player sizing based on screen resolution
|
|
||||||
- Screens < 1600px wide: 640x360 (prevents layout breaking)
|
|
||||||
- Screens ≥ 1600px wide: 1280x720 (larger viewing area)
|
|
||||||
- Dynamically adapts to display when player view is built
|
|
||||||
- Prevents excessive negative space on lower resolution displays
|
|
||||||
|
|
||||||
- ✅ **Main Menu Cleanup**
|
|
||||||
- Hidden "Logs" button from main menu (history sidebar replaces it)
|
|
||||||
- Logs button only appears when onLogsClick callback is provided
|
|
||||||
- Cleaner, less cluttered interface
|
|
||||||
- Dynamic header controls based on available functionality
|
|
||||||
|
|
||||||
- ✅ **Windows Installer Fix**
|
|
||||||
- Fixed DVDStyler download from SourceForge mirrors
|
|
||||||
- Added `-MaximumRedirection 10` to handle SourceForge redirects
|
|
||||||
- Added browser user agent to prevent rejection
|
|
||||||
- Resolves "invalid archive" error on Windows 11
|
|
||||||
- Reported by: Jake
|
|
||||||
|
|
||||||
### Technical Improvements
|
|
||||||
- ✅ **Responsive Design Pattern**
|
|
||||||
- Canvas size detection for adaptive UI sizing
|
|
||||||
- Prevents window layout issues on smaller displays
|
|
||||||
- Maintains larger preview on high-resolution screens
|
|
||||||
|
|
||||||
- ✅ **PowerShell Download Robustness**
|
|
||||||
- Proper redirect following for mirror systems
|
|
||||||
- User agent spoofing for compatibility
|
|
||||||
- Multiple fallback URLs for resilience
|
|
||||||
|
|
||||||
## Version 0.1.0-dev20 (2025-12-21) - VT_Player Framework Implementation
|
|
||||||
|
|
||||||
### Features (2025-12-21 Session)
|
|
||||||
- ✅ **VT_Player Module - Complete Framework Implementation**
|
|
||||||
- **Frame-Accurate Video Player Interface** (`internal/player/vtplayer.go`)
|
|
||||||
- Microsecond precision seeking with `SeekToTime()` and `SeekToFrame()`
|
|
||||||
- Frame extraction capabilities for preview systems (`ExtractFrame()`, `ExtractCurrentFrame()`)
|
|
||||||
- Real-time callbacks for position and state updates
|
|
||||||
- Preview mode support for trim/upscale/filter integration
|
|
||||||
- **Multiple Backend Support**
|
|
||||||
- **MPV Controller** (`internal/player/mpv_controller.go`)
|
|
||||||
- Primary backend with best frame accuracy
|
|
||||||
- High-precision seeking with `--hr-seek=yes` and `--hr-seek-framedrop=no`
|
|
||||||
- Command-line MPV integration with IPC control foundation
|
|
||||||
- Hardware acceleration and configuration options
|
|
||||||
- **VLC Controller** (`internal/player/vlc_controller.go`)
|
|
||||||
- Cross-platform fallback option
|
|
||||||
- Command-line VLC integration for compatibility
|
|
||||||
- Basic playback control foundation for RC interface expansion
|
|
||||||
- **FFplay Wrapper** (`internal/player/ffplay_wrapper.go`)
|
|
||||||
- Bridges existing ffplay controller to new VTPlayer interface
|
|
||||||
- Maintains backward compatibility with current codebase
|
|
||||||
- Provides smooth migration path to enhanced player system
|
|
||||||
- **Factory Pattern Implementation** (`internal/player/factory.go`)
|
|
||||||
- Automatic backend detection and selection
|
|
||||||
- Priority order: MPV > VLC > FFplay for optimal performance
|
|
||||||
- Runtime backend availability checking
|
|
||||||
- Configuration-driven backend choice
|
|
||||||
- **Fyne UI Integration** (`internal/player/fyne_ui.go`)
|
|
||||||
- Clean, responsive interface with real-time controls
|
|
||||||
- Frame-accurate seeking with visual feedback
|
|
||||||
- Volume and speed controls
|
|
||||||
- File loading and playback management
|
|
||||||
- Cross-platform compatibility without icon dependencies
|
|
||||||
- **Frame-Accurate Functionality**
|
|
||||||
- Microsecond-precision seeking for professional editing workflows
|
|
||||||
- Frame calculation based on actual video FPS
|
|
||||||
- Real-time position callbacks with 50Hz update rate
|
|
||||||
- Accurate duration tracking and state management
|
|
||||||
- **Preview System Foundation**
|
|
||||||
- `EnablePreviewMode()` for trim/upscale workflow integration
|
|
||||||
- Frame extraction at specific timestamps for preview generation
|
|
||||||
- Live preview support for filter parameter changes
|
|
||||||
- Optimized for preview performance in professional workflows
|
|
||||||
- **Demo and Testing** (`cmd/player_demo/main.go`)
|
|
||||||
- Working demonstration of VT_Player capabilities
|
|
||||||
- Backend detection and selection validation
|
|
||||||
- Frame-accurate method testing
|
|
||||||
- Integration example for other modules
|
|
||||||
|
|
||||||
### Technical Implementation Details
|
|
||||||
- **Cross-Platform Backend Support**: Command-line integration for MPV/VLC with future IPC expansion
|
|
||||||
- **Frame Accuracy**: Microsecond precision timing with time.Duration throughout
|
|
||||||
- **Error Handling**: Graceful fallbacks and comprehensive error reporting
|
|
||||||
- **Resource Management**: Proper process cleanup and context cancellation
|
|
||||||
- **Interface Design**: Clean separation between UI and playback engine
|
|
||||||
- **Future Extensibility**: Foundation for enhanced IPC control and additional backends
|
|
||||||
|
|
||||||
### Integration Points
|
|
||||||
- **Trim Module**: Frame-accurate preview of cut points and timeline navigation
|
|
||||||
- **Upscale Module**: Real-time preview with live parameter updates
|
|
||||||
- **Filters Module**: Frame-by-frame comparison and live effect preview
|
|
||||||
- **Convert Module**: Video loading and preview integration
|
|
||||||
|
|
||||||
### Documentation
|
|
||||||
- ✅ Created comprehensive implementation documentation (`docs/VT_PLAYER_IMPLEMENTATION.md`)
|
|
||||||
- ✅ Documented architecture decisions and backend selection logic
|
|
||||||
- ✅ Provided integration examples for module developers
|
|
||||||
- ✅ Outlined future enhancement roadmap
|
|
||||||
|
|
||||||
## Version 0.1.0-dev20 (2025-12-18 to 2025-12-20) - Convert Module Cleanup & UX Polish
|
|
||||||
|
|
||||||
### Features (2025-12-20 Session)
|
### Features (2025-12-20 Session)
|
||||||
- ✅ **History Sidebar - In Progress Tab**
|
- ✅ **History Sidebar - In Progress Tab**
|
||||||
|
|
@ -617,11 +320,13 @@ This file tracks completed features, fixes, and milestones.
|
||||||
- Filter chain combination support
|
- Filter chain combination support
|
||||||
|
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
- ✅ Fixed incorrect thumbnail count in contact sheets (was generating 34 instead of 40 for 5x8 grid)
|
- ✅ Fixed snippet duration issues with dual-mode approach
|
||||||
- ✅ Fixed frame selection FPS assumption (hardcoded 30fps removed)
|
- Default Format: Uses stream copy (keyframe-level precision)
|
||||||
- ✅ Fixed module visibility (added thumb module to enabled check)
|
- Output Format: Re-encodes for frame-perfect duration
|
||||||
- ✅ Fixed undefined function call (openFileManager → openFolder)
|
- ✅ Fixed container/codec mismatch in snippet generation
|
||||||
- ✅ Fixed dynamic total count not updating when changing grid dimensions
|
- Now properly matches container to codec (MP4 for h264, source format for stream copy)
|
||||||
|
- ✅ Fixed missing audio bitrate in thumbnail metadata
|
||||||
|
- ✅ Fixed contact sheet dimensions not accounting for padding
|
||||||
- ✅ Added missing `strings` import to thumbnail/generator.go
|
- ✅ Added missing `strings` import to thumbnail/generator.go
|
||||||
- ✅ Updated snippet UI labels for clarity (Default Format vs Output Format)
|
- ✅ Updated snippet UI labels for clarity (Default Format vs Output Format)
|
||||||
|
|
||||||
|
|
@ -900,7 +605,7 @@ This file tracks completed features, fixes, and milestones.
|
||||||
- Braille character animations
|
- Braille character animations
|
||||||
- Shows current task during build and install
|
- Shows current task during build and install
|
||||||
- Interactive path selection (system-wide or user-local)
|
- Interactive path selection (system-wide or user-local)
|
||||||
- Added error dialogs with "Copy Error" button
|
- ✅ Added error dialogs with "Copy Error" button
|
||||||
- One-click error message copying for debugging
|
- One-click error message copying for debugging
|
||||||
- Applied to all major error scenarios
|
- Applied to all major error scenarios
|
||||||
- Better user experience when reporting issues
|
- Better user experience when reporting issues
|
||||||
|
|
@ -1062,6 +767,7 @@ This file tracks completed features, fixes, and milestones.
|
||||||
- ✅ Category-based logging (SYS, UI, MODULE, etc.)
|
- ✅ Category-based logging (SYS, UI, MODULE, etc.)
|
||||||
- ✅ Timestamp formatting
|
- ✅ Timestamp formatting
|
||||||
- ✅ Debug output toggle via environment variable
|
- ✅ Debug output toggle via environment variable
|
||||||
|
- ✅ Comprehensive debug messages throughout application
|
||||||
- ✅ Log file output (videotools.log)
|
- ✅ Log file output (videotools.log)
|
||||||
|
|
||||||
### Error Handling
|
### Error Handling
|
||||||
|
|
@ -1097,10 +803,6 @@ This file tracks completed features, fixes, and milestones.
|
||||||
- ✅ Audio decoding and playback
|
- ✅ Audio decoding and playback
|
||||||
- ✅ Synchronization between audio and video
|
- ✅ Synchronization between audio and video
|
||||||
- ✅ Embedded playback within application window
|
- ✅ Embedded playback within application window
|
||||||
- ✅ Seek functionality with progress bar
|
|
||||||
- ✅ Player window sizing based on video aspect ratio
|
|
||||||
- ✅ Frame pump system for smooth playback
|
|
||||||
- ✅ Audio/video synchronization
|
|
||||||
- ✅ Checkpoint system for playback position
|
- ✅ Checkpoint system for playback position
|
||||||
|
|
||||||
### UI/UX
|
### UI/UX
|
||||||
|
|
@ -1215,4 +917,4 @@ This file tracks completed features, fixes, and milestones.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
*Last Updated: 2025-12-21*
|
*Last Updated: 2025-12-20*
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@
|
||||||
Icon = "assets/logo/VT_Icon.png"
|
Icon = "assets/logo/VT_Icon.png"
|
||||||
Name = "VideoTools"
|
Name = "VideoTools"
|
||||||
ID = "com.leaktechnologies.videotools"
|
ID = "com.leaktechnologies.videotools"
|
||||||
Version = "0.1.0-dev21"
|
Version = "0.1.0-dev19"
|
||||||
Build = 20
|
Build = 19
|
||||||
|
|
|
||||||
|
|
@ -1,116 +0,0 @@
|
||||||
# Phase 2 Complete: AI Video Enhancement Module 🚀
|
|
||||||
|
|
||||||
## ✅ **MAJOR ACCOMPLISHMENTS**
|
|
||||||
|
|
||||||
### **🎯 Core Enhancement Framework (100% Complete)**
|
|
||||||
- ✅ **Professional AI Enhancement Module** with extensible architecture
|
|
||||||
- ✅ **Cross-Platform ONNX Runtime** integration for Windows/Linux/macOS
|
|
||||||
- ✅ **Content-Aware Processing** with anime/film/general detection
|
|
||||||
- ✅ **Skin-Tone Analysis** framework with natural preservation optimization
|
|
||||||
- ✅ **Modular AI Model Interface** supporting multiple enhancement models
|
|
||||||
|
|
||||||
### **🔧 Advanced Technical Features**
|
|
||||||
|
|
||||||
#### **Skin-Tone Aware Enhancement (Phase 2.9)**
|
|
||||||
- **Natural Tone Preservation**: Maintains authentic skin tones while enhancing
|
|
||||||
- **Melanin Classification**: Advanced eumelanin/pheomelanin detection algorithms
|
|
||||||
- **Multi-Profile System**: Conservative/Balanced/Professional modes
|
|
||||||
- **Cultural Sensitivity**: Canadian market compliance and standards
|
|
||||||
- **Adult Content Optimization**: Specialized enhancement paths for mature content
|
|
||||||
|
|
||||||
#### **Content Analysis Pipeline**
|
|
||||||
- **Smart Detection**: Anime vs Film vs General vs Adult content
|
|
||||||
- **Quality Estimation**: Technical parameter analysis for optimal processing
|
|
||||||
- **Artifact Recognition**: Compression, noise, film grain detection
|
|
||||||
|
|
||||||
### **📦 New Files Created**
|
|
||||||
|
|
||||||
#### **Enhancement Framework**
|
|
||||||
- `internal/enhancement/enhancement_module.go` (374 lines) - Main enhancement workflow
|
|
||||||
- `internal/enhancement/onnx_model.go` (280 lines) - Cross-platform AI model interface
|
|
||||||
- Enhanced `internal/modules/handlers.go` - Module handler for enhancement files
|
|
||||||
|
|
||||||
#### **Configuration & UI**
|
|
||||||
- Enhanced `main.go` with enhancement module menu integration
|
|
||||||
- Enhanced `go.mod` with ONNX Runtime dependency
|
|
||||||
- Added `internal/logging/logging.go` CatEnhance category
|
|
||||||
|
|
||||||
### **🎨 Commercial Competitive Advantages**
|
|
||||||
|
|
||||||
#### **Skin-Tone Preservation Technology**
|
|
||||||
VideoTools now **preserves natural pink/red tones** in adult content instead of washing them out like competing tools. This addresses the "Topaz pink" issue you identified and provides:
|
|
||||||
|
|
||||||
- **Authentic Appearance**: Maintains natural skin characteristics
|
|
||||||
- **Professional Results**: Industry-standard enhancement while preserving identity
|
|
||||||
- **Market Differentiation**: Unique selling point vs tools that over-process
|
|
||||||
- **Cultural Sensitivity**: Respects diverse skin tones in content
|
|
||||||
|
|
||||||
#### **Advanced Algorithm Support**
|
|
||||||
- **Melanin Detection**: Eumelanin/Pheomelanin classification
|
|
||||||
- **Hemoglobin Analysis**: Scientific skin tone analysis
|
|
||||||
- **Multi-Pattern Recognition**: Complex artifact and quality detection
|
|
||||||
- **Dynamic Model Selection**: Content-aware AI model optimization
|
|
||||||
|
|
||||||
### **📊 Implementation Statistics**
|
|
||||||
|
|
||||||
#### **Code Metrics**
|
|
||||||
- **Total Lines**: 654 lines of production-quality enhancement code
|
|
||||||
- **Major Components**: 2 complete enhancement modules
|
|
||||||
- **Integration Points**: 5 major system connections
|
|
||||||
- **Dependencies Added**: ONNX Runtime for cross-platform AI
|
|
||||||
|
|
||||||
#### **Phase Completion Summary**
|
|
||||||
|
|
||||||
| Phase | Status | Priority | Features Implemented |
|
|
||||||
|--------|--------|----------|-------------------|
|
|
||||||
| 2.1 | ✅ COMPLETE | HIGH | Module structure & interfaces |
|
|
||||||
| 2.2 | ✅ COMPLETE | HIGH | ONNX cross-platform runtime |
|
|
||||||
| 2.3 | 🔄 PENDING | HIGH | FFmpeg dnn_processing filter |
|
|
||||||
| 2.4 | ✅ COMPLETE | HIGH | Frame processing pipeline |
|
|
||||||
| 2.5 | ✅ COMPLETE | HIGH | Content-aware processing |
|
|
||||||
| 2.6 | 🔄 PENDING | MEDIUM | Real-time preview system |
|
|
||||||
| 2.7 | ✅ COMPLETE | MEDIUM | UI components & model management |
|
|
||||||
| 2.8 | 🔄 PENDING | LOW | AI model management |
|
|
||||||
| 2.9 | ✅ COMPLETE | HIGH | Skin-tone aware enhancement |
|
|
||||||
|
|
||||||
### **🎯 Ready for Phase 3: Advanced Model Integration**
|
|
||||||
|
|
||||||
#### **Completed Foundation:**
|
|
||||||
- ✅ **Rock-solid unified FFmpeg player** (from Phase 1)
|
|
||||||
- ✅ **Professional enhancement framework** with extensible AI interfaces
|
|
||||||
- ✅ **Content-aware processing** with cultural sensitivity
|
|
||||||
- ✅ **Skin-tone preservation** with natural tone maintenance
|
|
||||||
- ✅ **Cross-platform architecture** with ONNX Runtime support
|
|
||||||
|
|
||||||
#### **Next Steps Available:**
|
|
||||||
1. **Phase 2.3**: FFmpeg dnn_processing filter integration
|
|
||||||
2. **Phase 2.5**: Real-time preview with tile-based processing
|
|
||||||
3. **Phase 2.6**: Live enhancement monitoring and optimization
|
|
||||||
4. **Phase 2.8**: Model download and version management
|
|
||||||
5. **Phase 3**: Multi-language support for Canadian market
|
|
||||||
|
|
||||||
### **🚀 Commercial Impact**
|
|
||||||
|
|
||||||
VideoTools is now positioned as a **professional-grade AI video enhancement platform** with:
|
|
||||||
|
|
||||||
- **Market-leading skin optimization**
|
|
||||||
- **Culturally sensitive content processing**
|
|
||||||
- **Cross-platform compatibility** (Windows/Linux/macOS)
|
|
||||||
- **Extensible AI model architecture**
|
|
||||||
- **Professional enhancement quality** suitable for commercial use
|
|
||||||
|
|
||||||
## **🏆 Technical Debt Resolution**
|
|
||||||
|
|
||||||
All enhancement framework code is **clean, documented, and production-ready**. The implementation follows:
|
|
||||||
|
|
||||||
- **SOLID Principles**: Single responsibility, clean interfaces
|
|
||||||
- **Performance Optimization**: Memory-efficient tile-based processing
|
|
||||||
- **Cross-Platform Standards**: Platform-agnostic AI integration
|
|
||||||
- **Professional Code Quality**: Comprehensive error handling and logging
|
|
||||||
- **Extensible Design**: Plugin architecture for future models
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
**Phase 2 establishes VideoTools as an industry-leading AI video enhancement platform** 🎉
|
|
||||||
|
|
||||||
*Status: ✅ READY FOR ADVANCED AI INTEGRATION*
|
|
||||||
|
|
@ -1,354 +0,0 @@
|
||||||
# Player Module Performance Issues & Fixes
|
|
||||||
|
|
||||||
## Current Problems Causing Stuttering
|
|
||||||
|
|
||||||
### 1. **Separate Video & Audio Processes (No Sync)**
|
|
||||||
**Location:** `main.go:9144` (runVideo) and `main.go:9233` (runAudio)
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
- Video and audio run in completely separate FFmpeg processes
|
|
||||||
- No synchronization mechanism between them
|
|
||||||
- They will inevitably drift apart, causing A/V desync and stuttering
|
|
||||||
|
|
||||||
**Current Implementation:**
|
|
||||||
```go
|
|
||||||
func (p *playSession) startLocked(offset float64) {
|
|
||||||
p.runVideo(offset) // Separate process
|
|
||||||
p.runAudio(offset) // Separate process
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- If video frame processing takes too long → audio continues → desync
|
|
||||||
- If audio buffer underruns → video continues → desync
|
|
||||||
- No feedback loop to keep them in sync
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 2. **Audio Buffer Too Small**
|
|
||||||
**Location:** `main.go:8960` (audio context) and `main.go:9274` (chunk size)
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```go
|
|
||||||
// Audio context with tiny buffer (42ms at 48kHz)
|
|
||||||
audioCtxGlobal.ctx, audioCtxGlobal.err = oto.NewContext(sampleRate, channels, bytesPerSample, 2048)
|
|
||||||
|
|
||||||
// Tiny read chunks (21ms of audio)
|
|
||||||
chunk := make([]byte, 4096)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- 21ms chunks mean we need to read 47 times per second
|
|
||||||
- Any delay > 21ms causes audio dropout/stuttering
|
|
||||||
- 2048 sample buffer gives only 42ms protection against underruns
|
|
||||||
- Modern systems need 100-200ms buffers for smooth playback
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 3. **Volume Processing in Hot Path**
|
|
||||||
**Location:** `main.go:9294-9318`
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```go
|
|
||||||
// Processes volume on EVERY audio chunk read
|
|
||||||
for i := 0; i+1 < n; i += 2 {
|
|
||||||
sample := int16(binary.LittleEndian.Uint16(tmp[i:]))
|
|
||||||
amp := int(float64(sample) * gain)
|
|
||||||
// ... clamping ...
|
|
||||||
binary.LittleEndian.PutUint16(tmp[i:], uint16(int16(amp)))
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- CPU-intensive per-sample processing
|
|
||||||
- Happens 47 times/second with tiny chunks
|
|
||||||
- Blocks the audio read loop
|
|
||||||
- Should use FFmpeg's volume filter or hardware mixing
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 4. **Video Frame Pacing Issues**
|
|
||||||
**Location:** `main.go:9200-9203`
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```go
|
|
||||||
if delay := time.Until(nextFrameAt); delay > 0 {
|
|
||||||
time.Sleep(delay)
|
|
||||||
}
|
|
||||||
nextFrameAt = nextFrameAt.Add(frameDur)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- `time.Sleep()` is not precise (can wake up late)
|
|
||||||
- Cumulative drift: if one frame is late, all future frames shift
|
|
||||||
- No correction mechanism if we fall behind
|
|
||||||
- UI thread delays from `DoFromGoroutine` can cause frame drops
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 5. **UI Thread Blocking**
|
|
||||||
**Location:** `main.go:9207-9215`
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```go
|
|
||||||
// Every frame waits for UI thread to be available
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
p.img.Image = frame
|
|
||||||
p.img.Refresh()
|
|
||||||
}, false)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- If UI thread is busy, frame updates queue up
|
|
||||||
- Can cause video to appear choppy even if FFmpeg is delivering smoothly
|
|
||||||
- No frame dropping mechanism if UI can't keep up
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 6. **Frame Allocation on Every Frame**
|
|
||||||
**Location:** `main.go:9205-9206`
|
|
||||||
|
|
||||||
**Problem:**
|
|
||||||
```go
|
|
||||||
// Allocates new frame buffer 24-60 times per second
|
|
||||||
frame := image.NewRGBA(image.Rect(0, 0, p.targetW, p.targetH))
|
|
||||||
utils.CopyRGBToRGBA(frame.Pix, buf)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Why It Stutters:**
|
|
||||||
- Memory allocation on every frame causes GC pressure
|
|
||||||
- Extra copy operation adds latency
|
|
||||||
- Could reuse buffers or use ring buffer
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Recommended Fixes (Priority Order)
|
|
||||||
|
|
||||||
### Priority 1: Increase Audio Buffers (Quick Fix)
|
|
||||||
|
|
||||||
**Change `main.go:8960`:**
|
|
||||||
```go
|
|
||||||
// OLD: 2048 samples = 42ms
|
|
||||||
audioCtxGlobal.ctx, audioCtxGlobal.err = oto.NewContext(sampleRate, channels, bytesPerSample, 2048)
|
|
||||||
|
|
||||||
// NEW: 8192 samples = 170ms (more buffer = smoother playback)
|
|
||||||
audioCtxGlobal.ctx, audioCtxGlobal.err = oto.NewContext(sampleRate, channels, bytesPerSample, 8192)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Change `main.go:9274`:**
|
|
||||||
```go
|
|
||||||
// OLD: 4096 bytes = 21ms
|
|
||||||
chunk := make([]byte, 4096)
|
|
||||||
|
|
||||||
// NEW: 16384 bytes = 85ms per chunk
|
|
||||||
chunk := make([]byte, 16384)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected Result:** Audio stuttering should improve significantly
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Priority 2: Use FFmpeg for Volume Control
|
|
||||||
|
|
||||||
**Change `main.go:9238-9247`:**
|
|
||||||
```go
|
|
||||||
// Add volume filter to FFmpeg command instead of processing in Go
|
|
||||||
volumeFilter := ""
|
|
||||||
if p.muted || p.volume <= 0 {
|
|
||||||
volumeFilter = "-af volume=0"
|
|
||||||
} else if math.Abs(p.volume - 100) > 0.1 {
|
|
||||||
volumeFilter = fmt.Sprintf("-af volume=%.2f", p.volume/100.0)
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd := exec.Command(platformConfig.FFmpegPath,
|
|
||||||
"-hide_banner", "-loglevel", "error",
|
|
||||||
"-ss", fmt.Sprintf("%.3f", offset),
|
|
||||||
"-i", p.path,
|
|
||||||
"-vn",
|
|
||||||
"-ac", fmt.Sprintf("%d", channels),
|
|
||||||
"-ar", fmt.Sprintf("%d", sampleRate),
|
|
||||||
volumeFilter, // Let FFmpeg handle volume
|
|
||||||
"-f", "s16le",
|
|
||||||
"-",
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Remove volume processing loop (lines 9294-9318):**
|
|
||||||
```go
|
|
||||||
// Simply write chunks directly
|
|
||||||
localPlayer.Write(chunk[:n])
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected Result:** Reduced CPU usage, smoother audio
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Priority 3: Use Single FFmpeg Process with A/V Sync
|
|
||||||
|
|
||||||
**Conceptual Change:**
|
|
||||||
Instead of separate video/audio processes, use ONE FFmpeg process that:
|
|
||||||
1. Outputs video frames to one pipe
|
|
||||||
2. Outputs audio to another pipe (or use `-f matroska` with demuxing)
|
|
||||||
3. Maintains sync internally
|
|
||||||
|
|
||||||
**Pseudocode:**
|
|
||||||
```go
|
|
||||||
cmd := exec.Command(platformConfig.FFmpegPath,
|
|
||||||
"-ss", fmt.Sprintf("%.3f", offset),
|
|
||||||
"-i", p.path,
|
|
||||||
// Video stream
|
|
||||||
"-map", "0:v:0",
|
|
||||||
"-f", "rawvideo",
|
|
||||||
"-pix_fmt", "rgb24",
|
|
||||||
"-r", fmt.Sprintf("%.3f", p.fps),
|
|
||||||
"pipe:4", // Video to fd 4
|
|
||||||
// Audio stream
|
|
||||||
"-map", "0:a:0",
|
|
||||||
"-ac", "2",
|
|
||||||
"-ar", "48000",
|
|
||||||
"-f", "s16le",
|
|
||||||
"pipe:5", // Audio to fd 5
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected Result:** Perfect A/V sync, no drift
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Priority 4: Frame Buffer Reuse
|
|
||||||
|
|
||||||
**Change `main.go:9205-9206`:**
|
|
||||||
```go
|
|
||||||
// Reuse frame buffers instead of allocating every frame
|
|
||||||
type framePool struct {
|
|
||||||
pool sync.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *framePool) get(w, h int) *image.RGBA {
|
|
||||||
if img := p.pool.Get(); img != nil {
|
|
||||||
return img.(*image.RGBA)
|
|
||||||
}
|
|
||||||
return image.NewRGBA(image.Rect(0, 0, w, h))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *framePool) put(img *image.RGBA) {
|
|
||||||
// Clear pixel data
|
|
||||||
for i := range img.Pix {
|
|
||||||
img.Pix[i] = 0
|
|
||||||
}
|
|
||||||
p.pool.Put(img)
|
|
||||||
}
|
|
||||||
|
|
||||||
// In video loop:
|
|
||||||
frame := framePool.get(p.targetW, p.targetH)
|
|
||||||
utils.CopyRGBToRGBA(frame.Pix, buf)
|
|
||||||
// ... use frame ...
|
|
||||||
// Note: can't return to pool if UI is still using it
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected Result:** Reduced GC pressure, smoother frame delivery
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Priority 5: Adaptive Frame Timing
|
|
||||||
|
|
||||||
**Change `main.go:9200-9203`:**
|
|
||||||
```go
|
|
||||||
// Track actual vs expected time to detect drift
|
|
||||||
now := time.Now()
|
|
||||||
behind := now.Sub(nextFrameAt)
|
|
||||||
|
|
||||||
if behind < 0 {
|
|
||||||
// We're ahead, sleep until next frame
|
|
||||||
time.Sleep(-behind)
|
|
||||||
} else if behind > frameDur*2 {
|
|
||||||
// We're way behind (>2 frames), skip this frame
|
|
||||||
logging.Debug(logging.CatFFMPEG, "dropping frame, %.0fms behind", behind.Seconds()*1000)
|
|
||||||
nextFrameAt = now
|
|
||||||
continue
|
|
||||||
} else {
|
|
||||||
// We're slightly behind, catchup gradually
|
|
||||||
nextFrameAt = now.Add(frameDur / 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
nextFrameAt = nextFrameAt.Add(frameDur)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected Result:** Better handling of temporary slowdowns, adaptive recovery
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Testing Checklist
|
|
||||||
|
|
||||||
After each fix, test:
|
|
||||||
|
|
||||||
- [ ] 24fps video plays smoothly
|
|
||||||
- [ ] 30fps video plays smoothly
|
|
||||||
- [ ] 60fps video plays smoothly
|
|
||||||
- [ ] Audio doesn't stutter
|
|
||||||
- [ ] A/V sync maintained over 30+ seconds
|
|
||||||
- [ ] Seeking doesn't cause prolonged stuttering
|
|
||||||
- [ ] CPU usage is reasonable (<20% for playback)
|
|
||||||
- [ ] Works on both Linux and Windows
|
|
||||||
- [ ] Works with various codecs (H.264, H.265, VP9)
|
|
||||||
- [ ] Volume control works smoothly
|
|
||||||
- [ ] Pause/resume doesn't cause issues
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Performance Monitoring
|
|
||||||
|
|
||||||
Add instrumentation to measure:
|
|
||||||
|
|
||||||
```go
|
|
||||||
// Video frame timing
|
|
||||||
frameDeliveryTime := time.Since(frameReadStart)
|
|
||||||
if frameDeliveryTime > frameDur*1.5 {
|
|
||||||
logging.Debug(logging.CatFFMPEG, "slow frame delivery: %.1fms (target: %.1fms)",
|
|
||||||
frameDeliveryTime.Seconds()*1000,
|
|
||||||
frameDur.Seconds()*1000)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Audio buffer health
|
|
||||||
if audioBufferFillLevel < 0.3 {
|
|
||||||
logging.Debug(logging.CatFFMPEG, "audio buffer low: %.0f%%", audioBufferFillLevel*100)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Alternative: Use External Player Library
|
|
||||||
|
|
||||||
If these tweaks don't achieve smooth playback, consider:
|
|
||||||
|
|
||||||
1. **mpv library** (libmpv) - Industry standard, perfect A/V sync
|
|
||||||
2. **FFmpeg's ffplay** code - Reference implementation
|
|
||||||
3. **VLC libvlc** - Proven playback engine
|
|
||||||
|
|
||||||
These handle all the complex synchronization automatically.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
**Root Causes:**
|
|
||||||
1. Separate video/audio processes with no sync
|
|
||||||
2. Tiny audio buffers causing underruns
|
|
||||||
3. CPU waste on per-sample volume processing
|
|
||||||
4. Frame timing drift with no correction
|
|
||||||
5. UI thread blocking frame updates
|
|
||||||
|
|
||||||
**Quick Wins (30 min):**
|
|
||||||
- Increase audio buffers (Priority 1)
|
|
||||||
- Move volume to FFmpeg (Priority 2)
|
|
||||||
|
|
||||||
**Proper Fix (2-4 hours):**
|
|
||||||
- Single FFmpeg process with A/V muxing (Priority 3)
|
|
||||||
- Frame buffer pooling (Priority 4)
|
|
||||||
- Adaptive timing (Priority 5)
|
|
||||||
|
|
||||||
**Expected Final Result:**
|
|
||||||
- Smooth playback at all frame rates
|
|
||||||
- Rock-solid A/V sync
|
|
||||||
- Low CPU usage
|
|
||||||
- No stuttering or dropouts
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
# Project Status
|
|
||||||
|
|
||||||
This document provides a high-level overview of the implementation status of the VideoTools project. It is intended to give users and developers a clear, at-a-glance understanding of what is complete, what is in progress, and what is planned.
|
|
||||||
|
|
||||||
## High-Level Summary
|
|
||||||
|
|
||||||
VideoTools is a modular application for video processing. While many features are planned, the current implementation is focused on a few core modules. The documentation often describes planned features, so please refer to this document for the ground truth.
|
|
||||||
|
|
||||||
## 🚨 Critical Known Issues
|
|
||||||
|
|
||||||
* **Player Module:** The core player has fundamental A/V synchronization and frame-accurate seeking issues. This blocks the development of several planned features that depend on it (e.g., Trim, Filters). A major rework of the player is a critical priority.
|
|
||||||
|
|
||||||
## Module Implementation Status
|
|
||||||
|
|
||||||
### Core Modules
|
|
||||||
|
|
||||||
| Module | Status | Notes |
|
|
||||||
| :------ | :-------------------------- | :--------------------------------------------------------------------- |
|
|
||||||
| Player | 🟡 **Partial / Buggy** | Core playback works, but critical bugs block further development. |
|
|
||||||
| Convert | ✅ **Implemented** | Fully implemented with DVD encoding and professional validation. |
|
|
||||||
| Merge | 🔄 **Planned** | Planned for a future release. |
|
|
||||||
| Trim | 🔄 **Planned** | Planned. Depends on Player module fixes. |
|
|
||||||
| Filters | 🔄 **Planned** | Planned. Depends on Player module fixes. |
|
|
||||||
| Upscale | 🟡 **Partial** | AI-based upscaling (Real-ESRGAN) is integrated. |
|
|
||||||
| Audio | 🔄 **Planned** | Planned for a future release. |
|
|
||||||
| Thumb | 🔄 **Planned** | Planned for a future release. |
|
|
||||||
| Inspect | 🟡 **Partial** | Basic metadata viewing is implemented. Advanced features are planned. |
|
|
||||||
| Rip | ✅ **Implemented** | Ripping from `VIDEO_TS` folders and ISO images is implemented. |
|
|
||||||
| Blu-ray | 🔄 **Planned** | Comprehensive planning is complete. Implementation is for a future release. |
|
|
||||||
|
|
||||||
### Suggested Modules (All Planned)
|
|
||||||
|
|
||||||
The following modules have been suggested and are planned for future development, but are not yet implemented:
|
|
||||||
|
|
||||||
* Subtitle Management
|
|
||||||
* Advanced Stream Management
|
|
||||||
* GIF Creation
|
|
||||||
* Cropping Tools
|
|
||||||
* Screenshot Capture
|
|
||||||
18
README.md
18
README.md
|
|
@ -1,16 +1,9 @@
|
||||||
# VideoTools - Video Processing Suite
|
# VideoTools - Professional Video Processing Suite
|
||||||
|
|
||||||
## What is VideoTools?
|
## What is VideoTools?
|
||||||
|
|
||||||
VideoTools is a professional-grade video processing application with a modern GUI. It specializes in creating **DVD-compliant videos** for authoring and distribution.
|
VideoTools is a professional-grade video processing application with a modern GUI. It specializes in creating **DVD-compliant videos** for authoring and distribution.
|
||||||
|
|
||||||
## Project Status
|
|
||||||
|
|
||||||
**This project is under active development, and many documented features are not yet implemented.**
|
|
||||||
|
|
||||||
For a clear, up-to-date overview of what is complete, in progress, and planned, please see our **[Project Status Page](PROJECT_STATUS.md)**. This document provides the most accurate reflection of the project's current state.
|
|
||||||
|
|
||||||
|
|
||||||
## Key Features
|
## Key Features
|
||||||
|
|
||||||
### DVD-NTSC & DVD-PAL Output
|
### DVD-NTSC & DVD-PAL Output
|
||||||
|
|
@ -37,7 +30,7 @@ For a clear, up-to-date overview of what is complete, in progress, and planned,
|
||||||
### Installation (One Command)
|
### Installation (One Command)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bash scripts/install.sh
|
bash install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
The installer will build, install, and set up everything automatically with a guided wizard!
|
The installer will build, install, and set up everything automatically with a guided wizard!
|
||||||
|
|
@ -50,16 +43,15 @@ VideoTools
|
||||||
|
|
||||||
### Alternative: Developer Setup
|
### Alternative: Developer Setup
|
||||||
|
|
||||||
If you already have the repo cloned (dev workflow):
|
If you already have the repo cloned:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd /path/to/VideoTools
|
cd /path/to/VideoTools
|
||||||
bash scripts/build.sh
|
source scripts/alias.sh
|
||||||
bash scripts/run.sh
|
VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
For detailed installation options, troubleshooting, and platform-specific notes, see **INSTALLATION.md**.
|
For detailed installation options, troubleshooting, and platform-specific notes, see **INSTALLATION.md**.
|
||||||
For upcoming work and priorities, see **docs/ROADMAP.md**.
|
|
||||||
|
|
||||||
## How to Create a Professional DVD
|
## How to Create a Professional DVD
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Adding to documentation: Need to simplify Whisper and Whisper usage in Subtitles module
|
|
||||||
|
|
@ -1,252 +0,0 @@
|
||||||
# Windows Build Performance Guide
|
|
||||||
|
|
||||||
## Issue: Slow Builds (5+ Minutes)
|
|
||||||
|
|
||||||
If you're experiencing very slow build times on Windows, follow these steps to dramatically improve performance.
|
|
||||||
|
|
||||||
## Quick Fixes
|
|
||||||
|
|
||||||
### 1. Use the Optimized Build Scripts
|
|
||||||
|
|
||||||
We've updated the build scripts with performance optimizations:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Git Bash (Most Windows users)
|
|
||||||
./scripts/build.sh
|
|
||||||
|
|
||||||
# PowerShell
|
|
||||||
.\scripts\build.ps1
|
|
||||||
|
|
||||||
# Command Prompt
|
|
||||||
.\scripts\build.bat
|
|
||||||
```
|
|
||||||
|
|
||||||
**New Optimizations:**
|
|
||||||
- `-p N`: Parallel compilation using all CPU cores
|
|
||||||
- `-trimpath`: Faster builds and smaller binaries
|
|
||||||
- `-ldflags="-s -w"`: Strip debug symbols (faster linking)
|
|
||||||
|
|
||||||
### 2. Add Windows Defender Exclusions (CRITICAL!)
|
|
||||||
|
|
||||||
**This is the #1 cause of slow builds on Windows.**
|
|
||||||
|
|
||||||
Windows Defender scans every intermediate `.o` file during compilation, adding 2-5 minutes to build time.
|
|
||||||
|
|
||||||
#### Automated Script (Easiest - For Git Bash Users):
|
|
||||||
|
|
||||||
**From Git Bash (Run as Administrator):**
|
|
||||||
```bash
|
|
||||||
# Run the automated exclusion script
|
|
||||||
powershell.exe -ExecutionPolicy Bypass -File ./scripts/add-defender-exclusions.ps1
|
|
||||||
```
|
|
||||||
|
|
||||||
**To run Git Bash as Administrator:**
|
|
||||||
1. Search for "Git Bash" in Start Menu
|
|
||||||
2. Right-click → "Run as administrator"
|
|
||||||
3. Navigate to your VideoTools directory
|
|
||||||
4. Run the command above
|
|
||||||
|
|
||||||
#### Manual Method (GUI):
|
|
||||||
|
|
||||||
1. **Open Windows Security**
|
|
||||||
- Press `Win + I` → Update & Security → Windows Security → Virus & threat protection
|
|
||||||
|
|
||||||
2. **Add Exclusions** (Manage settings → Add or remove exclusions):
|
|
||||||
- `C:\Users\YourName\go` - Go package cache
|
|
||||||
- `C:\Users\YourName\AppData\Local\go-build` - Go build cache
|
|
||||||
- `C:\Users\YourName\Projects\VideoTools` - Your project directory
|
|
||||||
- `C:\msys64` - MinGW toolchain (if using MSYS2)
|
|
||||||
|
|
||||||
#### PowerShell Method (If Not Using Git Bash):
|
|
||||||
|
|
||||||
Run PowerShell as Administrator:
|
|
||||||
```powershell
|
|
||||||
# Run the automated script
|
|
||||||
.\scripts\add-defender-exclusions.ps1
|
|
||||||
|
|
||||||
# Or add manually:
|
|
||||||
Add-MpPreference -ExclusionPath "$env:LOCALAPPDATA\go-build"
|
|
||||||
Add-MpPreference -ExclusionPath "$env:USERPROFILE\go"
|
|
||||||
Add-MpPreference -ExclusionPath "C:\Users\$env:USERNAME\Projects\VideoTools"
|
|
||||||
Add-MpPreference -ExclusionPath "C:\msys64"
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected improvement:** 5 minutes → 30-90 seconds
|
|
||||||
|
|
||||||
### 3. Use Go Build Cache
|
|
||||||
|
|
||||||
Make sure Go's build cache is enabled (it should be by default):
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Check cache location
|
|
||||||
go env GOCACHE
|
|
||||||
|
|
||||||
# Should output something like: C:\Users\YourName\AppData\Local\go-build
|
|
||||||
```
|
|
||||||
|
|
||||||
**Don't use `-Clean` flag** unless you're troubleshooting. Clean builds are much slower.
|
|
||||||
|
|
||||||
### 4. Optimize MinGW/GCC
|
|
||||||
|
|
||||||
If using MSYS2/MinGW, ensure it's in your PATH before other compilers:
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Check GCC version
|
|
||||||
gcc --version
|
|
||||||
|
|
||||||
# Should show: gcc (GCC) 13.x or newer
|
|
||||||
```
|
|
||||||
|
|
||||||
## Advanced Optimizations
|
|
||||||
|
|
||||||
### 1. Use Faster SSD for Build Cache
|
|
||||||
|
|
||||||
Move your Go cache to an SSD if it's on an HDD:
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Set custom cache location on fast SSD
|
|
||||||
$env:GOCACHE = "D:\FastSSD\go-build"
|
|
||||||
go env -w GOCACHE="D:\FastSSD\go-build"
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Increase Go Build Parallelism
|
|
||||||
|
|
||||||
For high-core-count CPUs:
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Use all CPU threads
|
|
||||||
$env:GOMAXPROCS = [Environment]::ProcessorCount
|
|
||||||
|
|
||||||
# Or set specific count
|
|
||||||
$env:GOMAXPROCS = 16
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Disable Real-Time Scanning Temporarily
|
|
||||||
|
|
||||||
**Only during builds** (not recommended for normal use):
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Disable (run as Administrator)
|
|
||||||
Set-MpPreference -DisableRealtimeMonitoring $true
|
|
||||||
|
|
||||||
# Build your project
|
|
||||||
.\scripts\build.ps1
|
|
||||||
|
|
||||||
# Re-enable immediately after
|
|
||||||
Set-MpPreference -DisableRealtimeMonitoring $false
|
|
||||||
```
|
|
||||||
|
|
||||||
## Benchmarking Your Build
|
|
||||||
|
|
||||||
Time your build to measure improvements:
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# PowerShell
|
|
||||||
Measure-Command { .\scripts\build.ps1 }
|
|
||||||
|
|
||||||
# Command Prompt
|
|
||||||
echo %time% && .\scripts\build.bat && echo %time%
|
|
||||||
```
|
|
||||||
|
|
||||||
## Expected Build Times
|
|
||||||
|
|
||||||
With optimizations:
|
|
||||||
|
|
||||||
| Machine Type | Clean Build | Incremental Build |
|
|
||||||
|--------------|-------------|-------------------|
|
|
||||||
| Modern Desktop (8+ cores, SSD) | 30-60 seconds | 5-15 seconds |
|
|
||||||
| Laptop (4-6 cores, SSD) | 60-90 seconds | 10-20 seconds |
|
|
||||||
| Older Machine (2-4 cores, HDD) | 2-3 minutes | 30-60 seconds |
|
|
||||||
|
|
||||||
**Without Defender exclusions:** Add 2-5 minutes to above times.
|
|
||||||
|
|
||||||
## Still Slow?
|
|
||||||
|
|
||||||
### Check for Common Issues:
|
|
||||||
|
|
||||||
1. **Antivirus Software**
|
|
||||||
- Third-party antivirus can be even worse than Defender
|
|
||||||
- Add same exclusions in your antivirus settings
|
|
||||||
|
|
||||||
2. **Disk Space**
|
|
||||||
- Go cache can grow large
|
|
||||||
- Ensure 5+ GB free space on cache drive
|
|
||||||
|
|
||||||
3. **Background Processes**
|
|
||||||
- Close resource-heavy applications during builds
|
|
||||||
- Check Task Manager for CPU/disk usage
|
|
||||||
|
|
||||||
4. **Network Drives**
|
|
||||||
- **Never** build on network drives or cloud-synced folders
|
|
||||||
- Move project to local SSD
|
|
||||||
|
|
||||||
5. **WSL2 vs Native Windows**
|
|
||||||
- Building in WSL2 can be faster
|
|
||||||
- But adds complexity with GUI apps
|
|
||||||
|
|
||||||
## Troubleshooting Commands
|
|
||||||
|
|
||||||
```powershell
|
|
||||||
# Check Go environment
|
|
||||||
go env
|
|
||||||
|
|
||||||
# Check build cache size
|
|
||||||
Get-ChildItem -Path (go env GOCACHE) -Recurse | Measure-Object -Property Length -Sum
|
|
||||||
|
|
||||||
# Clean cache if too large (>10 GB)
|
|
||||||
go clean -cache
|
|
||||||
|
|
||||||
# Verify GCC is working
|
|
||||||
gcc --version
|
|
||||||
```
|
|
||||||
|
|
||||||
## Getting Help
|
|
||||||
|
|
||||||
If you're still experiencing slow builds after following this guide:
|
|
||||||
|
|
||||||
1. **Capture build timing:**
|
|
||||||
```powershell
|
|
||||||
Measure-Command { go build -v -x . } > build-log.txt 2>&1
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Check system specs:**
|
|
||||||
```powershell
|
|
||||||
systeminfo | findstr /C:"Processor" /C:"Physical Memory"
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Report issue** with:
|
|
||||||
- Build timing output
|
|
||||||
- System specifications
|
|
||||||
- Windows version
|
|
||||||
- Antivirus software in use
|
|
||||||
|
|
||||||
## Summary: Quick Start for Git Bash Users
|
|
||||||
|
|
||||||
**If you're using Git Bash on Windows (most users), do this:**
|
|
||||||
|
|
||||||
1. **Open Git Bash as Administrator**
|
|
||||||
- Right-click Git Bash → "Run as administrator"
|
|
||||||
|
|
||||||
2. **Navigate to VideoTools:**
|
|
||||||
```bash
|
|
||||||
cd ~/Projects/VideoTools # or wherever your project is
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Add Defender exclusions (ONE TIME ONLY):**
|
|
||||||
```bash
|
|
||||||
powershell.exe -ExecutionPolicy Bypass -File ./scripts/add-defender-exclusions.ps1
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Close and reopen Git Bash (normal, not admin)**
|
|
||||||
|
|
||||||
5. **Build with optimized script:**
|
|
||||||
```bash
|
|
||||||
./scripts/build.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
**Expected result:** 5+ minutes → 30-90 seconds
|
|
||||||
|
|
||||||
### What Each Step Does:
|
|
||||||
1. ✅ **Add Windows Defender exclusions** (saves 2-5 minutes) - Most important!
|
|
||||||
2. ✅ **Use optimized build scripts** (saves 30-60 seconds) - Parallel compilation
|
|
||||||
3. ✅ **Avoid clean builds** (saves 1-2 minutes) - Uses Go's build cache
|
|
||||||
138
WORKING_ON.md
138
WORKING_ON.md
|
|
@ -1,138 +0,0 @@
|
||||||
# Active Work Coordination
|
|
||||||
|
|
||||||
This file tracks what each agent is currently working on to prevent conflicts and coordinate changes.
|
|
||||||
|
|
||||||
**Last Updated**: 2026-01-02 04:30 UTC
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🔴 Current Blockers
|
|
||||||
|
|
||||||
- **Build Status**: ❌ FAILING
|
|
||||||
- Issue: Player code has missing functions and syntax errors
|
|
||||||
- Blocking: All testing and integration work
|
|
||||||
- Owner: opencode (fixing player issues)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 👥 Active Work by Agent
|
|
||||||
|
|
||||||
### 🤖 opencode
|
|
||||||
**Status**: Working on player backend and enhancement module
|
|
||||||
|
|
||||||
**Currently Modifying**:
|
|
||||||
- `internal/player/unified_ffmpeg_player.go` - Fixing API and syntax issues
|
|
||||||
- `internal/enhancement/enhancement_module.go` - Building enhancement framework
|
|
||||||
- Potentially: `internal/utils/` - Need to add `GetFFmpegPath()` function
|
|
||||||
|
|
||||||
**Completed This Session**:
|
|
||||||
- ✅ Unified FFmpeg player implementation
|
|
||||||
- ✅ Command execution refactoring (`utils.CreateCommand`)
|
|
||||||
- ✅ Enhancement module architecture
|
|
||||||
|
|
||||||
**Next Tasks**:
|
|
||||||
1. Add missing `utils.GetFFmpegPath()` function
|
|
||||||
2. Fix remaining player syntax errors
|
|
||||||
3. Decide when to commit enhancement module
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 🤖 thisagent (UI/Convert Module)
|
|
||||||
**Status**: Completed color-coded dropdown implementation, waiting for build fix
|
|
||||||
|
|
||||||
**Currently Modifying**:
|
|
||||||
- ✅ `internal/ui/components.go` - ColoredSelect widget (COMPLETE)
|
|
||||||
- ✅ `internal/ui/colors.go` - Color mapping functions (COMPLETE)
|
|
||||||
- ✅ `main.go` - Convert module dropdown integration (COMPLETE)
|
|
||||||
|
|
||||||
**Completed This Session**:
|
|
||||||
- ✅ Created `ColoredSelect` custom widget with colored dropdown items
|
|
||||||
- ✅ Added color mapping helpers for formats/codecs
|
|
||||||
- ✅ Updated all three Convert module selectors (format, video codec, audio codec)
|
|
||||||
- ✅ Fixed import paths (relative → full module paths)
|
|
||||||
- ✅ Created platform-specific exec wrappers
|
|
||||||
- ✅ Fixed player syntax errors and removed duplicate file
|
|
||||||
|
|
||||||
**Next Tasks**:
|
|
||||||
1. Test colored dropdowns once build succeeds
|
|
||||||
2. Potentially help with Enhancement module UI integration
|
|
||||||
3. Address any UX feedback on colored dropdowns
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### 🤖 gemini (Documentation & Platform)
|
|
||||||
**Status**: Platform-specific code and documentation
|
|
||||||
|
|
||||||
**Currently Modifying**:
|
|
||||||
- `internal/utils/exec_windows.go` - Added detailed comments (COMPLETE)
|
|
||||||
- Documentation files (as needed)
|
|
||||||
|
|
||||||
**Completed This Session**:
|
|
||||||
- ✅ Added detailed comments to exec_windows.go
|
|
||||||
- ✅ Added detailed comments to exec_unix.go
|
|
||||||
- ✅ Replaced platformConfig.FFmpegPath → utils.GetFFmpegPath() in main.go (completed by thisagent)
|
|
||||||
- ✅ Replaced platformConfig.FFprobePath → utils.GetFFprobePath() in main.go (completed by thisagent)
|
|
||||||
|
|
||||||
**Next Tasks**:
|
|
||||||
1. Document the platform-specific exec abstraction
|
|
||||||
2. Create/update ARCHITECTURE.md with ColoredSelect widget
|
|
||||||
3. Document Enhancement module once stable
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 📝 Shared Files - Coordinate Before Modifying!
|
|
||||||
|
|
||||||
These files are touched by multiple agents - check this file before editing:
|
|
||||||
|
|
||||||
- **`main.go`** - High conflict risk!
|
|
||||||
- opencode: Command execution calls, player integration
|
|
||||||
- thisagent: UI widget updates in Convert module
|
|
||||||
- gemini: Possibly documentation comments
|
|
||||||
|
|
||||||
- **`internal/utils/`** - Medium risk
|
|
||||||
- opencode: May need to add utility functions
|
|
||||||
- thisagent: Created exec_*.go files
|
|
||||||
- gemini: Documentation
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## ✅ Ready to Commit
|
|
||||||
|
|
||||||
Files ready for commit once build passes:
|
|
||||||
|
|
||||||
**thisagent's changes**:
|
|
||||||
- `internal/ui/components.go` - ColoredSelect widget
|
|
||||||
- `internal/ui/colors.go` - Color mapping helpers
|
|
||||||
- `internal/utils/exec_unix.go` - Unix command wrapper
|
|
||||||
- `internal/utils/exec_windows.go` - Windows command wrapper
|
|
||||||
- `internal/logging/logging.go` - Added CatPlayer category
|
|
||||||
- `main.go` - Convert module dropdown updates
|
|
||||||
|
|
||||||
**opencode's changes** (when ready):
|
|
||||||
- Player fixes
|
|
||||||
- Enhancement module (decide if ready to commit)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 🎯 Commit Strategy
|
|
||||||
|
|
||||||
1. **opencode**: Fix player issues first (unblocks build)
|
|
||||||
2. **thisagent**: Commit colored dropdown feature once build works
|
|
||||||
3. **gemini**: Document new features after commits
|
|
||||||
4. **All**: Test integration together before tagging new version
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 💡 Quick Reference
|
|
||||||
|
|
||||||
**To update this file**:
|
|
||||||
1. Mark what you're starting to work on
|
|
||||||
2. Update "Currently Modifying" section
|
|
||||||
3. Move completed items to "Completed This Session"
|
|
||||||
4. Update blocker status if you fix something
|
|
||||||
5. Save and commit this file with your changes
|
|
||||||
|
|
||||||
**File naming convention for commits**:
|
|
||||||
- `feat(ui/thisagent): add colored dropdown menus`
|
|
||||||
- `fix(player/opencode): add missing GetFFmpegPath function`
|
|
||||||
- `docs(gemini): document platform-specific exec wrappers`
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 112 KiB |
1106
audio_module.go
1106
audio_module.go
File diff suppressed because it is too large
Load Diff
|
|
@ -1,260 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
)
|
|
||||||
|
|
||||||
// buildDVDRipTab creates a DVD/ISO ripping tab with import support
|
|
||||||
func buildDVDRipTab(state *appState) fyne.CanvasObject {
|
|
||||||
// DVD/ISO source
|
|
||||||
var sourceType string // "dvd" or "iso"
|
|
||||||
var isDVD5 bool
|
|
||||||
var isDVD9 bool
|
|
||||||
var titles []DVDTitle
|
|
||||||
|
|
||||||
sourceLabel := widget.NewLabel("No DVD/ISO selected")
|
|
||||||
sourceLabel.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
|
|
||||||
var updateTitleList func()
|
|
||||||
importBtn := widget.NewButton("Import DVD/ISO", func() {
|
|
||||||
dialog.ShowFileOpen(func(reader fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || reader == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer reader.Close()
|
|
||||||
path := reader.URI().Path()
|
|
||||||
|
|
||||||
if strings.ToLower(filepath.Ext(path)) == ".iso" {
|
|
||||||
sourceType = "iso"
|
|
||||||
sourceLabel.SetText(fmt.Sprintf("ISO: %s", filepath.Base(path)))
|
|
||||||
} else if isDVDPath(path) {
|
|
||||||
sourceType = "dvd"
|
|
||||||
sourceLabel.SetText(fmt.Sprintf("DVD: %s", path))
|
|
||||||
} else {
|
|
||||||
dialog.ShowError(fmt.Errorf("not a valid DVD or ISO file"), state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Analyze DVD/ISO
|
|
||||||
analyzedTitles, dvd5, dvd9 := analyzeDVDStructure(path, sourceType)
|
|
||||||
titles = analyzedTitles
|
|
||||||
isDVD5 = dvd5
|
|
||||||
isDVD9 = dvd9
|
|
||||||
updateTitleList()
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
importBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
// Title list
|
|
||||||
titleList := container.NewVBox()
|
|
||||||
|
|
||||||
updateTitleList = func() {
|
|
||||||
titleList.Objects = nil
|
|
||||||
|
|
||||||
if len(titles) == 0 {
|
|
||||||
emptyLabel := widget.NewLabel("Import a DVD or ISO to analyze")
|
|
||||||
emptyLabel.Alignment = fyne.TextAlignCenter
|
|
||||||
titleList.Add(container.NewCenter(emptyLabel))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add DVD5/DVD9 indicators
|
|
||||||
if isDVD5 {
|
|
||||||
dvd5Label := widget.NewLabel("🎞 DVD-5 Detected (Single Layer)")
|
|
||||||
dvd5Label.Importance = widget.LowImportance
|
|
||||||
titleList.Add(dvd5Label)
|
|
||||||
}
|
|
||||||
if isDVD9 {
|
|
||||||
dvd9Label := widget.NewLabel("🎞 DVD-9 Detected (Dual Layer)")
|
|
||||||
dvd9Label.Importance = widget.LowImportance
|
|
||||||
titleList.Add(dvd9Label)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add titles
|
|
||||||
for i, title := range titles {
|
|
||||||
idx := i
|
|
||||||
titleCard := widget.NewCard(
|
|
||||||
fmt.Sprintf("Title %d: %s", idx+1, title.Name),
|
|
||||||
fmt.Sprintf("%.2fs (%.1f GB)", title.Duration, title.SizeGB),
|
|
||||||
nil,
|
|
||||||
)
|
|
||||||
|
|
||||||
// Title details
|
|
||||||
details := container.NewVBox(
|
|
||||||
widget.NewLabel(fmt.Sprintf("Duration: %.2f seconds", title.Duration)),
|
|
||||||
widget.NewLabel(fmt.Sprintf("Size: %.1f GB", title.SizeGB)),
|
|
||||||
widget.NewLabel(fmt.Sprintf("Video: %s", title.VideoCodec)),
|
|
||||||
widget.NewLabel(fmt.Sprintf("Audio: %d tracks", len(title.AudioTracks))),
|
|
||||||
widget.NewLabel(fmt.Sprintf("Subtitles: %d tracks", len(title.SubtitleTracks))),
|
|
||||||
widget.NewLabel(fmt.Sprintf("Chapters: %d", len(title.Chapters))),
|
|
||||||
)
|
|
||||||
titleCard.SetContent(details)
|
|
||||||
|
|
||||||
// Rip button for this title
|
|
||||||
ripBtn := widget.NewButton("Rip Title", func() {
|
|
||||||
ripTitle(title, state)
|
|
||||||
})
|
|
||||||
ripBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
// Add to controls
|
|
||||||
controls := container.NewVBox(details, widget.NewSeparator(), ripBtn)
|
|
||||||
titleCard.SetContent(controls)
|
|
||||||
titleList.Add(titleCard)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rip all button
|
|
||||||
ripAllBtn := widget.NewButton("Rip All Titles", func() {
|
|
||||||
if len(titles) == 0 {
|
|
||||||
dialog.ShowInformation("No Titles", "Please import a DVD or ISO first", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ripAllTitles(titles, state)
|
|
||||||
})
|
|
||||||
ripAllBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
controls := container.NewVBox(
|
|
||||||
widget.NewLabel("DVD/ISO Source:"),
|
|
||||||
sourceLabel,
|
|
||||||
importBtn,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabel("Titles Found:"),
|
|
||||||
container.NewScroll(titleList),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
container.NewHBox(ripAllBtn),
|
|
||||||
)
|
|
||||||
|
|
||||||
return container.NewPadded(controls)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DVDTitle represents a DVD title
|
|
||||||
type DVDTitle struct {
|
|
||||||
Number int
|
|
||||||
Name string
|
|
||||||
Duration float64
|
|
||||||
SizeGB float64
|
|
||||||
VideoCodec string
|
|
||||||
AudioTracks []DVDTrack
|
|
||||||
SubtitleTracks []DVDTrack
|
|
||||||
Chapters []DVDChapter
|
|
||||||
AngleCount int
|
|
||||||
IsPAL bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// DVDTrack represents an audio/subtitle track
|
|
||||||
type DVDTrack struct {
|
|
||||||
ID int
|
|
||||||
Language string
|
|
||||||
Codec string
|
|
||||||
Channels int
|
|
||||||
SampleRate int
|
|
||||||
Bitrate int
|
|
||||||
}
|
|
||||||
|
|
||||||
// DVDChapter represents a chapter
|
|
||||||
type DVDChapter struct {
|
|
||||||
Number int
|
|
||||||
Title string
|
|
||||||
StartTime float64
|
|
||||||
Duration float64
|
|
||||||
}
|
|
||||||
|
|
||||||
// isDVDPath checks if path is likely a DVD structure
|
|
||||||
func isDVDPath(path string) bool {
|
|
||||||
// Check for VIDEO_TS directory
|
|
||||||
videoTS := filepath.Join(path, "VIDEO_TS")
|
|
||||||
if _, err := os.Stat(videoTS); err == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for common DVD file patterns
|
|
||||||
dirs, err := os.ReadDir(path)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, dir := range dirs {
|
|
||||||
name := strings.ToUpper(dir.Name())
|
|
||||||
if strings.Contains(name, "VIDEO_TS") ||
|
|
||||||
strings.Contains(name, "VTS_") {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyzeDVDStructure analyzes a DVD or ISO file for titles
|
|
||||||
func analyzeDVDStructure(path string, sourceType string) ([]DVDTitle, bool, bool) {
|
|
||||||
// This is a placeholder implementation
|
|
||||||
// In reality, you would use FFmpeg with DVD input support
|
|
||||||
dialog.ShowInformation("DVD Analysis",
|
|
||||||
fmt.Sprintf("Analyzing %s: %s\n\nThis will extract DVD structure and find all titles, audio tracks, and subtitles.", sourceType, filepath.Base(path)),
|
|
||||||
nil)
|
|
||||||
|
|
||||||
// Return sample titles
|
|
||||||
return []DVDTitle{
|
|
||||||
{
|
|
||||||
Number: 1,
|
|
||||||
Name: "Main Feature",
|
|
||||||
Duration: 7200, // 2 hours
|
|
||||||
SizeGB: 7.8,
|
|
||||||
VideoCodec: "MPEG-2",
|
|
||||||
AudioTracks: []DVDTrack{
|
|
||||||
{ID: 1, Language: "en", Codec: "AC-3", Channels: 6, SampleRate: 48000, Bitrate: 448000},
|
|
||||||
{ID: 2, Language: "es", Codec: "AC-3", Channels: 2, SampleRate: 48000, Bitrate: 192000},
|
|
||||||
},
|
|
||||||
SubtitleTracks: []DVDTrack{
|
|
||||||
{ID: 1, Language: "en", Codec: "SubRip"},
|
|
||||||
{ID: 2, Language: "es", Codec: "SubRip"},
|
|
||||||
},
|
|
||||||
Chapters: []DVDChapter{
|
|
||||||
{Number: 1, Title: "Chapter 1", StartTime: 0, Duration: 1800},
|
|
||||||
{Number: 2, Title: "Chapter 2", StartTime: 1800, Duration: 1800},
|
|
||||||
{Number: 3, Title: "Chapter 3", StartTime: 3600, Duration: 1800},
|
|
||||||
{Number: 4, Title: "Chapter 4", StartTime: 5400, Duration: 1800},
|
|
||||||
},
|
|
||||||
AngleCount: 1,
|
|
||||||
IsPAL: false,
|
|
||||||
},
|
|
||||||
}, false, false // DVD-5 by default for this example
|
|
||||||
}
|
|
||||||
|
|
||||||
// ripTitle rips a single DVD title to MKV format
|
|
||||||
func ripTitle(title DVDTitle, state *appState) {
|
|
||||||
// Default to AV1 in MKV for best quality
|
|
||||||
outputPath := fmt.Sprintf("%s_%s_Title%d.mkv",
|
|
||||||
strings.TrimSuffix(strings.TrimSuffix(filepath.Base(state.authorFile.Path), filepath.Ext(state.authorFile.Path)), ".dvd"),
|
|
||||||
title.Name,
|
|
||||||
title.Number)
|
|
||||||
|
|
||||||
dialog.ShowInformation("Rip Title",
|
|
||||||
fmt.Sprintf("Ripping Title %d: %s\n\nOutput: %s\nFormat: MKV (AV1)\nAudio: All tracks\nSubtitles: All tracks",
|
|
||||||
title.Number, title.Name, outputPath),
|
|
||||||
state.window)
|
|
||||||
|
|
||||||
// TODO: Implement actual ripping with FFmpeg
|
|
||||||
// This would use FFmpeg to extract the title with selected codec
|
|
||||||
// For DVD: ffmpeg -i dvd://1 -c:v libaom-av1 -c:a libopus -map_metadata 0 output.mkv
|
|
||||||
// For ISO: ffmpeg -i path/to/iso -map 0:v:0 -map 0:a -c:v libaom-av1 -c:a libopus output.mkv
|
|
||||||
}
|
|
||||||
|
|
||||||
// ripAllTitles rips all DVD titles
|
|
||||||
func ripAllTitles(titles []DVDTitle, state *appState) {
|
|
||||||
dialog.ShowInformation("Rip All Titles",
|
|
||||||
fmt.Sprintf("Ripping all %d titles\n\nThis will extract each title to separate MKV files with AV1 encoding.", len(titles)),
|
|
||||||
state.window)
|
|
||||||
|
|
||||||
// TODO: Implement batch ripping
|
|
||||||
for _, title := range titles {
|
|
||||||
ripTitle(title, state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
2761
author_module.go
2761
author_module.go
File diff suppressed because it is too large
Load Diff
|
|
@ -1,20 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
)
|
|
||||||
|
|
||||||
func moduleConfigPath(name string) string {
|
|
||||||
configDir, err := os.UserConfigDir()
|
|
||||||
if err != nil || configDir == "" {
|
|
||||||
home := os.Getenv("HOME")
|
|
||||||
if home != "" {
|
|
||||||
configDir = filepath.Join(home, ".config")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if configDir == "" {
|
|
||||||
return name + ".json"
|
|
||||||
}
|
|
||||||
return filepath.Join(configDir, "VideoTools", name+".json")
|
|
||||||
}
|
|
||||||
|
|
@ -1,263 +0,0 @@
|
||||||
# Author Module Guide
|
|
||||||
|
|
||||||
## What Does This Do?
|
|
||||||
|
|
||||||
The Author module turns your video files into DVDs that'll play in any DVD player - the kind you'd hook up to a TV. It handles all the technical stuff so you don't have to worry about it.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Getting Started
|
|
||||||
|
|
||||||
### Making a Single DVD
|
|
||||||
|
|
||||||
1. Click **Author** from the main menu
|
|
||||||
2. **Files Tab** → Click "Select File" → Pick your video
|
|
||||||
3. **Settings Tab**:
|
|
||||||
- DVD or Blu-ray (pick DVD for now)
|
|
||||||
- NTSC or PAL - pick NTSC if you're in the US
|
|
||||||
- 16:9 or 4:3 - pick 16:9 for widescreen
|
|
||||||
4. **Generate Tab** → Click "Generate DVD/ISO"
|
|
||||||
5. Wait for it to finish, then burn the .iso file to a DVD-R
|
|
||||||
|
|
||||||
That's it. The DVD will play in any player.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Scene Detection - Finding Chapter Points Automatically
|
|
||||||
|
|
||||||
### What Are Chapters?
|
|
||||||
|
|
||||||
You know how DVDs let you skip to different parts of the movie? Those are chapters. The Author module can find these automatically by detecting when scenes change.
|
|
||||||
|
|
||||||
### How to Use It
|
|
||||||
|
|
||||||
1. Load your video (Files or Clips tab)
|
|
||||||
2. Go to **Chapters Tab**
|
|
||||||
3. Move the "Detection Sensitivity" slider:
|
|
||||||
- Move it **left** for more chapters (catches small changes)
|
|
||||||
- Move it **right** for fewer chapters (only big changes)
|
|
||||||
4. Click "Detect Scenes"
|
|
||||||
5. Look at the thumbnails that pop up - these show where chapters will be
|
|
||||||
6. If it looks good, click "Accept." If not, click "Reject" and try a different sensitivity
|
|
||||||
|
|
||||||
### What Sensitivity Should I Use?
|
|
||||||
|
|
||||||
It depends on your video:
|
|
||||||
|
|
||||||
- **Movies**: Use 0.5 - 0.6 (only major scene changes)
|
|
||||||
- **TV shows**: Use 0.3 - 0.4 (catches scene changes between commercial breaks)
|
|
||||||
- **Music videos**: Use 0.2 - 0.3 (lots of quick cuts)
|
|
||||||
- **Your phone videos**: Use 0.4 - 0.5 (depends on how much you moved around)
|
|
||||||
|
|
||||||
Don't stress about getting it perfect. Just adjust the slider and click "Detect Scenes" again until the preview looks right.
|
|
||||||
|
|
||||||
### The Preview Window
|
|
||||||
|
|
||||||
After detection runs, you'll see a grid of thumbnails. Each thumbnail is a freeze-frame from where a chapter starts. This lets you actually see if the detection makes sense - way better than just seeing a list of timestamps.
|
|
||||||
|
|
||||||
The preview shows the first 24 chapters. If more were detected, you'll see a message like "Found 152 chapters (showing first 24)". That's a sign you should increase the sensitivity slider.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Understanding the Settings
|
|
||||||
|
|
||||||
### Output Type
|
|
||||||
|
|
||||||
**DVD** - Standard DVD format. Works everywhere.
|
|
||||||
**Blu-ray** - Not ready yet. Stick with DVD.
|
|
||||||
|
|
||||||
### Region
|
|
||||||
|
|
||||||
**NTSC** - US, Canada, Japan. Videos play at 30 frames per second.
|
|
||||||
**PAL** - Europe, Australia, most of the world. Videos play at 25 frames per second.
|
|
||||||
|
|
||||||
Pick based on where you live. If you're not sure, pick NTSC.
|
|
||||||
|
|
||||||
### Aspect Ratio
|
|
||||||
|
|
||||||
**16:9** - Widescreen. Use this for videos from phones, cameras, YouTube.
|
|
||||||
**4:3** - Old TV shape. Only use if your video is actually in this format (rare now).
|
|
||||||
**AUTO** - Let the software decide. Safe choice.
|
|
||||||
|
|
||||||
When in doubt, use 16:9.
|
|
||||||
|
|
||||||
### Disc Size
|
|
||||||
|
|
||||||
**DVD5** - Holds 4.7 GB. Standard blank DVDs you buy at the store.
|
|
||||||
**DVD9** - Holds 8.5 GB. Dual-layer discs (more expensive).
|
|
||||||
|
|
||||||
Use DVD5 unless you're making a really long video (over 2 hours).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Common Scenarios
|
|
||||||
|
|
||||||
### Scenario 1: Burning Home Videos to DVD
|
|
||||||
|
|
||||||
You filmed stuff on your phone and want to give it to relatives who don't use computers much.
|
|
||||||
|
|
||||||
1. **Files Tab** → Select your phone video
|
|
||||||
2. **Chapters Tab** → Detect scenes with sensitivity around 0.4
|
|
||||||
3. Check the preview - should show major moments (birthday, cake, opening presents, etc.)
|
|
||||||
4. **Settings Tab**:
|
|
||||||
- Output Type: DVD
|
|
||||||
- Region: NTSC
|
|
||||||
- Aspect Ratio: 16:9
|
|
||||||
5. **Generate Tab**:
|
|
||||||
- Title: "Birthday 2024"
|
|
||||||
- Pick where to save it
|
|
||||||
- Click Generate
|
|
||||||
6. When done, burn the .iso file to a DVD-R
|
|
||||||
7. Hand it to grandma - it'll just work in her DVD player
|
|
||||||
|
|
||||||
### Scenario 2: Multiple Episodes on One Disc
|
|
||||||
|
|
||||||
You downloaded 3 episodes of a show and want them on one disc with a menu.
|
|
||||||
|
|
||||||
1. **Clips Tab** → Click "Add Video" for each episode
|
|
||||||
2. Leave "Treat as Chapters" OFF - this keeps them as separate titles
|
|
||||||
3. **Settings Tab**:
|
|
||||||
- Output Type: DVD
|
|
||||||
- Region: NTSC
|
|
||||||
- Create Menu: YES (important!)
|
|
||||||
4. **Generate Tab** → Generate the disc
|
|
||||||
5. The DVD will have a menu where you can pick which episode to watch
|
|
||||||
|
|
||||||
### Scenario 3: Concert Video with Song Chapters
|
|
||||||
|
|
||||||
You recorded a concert and want to skip to specific songs.
|
|
||||||
|
|
||||||
Option A - Automatic:
|
|
||||||
1. Load the concert video
|
|
||||||
2. **Chapters Tab** → Try sensitivity 0.3 first
|
|
||||||
3. Look at preview - if chapters line up with songs, you're done
|
|
||||||
4. If not, adjust sensitivity and try again
|
|
||||||
|
|
||||||
Option B - Manual:
|
|
||||||
1. Play through the video and note the times when songs start
|
|
||||||
2. **Chapters Tab** → Click "+ Add Chapter" for each song
|
|
||||||
3. Enter the time (like 3:45 for 3 minutes 45 seconds)
|
|
||||||
4. Name it (Song 1, Song 2, etc.)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## What's Happening Behind the Scenes?
|
|
||||||
|
|
||||||
You don't need to know this to use the software, but if you're curious:
|
|
||||||
|
|
||||||
### The Encoding Process
|
|
||||||
|
|
||||||
When you click Generate:
|
|
||||||
|
|
||||||
1. **Encoding**: Your video gets converted to MPEG-2 format (the DVD standard)
|
|
||||||
2. **Timestamp Fix**: The software makes sure the timestamps are perfectly sequential (DVDs are picky about this)
|
|
||||||
3. **Structure Creation**: It builds the VIDEO_TS folder structure that DVD players expect
|
|
||||||
4. **ISO Creation**: If you picked ISO, everything gets packed into one burnable file
|
|
||||||
|
|
||||||
### Why Does It Take So Long?
|
|
||||||
|
|
||||||
Converting video to MPEG-2 is CPU-intensive. A 90-minute video might take 30-60 minutes to encode, depending on your computer. You can queue multiple jobs and let it run overnight.
|
|
||||||
|
|
||||||
### The Timestamp Fix Thing
|
|
||||||
|
|
||||||
Some videos, especially .avi files, have timestamps that go slightly backwards occasionally. DVD players hate this and will error out. The software automatically fixes it by running the encoded video through a "remux" step - think of it like reformatting a document to fix the page numbers. Takes a few extra seconds but ensures the DVD actually works.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
### "I got 200 chapters, that's way too many"
|
|
||||||
|
|
||||||
Your sensitivity is too low. Move the slider right to 0.5 or higher and try again.
|
|
||||||
|
|
||||||
### "It only found 3 chapters in a 2-hour movie"
|
|
||||||
|
|
||||||
Sensitivity is too high. Move the slider left to 0.3 or 0.4.
|
|
||||||
|
|
||||||
### "The program is really slow when generating"
|
|
||||||
|
|
||||||
That's normal. Encoding video is slow. The good news is you can:
|
|
||||||
- Queue multiple jobs and walk away
|
|
||||||
- Work on other stuff - the encoding happens in the background
|
|
||||||
- Check the log to see progress
|
|
||||||
|
|
||||||
### "The authoring log is making everything lag"
|
|
||||||
|
|
||||||
This was a bug that's now fixed. The log only shows the last 100 lines. If you want to see everything, click "View Full Log" and it opens in a separate window.
|
|
||||||
|
|
||||||
### "My ISO file won't fit on a DVD-R"
|
|
||||||
|
|
||||||
Your video is too long or the quality is too high. Options:
|
|
||||||
- Use a dual-layer DVD-R (DVD9) instead
|
|
||||||
- Split into 2 discs
|
|
||||||
- Check if you accidentally loaded multiple long videos
|
|
||||||
|
|
||||||
### "The DVD plays but skips or stutters"
|
|
||||||
|
|
||||||
This is usually because your original video had variable frame rate (VFR) - phone videos often do this. The software will warn you if it detects this. Solution:
|
|
||||||
- Try generating again (sometimes it just works)
|
|
||||||
- Convert the source video to constant frame rate first using the Convert module
|
|
||||||
- Check if the source video itself plays smoothly
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## File Size Reference
|
|
||||||
|
|
||||||
Here's roughly how much video fits on each disc type:
|
|
||||||
|
|
||||||
**DVD5 (4.7 GB)**
|
|
||||||
- About 2 hours of video at standard quality
|
|
||||||
- Most movies fit comfortably
|
|
||||||
|
|
||||||
**DVD9 (8.5 GB)**
|
|
||||||
- About 4 hours of video
|
|
||||||
- Good for director's cuts or multiple episodes
|
|
||||||
|
|
||||||
If you're over these limits, split your content across multiple discs.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## The Output Files Explained
|
|
||||||
|
|
||||||
### VIDEO_TS Folder
|
|
||||||
|
|
||||||
This is what DVD players actually read. It contains:
|
|
||||||
- .IFO files - the "table of contents"
|
|
||||||
- .VOB files - the actual video data
|
|
||||||
|
|
||||||
You can copy this folder to a USB drive and some DVD players can read it directly.
|
|
||||||
|
|
||||||
### ISO File
|
|
||||||
|
|
||||||
Think of this as a zip file of the VIDEO_TS folder, formatted specifically for burning to disc. When you burn an ISO to a DVD-R, it extracts everything into the right structure automatically.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Tips
|
|
||||||
|
|
||||||
**Test Before Making Multiple Copies**
|
|
||||||
Make one disc, test it in a DVD player, make sure everything works. Then make more copies.
|
|
||||||
|
|
||||||
**Name Your Files Clearly**
|
|
||||||
Use names like "vacation_2024.iso" not "output.iso". Future you will thank you.
|
|
||||||
|
|
||||||
**Keep the Source Files**
|
|
||||||
Don't delete your original videos after making DVDs. Hard drives are cheap, memories aren't.
|
|
||||||
|
|
||||||
**Preview the Chapters**
|
|
||||||
Always check that chapter preview before accepting. It takes 10 seconds and prevents surprises.
|
|
||||||
|
|
||||||
**Use the Queue**
|
|
||||||
Got 5 videos to convert? Add them all to the queue and start it before bed. They'll all be done by morning.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Related Guides
|
|
||||||
|
|
||||||
- **DVD_USER_GUIDE.md** - How to use the Convert module for DVD encoding
|
|
||||||
- **QUEUE_SYSTEM_GUIDE.md** - Managing multiple jobs
|
|
||||||
- **MODULES.md** - What all the other modules do
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
That's everything. Load a video, adjust some settings, click Generate. The software handles the complicated parts.
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
- **Cross-compilation script** (`scripts/build-windows.sh`)
|
- **Cross-compilation script** (`scripts/build-windows.sh`)
|
||||||
|
|
||||||
#### Professional Installation System
|
#### Professional Installation System
|
||||||
- **One-command installer** (`scripts/install.sh`) with guided wizard
|
- **One-command installer** (`install.sh`) with guided wizard
|
||||||
- **Automatic shell detection** (bash/zsh) and configuration
|
- **Automatic shell detection** (bash/zsh) and configuration
|
||||||
- **System-wide vs user-local installation** options
|
- **System-wide vs user-local installation** options
|
||||||
- **Convenience aliases** (`VideoTools`, `VideoToolsRebuild`, `VideoToolsClean`)
|
- **Convenience aliases** (`VideoTools`, `VideoToolsRebuild`, `VideoToolsClean`)
|
||||||
|
|
@ -198,12 +198,14 @@
|
||||||
### 📚 Documentation Updates
|
### 📚 Documentation Updates
|
||||||
|
|
||||||
#### New Documentation Added
|
#### New Documentation Added
|
||||||
|
- `HANDBRAKE_REPLACEMENT.md` - Comprehensive modern video processing strategy
|
||||||
- Enhanced `TODO.md` with Lossless-Cut inspired trim module specifications
|
- Enhanced `TODO.md` with Lossless-Cut inspired trim module specifications
|
||||||
- Updated `MODULES.md` with detailed trim module implementation plan
|
- Updated `MODULES.md` with detailed trim module implementation plan
|
||||||
- Enhanced `docs/README.md` with VT_Player integration links
|
- Enhanced `docs/README.md` with VT_Player integration links
|
||||||
|
|
||||||
#### Documentation Enhancements
|
#### Documentation Enhancements
|
||||||
- **Trim Module Specifications** - Detailed Lossless-Cut inspired design
|
- **Trim Module Specifications** - Detailed Lossless-Cut inspired design
|
||||||
|
- **HandBrake Parity Analysis** - Feature comparison and migration strategy
|
||||||
- **VT_Player Integration Notes** - Cross-project component reuse
|
- **VT_Player Integration Notes** - Cross-project component reuse
|
||||||
- **Implementation Roadmap** - Clear development phases and priorities
|
- **Implementation Roadmap** - Clear development phases and priorities
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -328,4 +328,5 @@ Happy encoding! 📀
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
For technical details on DVD authoring with chapters, see AUTHOR_MODULE.md
|
*Generated with Claude Code*
|
||||||
|
*For support, check the comprehensive guides in the project repository*
|
||||||
|
|
|
||||||
197
docs/HANDBRAKE_REPLACEMENT.md
Normal file
197
docs/HANDBRAKE_REPLACEMENT.md
Normal file
|
|
@ -0,0 +1,197 @@
|
||||||
|
# VideoTools: Modern Video Processing Strategy
|
||||||
|
|
||||||
|
## 🎯 Project Vision
|
||||||
|
|
||||||
|
VideoTools provides a **modern approach to video processing** with enhanced capabilities while maintaining simplicity and focusing on core video processing workflows.
|
||||||
|
|
||||||
|
## 📊 Modern Video Processing Features
|
||||||
|
|
||||||
|
### ✅ Core Video Processing Features (VideoTools Status)
|
||||||
|
| Feature | VideoTools Status | Notes |
|
||||||
|
|---------|-------------------|---------|
|
||||||
|
| Video transcoding | ✅ IMPLEMENTED | Enhanced with DVD/Blu-ray presets |
|
||||||
|
| Queue system | ✅ IMPLEMENTED | Advanced with job reordering and prioritization |
|
||||||
|
| Preset management | 🔄 PARTIAL | Basic presets, needs modern device profiles |
|
||||||
|
| Chapter support | 🔄 PLANNED | Auto-chapter creation in trim/merge modules |
|
||||||
|
| Multi-title support | 🔄 PLANNED | For DVD/Blu-ray sources |
|
||||||
|
| Subtitle support | 🔄 PLANNED | Advanced subtitle handling and styling |
|
||||||
|
| Audio track management | 🔄 PLANNED | Multi-track selection and processing |
|
||||||
|
| Quality control | ✅ IMPLEMENTED | Enhanced with size targets and validation |
|
||||||
|
| Device profiles | 🔄 PLANNED | Modern device optimization |
|
||||||
|
|
||||||
|
### 🚀 VideoTools Modern Advantages
|
||||||
|
| Feature | Traditional Tools | VideoTools | Advantage |
|
||||||
|
|---------|------------------|-------------|-----------|
|
||||||
|
| **Modern Architecture** | Monolithic | Modular | Extensible, maintainable |
|
||||||
|
| **Cross-Platform** | Limited | Full support | Linux, Windows parity |
|
||||||
|
| **AI Upscaling** | None | Planned | Next-gen enhancement |
|
||||||
|
| **Smart Chapters** | Manual | Auto-generation | Intelligent workflow |
|
||||||
|
| **Advanced Queue** | Basic | Enhanced | Better batch processing |
|
||||||
|
| **Lossless-Cut Style** | No | Planned | Frame-accurate trimming |
|
||||||
|
| **Blu-ray Authoring** | No | Planned | Professional workflows |
|
||||||
|
| **VT_Player Integration** | No | Planned | Unified ecosystem |
|
||||||
|
|
||||||
|
## 🎯 Core HandBrake Replacement Features
|
||||||
|
|
||||||
|
### 1. **Enhanced Convert Module** (Core Replacement)
|
||||||
|
```go
|
||||||
|
// HandBrake-equivalent transcoding with modern enhancements
|
||||||
|
type ConvertConfig struct {
|
||||||
|
// HandBrake parity features
|
||||||
|
VideoCodec string // H.264, H.265, AV1
|
||||||
|
AudioCodec string // AAC, AC3, Opus, FLAC
|
||||||
|
Quality Quality // CRF, bitrate, 2-pass
|
||||||
|
Preset string // Fast, Balanced, HQ, Archive
|
||||||
|
|
||||||
|
// VideoTools enhancements
|
||||||
|
DeviceProfile string // iPhone, Android, TV, Gaming
|
||||||
|
ContentAware bool // Auto-optimize for content type
|
||||||
|
SmartBitrate bool // Size-target encoding
|
||||||
|
AIUpscale bool // AI enhancement when upscaling
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. **Professional Preset System** (Enhanced)
|
||||||
|
```go
|
||||||
|
// Modern device and platform presets
|
||||||
|
type PresetCategory string
|
||||||
|
const (
|
||||||
|
PresetDevices PresetCategory = "devices" // iPhone, Android, TV
|
||||||
|
PresetPlatforms PresetCategory = "platforms" // YouTube, TikTok, Instagram
|
||||||
|
PresetQuality PresetCategory = "quality" // Fast, Balanced, HQ
|
||||||
|
PresetArchive PresetCategory = "archive" // Long-term preservation
|
||||||
|
)
|
||||||
|
|
||||||
|
// HandBrake-compatible + modern presets
|
||||||
|
- iPhone 15 Pro Max
|
||||||
|
- Samsung Galaxy S24
|
||||||
|
- PlayStation 5
|
||||||
|
- YouTube 4K HDR
|
||||||
|
- TikTok Vertical
|
||||||
|
- Instagram Reels
|
||||||
|
- Netflix 4K Profile
|
||||||
|
- Archive Master Quality
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. **Advanced Queue System** (Enhanced)
|
||||||
|
```go
|
||||||
|
// HandBrake queue with modern features
|
||||||
|
type QueueJob struct {
|
||||||
|
// HandBrake parity
|
||||||
|
Source string
|
||||||
|
Destination string
|
||||||
|
Settings ConvertConfig
|
||||||
|
Status JobStatus
|
||||||
|
|
||||||
|
// VideoTools enhancements
|
||||||
|
Priority int // Job prioritization
|
||||||
|
Dependencies []int // Job dependencies
|
||||||
|
RetryCount int // Smart retry logic
|
||||||
|
ETA time.Duration // Accurate time estimation
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4. **Smart Title Selection** (Enhanced)
|
||||||
|
```go
|
||||||
|
// Enhanced title detection for multi-title sources
|
||||||
|
type TitleInfo struct {
|
||||||
|
ID int
|
||||||
|
Duration time.Duration
|
||||||
|
Resolution string
|
||||||
|
AudioTracks []AudioTrack
|
||||||
|
Subtitles []SubtitleTrack
|
||||||
|
Chapters []Chapter
|
||||||
|
Quality QualityMetrics
|
||||||
|
Recommended bool // AI-based recommendation
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sources: DVD, Blu-ray, multi-title MKV
|
||||||
|
```
|
||||||
|
|
||||||
|
## 🔄 User Experience Strategy
|
||||||
|
|
||||||
|
### **Modern Video Processing Experience**
|
||||||
|
- **Intuitive Interface** - Clean, focused layout for common workflows
|
||||||
|
- **Smart Presets** - Content-aware and device-optimized settings
|
||||||
|
- **Efficient Queue** - Advanced batch processing with job management
|
||||||
|
- **Professional Workflows** - DVD/Blu-ray authoring, multi-format output
|
||||||
|
|
||||||
|
### **Enhanced Processing Capabilities**
|
||||||
|
- **Smart Defaults** - Content-aware optimization for better results
|
||||||
|
- **Hardware Acceleration** - GPU utilization across all platforms
|
||||||
|
- **Modern Codecs** - AV1, HEVC, VP9 with professional profiles
|
||||||
|
- **AI Features** - Intelligent upscaling and quality enhancement
|
||||||
|
|
||||||
|
## 📋 Implementation Priority
|
||||||
|
|
||||||
|
### **Phase 1: Core Modern Features** (6-8 weeks)
|
||||||
|
1. **Enhanced Convert Module** - Modern transcoding with smart optimization
|
||||||
|
2. **Professional Presets** - Device and platform-specific profiles
|
||||||
|
3. **Advanced Queue System** - Intelligent batch processing with prioritization
|
||||||
|
4. **Multi-Title Support** - DVD/Blu-ray source handling
|
||||||
|
|
||||||
|
### **Phase 2: Enhanced Workflows** (4-6 weeks)
|
||||||
|
5. **Smart Chapter System** - Auto-generation in trim/merge modules
|
||||||
|
6. **Advanced Audio Processing** - Multi-track management and conversion
|
||||||
|
7. **Comprehensive Subtitle System** - Advanced subtitle handling and styling
|
||||||
|
8. **Quality Control Tools** - Size targets and validation systems
|
||||||
|
|
||||||
|
### **Phase 3: Next-Generation Features** (6-8 weeks)
|
||||||
|
9. **AI-Powered Upscaling** - Modern enhancement and upscaling
|
||||||
|
10. **VT_Player Integration** - Unified playback and processing ecosystem
|
||||||
|
11. **Professional Blu-ray Authoring** - Complete Blu-ray workflow support
|
||||||
|
12. **Content-Aware Processing** - Intelligent optimization based on content analysis
|
||||||
|
|
||||||
|
## 🎯 Key Differentiators
|
||||||
|
|
||||||
|
### **Technical Advantages**
|
||||||
|
- **Modern Codebase** - Go language for better maintainability and performance
|
||||||
|
- **Modular Architecture** - Extensible design for future enhancements
|
||||||
|
- **Cross-Platform** - Native support on Linux and Windows
|
||||||
|
- **Hardware Acceleration** - Optimized GPU utilization across platforms
|
||||||
|
- **AI Integration** - Next-generation enhancement capabilities
|
||||||
|
|
||||||
|
### **User Experience**
|
||||||
|
- **Intuitive Interface** - Focused design for common video workflows
|
||||||
|
- **Smart Defaults** - Content-aware settings for excellent results
|
||||||
|
- **Optimized Performance** - Efficient encoding pipelines and processing
|
||||||
|
- **Real-time Feedback** - Quality metrics and progress indicators
|
||||||
|
- **Unified Ecosystem** - Integrated VT_Player for seamless workflow
|
||||||
|
|
||||||
|
### **Professional Features**
|
||||||
|
- **Broadcast Quality** - Professional standards compliance and validation
|
||||||
|
- **Advanced Workflows** - Complete DVD and Blu-ray authoring capabilities
|
||||||
|
- **Intelligent Batch Processing** - Advanced queue system with job management
|
||||||
|
- **Quality Assurance** - Built-in validation and testing tools
|
||||||
|
|
||||||
|
## 📊 Success Metrics
|
||||||
|
|
||||||
|
### **Modern Video Processing Goals**
|
||||||
|
- ✅ **Complete Feature Set** - Comprehensive video processing capabilities
|
||||||
|
- ✅ **50% Faster Encoding** - Optimized hardware utilization
|
||||||
|
- ✅ **30% Better Quality** - Smart optimization algorithms
|
||||||
|
- ✅ **Cross-Platform** - Native Linux/Windows support
|
||||||
|
|
||||||
|
### **Market Positioning**
|
||||||
|
- **Modern Video Suite** - Next-generation architecture and features
|
||||||
|
- **Professional Tool** - Beyond consumer-level capabilities
|
||||||
|
- **Intuitive Processing** - Smart defaults and user-friendly workflows
|
||||||
|
- **Ecosystem Solution** - Integrated VT_Player for seamless experience
|
||||||
|
|
||||||
|
## 🚀 User Experience Strategy
|
||||||
|
|
||||||
|
### **Launch Positioning**
|
||||||
|
- **"Modern Video Processing"** - Next-generation approach to video tools
|
||||||
|
- **"AI-Powered Enhancement"** - Intelligent upscaling and optimization
|
||||||
|
- **"Professional Video Suite"** - Comprehensive processing capabilities
|
||||||
|
- **"Cross-Platform Solution"** - Native support everywhere
|
||||||
|
|
||||||
|
### **User Onboarding**
|
||||||
|
- **Intuitive Interface** - Familiar workflows with modern enhancements
|
||||||
|
- **Smart Presets** - Content-aware settings for excellent results
|
||||||
|
- **Tutorial Integration** - Built-in guidance for advanced features
|
||||||
|
- **Workflow Examples** - Show common use cases and best practices
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
This strategy positions VideoTools as a **direct HandBrake replacement** while adding significant modern advantages and professional capabilities.
|
||||||
|
|
@ -1,36 +1,359 @@
|
||||||
# VideoTools Installation Guide
|
# VideoTools Installation Guide
|
||||||
|
|
||||||
Welcome to the VideoTools installation guide. Please select your operating system to view the detailed instructions.
|
This guide will help you install VideoTools with minimal setup.
|
||||||
|
|
||||||
|
## Quick Start (Recommended for Most Users)
|
||||||
|
|
||||||
|
### One-Command Installation
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash install.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
That's it! The installer will:
|
||||||
|
|
||||||
|
1. ✅ Check your Go installation
|
||||||
|
2. ✅ Build VideoTools from source
|
||||||
|
3. ✅ Install the binary to your system
|
||||||
|
4. ✅ Set up shell aliases automatically
|
||||||
|
5. ✅ Configure your shell environment
|
||||||
|
|
||||||
|
### After Installation
|
||||||
|
|
||||||
|
Reload your shell:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# For bash users:
|
||||||
|
source ~/.bashrc
|
||||||
|
|
||||||
|
# For zsh users:
|
||||||
|
source ~/.zshrc
|
||||||
|
```
|
||||||
|
|
||||||
|
Then start using VideoTools:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Supported Platforms
|
## Installation Options
|
||||||
|
|
||||||
### 🖥️ Windows
|
### Option 1: System-Wide Installation (Recommended for Shared Computers)
|
||||||
|
|
||||||
For Windows 10 and 11, please follow our detailed, step-by-step guide. It covers both automated and manual setup.
|
```bash
|
||||||
|
bash install.sh
|
||||||
|
# Select option 1 when prompted
|
||||||
|
# Enter your password if requested
|
||||||
|
```
|
||||||
|
|
||||||
- **[➡️ View Windows Installation Guide](./INSTALL_WINDOWS.md)**
|
**Advantages:**
|
||||||
|
- ✅ Available to all users on the system
|
||||||
|
- ✅ Binary in standard system path
|
||||||
|
- ✅ Professional setup
|
||||||
|
|
||||||
### 🐧 Linux & macOS
|
**Requirements:**
|
||||||
|
- Sudo access (for system-wide installation)
|
||||||
For Linux (Ubuntu, Fedora, Arch, etc.), macOS, and Windows Subsystem for Linux (WSL), the installation is handled by a single, powerful script.
|
|
||||||
|
|
||||||
- **[➡️ View Linux, macOS, & WSL Installation Guide](./INSTALL_LINUX.md)**
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## General Requirements
|
### Option 2: User-Local Installation (Recommended for Personal Use)
|
||||||
|
|
||||||
Before you begin, ensure your system meets these basic requirements:
|
```bash
|
||||||
|
bash install.sh
|
||||||
|
# Select option 2 when prompted (default)
|
||||||
|
```
|
||||||
|
|
||||||
- **Go:** Version 1.21 or later is required to build the application.
|
**Advantages:**
|
||||||
- **FFmpeg:** Required for all video and audio processing. Our platform-specific guides cover how to install this.
|
- ✅ No sudo required
|
||||||
- **Disk Space:** At least 2 GB of free disk space for the application and its dependencies.
|
- ✅ Works immediately
|
||||||
- **Internet Connection:** Required for downloading dependencies during the build process.
|
- ✅ Private to your user account
|
||||||
|
- ✅ No administrator needed
|
||||||
|
|
||||||
|
**Requirements:**
|
||||||
|
- None - works on any system!
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Development
|
## What the Installer Does
|
||||||
|
|
||||||
|
The `install.sh` script performs these steps:
|
||||||
|
|
||||||
|
### Step 1: Go Verification
|
||||||
|
- Checks if Go 1.21+ is installed
|
||||||
|
- Displays Go version
|
||||||
|
- Exits with helpful error message if not found
|
||||||
|
|
||||||
|
### Step 2: Build
|
||||||
|
- Cleans previous builds
|
||||||
|
- Downloads dependencies
|
||||||
|
- Compiles VideoTools binary
|
||||||
|
- Validates build success
|
||||||
|
|
||||||
|
### Step 3: Installation Path Selection
|
||||||
|
- Presents two options:
|
||||||
|
- System-wide (`/usr/local/bin`)
|
||||||
|
- User-local (`~/.local/bin`)
|
||||||
|
- Creates directories if needed
|
||||||
|
|
||||||
|
### Step 4: Binary Installation
|
||||||
|
- Copies binary to selected location
|
||||||
|
- Sets proper file permissions (755)
|
||||||
|
- Validates installation
|
||||||
|
|
||||||
|
### Step 5: Shell Environment Setup
|
||||||
|
- Detects your shell (bash/zsh)
|
||||||
|
- Adds VideoTools installation path to PATH
|
||||||
|
- Sources alias script for convenience commands
|
||||||
|
- Adds to appropriate rc file (`.bashrc` or `.zshrc`)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Convenience Commands
|
||||||
|
|
||||||
|
After installation, you'll have access to:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
VideoTools # Run VideoTools directly
|
||||||
|
VideoToolsRebuild # Force rebuild from source
|
||||||
|
VideoToolsClean # Clean build artifacts and cache
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
### Essential
|
||||||
|
- **Go 1.21 or later** - https://go.dev/dl/
|
||||||
|
- **Bash or Zsh** shell
|
||||||
|
|
||||||
|
### Optional
|
||||||
|
- **FFmpeg** (for actual video encoding)
|
||||||
|
```bash
|
||||||
|
ffmpeg -version
|
||||||
|
```
|
||||||
|
|
||||||
|
### System
|
||||||
|
- Linux, macOS, or WSL (Windows Subsystem for Linux)
|
||||||
|
- At least 2 GB free disk space
|
||||||
|
- Stable internet connection (for dependencies)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### "Go is not installed"
|
||||||
|
|
||||||
|
**Solution:** Install Go from https://go.dev/dl/
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# After installing Go, verify:
|
||||||
|
go version
|
||||||
|
```
|
||||||
|
|
||||||
|
### Build Failed
|
||||||
|
|
||||||
|
**Solution:** Check build log for specific errors:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bash install.sh
|
||||||
|
# Look for error messages in the build log output
|
||||||
|
```
|
||||||
|
|
||||||
|
### Installation Path Not in PATH
|
||||||
|
|
||||||
|
If you see this warning:
|
||||||
|
|
||||||
|
```
|
||||||
|
Warning: ~/.local/bin is not in your PATH
|
||||||
|
```
|
||||||
|
|
||||||
|
**Solution:** Reload your shell:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
source ~/.bashrc # For bash
|
||||||
|
source ~/.zshrc # For zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
Or manually add to your shell configuration:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Add this line to ~/.bashrc or ~/.zshrc:
|
||||||
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
```
|
||||||
|
|
||||||
|
### "Permission denied" on binary
|
||||||
|
|
||||||
|
**Solution:** Ensure file has correct permissions:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
chmod +x ~/.local/bin/VideoTools
|
||||||
|
# or for system-wide:
|
||||||
|
ls -l /usr/local/bin/VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
|
### Aliases Not Working
|
||||||
|
|
||||||
|
**Solution:** Ensure alias script is sourced:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check if this line is in your ~/.bashrc or ~/.zshrc:
|
||||||
|
source /path/to/VideoTools/scripts/alias.sh
|
||||||
|
|
||||||
|
# If not, add it manually:
|
||||||
|
echo 'source /path/to/VideoTools/scripts/alias.sh' >> ~/.bashrc
|
||||||
|
source ~/.bashrc
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Advanced: Manual Installation
|
||||||
|
|
||||||
|
If you prefer to install manually:
|
||||||
|
|
||||||
|
### Step 1: Build
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /path/to/VideoTools
|
||||||
|
CGO_ENABLED=1 go build -o VideoTools .
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 2: Install Binary
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# User-local installation:
|
||||||
|
mkdir -p ~/.local/bin
|
||||||
|
cp VideoTools ~/.local/bin/VideoTools
|
||||||
|
chmod +x ~/.local/bin/VideoTools
|
||||||
|
|
||||||
|
# System-wide installation:
|
||||||
|
sudo cp VideoTools /usr/local/bin/VideoTools
|
||||||
|
sudo chmod +x /usr/local/bin/VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 3: Setup Aliases
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Add to ~/.bashrc or ~/.zshrc:
|
||||||
|
source /path/to/VideoTools/scripts/alias.sh
|
||||||
|
|
||||||
|
# Add to PATH if needed:
|
||||||
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
```
|
||||||
|
|
||||||
|
### Step 4: Reload Shell
|
||||||
|
|
||||||
|
```bash
|
||||||
|
source ~/.bashrc # for bash
|
||||||
|
source ~/.zshrc # for zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Uninstallation
|
||||||
|
|
||||||
|
### If Installed System-Wide
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo rm /usr/local/bin/VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
|
### If Installed User-Local
|
||||||
|
|
||||||
|
```bash
|
||||||
|
rm ~/.local/bin/VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
|
### Remove Shell Configuration
|
||||||
|
|
||||||
|
Remove these lines from `~/.bashrc` or `~/.zshrc`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# VideoTools installation path
|
||||||
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
|
|
||||||
|
# VideoTools convenience aliases
|
||||||
|
source "/path/to/VideoTools/scripts/alias.sh"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
After installation, verify everything works:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check binary is accessible:
|
||||||
|
which VideoTools
|
||||||
|
|
||||||
|
# Check version/help:
|
||||||
|
VideoTools --help
|
||||||
|
|
||||||
|
# Check aliases are available:
|
||||||
|
type VideoToolsRebuild
|
||||||
|
type VideoToolsClean
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Getting Help
|
||||||
|
|
||||||
|
For issues or questions:
|
||||||
|
|
||||||
|
1. Check **BUILD_AND_RUN.md** for build-specific help
|
||||||
|
2. Check **DVD_USER_GUIDE.md** for usage help
|
||||||
|
3. Review installation logs in `/tmp/videotools-build.log`
|
||||||
|
4. Check shell configuration files for errors
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Next Steps
|
||||||
|
|
||||||
|
After successful installation:
|
||||||
|
|
||||||
|
1. **Read the Quick Start Guide:**
|
||||||
|
```bash
|
||||||
|
cat DVD_USER_GUIDE.md
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Launch VideoTools:**
|
||||||
|
```bash
|
||||||
|
VideoTools
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Convert your first video:**
|
||||||
|
- Go to Convert module
|
||||||
|
- Load a video
|
||||||
|
- Select "DVD-NTSC (MPEG-2)" or "DVD-PAL (MPEG-2)"
|
||||||
|
- Click "Add to Queue"
|
||||||
|
- Click "View Queue" → "Start Queue"
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Platform-Specific Notes
|
||||||
|
|
||||||
|
### Linux (Ubuntu/Debian)
|
||||||
|
|
||||||
|
Installation is fully automatic. The script handles all steps.
|
||||||
|
|
||||||
|
### Linux (Arch/Manjaro)
|
||||||
|
|
||||||
|
Same as above. Installation works without modification.
|
||||||
|
|
||||||
|
### macOS
|
||||||
|
|
||||||
|
Installation works but requires Xcode Command Line Tools:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
xcode-select --install
|
||||||
|
```
|
||||||
|
|
||||||
|
### Windows (WSL)
|
||||||
|
|
||||||
|
Installation works in WSL environment. Ensure you have WSL with Linux distro installed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Enjoy using VideoTools! 🎬
|
||||||
|
|
||||||
If you are a developer looking to contribute to the project, please see the [Build and Run Guide](./BUILD_AND_RUN.md) for instructions on setting up a development environment.
|
|
||||||
|
|
|
||||||
|
|
@ -1,107 +0,0 @@
|
||||||
# VideoTools Installation Guide for Linux, macOS, & WSL
|
|
||||||
|
|
||||||
This guide provides detailed instructions for installing VideoTools on Linux, macOS, and Windows Subsystem for Linux (WSL) using the automated script.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## One-Command Installation
|
|
||||||
|
|
||||||
The recommended method for all Unix-like systems is the `install.sh` script.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
bash scripts/install.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
This single command automates the entire setup process.
|
|
||||||
|
|
||||||
### What the Installer Does
|
|
||||||
|
|
||||||
1. **Go Verification:** Checks if Go (version 1.21 or later) is installed and available in your `PATH`.
|
|
||||||
2. **Build from Source:** Cleans any previous builds, downloads all necessary Go dependencies, and compiles the `VideoTools` binary.
|
|
||||||
3. **Path Selection:** Prompts you to choose an installation location:
|
|
||||||
* **System-wide:** `/usr/local/bin` (Requires `sudo` privileges). Recommended for multi-user systems.
|
|
||||||
* **User-local:** `~/.local/bin` (Default). Recommended for most users as it does not require `sudo`.
|
|
||||||
4. **Install Binary:** Copies the compiled binary to the selected location and makes it executable.
|
|
||||||
5. **Configure Shell:** Detects your shell (`bash` or `zsh`) and updates the corresponding resource file (`~/.bashrc` or `~/.zshrc`) to:
|
|
||||||
* Add the installation directory to your `PATH`.
|
|
||||||
* Source the `alias.sh` script for convenience commands.
|
|
||||||
|
|
||||||
### After Installation
|
|
||||||
|
|
||||||
You must reload your shell for the changes to take effect:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# For bash users:
|
|
||||||
source ~/.bashrc
|
|
||||||
|
|
||||||
# For zsh users:
|
|
||||||
source ~/.zshrc
|
|
||||||
```
|
|
||||||
|
|
||||||
You can now run the application from anywhere by simply typing `VideoTools`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Convenience Commands
|
|
||||||
|
|
||||||
The installation script sets up a few helpful aliases:
|
|
||||||
|
|
||||||
- `VideoTools`: Runs the main application.
|
|
||||||
- `VideoToolsRebuild`: Forces a full rebuild of the application from source.
|
|
||||||
- `VideoToolsClean`: Cleans all build artifacts and clears the Go cache for the project.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Manual Installation
|
|
||||||
|
|
||||||
If you prefer to perform the steps manually:
|
|
||||||
|
|
||||||
1. **Build the Binary:**
|
|
||||||
```bash
|
|
||||||
CGO_ENABLED=1 go build -o VideoTools .
|
|
||||||
```
|
|
||||||
|
|
||||||
2. **Install the Binary:**
|
|
||||||
* **User-local:**
|
|
||||||
```bash
|
|
||||||
mkdir -p ~/.local/bin
|
|
||||||
cp VideoTools ~/.local/bin/
|
|
||||||
```
|
|
||||||
* **System-wide:**
|
|
||||||
```bash
|
|
||||||
sudo cp VideoTools /usr/local/bin/
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Update Shell Configuration:**
|
|
||||||
Add the following lines to your `~/.bashrc` or `~/.zshrc` file, replacing `/path/to/VideoTools` with the actual absolute path to the project directory.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Add VideoTools to PATH
|
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
|
||||||
|
|
||||||
# Source VideoTools aliases
|
|
||||||
source /path/to/VideoTools/scripts/alias.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
4. **Reload Your Shell:**
|
|
||||||
```bash
|
|
||||||
source ~/.bashrc # Or source ~/.zshrc
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Uninstallation
|
|
||||||
|
|
||||||
1. **Remove the Binary:**
|
|
||||||
* If installed user-locally: `rm ~/.local/bin/VideoTools`
|
|
||||||
* If installed system-wide: `sudo rm /usr/local/bin/VideoTools`
|
|
||||||
|
|
||||||
2. **Remove Shell Configuration:**
|
|
||||||
Open your `~/.bashrc` or `~/.zshrc` file and remove the lines that were added for `VideoTools`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Platform-Specific Notes
|
|
||||||
|
|
||||||
- **macOS:** You may need to install Xcode Command Line Tools first by running `xcode-select --install`.
|
|
||||||
- **WSL:** The Linux instructions work without modification inside a WSL environment.
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
# VideoTools Installation Guide for Windows
|
|
||||||
|
|
||||||
This guide provides step-by-step instructions for installing VideoTools on Windows 10 and 11.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Method 1: Automated Installation (Recommended)
|
|
||||||
|
|
||||||
This method uses a script to automatically download and configure all necessary dependencies.
|
|
||||||
|
|
||||||
### Step 1: Download the Project
|
|
||||||
|
|
||||||
If you haven't already, download the project files as a ZIP and extract them to a folder on your computer (e.g., `C:\Users\YourUser\Documents\VideoTools`).
|
|
||||||
|
|
||||||
### Step 2: Run the Setup Script
|
|
||||||
|
|
||||||
1. Open the project folder in File Explorer.
|
|
||||||
2. Find and double-click on `setup-windows.bat`.
|
|
||||||
3. A terminal window will open and run the PowerShell setup script. This will:
|
|
||||||
* **Download FFmpeg:** The script automatically fetches the latest stable version of FFmpeg, which is required for all video operations.
|
|
||||||
* **Install Dependencies:** It places the necessary files in the correct directories.
|
|
||||||
* **Configure for Portability:** By default, it sets up VideoTools as a "portable" application, meaning all its components (like `ffmpeg.exe`) are stored directly within the project's `scripts/` folder.
|
|
||||||
|
|
||||||
> **Note:** If Windows Defender SmartScreen appears, click "More info" and then "Run anyway". This is expected as the application is not yet digitally signed.
|
|
||||||
|
|
||||||
### Step 3: Run VideoTools
|
|
||||||
|
|
||||||
Once the script finishes, you can run the application by double-clicking `run.bat` in the main project folder.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Method 2: Manual Installation
|
|
||||||
|
|
||||||
If you prefer to set up the dependencies yourself, follow these steps.
|
|
||||||
|
|
||||||
### Step 1: Download and Install Go
|
|
||||||
|
|
||||||
1. **Download:** Go to the official Go website: [go.dev/dl/](https://go.dev/dl/)
|
|
||||||
2. **Install:** Run the installer and follow the on-screen instructions.
|
|
||||||
3. **Verify:** Open a Command Prompt and type `go version`. You should see the installed Go version.
|
|
||||||
|
|
||||||
### Step 2: Download FFmpeg
|
|
||||||
|
|
||||||
FFmpeg is the engine that powers VideoTools.
|
|
||||||
|
|
||||||
1. **Download:** Go to the recommended FFmpeg builds page: [github.com/BtbN/FFmpeg-Builds/releases](https://github.com/BtbN/FFmpeg-Builds/releases)
|
|
||||||
2. Download the file named `ffmpeg-master-latest-win64-gpl.zip`.
|
|
||||||
|
|
||||||
### Step 3: Place FFmpeg Files
|
|
||||||
|
|
||||||
You have two options for where to place the FFmpeg files:
|
|
||||||
|
|
||||||
#### Option A: Bundle with VideoTools (Portable)
|
|
||||||
|
|
||||||
This is the easiest option.
|
|
||||||
|
|
||||||
1. Open the downloaded `ffmpeg-...-win64-gpl.zip`.
|
|
||||||
2. Navigate into the `bin` folder inside the zip file.
|
|
||||||
3. Copy `ffmpeg.exe` and `ffprobe.exe`.
|
|
||||||
4. Paste them into the root directory of the VideoTools project, right next to `VideoTools.exe` (or `main.go` if you are building from source).
|
|
||||||
|
|
||||||
Your folder should look like this:
|
|
||||||
```
|
|
||||||
\---VideoTools
|
|
||||||
| VideoTools.exe (or the built executable)
|
|
||||||
| ffmpeg.exe <-- Copied here
|
|
||||||
| ffprobe.exe <-- Copied here
|
|
||||||
| main.go
|
|
||||||
\---...
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Option B: Install System-Wide
|
|
||||||
|
|
||||||
This makes FFmpeg available to all applications on your system.
|
|
||||||
|
|
||||||
1. Extract the entire `ffmpeg-...-win64-gpl.zip` to a permanent location, like `C:\Program Files\ffmpeg`.
|
|
||||||
2. Add the FFmpeg `bin` directory to your system's PATH environment variable.
|
|
||||||
* Press the Windows key and type "Edit the system environment variables".
|
|
||||||
* Click the "Environment Variables..." button.
|
|
||||||
* Under "System variables", find and select the `Path` variable, then click "Edit...".
|
|
||||||
* Click "New" and add the path to your FFmpeg `bin` folder (e.g., `C:\Program Files\ffmpeg\bin`).
|
|
||||||
3. **Verify:** Open a Command Prompt and type `ffmpeg -version`. You should see the version information.
|
|
||||||
|
|
||||||
### Step 4: Build and Run
|
|
||||||
|
|
||||||
1. Open a Command Prompt in the VideoTools project directory.
|
|
||||||
2. Run the build script: `scripts\build.bat`
|
|
||||||
3. Run the application: `run.bat`
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Troubleshooting
|
|
||||||
|
|
||||||
- **"FFmpeg not found" Error:** This means VideoTools can't locate `ffmpeg.exe`. Ensure it's either in the same folder as `VideoTools.exe` or that the system-wide installation path is correct.
|
|
||||||
- **Application Doesn't Start:** Make sure you have a 64-bit version of Windows 10 or 11 and that your graphics drivers are up to date.
|
|
||||||
- **Antivirus Warnings:** Some antivirus programs may flag the unsigned executable. This is a false positive.
|
|
||||||
|
|
@ -469,25 +469,25 @@ After integration, verify:
|
||||||
|
|
||||||
Once integration is complete, consider:
|
Once integration is complete, consider:
|
||||||
|
|
||||||
1. **DVD Menu Support** [PLANNED]
|
1. **DVD Menu Support**
|
||||||
- Simple menu generation
|
- Simple menu generation
|
||||||
- Chapter selection
|
- Chapter selection
|
||||||
- Thumbnail previews
|
- Thumbnail previews
|
||||||
|
|
||||||
2. **Batch Region Conversion** [PLANNED]
|
2. **Batch Region Conversion**
|
||||||
- Convert same video to NTSC/PAL/SECAM in one batch
|
- Convert same video to NTSC/PAL/SECAM in one batch
|
||||||
- Auto-detect region from source
|
- Auto-detect region from source
|
||||||
|
|
||||||
3. **Preset Management** [PLANNED]
|
3. **Preset Management**
|
||||||
- Save custom DVD presets
|
- Save custom DVD presets
|
||||||
- Share presets between users
|
- Share presets between users
|
||||||
|
|
||||||
4. **Advanced Validation** [PLANNED]
|
4. **Advanced Validation**
|
||||||
- Check minimum file size
|
- Check minimum file size
|
||||||
- Estimate disc usage
|
- Estimate disc usage
|
||||||
- Warn about audio track count
|
- Warn about audio track count
|
||||||
|
|
||||||
5. **CLI Integration** [PLANNED]
|
5. **CLI Integration**
|
||||||
- `videotools dvd-encode input.mp4 output.mpg --region PAL`
|
- `videotools dvd-encode input.mp4 output.mpg --region PAL`
|
||||||
- Batch encoding from command line
|
- Batch encoding from command line
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ The queue view now displays:
|
||||||
|
|
||||||
### New Files
|
### New Files
|
||||||
|
|
||||||
1. **Enhanced `scripts/install.sh`** - One-command installation
|
1. **Enhanced `install.sh`** - One-command installation
|
||||||
2. **New `INSTALLATION.md`** - Comprehensive installation guide
|
2. **New `INSTALLATION.md`** - Comprehensive installation guide
|
||||||
|
|
||||||
### install.sh Features
|
### install.sh Features
|
||||||
|
|
@ -96,7 +96,7 @@ The queue view now displays:
|
||||||
The installer now performs all setup automatically:
|
The installer now performs all setup automatically:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
bash scripts/install.sh
|
bash install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
This handles:
|
This handles:
|
||||||
|
|
@ -113,13 +113,13 @@ This handles:
|
||||||
|
|
||||||
**Option 1: System-Wide (for shared computers)**
|
**Option 1: System-Wide (for shared computers)**
|
||||||
```bash
|
```bash
|
||||||
bash scripts/install.sh
|
bash install.sh
|
||||||
# Select option 1 when prompted
|
# Select option 1 when prompted
|
||||||
```
|
```
|
||||||
|
|
||||||
**Option 2: User-Local (default, no sudo required)**
|
**Option 2: User-Local (default, no sudo required)**
|
||||||
```bash
|
```bash
|
||||||
bash scripts/install.sh
|
bash install.sh
|
||||||
# Select option 2 when prompted (or just press Enter)
|
# Select option 2 when prompted (or just press Enter)
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -235,7 +235,7 @@ All features are built and ready:
|
||||||
3. Test reordering with up/down arrows
|
3. Test reordering with up/down arrows
|
||||||
|
|
||||||
### For Testing Installation
|
### For Testing Installation
|
||||||
1. Run `bash scripts/install.sh` on a clean system
|
1. Run `bash install.sh` on a clean system
|
||||||
2. Verify binary is in PATH
|
2. Verify binary is in PATH
|
||||||
3. Verify aliases are available
|
3. Verify aliases are available
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,6 @@ This document describes all the modules in VideoTools and their purpose. Each mo
|
||||||
|
|
||||||
## Core Modules
|
## Core Modules
|
||||||
|
|
||||||
### Player ✅ CRITICAL FOUNDATION
|
|
||||||
|
|
||||||
### Player ✅ CRITICAL FOUNDATION
|
|
||||||
|
|
||||||
### Convert ✅ IMPLEMENTED
|
### Convert ✅ IMPLEMENTED
|
||||||
Convert is the primary module for video transcoding and format conversion. This handles:
|
Convert is the primary module for video transcoding and format conversion. This handles:
|
||||||
- ✅ Codec conversion (H.264, H.265/HEVC, VP9, AV1, etc.)
|
- ✅ Codec conversion (H.264, H.265/HEVC, VP9, AV1, etc.)
|
||||||
|
|
@ -139,17 +135,20 @@ Comprehensive metadata viewer and editor:
|
||||||
|
|
||||||
**Current Status:** Basic metadata viewing implemented, advanced features planned.
|
**Current Status:** Basic metadata viewing implemented, advanced features planned.
|
||||||
|
|
||||||
### Rip ✅ IMPLEMENTED
|
### Rip 🔄 PLANNED
|
||||||
Extract and convert content from optical media and disc images:
|
Extract and convert content from optical media and disc images:
|
||||||
- ✅ Rip from VIDEO_TS folders
|
- ⏳ Rip directly from DVD/Blu-ray drives to video files
|
||||||
- ✅ Extract from ISO images (requires `xorriso` or `bsdtar`)
|
- ⏳ Extract from ISO, IMG, and other disc image formats
|
||||||
- ✅ Default lossless DVD → MKV (stream copy)
|
- ⏳ Title and chapter selection
|
||||||
- ✅ Optional H.264 MKV/MP4 outputs
|
- ⏳ Preserve or transcode during extraction
|
||||||
- ✅ Queue-based execution with logs and progress
|
- ⏳ Handle copy protection (via libdvdcss/libaacs when available)
|
||||||
|
- ⏳ Subtitle and audio track selection
|
||||||
|
- ⏳ Batch ripping of multiple titles
|
||||||
|
- ⏳ Output to lossless or compressed formats
|
||||||
|
|
||||||
**FFmpeg Features:** concat demuxer, stream copy, H.264 encoding
|
**FFmpeg Features:** DVD/Blu-ray input, concat, stream copying
|
||||||
|
|
||||||
**Current Status:** Available in dev20+. Physical disc and multi-title selection are still planned.
|
**Current Status:** Planned for dev16, requires legal research and library integration.
|
||||||
|
|
||||||
### Blu-ray 🔄 PLANNED
|
### Blu-ray 🔄 PLANNED
|
||||||
Professional Blu-ray Disc authoring and encoding system:
|
Professional Blu-ray Disc authoring and encoding system:
|
||||||
|
|
@ -223,24 +222,14 @@ Extract still images from video:
|
||||||
|
|
||||||
## Module Coverage Summary
|
## Module Coverage Summary
|
||||||
|
|
||||||
**Current Status:** Player module is the critical foundation for all advanced features. Current implementation has fundamental A/V synchronization and frame-accurate seeking issues that block enhancement development. See PLAYER_MODULE.md for detailed architecture plan.
|
|
||||||
|
|
||||||
This module set covers all major FFmpeg capabilities:
|
This module set covers all major FFmpeg capabilities:
|
||||||
|
|
||||||
### ✅ Currently Implemented
|
### ✅ Currently Implemented
|
||||||
- ✅ **Video/Audio Playback** - Core FFmpeg-based player with Fyne integration
|
|
||||||
- ✅ **Transcoding and format conversion** - Full DVD encoding system
|
- ✅ **Transcoding and format conversion** - Full DVD encoding system
|
||||||
- ✅ **Metadata viewing and editing** - Basic implementation
|
- ✅ **Metadata viewing and editing** - Basic implementation
|
||||||
- ✅ **Queue system** - Batch processing with job management
|
- ✅ **Queue system** - Batch processing with job management
|
||||||
- ✅ **Cross-platform support** - Linux, Windows (dev14)
|
- ✅ **Cross-platform support** - Linux, Windows (dev14)
|
||||||
|
|
||||||
### Player 🔄 CRITICAL PRIORITY
|
|
||||||
- ⏳ **Rock-solid Go-based player** - Single process with A/V sync, frame-accurate seeking, hardware acceleration
|
|
||||||
- ⏳ **Chapter system integration** - Port scene detection from Author module, manual chapter support
|
|
||||||
- ⏳ **Frame extraction pipeline** - Keyframe detection, preview system
|
|
||||||
- ⏳ **Performance optimization** - Buffer management, adaptive timing, error recovery
|
|
||||||
- ⏳ **Cross-platform consistency** - Linux/Windows/macOS parity
|
|
||||||
|
|
||||||
### 🔄 In Development/Planned
|
### 🔄 In Development/Planned
|
||||||
- 🔄 **Concatenation and merging** - Planned for dev15
|
- 🔄 **Concatenation and merging** - Planned for dev15
|
||||||
- 🔄 **Trimming and splitting** - Planned for dev15
|
- 🔄 **Trimming and splitting** - Planned for dev15
|
||||||
|
|
|
||||||
|
|
@ -1,434 +0,0 @@
|
||||||
# VideoTools Player Module
|
|
||||||
|
|
||||||
## Overview
|
|
||||||
|
|
||||||
The Player module provides rock-solid video playback with frame-accurate capabilities, serving as the foundation for advanced features like enhancement, trimming, and chapter management.
|
|
||||||
|
|
||||||
## Architecture Philosophy
|
|
||||||
|
|
||||||
**Player stability is critical blocker** for all advanced features. The current implementation follows VideoTools' core principles:
|
|
||||||
- **Internal Implementation**: No external player dependencies
|
|
||||||
- **Go-based**: Native integration with existing codebase
|
|
||||||
- **Cross-platform**: Consistent behavior across Linux, Windows, macOS
|
|
||||||
- **Frame-accurate**: Precise seeking and frame extraction
|
|
||||||
- **A/V Sync**: Perfect synchronization without drift
|
|
||||||
- **Extensible**: Clean interfaces for module integration
|
|
||||||
|
|
||||||
## Critical Issues Identified (Legacy Implementation)
|
|
||||||
|
|
||||||
### 1. Separate A/V Processes - A/V Desync Inevitable
|
|
||||||
**Problem**: Video and audio run in completely separate FFmpeg processes with no synchronization.
|
|
||||||
|
|
||||||
**Location**: `main.go:10184-10185`
|
|
||||||
```go
|
|
||||||
func (p *playSession) startLocked(offset float64) {
|
|
||||||
p.runVideo(offset) // Separate process
|
|
||||||
p.runAudio(offset) // Separate process
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Symptoms**:
|
|
||||||
- Gradual A/V drift over time
|
|
||||||
- Stuttering when one process slows down
|
|
||||||
- No way to correct sync when drift occurs
|
|
||||||
|
|
||||||
### 2. Command-Line Interface Limitations
|
|
||||||
**Problem**: MPV/VLC controllers use basic CLI without proper IPC or frame extraction.
|
|
||||||
|
|
||||||
**Location**: `internal/player/mpv_controller.go`, `vlc_controller.go`
|
|
||||||
- No real-time position feedback
|
|
||||||
- No frame extraction capability
|
|
||||||
- Process restart required for control changes
|
|
||||||
|
|
||||||
### 3. Frame-Accurate Seeking Problems
|
|
||||||
**Problem**: Seeking restarts entire FFmpeg processes instead of precise seeking.
|
|
||||||
|
|
||||||
**Location**: `main.go:10018-10028`
|
|
||||||
```go
|
|
||||||
func (p *playSession) Seek(offset float64) {
|
|
||||||
p.stopLocked() // Kill processes
|
|
||||||
p.startLocked(p.current) // Restart from new position
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
**Symptoms**:
|
|
||||||
- 100-500ms gap during seek operations
|
|
||||||
- No keyframe awareness
|
|
||||||
- Cannot extract exact frames
|
|
||||||
|
|
||||||
### 4. Performance Issues
|
|
||||||
**Problems**:
|
|
||||||
- Frame allocation every frame causes GC pressure
|
|
||||||
- Small audio buffers cause underruns
|
|
||||||
- Volume processing in hot path wastes CPU
|
|
||||||
|
|
||||||
## Unified Player Architecture (Solution)
|
|
||||||
|
|
||||||
### Core Design Principles
|
|
||||||
|
|
||||||
1. **Single FFmpeg Process**
|
|
||||||
- Multiplexed A/V output to maintain perfect sync
|
|
||||||
- Master clock reference for timing
|
|
||||||
- PTS-based synchronization with drift correction
|
|
||||||
|
|
||||||
2. **Frame-Accurate Operations**
|
|
||||||
- Seeking to exact frames without restarts
|
|
||||||
- Keyframe extraction for previews
|
|
||||||
- Frame buffer pooling to reduce GC pressure
|
|
||||||
|
|
||||||
3. **Hardware Acceleration**
|
|
||||||
- CUDA/VA-API/VideoToolbox integration
|
|
||||||
- Fallback to software decoding
|
|
||||||
- Cross-platform hardware detection
|
|
||||||
|
|
||||||
4. **Module Integration**
|
|
||||||
- Clean interfaces for other modules
|
|
||||||
- Frame extraction APIs for enhancement
|
|
||||||
- Chapter detection integration from Author module
|
|
||||||
|
|
||||||
## Implementation Strategy
|
|
||||||
|
|
||||||
### Phase 1: Foundation (Week 1-2)
|
|
||||||
|
|
||||||
#### 1.1 Unified FFmpeg Process
|
|
||||||
```go
|
|
||||||
type UnifiedPlayer struct {
|
|
||||||
cmd *exec.Cmd
|
|
||||||
videoPipe io.Reader
|
|
||||||
audioPipe io.Reader
|
|
||||||
frameBuffer *RingBuffer
|
|
||||||
audioBuffer *RingBuffer
|
|
||||||
syncClock time.Time
|
|
||||||
ptsOffset int64
|
|
||||||
|
|
||||||
// Video properties
|
|
||||||
frameRate float64
|
|
||||||
frameCount int64
|
|
||||||
duration time.Duration
|
|
||||||
}
|
|
||||||
|
|
||||||
// Single FFmpeg with A/V sync
|
|
||||||
func (p *UnifiedPlayer) load(path string) error {
|
|
||||||
cmd := exec.Command("ffmpeg",
|
|
||||||
"-i", path,
|
|
||||||
// Video stream
|
|
||||||
"-map", "0:v:0", "-f", "rawvideo", "-pix_fmt", "rgb24", "pipe:4",
|
|
||||||
// Audio stream
|
|
||||||
"-map", "0:a:0", "-f", "s16le", "-ar", "48000", "pipe:5",
|
|
||||||
"-")
|
|
||||||
|
|
||||||
// Maintain sync internally
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 1.2 Hardware Acceleration
|
|
||||||
```go
|
|
||||||
type HardwareBackend struct {
|
|
||||||
Name string // "cuda", "vaapi", "videotoolbox"
|
|
||||||
Available bool
|
|
||||||
Device int
|
|
||||||
Memory int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func detectHardwareSupport() []HardwareBackend {
|
|
||||||
var backends []HardwareBackend
|
|
||||||
|
|
||||||
// NVIDIA CUDA
|
|
||||||
if checkNVML() {
|
|
||||||
backends = append(backends, HardwareBackend{
|
|
||||||
Name: "cuda", Available: true})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Intel VA-API
|
|
||||||
if runtime.GOOS == "linux" && checkVA-API() {
|
|
||||||
backends = append(backends, HardwareBackend{
|
|
||||||
Name: "vaapi", Available: true})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apple VideoToolbox
|
|
||||||
if runtime.GOOS == "darwin" && checkVideoToolbox() {
|
|
||||||
backends = append(backends, HardwareBackend{
|
|
||||||
Name: "videotoolbox", Available: true})
|
|
||||||
}
|
|
||||||
|
|
||||||
return backends
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 1.3 Frame Buffer Management
|
|
||||||
```go
|
|
||||||
type FramePool struct {
|
|
||||||
pool sync.Pool
|
|
||||||
active int
|
|
||||||
maxSize int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *FramePool) get(w, h int) *image.RGBA {
|
|
||||||
if img := p.pool.Get(); img != nil {
|
|
||||||
atomic.AddInt32(&p.active, -1)
|
|
||||||
return img.(*image.RGBA)
|
|
||||||
}
|
|
||||||
|
|
||||||
if atomic.LoadInt32(&p.active) >= p.maxSize {
|
|
||||||
return image.NewRGBA(image.Rect(0, 0, w, h)) // Fallback
|
|
||||||
}
|
|
||||||
|
|
||||||
atomic.AddInt32(&p.active, 1)
|
|
||||||
return image.NewRGBA(image.Rect(0, 0, w, h))
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Phase 2: Core Features (Week 3-4)
|
|
||||||
|
|
||||||
#### 2.1 Frame-Accurate Seeking
|
|
||||||
```go
|
|
||||||
// Frame extraction without restart
|
|
||||||
func (p *Player) SeekToFrame(frame int64) error {
|
|
||||||
seekTime := time.Duration(frame) * time.Second / time.Duration(p.frameRate)
|
|
||||||
|
|
||||||
// Extract single frame
|
|
||||||
cmd := exec.Command("ffmpeg",
|
|
||||||
"-ss", fmt.Sprintf("%.3f", seekTime.Seconds()),
|
|
||||||
"-i", p.path,
|
|
||||||
"-vframes", "1",
|
|
||||||
"-f", "rawvideo",
|
|
||||||
"-pix_fmt", "rgb24",
|
|
||||||
"-")
|
|
||||||
|
|
||||||
// Update display immediately
|
|
||||||
frame, err := p.extractFrame(cmd)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return p.displayFrame(frame)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 2.2 Chapter System Integration
|
|
||||||
```go
|
|
||||||
// Port scene detection from Author module
|
|
||||||
func (p *Player) DetectScenes(threshold float64) ([]Chapter, error) {
|
|
||||||
cmd := exec.Command("ffmpeg",
|
|
||||||
"-i", p.path,
|
|
||||||
"-vf", fmt.Sprintf("select='gt(scene=%.2f)',metadata=print:file", threshold),
|
|
||||||
"-f", "null",
|
|
||||||
"-")
|
|
||||||
|
|
||||||
return parseSceneChanges(cmd.Stdout)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Manual chapter support
|
|
||||||
func (p *Player) AddManualChapter(time time.Duration, title string) error {
|
|
||||||
p.chapters = append(p.chapters, Chapter{
|
|
||||||
StartTime: time,
|
|
||||||
Title: title,
|
|
||||||
Type: "manual",
|
|
||||||
})
|
|
||||||
p.updateChapterList()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Chapter navigation
|
|
||||||
func (p *Player) GoToChapter(index int) error {
|
|
||||||
if index < len(p.chapters) {
|
|
||||||
return p.SeekToTime(p.chapters[index].StartTime)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 2.3 Performance Optimization
|
|
||||||
```go
|
|
||||||
type SyncManager struct {
|
|
||||||
masterClock time.Time
|
|
||||||
videoPTS int64
|
|
||||||
audioPTS int64
|
|
||||||
driftOffset int64
|
|
||||||
correctionRate float64
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *SyncManager) SyncFrame(frameTime time.Duration) error {
|
|
||||||
now := time.Now()
|
|
||||||
expected := s.masterClock.Add(frameTime)
|
|
||||||
|
|
||||||
if now.Before(expected) {
|
|
||||||
// We're ahead, wait precisely
|
|
||||||
time.Sleep(expected.Sub(now))
|
|
||||||
} else if behind := now.Sub(expected); behind > frameDur*2 {
|
|
||||||
// We're way behind, skip this frame
|
|
||||||
logging.Debug(logging.CatPlayer, "dropping frame, %.0fms behind", behind.Seconds()*1000)
|
|
||||||
s.masterClock = now
|
|
||||||
return fmt.Errorf("too far behind, skipping frame")
|
|
||||||
} else {
|
|
||||||
// We're slightly behind, catch up gradually
|
|
||||||
s.masterClock = now.Add(frameDur / 2)
|
|
||||||
}
|
|
||||||
|
|
||||||
s.masterClock = expected
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Phase 3: Advanced Features (Week 5-6)
|
|
||||||
|
|
||||||
#### 3.1 Preview System
|
|
||||||
```go
|
|
||||||
type PreviewManager struct {
|
|
||||||
player *UnifiedPlayer
|
|
||||||
cache map[int64]*image.RGBA // Frame cache
|
|
||||||
maxSize int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *PreviewManager) GetPreviewFrame(offset time.Duration) (*image.RGBA, error) {
|
|
||||||
frameNum := int64(offset.Seconds() * p.player.FrameRate)
|
|
||||||
|
|
||||||
if cached, exists := p.cache[frameNum]; exists {
|
|
||||||
return cached, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract frame if not cached
|
|
||||||
frame, err := p.player.ExtractFrame(frameNum)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cache for future use
|
|
||||||
if len(p.cache) >= p.maxSize {
|
|
||||||
p.clearOldestCache()
|
|
||||||
}
|
|
||||||
p.cache[frameNum] = frame
|
|
||||||
|
|
||||||
return frame, nil
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
#### 3.2 Error Recovery
|
|
||||||
```go
|
|
||||||
type ErrorRecovery struct {
|
|
||||||
lastGoodFrame int64
|
|
||||||
retryCount int
|
|
||||||
maxRetries int
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *ErrorRecovery) HandlePlaybackError(err error) error {
|
|
||||||
e.retryCount++
|
|
||||||
|
|
||||||
if e.retryCount > e.maxRetries {
|
|
||||||
return fmt.Errorf("max retries exceeded: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Implement recovery strategy
|
|
||||||
if isDecodeError(err) {
|
|
||||||
return e.attemptCodecFallback()
|
|
||||||
}
|
|
||||||
|
|
||||||
if isBufferError(err) {
|
|
||||||
return e.increaseBufferSize()
|
|
||||||
}
|
|
||||||
|
|
||||||
return e.retryFromLastGoodFrame()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Module Integration Points
|
|
||||||
|
|
||||||
### Enhancement Module
|
|
||||||
```go
|
|
||||||
type EnhancementPlayer interface {
|
|
||||||
// Core playback
|
|
||||||
GetCurrentFrame() int64
|
|
||||||
ExtractFrame(frame int64) (*image.RGBA, error)
|
|
||||||
ExtractKeyframes() ([]int64, error)
|
|
||||||
|
|
||||||
// Chapter integration
|
|
||||||
GetChapters() []Chapter
|
|
||||||
AddManualChapter(time time.Duration, title string) error
|
|
||||||
|
|
||||||
// Content analysis
|
|
||||||
GetVideoInfo() *VideoInfo
|
|
||||||
DetectContent() (ContentType, error)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Trim Module
|
|
||||||
```go
|
|
||||||
type TrimPlayer interface {
|
|
||||||
// Timeline interface
|
|
||||||
GetTimeline() *TimelineWidget
|
|
||||||
SetChapterMarkers([]Chapter) error
|
|
||||||
|
|
||||||
// Frame-accurate operations
|
|
||||||
TrimToFrames(start, end int64) error
|
|
||||||
GetTrimPreview(start, end int64) (*image.RGBA, error)
|
|
||||||
|
|
||||||
// Export integration
|
|
||||||
ExportTrimmed(path string) error
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### Author Module Integration
|
|
||||||
```go
|
|
||||||
// Scene detection integration
|
|
||||||
func (p *Player) ImportSceneChapters(chapters []Chapter) error {
|
|
||||||
p.chapters = append(p.chapters, chapters...)
|
|
||||||
return p.updateChapterList()
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Performance Monitoring
|
|
||||||
|
|
||||||
### Key Metrics
|
|
||||||
```go
|
|
||||||
type PlayerMetrics struct {
|
|
||||||
FrameDeliveryTime time.Duration // Target: frameDur * 0.8
|
|
||||||
AudioBufferHealth float64 // Target: > 0.3 (30%)
|
|
||||||
SyncDrift time.Duration // Target: < 10ms
|
|
||||||
CPUMemoryUsage float64 // Target: < 80%
|
|
||||||
FrameDrops int64 // Target: 0
|
|
||||||
SeekTime time.Duration // Target: < 50ms
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *PlayerMetrics) Collect() {
|
|
||||||
// Real-time performance tracking
|
|
||||||
if frameDelivery := time.Since(frameReadStart); frameDelivery > frameDur*1.5 {
|
|
||||||
logging.Warn(logging.CatPlayer, "slow frame delivery: %.1fms", frameDelivery.Seconds()*1000)
|
|
||||||
}
|
|
||||||
|
|
||||||
if audioBufferFillLevel := audioBuffer.Available() / audioBuffer.Capacity();
|
|
||||||
audioBufferFillLevel < 0.3 {
|
|
||||||
logging.Warn(logging.CatPlayer, "audio buffer low: %.0f%%", audioBufferFillLevel*100)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Testing Strategy
|
|
||||||
|
|
||||||
### Test Matrix
|
|
||||||
| Feature | Test Cases | Success Criteria |
|
|
||||||
|----------|-------------|-----------------|
|
|
||||||
| Playback | 24/30/60fps smooth | No stuttering, <5% frame drops |
|
|
||||||
| Seeking | Frame-accurate | <50ms seek time, exact frame |
|
|
||||||
| A/V Sync | 30+ seconds stable | <10ms drift, no correction needed |
|
|
||||||
| Chapters | Navigation works | Previous/Next jumps correctly |
|
|
||||||
| Hardware | Acceleration detected | GPU utilization when available |
|
|
||||||
| Memory | Stable long-term | No memory leaks, stable usage |
|
|
||||||
| Cross-platform | Consistent behavior | Linux/Windows/macOS parity |
|
|
||||||
|
|
||||||
### Stress Testing
|
|
||||||
- Long-duration playback (2+ hours)
|
|
||||||
- Rapid seeking operations (10+ seeks/minute)
|
|
||||||
- Multiple format support (H.264, H.265, VP9, AV1)
|
|
||||||
- Hardware acceleration stress testing
|
|
||||||
- Memory leak detection with runtime/pprof
|
|
||||||
- CPU usage profiling under different loads
|
|
||||||
|
|
||||||
## Implementation Timeline
|
|
||||||
|
|
||||||
**Week 1**: Core unified player architecture
|
|
||||||
**Week 2**: Frame-accurate seeking and chapter integration
|
|
||||||
**Week 3**: Hardware acceleration and performance optimization
|
|
||||||
**Week 4**: Preview system and error recovery
|
|
||||||
**Week 5**: Advanced features (multiple audio tracks, subtitle support)
|
|
||||||
**Week 6**: Cross-platform testing and optimization
|
|
||||||
|
|
||||||
This player implementation provides the rock-solid foundation needed for all advanced VideoTools features while maintaining cross-platform compatibility and Go-based architecture principles.
|
|
||||||
|
|
@ -14,20 +14,18 @@ Get VideoTools running in minutes!
|
||||||
cd VideoTools
|
cd VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Install dependencies and build** (Git Bash or similar):
|
2. **Run the setup script**:
|
||||||
```bash
|
- Double-click `setup-windows.bat`
|
||||||
./scripts/install.sh
|
- OR run in PowerShell:
|
||||||
```
|
```powershell
|
||||||
|
.\scripts\setup-windows.ps1 -Portable
|
||||||
|
```
|
||||||
|
|
||||||
Or install Windows dependencies directly:
|
3. **Done!** FFmpeg will be downloaded automatically and VideoTools will be ready to run.
|
||||||
```powershell
|
|
||||||
.\scripts\install-deps-windows.ps1
|
|
||||||
```
|
|
||||||
|
|
||||||
3. **Run VideoTools**:
|
4. **Launch VideoTools**:
|
||||||
```bash
|
- Navigate to `dist/windows/`
|
||||||
./scripts/run.sh
|
- Double-click `VideoTools.exe`
|
||||||
```
|
|
||||||
|
|
||||||
### If You Need to Build
|
### If You Need to Build
|
||||||
|
|
||||||
|
|
@ -60,14 +58,26 @@ If `VideoTools.exe` doesn't exist yet:
|
||||||
cd VideoTools
|
cd VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Install dependencies and build**:
|
2. **Install FFmpeg** (if not already installed):
|
||||||
```bash
|
```bash
|
||||||
./scripts/install.sh
|
# Fedora/RHEL
|
||||||
|
sudo dnf install ffmpeg
|
||||||
|
|
||||||
|
# Ubuntu/Debian
|
||||||
|
sudo apt install ffmpeg
|
||||||
|
|
||||||
|
# Arch Linux
|
||||||
|
sudo pacman -S ffmpeg
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Run**:
|
3. **Build VideoTools**:
|
||||||
```bash
|
```bash
|
||||||
./scripts/run.sh
|
./scripts/build.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
4. **Run**:
|
||||||
|
```bash
|
||||||
|
./VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
### Cross-Compile for Windows from Linux
|
### Cross-Compile for Windows from Linux
|
||||||
|
|
@ -97,16 +107,21 @@ sudo apt install gcc-mingw-w64 # Ubuntu/Debian
|
||||||
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
|
||||||
```
|
```
|
||||||
|
|
||||||
2. **Clone and install dependencies/build**:
|
2. **Install FFmpeg**:
|
||||||
|
```bash
|
||||||
|
brew install ffmpeg
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Clone and build**:
|
||||||
```bash
|
```bash
|
||||||
git clone <repository-url>
|
git clone <repository-url>
|
||||||
cd VideoTools
|
cd VideoTools
|
||||||
./scripts/install.sh
|
go build -o VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
3. **Run**:
|
4. **Run**:
|
||||||
```bash
|
```bash
|
||||||
./scripts/run.sh
|
./VideoTools
|
||||||
```
|
```
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,60 +1,56 @@
|
||||||
# VideoTools Documentation
|
# VideoTools Documentation
|
||||||
|
|
||||||
VideoTools is a professional-grade video processing suite with a modern GUI. It specializes in creating DVD-compliant videos for authoring and distribution.
|
VideoTools is a professional-grade video processing suite with a modern GUI, currently on v0.1.0-dev18. It specializes in creating DVD-compliant videos for authoring and distribution.
|
||||||
|
|
||||||
**For a high-level overview of what is currently implemented, in progress, or planned, please see the [Project Status Page](../PROJECT_STATUS.md).**
|
|
||||||
|
|
||||||
## Documentation Structure
|
## Documentation Structure
|
||||||
|
|
||||||
### Core Modules (Implementation Status)
|
### Core Modules (Implementation Status)
|
||||||
|
|
||||||
#### ✅ Implemented
|
#### ✅ Fully Implemented
|
||||||
- [Convert](convert/) - Video transcoding and format conversion with DVD presets.
|
- [Convert](convert/) - Video transcoding and format conversion with DVD presets
|
||||||
- [Inspect](inspect/) - Basic metadata viewing.
|
- [Inspect](inspect/) - Metadata viewing and editing
|
||||||
- [Rip](rip/) - Extraction from `VIDEO_TS` folders and `.iso` images.
|
- [Queue System](../QUEUE_SYSTEM_GUIDE.md) - Batch processing with job management
|
||||||
- [Queue System](../QUEUE_SYSTEM_GUIDE.md) - Batch processing with job management.
|
|
||||||
|
|
||||||
#### 🟡 Partially Implemented / Buggy
|
#### 🔄 Partially Implemented
|
||||||
- **Player** - Core video playback is functional but has critical bugs blocking development.
|
- [Merge](merge/) - Join multiple video clips *(planned)*
|
||||||
- **Upscale** - AI-based upscaling (Real-ESRGAN) is integrated.
|
- [Trim](trim/) - Cut and split videos *(planned)*
|
||||||
|
- [Filters](filters/) - Video and audio effects *(planned)*
|
||||||
|
- [Upscale](upscale/) - Resolution enhancement *(AI + traditional now wired)*
|
||||||
|
- [Audio](audio/) - Audio track operations *(planned)*
|
||||||
|
- [Thumb](thumb/) - Thumbnail generation *(planned)*
|
||||||
|
- [Rip](rip/) - DVD/Blu-ray extraction *(planned)*
|
||||||
|
|
||||||
#### 🔄 Planned
|
### Additional Modules (Proposed)
|
||||||
- **Merge** - [PLANNED] Join multiple video clips.
|
- [Subtitle](subtitle/) - Subtitle management *(planned)*
|
||||||
- **Trim** - [PLANNED] Cut and split videos.
|
- [Streams](streams/) - Multi-stream handling *(planned)*
|
||||||
- **Filters** - [PLANNED] Video and audio effects.
|
- [GIF](gif/) - Animated GIF creation *(planned)*
|
||||||
- **Audio** - [PLANNED] Audio track operations.
|
- [Crop](crop/) - Video cropping tools *(planned)*
|
||||||
- **Thumb** - [PLANNED] Thumbnail generation.
|
- [Screenshots](screenshots/) - Frame extraction *(planned)*
|
||||||
|
|
||||||
### Additional Modules (All Planned)
|
|
||||||
- **Subtitle** - [PLANNED] Subtitle management.
|
|
||||||
- **Streams** - [PLANNED] Multi-stream handling.
|
|
||||||
- **GIF** - [PLANNED] Animated GIF creation.
|
|
||||||
- **Crop** - [PLANNED] Video cropping tools.
|
|
||||||
- **Screenshots** - [PLANNED] Frame extraction.
|
|
||||||
|
|
||||||
## Implementation Documents
|
## Implementation Documents
|
||||||
- [DVD Implementation Summary](../DVD_IMPLEMENTATION_SUMMARY.md) - Technical details of the DVD encoding system.
|
- [DVD Implementation Summary](../DVD_IMPLEMENTATION_SUMMARY.md) - Complete DVD encoding system
|
||||||
- [Windows Compatibility](WINDOWS_COMPATIBILITY.md) - Notes on cross-platform support.
|
- [Windows Compatibility](WINDOWS_COMPATIBILITY.md) - Cross-platform support
|
||||||
- [Queue System Guide](../QUEUE_SYSTEM_GUIDE.md) - Deep dive into the batch processing system.
|
- [Queue System Guide](../QUEUE_SYSTEM_GUIDE.md) - Batch processing system
|
||||||
- [Module Overview](MODULES.md) - The complete feature list for all modules (implemented and planned).
|
- [Module Overview](MODULES.md) - Complete module feature list
|
||||||
- [Persistent Video Context](PERSISTENT_VIDEO_CONTEXT.md) - Design for cross-module video state management.
|
- [Persistent Video Context](PERSISTENT_VIDEO_CONTEXT.md) - Cross-module video state management
|
||||||
- [Custom Video Player](VIDEO_PLAYER.md) - Documentation for the embedded playback implementation.
|
- [Custom Video Player](VIDEO_PLAYER.md) - Embedded playback implementation
|
||||||
|
|
||||||
## Development Documentation
|
## Development Documentation
|
||||||
- [Integration Guide](../INTEGRATION_GUIDE.md) - System architecture and integration plans.
|
- [Integration Guide](../INTEGRATION_GUIDE.md) - System architecture and integration
|
||||||
- [Build and Run Guide](../BUILD_AND_RUN.md) - Instructions for setting up a development environment.
|
- [Build and Run Guide](../BUILD_AND_RUN.md) - Build instructions and workflows
|
||||||
- **FFmpeg Integration** - [PLANNED] Documentation on FFmpeg command building.
|
- [FFmpeg Integration](ffmpeg/) - FFmpeg command building and execution *(coming soon)*
|
||||||
- **Contributing** - [PLANNED] Contribution guidelines.
|
- [Contributing](CONTRIBUTING.md) - Contribution guidelines *(coming soon)*
|
||||||
|
|
||||||
## User Guides
|
## User Guides
|
||||||
- [Installation Guide](../INSTALLATION.md) - Comprehensive installation instructions.
|
- [Installation Guide](../INSTALLATION.md) - Comprehensive installation instructions
|
||||||
- [DVD User Guide](../DVD_USER_GUIDE.md) - A step-by-step guide to the DVD encoding workflow.
|
- [DVD User Guide](../DVD_USER_GUIDE.md) - DVD encoding workflow
|
||||||
- [Quick Start](../README.md#quick-start) - The fastest way to get up and running.
|
- [Quick Start](../README.md#quick-start) - Installation and first steps
|
||||||
- **Workflows** - [PLANNED] Guides for common multi-module tasks.
|
- [Workflows](workflows/) - Common multi-module workflows *(coming soon)*
|
||||||
- **Keyboard Shortcuts** - [PLANNED] A reference for all keyboard shortcuts.
|
- [Keyboard Shortcuts](shortcuts.md) - Keyboard shortcuts reference *(coming soon)*
|
||||||
|
|
||||||
## Quick Links
|
## Quick Links
|
||||||
- [Module Feature Matrix](MODULES.md#module-coverage-summary)
|
- [Module Feature Matrix](MODULES.md#module-coverage-summary)
|
||||||
- [Latest Updates](../LATEST_UPDATES.md) - Recent development changes.
|
- [Latest Updates](../LATEST_UPDATES.md) - Recent development changes
|
||||||
- [Windows Implementation Notes](DEV14_WINDOWS_IMPLEMENTATION.md)
|
- [Windows Implementation](DEV14_WINDOWS_IMPLEMENTATION.md) - dev14 Windows support
|
||||||
- **VT_Player Integration** - [PLANNED] Frame-accurate playback system.
|
- [Modern Video Processing Strategy](HANDBRAKE_REPLACEMENT.md) - Next-generation video tools approach
|
||||||
|
- [VT_Player Integration](../VT_Player/README.md) - Frame-accurate playback system
|
||||||
|
|
|
||||||
105
docs/ROADMAP.md
105
docs/ROADMAP.md
|
|
@ -1,105 +0,0 @@
|
||||||
# VideoTools Roadmap
|
|
||||||
|
|
||||||
This roadmap is intentionally lightweight. It captures the next few high-priority goals without locking the project into a rigid plan.
|
|
||||||
|
|
||||||
## How We Use This
|
|
||||||
|
|
||||||
- The roadmap is a short list, not a full backlog.
|
|
||||||
- Items can move between buckets as priorities change.
|
|
||||||
- We update this at the start of each dev cycle.
|
|
||||||
|
|
||||||
## Current State
|
|
||||||
|
|
||||||
- dev21 focused on stylistic filters and enhancement module planning.
|
|
||||||
- Filters module now includes decade-based authentic effects (8mm, 16mm, B&W Film, Silent Film, VHS, Webcam).
|
|
||||||
- Player stability identified as critical blocker for enhancement development.
|
|
||||||
|
|
||||||
## Now (dev22 focus)
|
|
||||||
|
|
||||||
- **Rock-solid video player implementation** - CRITICAL PRIORITY
|
|
||||||
- Fix fundamental A/V synchronization issues
|
|
||||||
- Implement frame-accurate seeking without restarts
|
|
||||||
- Add hardware acceleration (CUDA/VA-API/VideoToolbox)
|
|
||||||
- Integrate chapter detection from Author module
|
|
||||||
- Build foundation for frame extraction and keyframing
|
|
||||||
- Eliminate seeking glitches and desync issues
|
|
||||||
|
|
||||||
- **Enhancement module foundation** - DEPENDS ON PLAYER
|
|
||||||
- Unified Filters + Upscale workflow
|
|
||||||
- Content-type aware processing (general/anime/film)
|
|
||||||
- AI model management system (extensible for future models)
|
|
||||||
- Multi-pass processing pipeline
|
|
||||||
- Before/after preview system
|
|
||||||
- Real-time enhancement feedback
|
|
||||||
|
|
||||||
## Next (dev23+)
|
|
||||||
|
|
||||||
- **Enhancement module completion** - DEPENDS ON PLAYER
|
|
||||||
- Open-source AI model integration (BasicVSR, RIFE, RealCUGan)
|
|
||||||
- Model registry system for easy addition of new models
|
|
||||||
- Content-aware model selection
|
|
||||||
- Advanced restoration (SVFR, SeedVR2, diffusion-based)
|
|
||||||
- Quality-aware enhancement strategies
|
|
||||||
|
|
||||||
- **Trim module with timeline interface** - DEPENDS ON PLAYER
|
|
||||||
- Frame-accurate trimming and cutting
|
|
||||||
- Manual chapter support with keyframing
|
|
||||||
- Visual timeline with chapter markers
|
|
||||||
- Preview-based trimming with exact frame selection
|
|
||||||
- Import chapter detection from Author module
|
|
||||||
|
|
||||||
- **Professional workflow integration**
|
|
||||||
- Seamless module communication (Player ↔ Enhancement ↔ Trim)
|
|
||||||
- Batch enhancement processing through queue
|
|
||||||
- Cross-platform frame extraction
|
|
||||||
- Hardware-accelerated enhancement pipeline
|
|
||||||
|
|
||||||
## Later
|
|
||||||
|
|
||||||
- **Advanced AI features**
|
|
||||||
- AI-powered scene detection
|
|
||||||
- Intelligent upscaling model selection
|
|
||||||
- Temporal consistency algorithms
|
|
||||||
- Custom model training framework
|
|
||||||
- Cloud processing options
|
|
||||||
|
|
||||||
- **Module expansion**
|
|
||||||
- Audio enhancement and restoration
|
|
||||||
- Subtitle processing and burning
|
|
||||||
- Multi-track management
|
|
||||||
- Advanced metadata editing
|
|
||||||
|
|
||||||
## Versioning Note
|
|
||||||
|
|
||||||
We keep continuous dev numbering. After v0.1.1 release, the next dev tag becomes v0.1.1-dev22 (or whatever the next number is).
|
|
||||||
|
|
||||||
## Technical Debt and Architecture
|
|
||||||
|
|
||||||
### Player Module Critical Issues Identified
|
|
||||||
|
|
||||||
The current video player has fundamental architectural problems preventing stable playback:
|
|
||||||
|
|
||||||
1. **Separate A/V Processes** - No synchronization, guaranteed drift
|
|
||||||
2. **Command-Line Interface Limitations** - VLC/MPV controllers use basic CLI, not proper IPC
|
|
||||||
3. **Frame-Accurate Seeking** - Seeking restarts processes with full re-decoding
|
|
||||||
4. **No Frame Extraction** - Critical for enhancement and chapter functionality
|
|
||||||
5. **Poor Buffer Management** - Small audio buffers cause stuttering
|
|
||||||
6. **No Hardware Acceleration** - Software decoding causes high CPU usage
|
|
||||||
|
|
||||||
### Proposed Go-Based Solution
|
|
||||||
|
|
||||||
**Unified FFmpeg Player Architecture:**
|
|
||||||
- Single FFmpeg process with multiplexed A/V output
|
|
||||||
- Proper PTS-based synchronization with drift correction
|
|
||||||
- Frame buffer pooling and memory management
|
|
||||||
- Hardware acceleration through FFmpeg's native support
|
|
||||||
- Frame extraction via pipe without restarts
|
|
||||||
|
|
||||||
**Key Implementation Strategies:**
|
|
||||||
- Ring buffers for audio/video to eliminate stuttering
|
|
||||||
- Master clock reference for A/V sync
|
|
||||||
- Adaptive frame timing with drift correction
|
|
||||||
- Zero-copy frame operations where possible
|
|
||||||
- Hardware backend detection and utilization
|
|
||||||
|
|
||||||
This player enhancement is the foundation requirement for all advanced features including enhancement module and all other features that depend on reliable video playback.
|
|
||||||
|
|
@ -1,48 +1,297 @@
|
||||||
# Rip Module
|
# Rip Module
|
||||||
|
|
||||||
Extract and convert content from DVD folder structures and disc images.
|
Extract and convert content from DVDs, Blu-rays, and disc images.
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
The Rip module focuses on offline extraction from VIDEO_TS folders or DVD ISO images. It is designed to be fast and lossless by default, with optional H.264 transcodes when you want smaller files. All processing happens locally.
|
The Rip module (formerly "Remux") handles extraction of video content from optical media and disc image files. It can rip directly from physical drives or work with ISO/IMG files, providing options for both lossless extraction and transcoding during the rip process.
|
||||||
|
|
||||||
## Current Capabilities (dev20+)
|
> **Note:** This module is currently in planning phase. Features described below are proposed functionality.
|
||||||
|
|
||||||
### Supported Sources
|
## Features
|
||||||
- VIDEO_TS folders
|
|
||||||
- ISO images (requires `xorriso` or `bsdtar` to extract)
|
|
||||||
|
|
||||||
### Output Modes
|
### Source Support
|
||||||
- Lossless DVD -> MKV (stream copy, default)
|
|
||||||
- H.264 MKV (transcode)
|
|
||||||
- H.264 MP4 (transcode)
|
|
||||||
|
|
||||||
### Behavior Notes
|
#### Physical Media
|
||||||
- Uses a queue job with progress and logs.
|
- **DVD** - Standard DVDs with VOB structure
|
||||||
- No online lookups or network calls.
|
- **Blu-ray** - BD structure with M2TS files
|
||||||
- ISO extraction is performed to a temporary working folder before FFmpeg runs.
|
- **CD** - Video CDs (VCD/SVCD)
|
||||||
- Default output naming is based on the source name.
|
- Direct drive access for ripping
|
||||||
|
|
||||||
## Not Yet Implemented
|
#### Disc Images
|
||||||
- Direct ripping from physical drives (DVD/Blu-ray)
|
- **ISO** - Standard disc image format
|
||||||
- Multi-title selection from ISO contents
|
- **IMG** - Raw disc images
|
||||||
- Auto metadata lookup
|
- **BIN/CUE** - CD image pairs
|
||||||
- Subtitle/audio track selection UI
|
- Mount and extract without burning
|
||||||
|
|
||||||
## Usage
|
### Title Selection
|
||||||
|
|
||||||
1. Open the Rip module.
|
#### Auto-Detection
|
||||||
2. Drag a VIDEO_TS folder or an ISO into the drop area.
|
- Scan disc for all titles
|
||||||
3. Choose the output mode (lossless MKV or H.264 MKV/MP4).
|
- Identify main feature (longest title)
|
||||||
4. Start the rip job and monitor the log/progress.
|
- List all extras/bonus content
|
||||||
|
- Show duration and chapter count for each
|
||||||
|
|
||||||
## Dependencies
|
#### Manual Selection
|
||||||
|
- Preview titles before ripping
|
||||||
|
- Select multiple titles for batch rip
|
||||||
|
- Choose specific chapters from titles
|
||||||
|
- Merge chapters from different titles
|
||||||
|
|
||||||
- `ffmpeg`
|
### Track Management
|
||||||
- `xorriso` or `bsdtar` for ISO extraction
|
|
||||||
|
|
||||||
## Example FFmpeg Flow (conceptual)
|
#### Video Tracks
|
||||||
|
- Select video angle (for multi-angle DVDs)
|
||||||
|
- Choose video quality/stream
|
||||||
|
|
||||||
- VIDEO_TS: concatenate VOBs then stream copy to MKV.
|
#### Audio Tracks
|
||||||
- ISO: extract VIDEO_TS from the ISO, then follow the same flow.
|
- List all audio tracks with language
|
||||||
|
- Select which tracks to include
|
||||||
|
- Reorder track priority
|
||||||
|
- Convert audio format during rip
|
||||||
|
|
||||||
|
#### Subtitle Tracks
|
||||||
|
- List all subtitle languages
|
||||||
|
- Extract or burn subtitles
|
||||||
|
- Select multiple subtitle tracks
|
||||||
|
- Convert subtitle formats
|
||||||
|
|
||||||
|
### Rip Modes
|
||||||
|
|
||||||
|
#### Direct Copy (Lossless)
|
||||||
|
Fast extraction with no quality loss:
|
||||||
|
- Copy VOB → MKV/MP4 container
|
||||||
|
- No re-encoding
|
||||||
|
- Preserves original quality
|
||||||
|
- Fastest option
|
||||||
|
- Larger file sizes
|
||||||
|
|
||||||
|
#### Transcode
|
||||||
|
Convert during extraction:
|
||||||
|
- Choose output codec (H.264, H.265, etc.)
|
||||||
|
- Set quality/bitrate
|
||||||
|
- Resize if desired
|
||||||
|
- Compress to smaller file
|
||||||
|
- Slower but more flexible
|
||||||
|
|
||||||
|
#### Smart Mode
|
||||||
|
Automatically choose best approach:
|
||||||
|
- Copy if already efficient codec
|
||||||
|
- Transcode if old/inefficient codec
|
||||||
|
- Optimize settings for content type
|
||||||
|
|
||||||
|
### Copy Protection Handling
|
||||||
|
|
||||||
|
#### DVD CSS
|
||||||
|
- Use libdvdcss when available
|
||||||
|
- Automatic decryption during rip
|
||||||
|
- Legal for personal use (varies by region)
|
||||||
|
|
||||||
|
#### Blu-ray AACS
|
||||||
|
- Use libaacs for AACS decryption
|
||||||
|
- Support for BD+ (limited)
|
||||||
|
- Requires key database
|
||||||
|
|
||||||
|
#### Region Codes
|
||||||
|
- Detect region restrictions
|
||||||
|
- Handle multi-region discs
|
||||||
|
- RPC-1 drive support
|
||||||
|
|
||||||
|
### Quality Settings
|
||||||
|
|
||||||
|
#### Presets
|
||||||
|
- **Archival** - Lossless or very high quality
|
||||||
|
- **Standard** - Good quality, moderate size
|
||||||
|
- **Efficient** - Smaller files, acceptable quality
|
||||||
|
- **Custom** - User-defined settings
|
||||||
|
|
||||||
|
#### Special Handling
|
||||||
|
- Deinterlace DVD content automatically
|
||||||
|
- Inverse telecine for film sources
|
||||||
|
- Upscale SD content to HD (optional)
|
||||||
|
- HDR passthrough for Blu-ray
|
||||||
|
|
||||||
|
### Batch Processing
|
||||||
|
|
||||||
|
#### Multiple Titles
|
||||||
|
- Queue all titles from disc
|
||||||
|
- Process sequentially
|
||||||
|
- Different settings per title
|
||||||
|
- Automatic naming
|
||||||
|
|
||||||
|
#### Multiple Discs
|
||||||
|
- Load multiple ISO files
|
||||||
|
- Batch rip entire series
|
||||||
|
- Consistent settings across discs
|
||||||
|
- Progress tracking
|
||||||
|
|
||||||
|
### Output Options
|
||||||
|
|
||||||
|
#### Naming Templates
|
||||||
|
Automatic file naming:
|
||||||
|
```
|
||||||
|
{disc_name}_Title{title_num}_Chapter{start}-{end}
|
||||||
|
Star_Wars_Title01_Chapter01-25.mp4
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Metadata
|
||||||
|
- Auto-populate from disc info
|
||||||
|
- Lookup online databases (IMDB, TheTVDB)
|
||||||
|
- Chapter markers preserved
|
||||||
|
- Cover art extraction
|
||||||
|
|
||||||
|
#### Organization
|
||||||
|
- Create folder per disc
|
||||||
|
- Separate folders for extras
|
||||||
|
- Season/episode structure for TV
|
||||||
|
- Automatic file organization
|
||||||
|
|
||||||
|
## Usage Guide
|
||||||
|
|
||||||
|
### Ripping a DVD
|
||||||
|
|
||||||
|
1. **Insert Disc or Load ISO**
|
||||||
|
- Physical disc: Insert and click "Scan Drive"
|
||||||
|
- ISO file: Click "Load ISO" and select file
|
||||||
|
|
||||||
|
2. **Scan Disc**
|
||||||
|
- Application analyzes disc structure
|
||||||
|
- Lists all titles with duration/chapters
|
||||||
|
- Main feature highlighted
|
||||||
|
|
||||||
|
3. **Select Title(s)**
|
||||||
|
- Choose main feature or specific titles
|
||||||
|
- Select desired chapters
|
||||||
|
- Preview title information
|
||||||
|
|
||||||
|
4. **Configure Tracks**
|
||||||
|
- Select audio tracks (e.g., English 5.1)
|
||||||
|
- Choose subtitle tracks if desired
|
||||||
|
- Set track order/defaults
|
||||||
|
|
||||||
|
5. **Choose Rip Mode**
|
||||||
|
- Direct Copy for fastest/lossless
|
||||||
|
- Transcode to save space
|
||||||
|
- Configure quality settings
|
||||||
|
|
||||||
|
6. **Set Output**
|
||||||
|
- Choose output folder
|
||||||
|
- Set filename or use template
|
||||||
|
- Select container format
|
||||||
|
|
||||||
|
7. **Start Rip**
|
||||||
|
- Click "Start Ripping"
|
||||||
|
- Monitor progress
|
||||||
|
- Can queue multiple titles
|
||||||
|
|
||||||
|
### Ripping a Blu-ray
|
||||||
|
|
||||||
|
Similar to DVD but with additional considerations:
|
||||||
|
- Much larger files (20-40GB for feature)
|
||||||
|
- Better quality settings available
|
||||||
|
- HDR preservation options
|
||||||
|
- Multi-audio track handling
|
||||||
|
|
||||||
|
### Batch Ripping a TV Series
|
||||||
|
|
||||||
|
1. **Load all disc ISOs** for season
|
||||||
|
2. **Scan each disc** to identify episodes
|
||||||
|
3. **Enable batch mode**
|
||||||
|
4. **Configure naming** with episode numbers
|
||||||
|
5. **Set consistent quality** for all
|
||||||
|
6. **Start batch rip**
|
||||||
|
|
||||||
|
## FFmpeg Integration
|
||||||
|
|
||||||
|
### Direct Copy Example
|
||||||
|
```bash
|
||||||
|
# Extract VOB to MKV without re-encoding
|
||||||
|
ffmpeg -i /dev/dvd -map 0 -c copy output.mkv
|
||||||
|
|
||||||
|
# Extract specific title
|
||||||
|
ffmpeg -i dvd://1 -map 0 -c copy title_01.mkv
|
||||||
|
```
|
||||||
|
|
||||||
|
### Transcode Example
|
||||||
|
```bash
|
||||||
|
# Rip DVD with H.264 encoding
|
||||||
|
ffmpeg -i dvd://1 \
|
||||||
|
-vf yadif,scale=720:480 \
|
||||||
|
-c:v libx264 -crf 20 \
|
||||||
|
-c:a aac -b:a 192k \
|
||||||
|
output.mp4
|
||||||
|
```
|
||||||
|
|
||||||
|
### Multi-Track Example
|
||||||
|
```bash
|
||||||
|
# Preserve multiple audio and subtitle tracks
|
||||||
|
ffmpeg -i dvd://1 \
|
||||||
|
-map 0:v:0 \
|
||||||
|
-map 0:a:0 -map 0:a:1 \
|
||||||
|
-map 0:s:0 -map 0:s:1 \
|
||||||
|
-c copy output.mkv
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tips & Best Practices
|
||||||
|
|
||||||
|
### DVD Quality
|
||||||
|
- Original DVD is 720×480 (NTSC) or 720×576 (PAL)
|
||||||
|
- Always deinterlace DVD content
|
||||||
|
- Consider upscaling to 1080p for modern displays
|
||||||
|
- Use inverse telecine for film sources (24fps)
|
||||||
|
|
||||||
|
### Blu-ray Handling
|
||||||
|
- Main feature typically 20-50GB
|
||||||
|
- Consider transcoding to H.265 to reduce size
|
||||||
|
- Preserve 1080p resolution
|
||||||
|
- Keep high bitrate audio (DTS-HD, TrueHD)
|
||||||
|
|
||||||
|
### File Size Management
|
||||||
|
| Source | Direct Copy | H.264 CRF 20 | H.265 CRF 24 |
|
||||||
|
|--------|-------------|--------------|--------------|
|
||||||
|
| DVD (2hr) | 4-8 GB | 2-4 GB | 1-3 GB |
|
||||||
|
| Blu-ray (2hr) | 30-50 GB | 6-10 GB | 4-6 GB |
|
||||||
|
|
||||||
|
### Legal Considerations
|
||||||
|
- Ripping for personal backup is legal in many regions
|
||||||
|
- Circumventing copy protection may have legal restrictions
|
||||||
|
- Distribution of ripped content is typically illegal
|
||||||
|
- Check local laws and regulations
|
||||||
|
|
||||||
|
### Drive Requirements
|
||||||
|
- DVD-ROM drive for DVD ripping
|
||||||
|
- Blu-ray drive for Blu-ray ripping (obviously)
|
||||||
|
- RPC-1 (region-free) firmware helpful
|
||||||
|
- External drives work fine
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Can't Read Disc
|
||||||
|
- Clean disc surface
|
||||||
|
- Try different drive
|
||||||
|
- Check drive region code
|
||||||
|
- Verify disc isn't damaged
|
||||||
|
|
||||||
|
### Copy Protection Errors
|
||||||
|
- Install libdvdcss (DVD) or libaacs (Blu-ray)
|
||||||
|
- Update key database
|
||||||
|
- Check disc region compatibility
|
||||||
|
- Try different disc copy
|
||||||
|
|
||||||
|
### Slow Ripping
|
||||||
|
- Direct copy is fastest
|
||||||
|
- Transcoding is CPU-intensive
|
||||||
|
- Use hardware acceleration if available
|
||||||
|
- Check drive speed settings
|
||||||
|
|
||||||
|
### Audio/Video Sync Issues
|
||||||
|
- Common with VFR content
|
||||||
|
- Use -vsync parameter
|
||||||
|
- Force constant frame rate
|
||||||
|
- Check source for corruption
|
||||||
|
|
||||||
|
## See Also
|
||||||
|
- [Convert Module](../convert/) - Transcode ripped files further
|
||||||
|
- [Streams Module](../streams/) - Manage multi-track ripped files
|
||||||
|
- [Subtitle Module](../subtitle/) - Handle extracted subtitle tracks
|
||||||
|
- [Inspect Module](../inspect/) - Analyze ripped output quality
|
||||||
|
|
|
||||||
|
|
@ -1,678 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s *appState) showFiltersView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "filters"
|
|
||||||
s.setContent(buildFiltersView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
// buildStylisticFilterChain creates FFmpeg filter chains for decade-based stylistic effects
|
|
||||||
func buildStylisticFilterChain(state *appState) []string {
|
|
||||||
var chain []string
|
|
||||||
|
|
||||||
switch state.filterStylisticMode {
|
|
||||||
case "8mm Film":
|
|
||||||
// 8mm/Super 8 film characteristics (1960s-1980s home movies)
|
|
||||||
// - Very fine grain structure
|
|
||||||
// - Slight color shifts toward warm/cyan
|
|
||||||
// - Film gate weave and frame instability
|
|
||||||
// - Lower resolution and softer details
|
|
||||||
chain = append(chain, "eq=contrast=1.0:saturation=0.9:brightness=0.02") // Slightly desaturated, natural contrast
|
|
||||||
chain = append(chain, "unsharp=6:6:0.2:6:6:0.2") // Very soft, film-like
|
|
||||||
chain = append(chain, "scale=iw*0.8:ih*0.8:flags=lanczos") // Lower resolution
|
|
||||||
chain = append(chain, "fftnorm=nor=0.08:Links=0") // Subtle film grain
|
|
||||||
|
|
||||||
if state.filterTapeNoise > 0 {
|
|
||||||
// Film grain with proper frequency
|
|
||||||
grain := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterTapeNoise*0.1)
|
|
||||||
chain = append(chain, grain)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Subtle frame weave (film movement in gate)
|
|
||||||
if state.filterTrackingError > 0 {
|
|
||||||
weave := fmt.Sprintf("crop='iw-mod(iw*%f/200,1)':'ih-mod(ih*%f/200,1)':%f:%f",
|
|
||||||
state.filterTrackingError, state.filterTrackingError*0.5,
|
|
||||||
state.filterTrackingError*2, state.filterTrackingError)
|
|
||||||
chain = append(chain, weave)
|
|
||||||
}
|
|
||||||
|
|
||||||
case "16mm Film":
|
|
||||||
// 16mm film characteristics (professional/educational films 1930s-1990s)
|
|
||||||
// - Higher resolution than 8mm but still grainy
|
|
||||||
// - More accurate color response
|
|
||||||
// - Film scratches and dust (age-dependent)
|
|
||||||
// - Stable but still organic movement
|
|
||||||
chain = append(chain, "eq=contrast=1.05:saturation=1.0:brightness=0.0") // Natural contrast
|
|
||||||
chain = append(chain, "unsharp=5:5:0.4:5:5:0.4") // Slightly sharper than 8mm
|
|
||||||
chain = append(chain, "scale=iw*0.9:ih*0.9:flags=lanczos") // Moderate resolution
|
|
||||||
chain = append(chain, "fftnorm=nor=0.06:Links=0") // Fine grain
|
|
||||||
|
|
||||||
if state.filterTapeNoise > 0 {
|
|
||||||
grain := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterTapeNoise*0.08)
|
|
||||||
chain = append(chain, grain)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterDropout > 0 {
|
|
||||||
// Occasional film scratches
|
|
||||||
scratches := int(state.filterDropout * 5) // Max 5 scratches
|
|
||||||
if scratches > 0 {
|
|
||||||
chain = append(chain, "geq=lum=lum:cb=cb:cr=cr,boxblur=1:1:cr=0:ar=1")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
case "B&W Film":
|
|
||||||
// Black and white film characteristics (various eras)
|
|
||||||
// - Rich tonal range with silver halide characteristics
|
|
||||||
// - Film grain in luminance only
|
|
||||||
// - High contrast potential
|
|
||||||
// - No color bleeding, but potential for halation
|
|
||||||
chain = append(chain, "colorchannelmixer=.299:.587:.114:0:.299:.587:.114:0:.299:.587:.114") // True B&W conversion
|
|
||||||
chain = append(chain, "eq=contrast=1.1:brightness=-0.02") // Higher contrast for B&W
|
|
||||||
chain = append(chain, "unsharp=4:4:0.3:4:4:0.3") // Moderate sharpness
|
|
||||||
chain = append(chain, "fftnorm=nor=0.05:Links=0") // Film grain
|
|
||||||
|
|
||||||
// Add subtle halation effect (bright edge bleed)
|
|
||||||
if state.filterColorBleeding {
|
|
||||||
chain = append(chain, "unsharp=7:7:0.8:7:7:0.8") // Glow effect for highlights
|
|
||||||
}
|
|
||||||
|
|
||||||
case "Silent Film":
|
|
||||||
// 1920s silent film characteristics
|
|
||||||
// - Very low frame rate (16-22 fps)
|
|
||||||
// - Sepia or B&W toning
|
|
||||||
// - Film grain with age-related deterioration
|
|
||||||
// - Frame jitter and instability
|
|
||||||
chain = append(chain, "framerate=18") // Classic silent film speed
|
|
||||||
chain = append(chain, "colorchannelmixer=.393:.769:.189:0:.393:.769:.189:0:.393:.769:.189") // Sepia tone
|
|
||||||
chain = append(chain, "eq=contrast=1.15:brightness=0.05") // High contrast, slightly bright
|
|
||||||
chain = append(chain, "unsharp=8:8:0.1:8:8:0.1") // Very soft, aged film look
|
|
||||||
chain = append(chain, "fftnorm=nor=0.12:Links=0") // Heavy grain
|
|
||||||
|
|
||||||
// Pronounced frame instability
|
|
||||||
if state.filterTrackingError > 0 {
|
|
||||||
jitter := fmt.Sprintf("crop='iw-mod(iw*%f/100,2)':'ih-mod(ih*%f/100,2)':%f:%f",
|
|
||||||
state.filterTrackingError*3, state.filterTrackingError*1.5,
|
|
||||||
state.filterTrackingError*5, state.filterTrackingError*2)
|
|
||||||
chain = append(chain, jitter)
|
|
||||||
}
|
|
||||||
|
|
||||||
case "70s":
|
|
||||||
// 1970s film/video characteristics
|
|
||||||
// - Lower resolution, softer images
|
|
||||||
// - Warmer color temperature, faded colors
|
|
||||||
// - Film grain (if film) or early video noise
|
|
||||||
// - Slight color shifts common in analog processing
|
|
||||||
chain = append(chain, "eq=contrast=0.95:saturation=0.85:brightness=0.05") // Slightly washed out
|
|
||||||
chain = append(chain, "unsharp=5:5:0.3:5:5:0.3") // Soften
|
|
||||||
chain = append(chain, "fftnorm=nor=0.15:Links=0") // Subtle noise
|
|
||||||
if state.filterChromaNoise > 0 {
|
|
||||||
noise := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterChromaNoise*0.2)
|
|
||||||
chain = append(chain, noise)
|
|
||||||
}
|
|
||||||
|
|
||||||
case "80s":
|
|
||||||
// 1980s video characteristics
|
|
||||||
// - Early home video camcorders (VHS, Betamax)
|
|
||||||
// - More pronounced color bleeding
|
|
||||||
// - Noticeable video noise and artifacts
|
|
||||||
// - Stronger contrast, vibrant colors
|
|
||||||
chain = append(chain, "eq=contrast=1.1:saturation=1.2:brightness=0.02") // Enhanced contrast/saturation
|
|
||||||
chain = append(chain, "unsharp=3:3:0.4:3:3:0.4") // Moderate sharpening (80s video look)
|
|
||||||
chain = append(chain, "fftnorm=nor=0.2:Links=0") // Moderate noise
|
|
||||||
|
|
||||||
if state.filterColorBleeding {
|
|
||||||
// Simulate chroma bleeding common in 80s video
|
|
||||||
chain = append(chain, "format=yuv420p,scale=iw+2:ih+2:flags=neighbor,crop=iw:ih")
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterChromaNoise > 0 {
|
|
||||||
noise := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterChromaNoise*0.3)
|
|
||||||
chain = append(chain, noise)
|
|
||||||
}
|
|
||||||
|
|
||||||
case "90s":
|
|
||||||
// 1990s video characteristics
|
|
||||||
// - Improved VHS quality, early digital video
|
|
||||||
// - Less color bleeding but still present
|
|
||||||
// - Better resolution but still analog artifacts
|
|
||||||
// - More stable but with tape noise
|
|
||||||
chain = append(chain, "eq=contrast=1.05:saturation=1.1:brightness=0.0") // Slight enhancement
|
|
||||||
chain = append(chain, "unsharp=3:3:0.5:3:3:0.5") // Light sharpening
|
|
||||||
chain = append(chain, "fftnorm=nor=0.1:Links=0") // Light noise
|
|
||||||
|
|
||||||
if state.filterTapeNoise > 0 {
|
|
||||||
// Magnetic tape noise simulation
|
|
||||||
noise := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterTapeNoise*0.15)
|
|
||||||
chain = append(chain, noise)
|
|
||||||
}
|
|
||||||
|
|
||||||
case "VHS":
|
|
||||||
// General VHS characteristics across decades
|
|
||||||
// - Resolution: ~240-320 lines horizontal
|
|
||||||
// - Chroma subsampling issues
|
|
||||||
// - Tracking errors and dropouts
|
|
||||||
// - Scanline artifacts
|
|
||||||
chain = append(chain, "eq=contrast=1.08:saturation=1.15:brightness=0.03") // VHS color boost
|
|
||||||
chain = append(chain, "unsharp=4:4:0.4:4:4:0.4") // VHS softness
|
|
||||||
chain = append(chain, "fftnorm=nor=0.18:Links=0") // VHS noise floor
|
|
||||||
|
|
||||||
if state.filterColorBleeding {
|
|
||||||
// Classic VHS chroma bleeding
|
|
||||||
chain = append(chain, "format=yuv420p,scale=iw+4:ih+4:flags=neighbor,crop=iw:ih")
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterTrackingError > 0 {
|
|
||||||
// Simulate tracking errors (slight image shifts/stutters)
|
|
||||||
errorLevel := state.filterTrackingError * 2.0
|
|
||||||
wobble := fmt.Sprintf("crop='iw-mod(iw*%f/100,2)':'ih-mod(ih*%f/100,2)':%f:%f",
|
|
||||||
errorLevel, errorLevel/2, errorLevel/2, errorLevel/4)
|
|
||||||
chain = append(chain, wobble)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterDropout > 0 {
|
|
||||||
// Tape dropout effect (random horizontal lines)
|
|
||||||
dropoutLevel := int(state.filterDropout * 20) // 0-20 dropouts max
|
|
||||||
if dropoutLevel > 0 {
|
|
||||||
chain = append(chain, fmt.Sprintf("geq=lum=lum:cb=cb:cr=cr,sendcmd=f=%d:'drawbox w=iw h=2 y=%f:color=black@1:t=fill',drawbox w=iw h=2 y=%f:color=black@1:t=fill'",
|
|
||||||
dropoutLevel, 100.0, 200.0))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
case "Webcam":
|
|
||||||
// Early 2000s webcam characteristics
|
|
||||||
// - Low resolution (320x240, 640x480)
|
|
||||||
// - High compression artifacts
|
|
||||||
// - Poor low-light performance
|
|
||||||
// - Frame rate issues
|
|
||||||
chain = append(chain, "eq=contrast=1.15:saturation=0.9:brightness=-0.05") // Webcam contrast boost, desaturation
|
|
||||||
chain = append(chain, "scale=640:480:flags=neighbor") // Typical low resolution
|
|
||||||
chain = append(chain, "unsharp=2:2:0.8:2:2:0.8") // Over-sharpened (common in webcams)
|
|
||||||
chain = append(chain, "fftnorm=nor=0.25:Links=0") // High compression noise
|
|
||||||
|
|
||||||
if state.filterChromaNoise > 0 {
|
|
||||||
// Webcam compression artifacts
|
|
||||||
noise := fmt.Sprintf("fftnorm=nor=%.2f:Links=0", state.filterChromaNoise*0.4)
|
|
||||||
chain = append(chain, noise)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add scanlines if enabled (across all modes)
|
|
||||||
if state.filterScanlines {
|
|
||||||
// CRT scanline simulation
|
|
||||||
scanlineFilter := "format=yuv420p,scale=ih*2/3:ih:flags=neighbor,setsar=1,scale=ih*3/2:ih"
|
|
||||||
chain = append(chain, scanlineFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add interlacing if specified
|
|
||||||
switch state.filterInterlacing {
|
|
||||||
case "Interlaced":
|
|
||||||
// Add interlacing artifacts
|
|
||||||
chain = append(chain, "interlace=scan=tff:lowpass=1")
|
|
||||||
case "Progressive":
|
|
||||||
// Ensure progressive output
|
|
||||||
chain = append(chain, "yadif=0:-1:0")
|
|
||||||
}
|
|
||||||
|
|
||||||
return chain
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildFiltersView(state *appState) fyne.CanvasObject {
|
|
||||||
filtersColor := moduleColor("filters")
|
|
||||||
|
|
||||||
// Back button
|
|
||||||
backBtn := widget.NewButton("< FILTERS", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
// Queue button
|
|
||||||
queueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
state.queueBtn = queueBtn
|
|
||||||
state.updateQueueButtonLabel()
|
|
||||||
|
|
||||||
clearCompletedBtn := widget.NewButton("⌫", func() {
|
|
||||||
state.clearCompletedJobs()
|
|
||||||
})
|
|
||||||
clearCompletedBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
// Top bar with module color
|
|
||||||
topBar := ui.TintedBar(filtersColor, container.NewHBox(backBtn, layout.NewSpacer(), clearCompletedBtn, queueBtn))
|
|
||||||
bottomBar := moduleFooter(filtersColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
// Instructions
|
|
||||||
instructions := widget.NewLabel("Apply filters and color corrections to your video. Preview changes in real-time.")
|
|
||||||
instructions.Wrapping = fyne.TextWrapWord
|
|
||||||
instructions.Alignment = fyne.TextAlignCenter
|
|
||||||
|
|
||||||
// Initialize state defaults
|
|
||||||
if state.filterBrightness == 0 && state.filterContrast == 0 && state.filterSaturation == 0 {
|
|
||||||
state.filterBrightness = 0.0 // -1.0 to 1.0
|
|
||||||
state.filterContrast = 1.0 // 0.0 to 3.0
|
|
||||||
state.filterSaturation = 1.0 // 0.0 to 3.0
|
|
||||||
state.filterSharpness = 0.0 // 0.0 to 5.0
|
|
||||||
state.filterDenoise = 0.0 // 0.0 to 10.0
|
|
||||||
}
|
|
||||||
if state.filterInterpPreset == "" {
|
|
||||||
state.filterInterpPreset = "Balanced"
|
|
||||||
}
|
|
||||||
if state.filterInterpFPS == "" {
|
|
||||||
state.filterInterpFPS = "60"
|
|
||||||
}
|
|
||||||
|
|
||||||
buildFilterChain := func() {
|
|
||||||
var chain []string
|
|
||||||
|
|
||||||
// Add basic color correction/enhancement first
|
|
||||||
if state.filterBrightness != 0 || state.filterContrast != 1.0 || state.filterSaturation != 1.0 {
|
|
||||||
eqFilter := fmt.Sprintf("eq=brightness=%.2f:contrast=%.2f:saturation=%.2f",
|
|
||||||
state.filterBrightness, state.filterContrast, state.filterSaturation)
|
|
||||||
chain = append(chain, eqFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterSharpness != 0.5 {
|
|
||||||
sharpenFilter := fmt.Sprintf("unsharp=5:5:%.1f:5:5:%.1f", state.filterSharpness, state.filterSharpness)
|
|
||||||
chain = append(chain, sharpenFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterDenoise != 0 {
|
|
||||||
denoiseFilter := fmt.Sprintf("hqdn3d=%.1f:%.1f:%.1f:%.1f",
|
|
||||||
state.filterDenoise, state.filterDenoise, state.filterDenoise, state.filterDenoise)
|
|
||||||
chain = append(chain, denoiseFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterGrayscale {
|
|
||||||
chain = append(chain, "colorchannelmixer=.299:.587:.114:0:.299:.587:.114:0:.299:.587:.114")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add stylistic effects after basic corrections
|
|
||||||
if state.filterStylisticMode != "None" && state.filterStylisticMode != "" {
|
|
||||||
stylisticChain := buildStylisticFilterChain(state)
|
|
||||||
chain = append(chain, stylisticChain...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add geometric transforms
|
|
||||||
if state.filterFlipH || state.filterFlipV {
|
|
||||||
var transform string
|
|
||||||
if state.filterFlipH && state.filterFlipV {
|
|
||||||
transform = "hflip,vflip"
|
|
||||||
} else if state.filterFlipH {
|
|
||||||
transform = "hflip"
|
|
||||||
} else {
|
|
||||||
transform = "vflip"
|
|
||||||
}
|
|
||||||
chain = append(chain, transform)
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.filterRotation != 0 {
|
|
||||||
rotateFilter := fmt.Sprintf("rotate=%d*PI/180", state.filterRotation)
|
|
||||||
chain = append(chain, rotateFilter)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add frame interpolation last
|
|
||||||
if state.filterInterpEnabled {
|
|
||||||
fps := state.filterInterpFPS
|
|
||||||
if fps == "" {
|
|
||||||
fps = "60"
|
|
||||||
}
|
|
||||||
var filter string
|
|
||||||
switch state.filterInterpPreset {
|
|
||||||
case "Ultra Fast":
|
|
||||||
filter = fmt.Sprintf("minterpolate=fps=%s:mi_mode=blend", fps)
|
|
||||||
case "Fast":
|
|
||||||
filter = fmt.Sprintf("minterpolate=fps=%s:mi_mode=duplicate", fps)
|
|
||||||
case "High Quality":
|
|
||||||
filter = fmt.Sprintf("minterpolate=fps=%s:mi_mode=mci:mc_mode=aobmc:me_mode=bidir:vsbmc=1:search_param=32", fps)
|
|
||||||
case "Maximum Quality":
|
|
||||||
filter = fmt.Sprintf("minterpolate=fps=%s:mi_mode=mci:mc_mode=aobmc:me_mode=bidir:vsbmc=1:search_param=64", fps)
|
|
||||||
default: // Balanced
|
|
||||||
filter = fmt.Sprintf("minterpolate=fps=%s:mi_mode=mci:mc_mode=obmc:me_mode=bidir:me=epzs:search_param=16:vsbmc=0", fps)
|
|
||||||
}
|
|
||||||
chain = append(chain, filter)
|
|
||||||
}
|
|
||||||
|
|
||||||
state.filterActiveChain = chain
|
|
||||||
}
|
|
||||||
|
|
||||||
// File label
|
|
||||||
fileLabel := widget.NewLabel("No file loaded")
|
|
||||||
fileLabel.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
|
|
||||||
var videoContainer fyne.CanvasObject
|
|
||||||
if state.filtersFile != nil {
|
|
||||||
fileLabel.SetText(fmt.Sprintf("File: %s", filepath.Base(state.filtersFile.Path)))
|
|
||||||
videoContainer = buildVideoPane(state, fyne.NewSize(480, 270), state.filtersFile, nil)
|
|
||||||
} else {
|
|
||||||
videoContainer = container.NewCenter(widget.NewLabel("No video loaded"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load button
|
|
||||||
loadBtn := widget.NewButton("Load Video", func() {
|
|
||||||
dialog.ShowFileOpen(func(reader fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || reader == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer reader.Close()
|
|
||||||
|
|
||||||
path := reader.URI().Path()
|
|
||||||
go func() {
|
|
||||||
src, err := probeVideo(path)
|
|
||||||
if err != nil {
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
dialog.ShowError(err, state.window)
|
|
||||||
}, false)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
state.filtersFile = src
|
|
||||||
state.showFiltersView()
|
|
||||||
}, false)
|
|
||||||
}()
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
loadBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
// Navigation to Upscale module
|
|
||||||
upscaleNavBtn := widget.NewButton("Send to Upscale →", func() {
|
|
||||||
if state.filtersFile != nil {
|
|
||||||
state.upscaleFile = state.filtersFile
|
|
||||||
buildFilterChain()
|
|
||||||
state.upscaleFilterChain = append([]string{}, state.filterActiveChain...)
|
|
||||||
}
|
|
||||||
state.showUpscaleView()
|
|
||||||
})
|
|
||||||
|
|
||||||
// Color Correction Section
|
|
||||||
brightnessSlider := widget.NewSlider(-1.0, 1.0)
|
|
||||||
brightnessSlider.SetValue(state.filterBrightness)
|
|
||||||
brightnessSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterBrightness = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
contrastSlider := widget.NewSlider(0.0, 3.0)
|
|
||||||
contrastSlider.SetValue(state.filterContrast)
|
|
||||||
contrastSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterContrast = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
saturationSlider := widget.NewSlider(0.0, 3.0)
|
|
||||||
saturationSlider.SetValue(state.filterSaturation)
|
|
||||||
saturationSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterSaturation = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
colorSection := widget.NewCard("Color Correction", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Adjust brightness, contrast, and saturation"),
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Brightness:"),
|
|
||||||
brightnessSlider,
|
|
||||||
widget.NewLabel("Contrast:"),
|
|
||||||
contrastSlider,
|
|
||||||
widget.NewLabel("Saturation:"),
|
|
||||||
saturationSlider,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Enhancement Section
|
|
||||||
sharpnessSlider := widget.NewSlider(0.0, 5.0)
|
|
||||||
sharpnessSlider.SetValue(state.filterSharpness)
|
|
||||||
sharpnessSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterSharpness = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
denoiseSlider := widget.NewSlider(0.0, 10.0)
|
|
||||||
denoiseSlider.SetValue(state.filterDenoise)
|
|
||||||
denoiseSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterDenoise = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
enhanceSection := widget.NewCard("Enhancement", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Sharpen, blur, and denoise"),
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Sharpness:"),
|
|
||||||
sharpnessSlider,
|
|
||||||
widget.NewLabel("Denoise:"),
|
|
||||||
denoiseSlider,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Transform Section
|
|
||||||
rotationSelect := widget.NewSelect([]string{"0°", "90°", "180°", "270°"}, func(s string) {
|
|
||||||
switch s {
|
|
||||||
case "90°":
|
|
||||||
state.filterRotation = 90
|
|
||||||
case "180°":
|
|
||||||
state.filterRotation = 180
|
|
||||||
case "270°":
|
|
||||||
state.filterRotation = 270
|
|
||||||
default:
|
|
||||||
state.filterRotation = 0
|
|
||||||
}
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
|
|
||||||
var rotationStr string
|
|
||||||
switch state.filterRotation {
|
|
||||||
case 90:
|
|
||||||
rotationStr = "90°"
|
|
||||||
case 180:
|
|
||||||
rotationStr = "180°"
|
|
||||||
case 270:
|
|
||||||
rotationStr = "270°"
|
|
||||||
default:
|
|
||||||
rotationStr = "0°"
|
|
||||||
}
|
|
||||||
rotationSelect.SetSelected(rotationStr)
|
|
||||||
|
|
||||||
flipHCheck := widget.NewCheck("", func(b bool) {
|
|
||||||
state.filterFlipH = b
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
flipHCheck.SetChecked(state.filterFlipH)
|
|
||||||
|
|
||||||
flipVCheck := widget.NewCheck("", func(b bool) {
|
|
||||||
state.filterFlipV = b
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
flipVCheck.SetChecked(state.filterFlipV)
|
|
||||||
|
|
||||||
transformSection := widget.NewCard("Transform", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Rotate and flip video"),
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Rotation:"),
|
|
||||||
rotationSelect,
|
|
||||||
widget.NewLabel("Flip Horizontal:"),
|
|
||||||
flipHCheck,
|
|
||||||
widget.NewLabel("Flip Vertical:"),
|
|
||||||
flipVCheck,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Creative Effects Section
|
|
||||||
grayscaleCheck := widget.NewCheck("Grayscale", func(b bool) {
|
|
||||||
state.filterGrayscale = b
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
grayscaleCheck.SetChecked(state.filterGrayscale)
|
|
||||||
|
|
||||||
creativeSection := widget.NewCard("Creative Effects", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Apply artistic effects"),
|
|
||||||
grayscaleCheck,
|
|
||||||
))
|
|
||||||
|
|
||||||
// Stylistic Effects Section
|
|
||||||
stylisticModeSelect := widget.NewSelect([]string{"None", "8mm Film", "16mm Film", "B&W Film", "Silent Film", "70s", "80s", "90s", "VHS", "Webcam"}, func(s string) {
|
|
||||||
state.filterStylisticMode = s
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
stylisticModeSelect.SetSelected(state.filterStylisticMode)
|
|
||||||
|
|
||||||
scanlinesCheck := widget.NewCheck("CRT Scanlines", func(b bool) {
|
|
||||||
state.filterScanlines = b
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
scanlinesCheck.SetChecked(state.filterScanlines)
|
|
||||||
|
|
||||||
chromaNoiseSlider := widget.NewSlider(0.0, 1.0)
|
|
||||||
chromaNoiseSlider.SetValue(state.filterChromaNoise)
|
|
||||||
chromaNoiseSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterChromaNoise = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
colorBleedingCheck := widget.NewCheck("Color Bleeding", func(b bool) {
|
|
||||||
state.filterColorBleeding = b
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
colorBleedingCheck.SetChecked(state.filterColorBleeding)
|
|
||||||
|
|
||||||
tapeNoiseSlider := widget.NewSlider(0.0, 1.0)
|
|
||||||
tapeNoiseSlider.SetValue(state.filterTapeNoise)
|
|
||||||
tapeNoiseSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterTapeNoise = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
trackingErrorSlider := widget.NewSlider(0.0, 1.0)
|
|
||||||
trackingErrorSlider.SetValue(state.filterTrackingError)
|
|
||||||
trackingErrorSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterTrackingError = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
dropoutSlider := widget.NewSlider(0.0, 1.0)
|
|
||||||
dropoutSlider.SetValue(state.filterDropout)
|
|
||||||
dropoutSlider.OnChanged = func(f float64) {
|
|
||||||
state.filterDropout = f
|
|
||||||
buildFilterChain()
|
|
||||||
}
|
|
||||||
|
|
||||||
interlacingSelect := widget.NewSelect([]string{"None", "Progressive", "Interlaced"}, func(s string) {
|
|
||||||
state.filterInterlacing = s
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
interlacingSelect.SetSelected(state.filterInterlacing)
|
|
||||||
|
|
||||||
stylisticSection := widget.NewCard("Stylistic Effects", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Authentic decade-based video effects"),
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Era Mode:"),
|
|
||||||
stylisticModeSelect,
|
|
||||||
widget.NewLabel("Interlacing:"),
|
|
||||||
interlacingSelect,
|
|
||||||
),
|
|
||||||
scanlinesCheck,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Chroma Noise:"),
|
|
||||||
chromaNoiseSlider,
|
|
||||||
widget.NewLabel("Tape Noise:"),
|
|
||||||
tapeNoiseSlider,
|
|
||||||
widget.NewLabel("Tracking Error:"),
|
|
||||||
trackingErrorSlider,
|
|
||||||
widget.NewLabel("Tape Dropout:"),
|
|
||||||
dropoutSlider,
|
|
||||||
),
|
|
||||||
colorBleedingCheck,
|
|
||||||
))
|
|
||||||
|
|
||||||
// Frame Interpolation Section
|
|
||||||
interpEnabledCheck := widget.NewCheck("Enable Frame Interpolation", func(checked bool) {
|
|
||||||
state.filterInterpEnabled = checked
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
interpEnabledCheck.SetChecked(state.filterInterpEnabled)
|
|
||||||
|
|
||||||
interpPresetSelect := widget.NewSelect([]string{"Ultra Fast", "Fast", "Balanced", "High Quality", "Maximum Quality"}, func(val string) {
|
|
||||||
state.filterInterpPreset = val
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
interpPresetSelect.SetSelected(state.filterInterpPreset)
|
|
||||||
|
|
||||||
interpFPSSelect := widget.NewSelect([]string{"24", "30", "50", "59.94", "60"}, func(val string) {
|
|
||||||
state.filterInterpFPS = val
|
|
||||||
buildFilterChain()
|
|
||||||
})
|
|
||||||
interpFPSSelect.SetSelected(state.filterInterpFPS)
|
|
||||||
|
|
||||||
interpHint := widget.NewLabel("Balanced preset is recommended; higher presets are CPU-intensive.")
|
|
||||||
interpHint.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
interpHint.Wrapping = fyne.TextWrapWord
|
|
||||||
|
|
||||||
interpSection := widget.NewCard("Frame Interpolation (Minterpolate)", "", container.NewVBox(
|
|
||||||
widget.NewLabel("Generate smoother motion by interpolating new frames"),
|
|
||||||
interpEnabledCheck,
|
|
||||||
container.NewGridWithColumns(2,
|
|
||||||
widget.NewLabel("Preset:"),
|
|
||||||
interpPresetSelect,
|
|
||||||
widget.NewLabel("Target FPS:"),
|
|
||||||
interpFPSSelect,
|
|
||||||
),
|
|
||||||
interpHint,
|
|
||||||
))
|
|
||||||
buildFilterChain()
|
|
||||||
|
|
||||||
// Apply button
|
|
||||||
applyBtn := widget.NewButton("Apply Filters", func() {
|
|
||||||
if state.filtersFile == nil {
|
|
||||||
dialog.ShowInformation("No Video", "Please load a video first.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
buildFilterChain()
|
|
||||||
dialog.ShowInformation("Filters", "Filters are now configured and will be applied when sent to Upscale.", state.window)
|
|
||||||
})
|
|
||||||
applyBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
// Main content
|
|
||||||
leftPanel := container.NewVBox(
|
|
||||||
instructions,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
fileLabel,
|
|
||||||
loadBtn,
|
|
||||||
upscaleNavBtn,
|
|
||||||
)
|
|
||||||
|
|
||||||
settingsPanel := container.NewVBox(
|
|
||||||
colorSection,
|
|
||||||
enhanceSection,
|
|
||||||
transformSection,
|
|
||||||
interpSection,
|
|
||||||
creativeSection,
|
|
||||||
stylisticSection,
|
|
||||||
applyBtn,
|
|
||||||
)
|
|
||||||
|
|
||||||
settingsScroll := container.NewVScroll(settingsPanel)
|
|
||||||
// Adaptive height for small screens - allow content to flow
|
|
||||||
// settingsScroll.SetMinSize(fyne.NewSize(350, 400)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
mainContent := container.New(&fixedHSplitLayout{ratio: 0.6},
|
|
||||||
container.NewVBox(leftPanel, container.NewCenter(videoContainer)),
|
|
||||||
settingsScroll,
|
|
||||||
)
|
|
||||||
|
|
||||||
content := container.NewPadded(mainContent)
|
|
||||||
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, content)
|
|
||||||
}
|
|
||||||
|
|
@ -1,298 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/interlace"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s *appState) showInspectView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "inspect"
|
|
||||||
s.setContent(buildInspectView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
// buildInspectView creates the UI for inspecting a single video with player
|
|
||||||
func buildInspectView(state *appState) fyne.CanvasObject {
|
|
||||||
inspectColor := moduleColor("inspect")
|
|
||||||
|
|
||||||
// Back button
|
|
||||||
backBtn := widget.NewButton("< INSPECT", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
// Top bar with module color
|
|
||||||
queueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
state.queueBtn = queueBtn
|
|
||||||
state.updateQueueButtonLabel()
|
|
||||||
|
|
||||||
clearCompletedBtn := widget.NewButton("⌫", func() {
|
|
||||||
state.clearCompletedJobs()
|
|
||||||
})
|
|
||||||
clearCompletedBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
topBar := ui.TintedBar(inspectColor, container.NewHBox(backBtn, layout.NewSpacer(), clearCompletedBtn, queueBtn))
|
|
||||||
bottomBar := moduleFooter(inspectColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
// Instructions
|
|
||||||
instructions := widget.NewLabel("Load a video to inspect its properties and preview playback. Drag a video here or use the button below.")
|
|
||||||
instructions.Wrapping = fyne.TextWrapWord
|
|
||||||
instructions.Alignment = fyne.TextAlignCenter
|
|
||||||
|
|
||||||
// Clear button
|
|
||||||
clearBtn := widget.NewButton("Clear", func() {
|
|
||||||
state.inspectFile = nil
|
|
||||||
state.showInspectView()
|
|
||||||
})
|
|
||||||
clearBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
instructionsRow := container.NewBorder(nil, nil, nil, nil, instructions)
|
|
||||||
|
|
||||||
// File label
|
|
||||||
fileLabel := widget.NewLabel("No file loaded")
|
|
||||||
fileLabel.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
|
|
||||||
// Metadata text
|
|
||||||
metadataText := widget.NewLabel("No file loaded")
|
|
||||||
metadataText.Wrapping = fyne.TextWrapWord
|
|
||||||
|
|
||||||
// Metadata scroll
|
|
||||||
metadataScroll := container.NewScroll(metadataText)
|
|
||||||
// metadataScroll.SetMinSize(fyne.NewSize(400, 200)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
// Helper function to format metadata
|
|
||||||
formatMetadata := func(src *videoSource) string {
|
|
||||||
fileSize := "Unknown"
|
|
||||||
if fi, err := os.Stat(src.Path); err == nil {
|
|
||||||
fileSize = utils.FormatBytes(fi.Size())
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata := fmt.Sprintf(
|
|
||||||
"━━━ FILE INFO ━━━\n"+
|
|
||||||
"Path: %s\n"+
|
|
||||||
"File Size: %s\n"+
|
|
||||||
"Format Family: %s\n"+
|
|
||||||
"\n━━━ VIDEO ━━━\n"+
|
|
||||||
"Codec: %s\n"+
|
|
||||||
"Resolution: %dx%d\n"+
|
|
||||||
"Aspect Ratio: %s\n"+
|
|
||||||
"Frame Rate: %.2f fps\n"+
|
|
||||||
"Bitrate: %s\n"+
|
|
||||||
"Pixel Format: %s\n"+
|
|
||||||
"Color Space: %s\n"+
|
|
||||||
"Color Range: %s\n"+
|
|
||||||
"Field Order: %s\n"+
|
|
||||||
"GOP Size: %d\n"+
|
|
||||||
"\n━━━ AUDIO ━━━\n"+
|
|
||||||
"Codec: %s\n"+
|
|
||||||
"Bitrate: %s\n"+
|
|
||||||
"Sample Rate: %d Hz\n"+
|
|
||||||
"Channels: %d\n"+
|
|
||||||
"\n━━━ OTHER ━━━\n"+
|
|
||||||
"Duration: %s\n"+
|
|
||||||
"SAR (Pixel Aspect): %s\n"+
|
|
||||||
"Chapters: %v\n"+
|
|
||||||
"Metadata: %v",
|
|
||||||
filepath.Base(src.Path),
|
|
||||||
fileSize,
|
|
||||||
src.Format,
|
|
||||||
src.VideoCodec,
|
|
||||||
src.Width, src.Height,
|
|
||||||
src.AspectRatioString(),
|
|
||||||
src.FrameRate,
|
|
||||||
formatBitrateFull(src.Bitrate),
|
|
||||||
src.PixelFormat,
|
|
||||||
src.ColorSpace,
|
|
||||||
src.ColorRange,
|
|
||||||
src.FieldOrder,
|
|
||||||
src.GOPSize,
|
|
||||||
src.AudioCodec,
|
|
||||||
formatBitrateFull(src.AudioBitrate),
|
|
||||||
src.AudioRate,
|
|
||||||
src.Channels,
|
|
||||||
src.DurationString(),
|
|
||||||
src.SampleAspectRatio,
|
|
||||||
src.HasChapters,
|
|
||||||
src.HasMetadata,
|
|
||||||
)
|
|
||||||
|
|
||||||
// Add interlacing detection results if available
|
|
||||||
if state.inspectInterlaceAnalyzing {
|
|
||||||
metadata += "\n\n━━━ INTERLACING DETECTION ━━━\n"
|
|
||||||
metadata += "Analyzing... (first 500 frames)"
|
|
||||||
} else if state.inspectInterlaceResult != nil {
|
|
||||||
result := state.inspectInterlaceResult
|
|
||||||
metadata += "\n\n━━━ INTERLACING DETECTION ━━━\n"
|
|
||||||
metadata += fmt.Sprintf("Status: %s\n", result.Status)
|
|
||||||
metadata += fmt.Sprintf("Interlaced Frames: %.1f%%\n", result.InterlacedPercent)
|
|
||||||
metadata += fmt.Sprintf("Field Order: %s\n", result.FieldOrder)
|
|
||||||
metadata += fmt.Sprintf("Confidence: %s\n", result.Confidence)
|
|
||||||
metadata += fmt.Sprintf("Recommendation: %s\n", result.Recommendation)
|
|
||||||
metadata += fmt.Sprintf("\nFrame Counts:\n")
|
|
||||||
metadata += fmt.Sprintf(" Progressive: %d\n", result.Progressive)
|
|
||||||
metadata += fmt.Sprintf(" Top Field First: %d\n", result.TFF)
|
|
||||||
metadata += fmt.Sprintf(" Bottom Field First: %d\n", result.BFF)
|
|
||||||
metadata += fmt.Sprintf(" Undetermined: %d\n", result.Undetermined)
|
|
||||||
metadata += fmt.Sprintf(" Total Analyzed: %d", result.TotalFrames)
|
|
||||||
}
|
|
||||||
|
|
||||||
return metadata
|
|
||||||
}
|
|
||||||
|
|
||||||
// Video player container
|
|
||||||
var videoContainer fyne.CanvasObject = container.NewCenter(widget.NewLabel("No video loaded"))
|
|
||||||
|
|
||||||
// Update display function
|
|
||||||
updateDisplay := func() {
|
|
||||||
if state.inspectFile != nil {
|
|
||||||
filename := filepath.Base(state.inspectFile.Path)
|
|
||||||
// Truncate if too long
|
|
||||||
if len(filename) > 50 {
|
|
||||||
ext := filepath.Ext(filename)
|
|
||||||
nameWithoutExt := strings.TrimSuffix(filename, ext)
|
|
||||||
if len(ext) > 10 {
|
|
||||||
filename = filename[:47] + "..."
|
|
||||||
} else {
|
|
||||||
availableLen := 47 - len(ext)
|
|
||||||
if availableLen < 1 {
|
|
||||||
filename = filename[:47] + "..."
|
|
||||||
} else {
|
|
||||||
filename = nameWithoutExt[:availableLen] + "..." + ext
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fileLabel.SetText(fmt.Sprintf("File: %s", filename))
|
|
||||||
metadataText.SetText(formatMetadata(state.inspectFile))
|
|
||||||
|
|
||||||
// Build video player
|
|
||||||
videoContainer = buildVideoPane(state, fyne.NewSize(480, 270), state.inspectFile, nil)
|
|
||||||
} else {
|
|
||||||
fileLabel.SetText("No file loaded")
|
|
||||||
metadataText.SetText("No file loaded")
|
|
||||||
videoContainer = container.NewCenter(widget.NewLabel("No video loaded"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize display
|
|
||||||
updateDisplay()
|
|
||||||
|
|
||||||
// Load button
|
|
||||||
loadBtn := widget.NewButton("Load Video", func() {
|
|
||||||
dialog.ShowFileOpen(func(reader fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || reader == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
path := reader.URI().Path()
|
|
||||||
reader.Close()
|
|
||||||
|
|
||||||
src, err := probeVideo(path)
|
|
||||||
if err != nil {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to load video: %w", err), state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
state.inspectFile = src
|
|
||||||
state.inspectInterlaceResult = nil
|
|
||||||
state.inspectInterlaceAnalyzing = true
|
|
||||||
state.showInspectView()
|
|
||||||
logging.Debug(logging.CatModule, "loaded inspect file: %s", path)
|
|
||||||
|
|
||||||
// Auto-run interlacing detection in background
|
|
||||||
go func() {
|
|
||||||
detector := interlace.NewDetector(utils.GetFFmpegPath(), utils.GetFFprobePath())
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
result, err := detector.QuickAnalyze(ctx, path)
|
|
||||||
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
state.inspectInterlaceAnalyzing = false
|
|
||||||
if err != nil {
|
|
||||||
logging.Debug(logging.CatSystem, "auto interlacing analysis failed: %v", err)
|
|
||||||
state.inspectInterlaceResult = nil
|
|
||||||
} else {
|
|
||||||
state.inspectInterlaceResult = result
|
|
||||||
logging.Debug(logging.CatSystem, "auto interlacing analysis complete: %s", result.Status)
|
|
||||||
}
|
|
||||||
state.showInspectView() // Refresh to show results
|
|
||||||
}, false)
|
|
||||||
}()
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Copy metadata button
|
|
||||||
copyBtn := widget.NewButton("Copy Metadata", func() {
|
|
||||||
if state.inspectFile == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
metadata := formatMetadata(state.inspectFile)
|
|
||||||
state.window.Clipboard().SetContent(metadata)
|
|
||||||
dialog.ShowInformation("Copied", "Metadata copied to clipboard", state.window)
|
|
||||||
})
|
|
||||||
copyBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
logPath := ""
|
|
||||||
if state.inspectFile != nil {
|
|
||||||
base := strings.TrimSuffix(filepath.Base(state.inspectFile.Path), filepath.Ext(state.inspectFile.Path))
|
|
||||||
p := filepath.Join(getLogsDir(), base+conversionLogSuffix)
|
|
||||||
if _, err := os.Stat(p); err == nil {
|
|
||||||
logPath = p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
viewLogBtn := widget.NewButton("View Conversion Log", func() {
|
|
||||||
if logPath == "" {
|
|
||||||
dialog.ShowInformation("No Log", "No conversion log found for this file.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
state.openLogViewer("Conversion Log", logPath, false)
|
|
||||||
})
|
|
||||||
viewLogBtn.Importance = widget.LowImportance
|
|
||||||
if logPath == "" {
|
|
||||||
viewLogBtn.Disable()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Action buttons
|
|
||||||
actionButtons := container.NewHBox(loadBtn, copyBtn, viewLogBtn, clearBtn)
|
|
||||||
|
|
||||||
// Main layout: left side is video player, right side is metadata
|
|
||||||
leftColumn := container.NewBorder(
|
|
||||||
fileLabel,
|
|
||||||
nil, nil, nil,
|
|
||||||
videoContainer,
|
|
||||||
)
|
|
||||||
|
|
||||||
rightColumn := container.NewBorder(
|
|
||||||
widget.NewLabel("Metadata:"),
|
|
||||||
nil, nil, nil,
|
|
||||||
metadataScroll,
|
|
||||||
)
|
|
||||||
|
|
||||||
// Bottom bar with module color
|
|
||||||
bottomBar = moduleFooter(inspectColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
// Main content
|
|
||||||
content := container.NewBorder(
|
|
||||||
container.NewVBox(instructionsRow, actionButtons, widget.NewSeparator()),
|
|
||||||
nil, nil, nil,
|
|
||||||
container.NewGridWithColumns(2, leftColumn, rightColumn),
|
|
||||||
)
|
|
||||||
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, content)
|
|
||||||
}
|
|
||||||
187
install.sh
Executable file
187
install.sh
Executable file
|
|
@ -0,0 +1,187 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
BLUE='\033[0;34m'
|
||||||
|
CYAN='\033[0;36m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
|
# Spinner function
|
||||||
|
spinner() {
|
||||||
|
local pid=$1
|
||||||
|
local task=$2
|
||||||
|
local spin='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
|
||||||
|
local i=0
|
||||||
|
|
||||||
|
while kill -0 $pid 2>/dev/null; do
|
||||||
|
i=$(( (i+1) %10 ))
|
||||||
|
printf "\r${BLUE}${spin:$i:1}${NC} %s..." "$task"
|
||||||
|
sleep 0.1
|
||||||
|
done
|
||||||
|
printf "\r"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
BINARY_NAME="VideoTools"
|
||||||
|
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
DEFAULT_INSTALL_PATH="/usr/local/bin"
|
||||||
|
USER_INSTALL_PATH="$HOME/.local/bin"
|
||||||
|
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo " VideoTools Professional Installation"
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Step 1: Check if Go is installed
|
||||||
|
echo -e "${CYAN}[1/5]${NC} Checking Go installation..."
|
||||||
|
if ! command -v go &> /dev/null; then
|
||||||
|
echo -e "${RED}✗ Error: Go is not installed or not in PATH${NC}"
|
||||||
|
echo "Please install Go 1.21+ from https://go.dev/dl/"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
GO_VERSION=$(go version | awk '{print $3}' | sed 's/go//')
|
||||||
|
echo -e "${GREEN}✓${NC} Found Go version: $GO_VERSION"
|
||||||
|
|
||||||
|
# Step 2: Build the binary
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[2/5]${NC} Building VideoTools..."
|
||||||
|
cd "$PROJECT_ROOT"
|
||||||
|
CGO_ENABLED=1 go build -o "$BINARY_NAME" . > /tmp/videotools-build.log 2>&1 &
|
||||||
|
BUILD_PID=$!
|
||||||
|
spinner $BUILD_PID "Building $BINARY_NAME"
|
||||||
|
|
||||||
|
if wait $BUILD_PID; then
|
||||||
|
echo -e "${GREEN}✓${NC} Build successful"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Build failed${NC}"
|
||||||
|
echo ""
|
||||||
|
echo "Build log:"
|
||||||
|
cat /tmp/videotools-build.log
|
||||||
|
rm -f /tmp/videotools-build.log
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f /tmp/videotools-build.log
|
||||||
|
|
||||||
|
# Step 3: Determine installation path
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[3/5]${NC} Installation path selection"
|
||||||
|
echo ""
|
||||||
|
echo "Where would you like to install $BINARY_NAME?"
|
||||||
|
echo " 1) System-wide (/usr/local/bin) - requires sudo, available to all users"
|
||||||
|
echo " 2) User-local (~/.local/bin) - no sudo needed, available only to you"
|
||||||
|
echo ""
|
||||||
|
read -p "Enter choice [1 or 2, default 2]: " choice
|
||||||
|
choice=${choice:-2}
|
||||||
|
|
||||||
|
case $choice in
|
||||||
|
1)
|
||||||
|
INSTALL_PATH="$DEFAULT_INSTALL_PATH"
|
||||||
|
NEEDS_SUDO=true
|
||||||
|
;;
|
||||||
|
2)
|
||||||
|
INSTALL_PATH="$USER_INSTALL_PATH"
|
||||||
|
NEEDS_SUDO=false
|
||||||
|
mkdir -p "$INSTALL_PATH"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo -e "${RED}✗ Invalid choice. Exiting.${NC}"
|
||||||
|
rm -f "$BINARY_NAME"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Step 4: Install the binary
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[4/5]${NC} Installing binary to $INSTALL_PATH..."
|
||||||
|
if [ "$NEEDS_SUDO" = true ]; then
|
||||||
|
sudo install -m 755 "$BINARY_NAME" "$INSTALL_PATH/$BINARY_NAME" > /dev/null 2>&1 &
|
||||||
|
INSTALL_PID=$!
|
||||||
|
spinner $INSTALL_PID "Installing $BINARY_NAME"
|
||||||
|
|
||||||
|
if wait $INSTALL_PID; then
|
||||||
|
echo -e "${GREEN}✓${NC} Installation successful"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Installation failed${NC}"
|
||||||
|
rm -f "$BINARY_NAME"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
install -m 755 "$BINARY_NAME" "$INSTALL_PATH/$BINARY_NAME" > /dev/null 2>&1 &
|
||||||
|
INSTALL_PID=$!
|
||||||
|
spinner $INSTALL_PID "Installing $BINARY_NAME"
|
||||||
|
|
||||||
|
if wait $INSTALL_PID; then
|
||||||
|
echo -e "${GREEN}✓${NC} Installation successful"
|
||||||
|
else
|
||||||
|
echo -e "${RED}✗ Installation failed${NC}"
|
||||||
|
rm -f "$BINARY_NAME"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f "$BINARY_NAME"
|
||||||
|
|
||||||
|
# Step 5: Setup shell aliases and environment
|
||||||
|
echo ""
|
||||||
|
echo -e "${CYAN}[5/5]${NC} Setting up shell environment..."
|
||||||
|
|
||||||
|
# Detect shell
|
||||||
|
if [ -n "$ZSH_VERSION" ]; then
|
||||||
|
SHELL_RC="$HOME/.zshrc"
|
||||||
|
SHELL_NAME="zsh"
|
||||||
|
elif [ -n "$BASH_VERSION" ]; then
|
||||||
|
SHELL_RC="$HOME/.bashrc"
|
||||||
|
SHELL_NAME="bash"
|
||||||
|
else
|
||||||
|
# Default to bash
|
||||||
|
SHELL_RC="$HOME/.bashrc"
|
||||||
|
SHELL_NAME="bash"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create alias setup script
|
||||||
|
ALIAS_SCRIPT="$PROJECT_ROOT/scripts/alias.sh"
|
||||||
|
|
||||||
|
# Add installation path to PATH if needed
|
||||||
|
if [[ ":$PATH:" != *":$INSTALL_PATH:"* ]]; then
|
||||||
|
# Check if PATH export already exists
|
||||||
|
if ! grep -q "export PATH.*$INSTALL_PATH" "$SHELL_RC" 2>/dev/null; then
|
||||||
|
echo "" >> "$SHELL_RC"
|
||||||
|
echo "# VideoTools installation path" >> "$SHELL_RC"
|
||||||
|
echo "export PATH=\"$INSTALL_PATH:\$PATH\"" >> "$SHELL_RC"
|
||||||
|
echo -e "${GREEN}✓${NC} Added $INSTALL_PATH to PATH in $SHELL_RC"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Add alias sourcing if not already present
|
||||||
|
if ! grep -q "source.*alias.sh" "$SHELL_RC" 2>/dev/null; then
|
||||||
|
echo "" >> "$SHELL_RC"
|
||||||
|
echo "# VideoTools convenience aliases" >> "$SHELL_RC"
|
||||||
|
echo "source \"$ALIAS_SCRIPT\"" >> "$SHELL_RC"
|
||||||
|
echo -e "${GREEN}✓${NC} Added VideoTools aliases to $SHELL_RC"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo -e "${GREEN}Installation Complete!${NC}"
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo ""
|
||||||
|
echo "Next steps:"
|
||||||
|
echo ""
|
||||||
|
echo "1. ${CYAN}Reload your shell configuration:${NC}"
|
||||||
|
echo " source $SHELL_RC"
|
||||||
|
echo ""
|
||||||
|
echo "2. ${CYAN}Run VideoTools:${NC}"
|
||||||
|
echo " VideoTools"
|
||||||
|
echo ""
|
||||||
|
echo "3. ${CYAN}Available commands:${NC}"
|
||||||
|
echo " • VideoTools - Run the application"
|
||||||
|
echo " • VideoToolsRebuild - Force rebuild from source"
|
||||||
|
echo " • VideoToolsClean - Clean build artifacts and cache"
|
||||||
|
echo ""
|
||||||
|
echo "For more information, see BUILD_AND_RUN.md and DVD_USER_GUIDE.md"
|
||||||
|
echo ""
|
||||||
|
|
@ -20,11 +20,11 @@ func NewDVDConfig() *DVDConvertConfig {
|
||||||
func (d *DVDConvertConfig) GetFFmpegArgs(inputPath, outputPath string, videoWidth, videoHeight int, videoFramerate float64, audioSampleRate int, isProgressive bool) []string {
|
func (d *DVDConvertConfig) GetFFmpegArgs(inputPath, outputPath string, videoWidth, videoHeight int, videoFramerate float64, audioSampleRate int, isProgressive bool) []string {
|
||||||
// Create a minimal videoSource for passing to BuildDVDFFmpegArgs
|
// Create a minimal videoSource for passing to BuildDVDFFmpegArgs
|
||||||
tempSrc := &convert.VideoSource{
|
tempSrc := &convert.VideoSource{
|
||||||
Width: videoWidth,
|
Width: videoWidth,
|
||||||
Height: videoHeight,
|
Height: videoHeight,
|
||||||
FrameRate: videoFramerate,
|
FrameRate: videoFramerate,
|
||||||
AudioRate: audioSampleRate,
|
AudioRate: audioSampleRate,
|
||||||
FieldOrder: fieldOrderFromProgressive(isProgressive),
|
FieldOrder: fieldOrderFromProgressive(isProgressive),
|
||||||
}
|
}
|
||||||
|
|
||||||
return convert.BuildDVDFFmpegArgs(inputPath, outputPath, d.cfg, tempSrc)
|
return convert.BuildDVDFFmpegArgs(inputPath, outputPath, d.cfg, tempSrc)
|
||||||
|
|
@ -59,16 +59,16 @@ func fieldOrderFromProgressive(isProgressive bool) string {
|
||||||
|
|
||||||
// DVDPresetInfo provides information about DVD-NTSC capability
|
// DVDPresetInfo provides information about DVD-NTSC capability
|
||||||
type DVDPresetInfo struct {
|
type DVDPresetInfo struct {
|
||||||
Name string
|
Name string
|
||||||
Description string
|
Description string
|
||||||
VideoCodec string
|
VideoCodec string
|
||||||
AudioCodec string
|
AudioCodec string
|
||||||
Container string
|
Container string
|
||||||
Resolution string
|
Resolution string
|
||||||
FrameRate string
|
FrameRate string
|
||||||
DefaultBitrate string
|
DefaultBitrate string
|
||||||
MaxBitrate string
|
MaxBitrate string
|
||||||
Features []string
|
Features []string
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDVDPresetInfo returns detailed information about the DVD-NTSC preset
|
// GetDVDPresetInfo returns detailed information about the DVD-NTSC preset
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,9 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Result stores the outcome of a single encoder benchmark test
|
// Result stores the outcome of a single encoder benchmark test
|
||||||
|
|
@ -60,7 +59,7 @@ func (s *Suite) GenerateTestVideo(ctx context.Context, duration int) (string, er
|
||||||
testPath,
|
testPath,
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd := utils.CreateCommand(ctx, s.FFmpegPath, args...)
|
cmd := exec.CommandContext(ctx, s.FFmpegPath, args...)
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
return "", fmt.Errorf("failed to generate test video: %w", err)
|
return "", fmt.Errorf("failed to generate test video: %w", err)
|
||||||
}
|
}
|
||||||
|
|
@ -131,7 +130,7 @@ func (s *Suite) TestEncoder(ctx context.Context, encoder, preset string) Result
|
||||||
|
|
||||||
// Measure encoding time
|
// Measure encoding time
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
cmd := utils.CreateCommand(ctx, s.FFmpegPath, args...)
|
cmd := exec.CommandContext(ctx, s.FFmpegPath, args...)
|
||||||
|
|
||||||
if err := cmd.Run(); err != nil {
|
if err := cmd.Run(); err != nil {
|
||||||
result.Error = fmt.Sprintf("encoding failed: %v", err)
|
result.Error = fmt.Sprintf("encoding failed: %v", err)
|
||||||
|
|
|
||||||
|
|
@ -206,8 +206,8 @@ func normalizeFrameRate(rate float64) string {
|
||||||
}
|
}
|
||||||
// Check for common framerates with tolerance
|
// Check for common framerates with tolerance
|
||||||
checks := []struct {
|
checks := []struct {
|
||||||
name string
|
name string
|
||||||
min, max float64
|
min, max float64
|
||||||
}{
|
}{
|
||||||
{"23.976", 23.9, 24.0},
|
{"23.976", 23.9, 24.0},
|
||||||
{"24.0", 23.99, 24.01},
|
{"24.0", 23.99, 24.01},
|
||||||
|
|
|
||||||
|
|
@ -9,26 +9,26 @@ import (
|
||||||
type DVDRegion string
|
type DVDRegion string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
DVDNTSCRegionFree DVDRegion = "ntsc-region-free"
|
DVDNTSCRegionFree DVDRegion = "ntsc-region-free"
|
||||||
DVDPALRegionFree DVDRegion = "pal-region-free"
|
DVDPALRegionFree DVDRegion = "pal-region-free"
|
||||||
DVDSECAMRegionFree DVDRegion = "secam-region-free"
|
DVDSECAMRegionFree DVDRegion = "secam-region-free"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DVDStandard represents the technical specifications for a DVD encoding standard
|
// DVDStandard represents the technical specifications for a DVD encoding standard
|
||||||
type DVDStandard struct {
|
type DVDStandard struct {
|
||||||
Region DVDRegion
|
Region DVDRegion
|
||||||
Name string
|
Name string
|
||||||
Resolution string // "720x480" or "720x576"
|
Resolution string // "720x480" or "720x576"
|
||||||
FrameRate string // "29.97" or "25.00"
|
FrameRate string // "29.97" or "25.00"
|
||||||
VideoFrames int // 30 or 25
|
VideoFrames int // 30 or 25
|
||||||
AudioRate int // 48000 Hz (universal)
|
AudioRate int // 48000 Hz (universal)
|
||||||
Type string // "NTSC", "PAL", or "SECAM"
|
Type string // "NTSC", "PAL", or "SECAM"
|
||||||
Countries []string
|
Countries []string
|
||||||
DefaultBitrate string // "6000k" for NTSC, "8000k" for PAL
|
DefaultBitrate string // "6000k" for NTSC, "8000k" for PAL
|
||||||
MaxBitrate string // "9000k" for NTSC, "9500k" for PAL
|
MaxBitrate string // "9000k" for NTSC, "9500k" for PAL
|
||||||
AspectRatios []string
|
AspectRatios []string
|
||||||
InterlaceMode string // "interlaced" or "progressive"
|
InterlaceMode string // "interlaced" or "progressive"
|
||||||
Description string
|
Description string
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDVDStandard returns specifications for a given DVD region
|
// GetDVDStandard returns specifications for a given DVD region
|
||||||
|
|
|
||||||
|
|
@ -1,499 +0,0 @@
|
||||||
package enhancement
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"image"
|
|
||||||
"image/color"
|
|
||||||
"image/draw"
|
|
||||||
"math"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/player"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AIModel interface defines the contract for video enhancement models
|
|
||||||
type AIModel interface {
|
|
||||||
Name() string
|
|
||||||
Type() string // "basicvsr", "realesrgan", "rife", "realcugan"
|
|
||||||
Load() error
|
|
||||||
ProcessFrame(frame *image.RGBA) (*image.RGBA, error)
|
|
||||||
Close() error
|
|
||||||
}
|
|
||||||
|
|
||||||
// ContentAnalysis represents video content analysis results
|
|
||||||
type ContentAnalysis struct {
|
|
||||||
Type string // "general", "anime", "film", "interlaced", "adult"
|
|
||||||
Quality float64 // 0.0-1.0
|
|
||||||
Resolution int64
|
|
||||||
FrameRate float64
|
|
||||||
Artifacts []string // ["noise", "compression", "film_grain", "skin_tones"]
|
|
||||||
Confidence float64 // AI model confidence in analysis
|
|
||||||
SkinTones *SkinToneAnalysis // Detailed skin analysis
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnhancementConfig configures the enhancement process
|
|
||||||
type EnhancementConfig struct {
|
|
||||||
Model string // AI model name (auto, basicvsr, realesrgan, etc.)
|
|
||||||
TargetResolution string // target resolution (match_source, 720p, 1080p, 4K, etc.)
|
|
||||||
QualityPreset string // fast, balanced, high
|
|
||||||
ContentDetection bool // enable content-aware processing
|
|
||||||
GPUAcceleration bool // use GPU acceleration if available
|
|
||||||
TileSize int // tile size for memory-efficient processing
|
|
||||||
PreviewMode bool // enable real-time preview
|
|
||||||
PreserveSkinTones bool // preserve natural skin tones (red/pink) instead of washing out
|
|
||||||
SkinToneMode string // off, conservative, balanced, professional
|
|
||||||
AdultContent bool // enable adult content optimization
|
|
||||||
Parameters map[string]interface{} // model-specific parameters
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnhancementProgress tracks enhancement progress
|
|
||||||
type EnhancementProgress struct {
|
|
||||||
CurrentFrame int64
|
|
||||||
TotalFrames int64
|
|
||||||
PercentComplete float64
|
|
||||||
CurrentTask string
|
|
||||||
EstimatedTime time.Duration
|
|
||||||
PreviewImage *image.RGBA
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnhancementCallbacks for progress updates and UI integration
|
|
||||||
type EnhancementCallbacks struct {
|
|
||||||
OnProgress func(progress EnhancementProgress)
|
|
||||||
OnPreviewUpdate func(frame int64, img image.Image)
|
|
||||||
OnComplete func(success bool, message string)
|
|
||||||
OnError func(err error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnhancementModule provides unified video enhancement combining Filters + Upscale
|
|
||||||
// with content-aware processing and AI model management
|
|
||||||
type EnhancementModule struct {
|
|
||||||
player player.VTPlayer // Unified player for frame extraction
|
|
||||||
config EnhancementConfig
|
|
||||||
callbacks EnhancementCallbacks
|
|
||||||
currentModel AIModel
|
|
||||||
analysis *ContentAnalysis
|
|
||||||
progress EnhancementProgress
|
|
||||||
ctx context.Context
|
|
||||||
cancel context.CancelFunc
|
|
||||||
|
|
||||||
// Processing state
|
|
||||||
active bool
|
|
||||||
inputPath string
|
|
||||||
outputPath string
|
|
||||||
tempDir string
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEnhancementModule creates a new enhancement module instance
|
|
||||||
func NewEnhancementModule(player player.VTPlayer) *EnhancementModule {
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
|
|
||||||
return &EnhancementModule{
|
|
||||||
player: player,
|
|
||||||
config: EnhancementConfig{
|
|
||||||
Model: "auto",
|
|
||||||
TargetResolution: "match_source",
|
|
||||||
QualityPreset: "balanced",
|
|
||||||
ContentDetection: true,
|
|
||||||
GPUAcceleration: true,
|
|
||||||
TileSize: 512,
|
|
||||||
PreviewMode: false,
|
|
||||||
Parameters: make(map[string]interface{}),
|
|
||||||
},
|
|
||||||
callbacks: EnhancementCallbacks{},
|
|
||||||
ctx: ctx,
|
|
||||||
cancel: cancel,
|
|
||||||
progress: EnhancementProgress{},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AnalyzeContent performs intelligent content analysis using FFmpeg
|
|
||||||
func (m *EnhancementModule) AnalyzeContent(path string) (*ContentAnalysis, error) {
|
|
||||||
logging.Debug(logging.CatEnhance, "Starting content analysis for: %s", path)
|
|
||||||
|
|
||||||
// Use FFprobe to get video information
|
|
||||||
cmd := utils.CreateCommand(m.ctx, utils.GetFFprobePath(),
|
|
||||||
"-v", "error",
|
|
||||||
"-select_streams", "v:0",
|
|
||||||
"-show_entries", "stream=r_frame_rate,width,height,duration,bit_rate,pix_fmt",
|
|
||||||
"-show_entries", "format=format_name,duration",
|
|
||||||
path,
|
|
||||||
)
|
|
||||||
|
|
||||||
output, err := cmd.CombinedOutput()
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("content analysis failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse FFprobe output to extract video characteristics
|
|
||||||
contentAnalysis := &ContentAnalysis{
|
|
||||||
Type: m.detectContentType(path, output),
|
|
||||||
Quality: m.estimateQuality(output),
|
|
||||||
Resolution: 1920, // Default, will be updated from FFprobe output
|
|
||||||
FrameRate: 30.0, // Default, will be updated from FFprobe output
|
|
||||||
Artifacts: m.detectArtifacts(output),
|
|
||||||
Confidence: 0.8, // Default confidence
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Implement advanced skin tone analysis with melanin/hemoglobin detection
|
|
||||||
// For now, use default skin analysis
|
|
||||||
|
|
||||||
// Advanced skin analysis for Phase 2.5
|
|
||||||
advancedSkinAnalysis := m.analyzeSkinTonesAdvanced(output)
|
|
||||||
|
|
||||||
// Update content analysis with advanced skin tone information
|
|
||||||
contentAnalysis.SkinTones = advancedSkinAnalysis.DetectedSkinTones
|
|
||||||
contentAnalysis.SkinSaturation = advancedSkinAnalysis.SkinSaturation
|
|
||||||
contentAnalysis.SkinBrightness = advancedSkinAnalysis.SkinBrightness
|
|
||||||
contentAnalysis.SkinWarmth = advancedSkinAnalysis.SkinWarmth
|
|
||||||
contentAnalysis.SkinContrast = advancedSkinAnalysis.SkinContrast
|
|
||||||
contentAnalysis.DetectedHemoglobin = advancedSkinAnalysis.DetectedHemoglobin
|
|
||||||
contentAnalysis.IsAdultContent = advancedSkinAnalysis.IsAdultContent
|
|
||||||
contentAnalysis.RecommendedProfile = advancedSkinAnalysis.RecommendedProfile
|
|
||||||
|
|
||||||
logging.Debug(logging.CatEnhance, "Advanced skin analysis applied: %+v", advancedSkinAnalysis)
|
|
||||||
}
|
|
||||||
|
|
||||||
// analyzeSkinTonesAdvanced performs sophisticated skin analysis for Phase 2.5
|
|
||||||
func (m *EnhancementModule) analyzeSkinTonesAdvanced(ffprobeOutput []byte) *SkinToneAnalysis {
|
|
||||||
// Default analysis for when content detection is disabled
|
|
||||||
if !m.config.ContentDetection {
|
|
||||||
return &SkinToneAnalysis{
|
|
||||||
DetectedSkinTones: []string{"neutral"}, // Default tone
|
|
||||||
SkinSaturation: 0.5, // Average saturation
|
|
||||||
SkinBrightness: 0.5, // Average brightness
|
|
||||||
SkinWarmth: 0.0, // Neutral warmth
|
|
||||||
SkinContrast: 1.0, // Normal contrast
|
|
||||||
DetectedHemoglobin: []string{"unknown"}, // Would be analyzed from frames
|
|
||||||
IsAdultContent: false, // Default until frame analysis
|
|
||||||
RecommendedProfile: "balanced", // Default enhancement profile
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse FFprobe output for advanced skin analysis
|
|
||||||
lines := strings.Split(string(ffprobeOutput), "\n")
|
|
||||||
|
|
||||||
// Initialize advanced analysis structure
|
|
||||||
analysis := &SkinToneAnalysis{
|
|
||||||
DetectedSkinTones: []string{}, // Will be detected from frames
|
|
||||||
SkinSaturation: 0.5, // Average saturation
|
|
||||||
SkinBrightness: 0.5, // Average brightness
|
|
||||||
SkinWarmth: 0.0, // Neutral warmth
|
|
||||||
SkinContrast: 1.0, // Normal contrast
|
|
||||||
DetectedHemoglobin: []string{}, // Would be analyzed from frames
|
|
||||||
IsAdultContent: false, // Default until frame analysis
|
|
||||||
RecommendedProfile: "balanced", // Default enhancement profile
|
|
||||||
}
|
|
||||||
|
|
||||||
// Advanced frame-by-frame skin tone detection
|
|
||||||
frameCount := 0
|
|
||||||
skinToneHistogram := make(map[string]int) // [skin_tone]count
|
|
||||||
totalSaturation := 0.0
|
|
||||||
totalBrightness := 0.0
|
|
||||||
totalWarmth := 0.0
|
|
||||||
totalCoolness := 0.0
|
|
||||||
|
|
||||||
// For now, simulate frame-by-frame skin analysis
|
|
||||||
// In production, this would process actual video frames
|
|
||||||
// Here we detect dominant skin tones and distribution across frames
|
|
||||||
|
|
||||||
return analysis
|
|
||||||
}
|
|
||||||
skinAnalysis := &SkinToneAnalysis{
|
|
||||||
DetectedSkinTones: []string{"neutral"}, // Default tone
|
|
||||||
SkinSaturation: 0.5, // Average saturation
|
|
||||||
SkinBrightness: 0.5, // Average brightness
|
|
||||||
SkinWarmth: 0.0, // Neutral warmth
|
|
||||||
SkinContrast: 1.0, // Normal contrast
|
|
||||||
DetectedHemoglobin: []string{"unknown"}, // Would be analyzed from frames
|
|
||||||
IsAdultContent: false, // Default until frame analysis
|
|
||||||
RecommendedProfile: "balanced", // Default profile
|
|
||||||
}
|
|
||||||
// Set skin tone analysis
|
|
||||||
contentAnalysis.SkinTones = skinAnalysis
|
|
||||||
|
|
||||||
logging.Debug(logging.CatEnhance, "Content analysis complete: %+v", contentAnalysis)
|
|
||||||
return analysis, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// detectContentType determines if content is anime, film, or general
|
|
||||||
func (m *EnhancementModule) detectContentType(path string, ffprobeOutput []byte) string {
|
|
||||||
// Simple heuristic-based detection
|
|
||||||
pathLower := strings.ToLower(path)
|
|
||||||
|
|
||||||
if strings.Contains(pathLower, "anime") || strings.Contains(pathLower, "manga") {
|
|
||||||
return "anime"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Implement more sophisticated content detection
|
|
||||||
// Could use frame analysis, motion patterns, etc.
|
|
||||||
return "general"
|
|
||||||
}
|
|
||||||
|
|
||||||
// estimateQuality estimates video quality from technical parameters
|
|
||||||
func (m *EnhancementModule) estimateQuality(ffprobeOutput []byte) float64 {
|
|
||||||
// TODO: Implement quality estimation based on:
|
|
||||||
// - Bitrate vs resolution ratio
|
|
||||||
// - Compression artifacts
|
|
||||||
// - Frame consistency
|
|
||||||
return 0.7 // Default reasonable quality
|
|
||||||
}
|
|
||||||
|
|
||||||
// detectArtifacts identifies compression and quality artifacts
|
|
||||||
func (m *EnhancementModule) detectArtifacts(ffprobeOutput []byte) []string {
|
|
||||||
// TODO: Implement artifact detection for:
|
|
||||||
// - Compression blocking
|
|
||||||
// - Color banding
|
|
||||||
// - Noise patterns
|
|
||||||
// - Film grain
|
|
||||||
return []string{"compression"} // Default
|
|
||||||
}
|
|
||||||
|
|
||||||
// SelectModel chooses the optimal AI model based on content analysis
|
|
||||||
func (m *EnhancementModule) SelectModel(analysis *ContentAnalysis) string {
|
|
||||||
if m.config.Model != "auto" {
|
|
||||||
return m.config.Model
|
|
||||||
}
|
|
||||||
|
|
||||||
switch analysis.Type {
|
|
||||||
case "anime":
|
|
||||||
return "realesrgan-x4plus-anime" // Anime-optimized
|
|
||||||
case "film":
|
|
||||||
return "basicvsr" // Film restoration
|
|
||||||
case "adult":
|
|
||||||
// Adult content optimization - preserve natural tones
|
|
||||||
if analysis.SkinTones != nil {
|
|
||||||
switch m.config.SkinToneMode {
|
|
||||||
case "professional", "conservative":
|
|
||||||
return "realesrgan-x4plus-skin-preserve"
|
|
||||||
case "balanced":
|
|
||||||
return "realesrgan-x4plus-skin-enhance"
|
|
||||||
default:
|
|
||||||
return "realesrgan-x4plus-anime" // Fallback to anime model
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "realesrgan-x4plus-skin-preserve" // Default for adult content
|
|
||||||
default:
|
|
||||||
return "realesrgan-x4plus" // General purpose
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ProcessVideo processes video through the enhancement pipeline
|
|
||||||
func (m *EnhancementModule) ProcessVideo(inputPath, outputPath string) error {
|
|
||||||
logging.Debug(logging.CatEnhance, "Starting video enhancement: %s -> %s", inputPath, outputPath)
|
|
||||||
|
|
||||||
m.inputPath = inputPath
|
|
||||||
m.outputPath = outputPath
|
|
||||||
m.active = true
|
|
||||||
|
|
||||||
// Analyze content first
|
|
||||||
analysis, err := m.AnalyzeContent(inputPath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("content analysis failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.analysis = analysis
|
|
||||||
|
|
||||||
// Select appropriate model
|
|
||||||
modelName := m.SelectModel(analysis)
|
|
||||||
logging.Debug(logging.CatEnhance, "Selected model: %s for content type: %s", modelName, analysis.Type)
|
|
||||||
|
|
||||||
// Load the AI model
|
|
||||||
model, err := m.loadModel(modelName)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to load model %s: %w", modelName, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
m.currentModel = model
|
|
||||||
defer model.Close()
|
|
||||||
|
|
||||||
// Load video in unified player
|
|
||||||
err = m.player.Load(inputPath, 0)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to load video: %w", err)
|
|
||||||
}
|
|
||||||
defer m.player.Close()
|
|
||||||
|
|
||||||
// Get video info
|
|
||||||
videoInfo := m.player.GetVideoInfo()
|
|
||||||
m.progress.TotalFrames = videoInfo.FrameCount
|
|
||||||
m.progress.CurrentFrame = 0
|
|
||||||
m.progress.PercentComplete = 0.0
|
|
||||||
|
|
||||||
// Process frame by frame
|
|
||||||
for m.active && m.progress.CurrentFrame < m.progress.TotalFrames {
|
|
||||||
select {
|
|
||||||
case <-m.ctx.Done():
|
|
||||||
return fmt.Errorf("enhancement cancelled")
|
|
||||||
default:
|
|
||||||
// Extract current frame from player
|
|
||||||
frame, err := m.extractCurrentFrame()
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(logging.CatEnhance, "Frame extraction failed: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply AI enhancement to frame
|
|
||||||
enhancedFrame, err := m.currentModel.ProcessFrame(frame)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(logging.CatEnhance, "Frame enhancement failed: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update progress
|
|
||||||
m.progress.CurrentFrame++
|
|
||||||
m.progress.PercentComplete = float64(m.progress.CurrentFrame) / float64(m.progress.TotalFrames)
|
|
||||||
m.progress.CurrentTask = fmt.Sprintf("Processing frame %d/%d", m.progress.CurrentFrame, m.progress.TotalFrames)
|
|
||||||
|
|
||||||
// Send preview update if enabled
|
|
||||||
if m.config.PreviewMode && m.callbacks.OnPreviewUpdate != nil {
|
|
||||||
m.callbacks.OnPreviewUpdate(m.progress.CurrentFrame, enhancedFrame)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send progress update
|
|
||||||
if m.callbacks.OnProgress != nil {
|
|
||||||
m.callbacks.OnProgress(m.progress)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reassemble enhanced video from frames
|
|
||||||
err = m.reassembleEnhancedVideo()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("video reassembly failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call completion callback
|
|
||||||
if m.callbacks.OnComplete != nil {
|
|
||||||
m.callbacks.OnComplete(true, fmt.Sprintf("Enhancement completed using %s model", modelName))
|
|
||||||
}
|
|
||||||
|
|
||||||
m.active = false
|
|
||||||
logging.Debug(logging.CatEnhance, "Video enhancement completed successfully")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// loadModel instantiates and returns an AI model instance
|
|
||||||
func (m *EnhancementModule) loadModel(modelName string) (AIModel, error) {
|
|
||||||
switch modelName {
|
|
||||||
case "basicvsr":
|
|
||||||
return NewBasicVSRModel(m.config.Parameters)
|
|
||||||
case "realesrgan-x4plus":
|
|
||||||
return NewRealESRGANModel(m.config.Parameters)
|
|
||||||
case "realesrgan-x4plus-anime":
|
|
||||||
return NewRealESRGANAnimeModel(m.config.Parameters)
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unsupported model: %s", modelName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Placeholder model constructors - will be implemented in Phase 2.2
|
|
||||||
func NewBasicVSRModel(params map[string]interface{}) (AIModel, error) {
|
|
||||||
return &placeholderModel{name: "basicvsr"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRealESRGANModel(params map[string]interface{}) (AIModel, error) {
|
|
||||||
return &placeholderModel{name: "realesrgan-x4plus"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewRealESRGANAnimeModel(params map[string]interface{}) (AIModel, error) {
|
|
||||||
return &placeholderModel{name: "realesrgan-x4plus-anime"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// placeholderModel implements AIModel interface for development
|
|
||||||
type placeholderModel struct {
|
|
||||||
name string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *placeholderModel) Name() string {
|
|
||||||
return p.name
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *placeholderModel) Type() string {
|
|
||||||
return "placeholder"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *placeholderModel) Load() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *placeholderModel) ProcessFrame(frame *image.RGBA) (*image.RGBA, error) {
|
|
||||||
// TODO: Implement actual AI processing
|
|
||||||
return frame, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (p *placeholderModel) Close() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// extractCurrentFrame extracts the current frame from the unified player
|
|
||||||
func (m *EnhancementModule) extractCurrentFrame() (*image.RGBA, error) {
|
|
||||||
// Interface with the unified player's frame extraction
|
|
||||||
// The unified player should provide frame access methods
|
|
||||||
|
|
||||||
// For now, simulate frame extraction from player
|
|
||||||
// In full implementation, this would call m.player.ExtractCurrentFrame()
|
|
||||||
|
|
||||||
// Create a dummy frame for testing
|
|
||||||
frame := image.NewRGBA(image.Rect(0, 0, 1920, 1080))
|
|
||||||
|
|
||||||
// Fill with a test pattern
|
|
||||||
for y := 0; y < 1080; y++ {
|
|
||||||
for x := 0; x < 1920; x++ {
|
|
||||||
// Create a simple gradient pattern
|
|
||||||
frame.Set(x, y, color.RGBA{
|
|
||||||
R: uint8(x / 8),
|
|
||||||
G: uint8(y / 8),
|
|
||||||
B: uint8(255),
|
|
||||||
A: 255,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return frame, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// reassembleEnhancedVideo reconstructs the video from enhanced frames
|
|
||||||
func (m *EnhancementModule) reassembleEnhancedVideo() error {
|
|
||||||
// This will use FFmpeg to reconstruct video from enhanced frames
|
|
||||||
// Implementation will use the temp directory for frame storage
|
|
||||||
return fmt.Errorf("video reassembly not yet implemented")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Cancel stops the enhancement process
|
|
||||||
func (m *EnhancementModule) Cancel() {
|
|
||||||
if m.active {
|
|
||||||
m.active = false
|
|
||||||
m.cancel()
|
|
||||||
logging.Debug(logging.CatEnhance, "Enhancement cancelled")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetConfig updates the enhancement configuration
|
|
||||||
func (m *EnhancementModule) SetConfig(config EnhancementConfig) {
|
|
||||||
m.config = config
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetConfig returns the current enhancement configuration
|
|
||||||
func (m *EnhancementModule) GetConfig() EnhancementConfig {
|
|
||||||
return m.config
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetCallbacks sets the enhancement progress callbacks
|
|
||||||
func (m *EnhancementModule) SetCallbacks(callbacks EnhancementCallbacks) {
|
|
||||||
m.callbacks = callbacks
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetProgress returns current enhancement progress
|
|
||||||
func (m *EnhancementModule) GetProgress() EnhancementProgress {
|
|
||||||
return m.progress
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsActive returns whether enhancement is currently running
|
|
||||||
func (m *EnhancementModule) IsActive() bool {
|
|
||||||
return m.active
|
|
||||||
}
|
|
||||||
|
|
@ -1,173 +0,0 @@
|
||||||
package enhancement
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"image"
|
|
||||||
"image/color"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"sync"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// ONNXModel provides cross-platform AI model inference using ONNX Runtime
|
|
||||||
type ONNXModel struct {
|
|
||||||
name string
|
|
||||||
modelPath string
|
|
||||||
loaded bool
|
|
||||||
mu sync.RWMutex
|
|
||||||
config map[string]interface{}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewONNXModel creates a new ONNX-based AI model
|
|
||||||
func NewONNXModel(name, modelPath string, config map[string]interface{}) *ONNXModel {
|
|
||||||
return &ONNXModel{
|
|
||||||
name: name,
|
|
||||||
modelPath: modelPath,
|
|
||||||
loaded: false,
|
|
||||||
config: config,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Name returns the model name
|
|
||||||
func (m *ONNXModel) Name() string {
|
|
||||||
return m.name
|
|
||||||
}
|
|
||||||
|
|
||||||
// Type returns the model type classification
|
|
||||||
func (m *ONNXModel) Type() string {
|
|
||||||
switch {
|
|
||||||
case contains(m.name, "basicvsr"):
|
|
||||||
return "basicvsr"
|
|
||||||
case contains(m.name, "realesrgan"):
|
|
||||||
return "realesrgan"
|
|
||||||
case contains(m.name, "rife"):
|
|
||||||
return "rife"
|
|
||||||
default:
|
|
||||||
return "general"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load initializes the ONNX model for inference
|
|
||||||
func (m *ONNXModel) Load() error {
|
|
||||||
m.mu.Lock()
|
|
||||||
defer m.mu.Unlock()
|
|
||||||
|
|
||||||
// Check if model file exists
|
|
||||||
if _, err := os.Stat(m.modelPath); os.IsNotExist(err) {
|
|
||||||
return fmt.Errorf("model file not found: %s", m.modelPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Initialize ONNX Runtime session
|
|
||||||
// This requires adding ONNX Runtime Go bindings to go.mod
|
|
||||||
// For now, simulate successful loading
|
|
||||||
m.loaded = true
|
|
||||||
|
|
||||||
logging.Debug(logging.CatEnhance, "ONNX model loaded: %s", m.name)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ProcessFrame applies AI enhancement to a single frame
|
|
||||||
func (m *ONNXModel) ProcessFrame(frame *image.RGBA) (*image.RGBA, error) {
|
|
||||||
m.mu.RLock()
|
|
||||||
defer m.mu.RUnlock()
|
|
||||||
|
|
||||||
if !m.loaded {
|
|
||||||
return nil, fmt.Errorf("model not loaded: %s", m.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO: Implement actual ONNX inference
|
|
||||||
// This will involve:
|
|
||||||
// 1. Convert image.RGBA to tensor format
|
|
||||||
// 2. Run ONNX model inference
|
|
||||||
// 3. Convert output tensor back to image.RGBA
|
|
||||||
|
|
||||||
// For now, return basic enhancement simulation
|
|
||||||
width := frame.Bounds().Dx()
|
|
||||||
height := frame.Bounds().Dy()
|
|
||||||
|
|
||||||
// Simple enhancement simulation (contrast boost, sharpening)
|
|
||||||
enhanced := image.NewRGBA(frame.Bounds())
|
|
||||||
for y := 0; y < height; y++ {
|
|
||||||
for x := 0; x < width; x++ {
|
|
||||||
original := frame.RGBAAt(x, y)
|
|
||||||
enhancedPixel := m.enhancePixel(original)
|
|
||||||
enhanced.Set(x, y, enhancedPixel)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return enhanced, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// enhancePixel applies basic enhancement to simulate AI processing
|
|
||||||
func (m *ONNXModel) enhancePixel(c color.RGBA) color.RGBA {
|
|
||||||
// Simple enhancement: increase contrast and sharpness
|
|
||||||
g := float64(c.G)
|
|
||||||
b := float64(c.B)
|
|
||||||
a := float64(c.A)
|
|
||||||
|
|
||||||
// Boost contrast (1.1x)
|
|
||||||
g = min(255, g*1.1)
|
|
||||||
b = min(255, b*1.1)
|
|
||||||
|
|
||||||
// Subtle sharpening
|
|
||||||
factor := 1.2
|
|
||||||
center := (g + b) / 3.0
|
|
||||||
|
|
||||||
g = min(255, center+factor*(g-center))
|
|
||||||
b = min(255, center+factor*(b-center))
|
|
||||||
|
|
||||||
return color.RGBA{
|
|
||||||
R: uint8(c.G),
|
|
||||||
G: uint8(b),
|
|
||||||
B: uint8(b),
|
|
||||||
A: c.A,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close releases ONNX model resources
|
|
||||||
func (m *ONNXModel) Close() error {
|
|
||||||
m.mu.Lock()
|
|
||||||
defer m.mu.Unlock()
|
|
||||||
|
|
||||||
// TODO: Close ONNX session when implemented
|
|
||||||
|
|
||||||
m.loaded = false
|
|
||||||
logging.Debug(logging.CatEnhance, "ONNX model closed: %s", m.name)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetModelPath returns the file path for a model
|
|
||||||
func GetModelPath(modelName string) (string, error) {
|
|
||||||
modelsDir := filepath.Join(utils.TempDir(), "models")
|
|
||||||
|
|
||||||
switch modelName {
|
|
||||||
case "basicvsr":
|
|
||||||
return filepath.Join(modelsDir, "basicvsr_x4.onnx"), nil
|
|
||||||
case "realesrgan-x4plus":
|
|
||||||
return filepath.Join(modelsDir, "realesrgan_x4plus.onnx"), nil
|
|
||||||
case "realesrgan-x4plus-anime":
|
|
||||||
return filepath.Join(modelsDir, "realesrgan_x4plus_anime.onnx"), nil
|
|
||||||
case "rife":
|
|
||||||
return filepath.Join(modelsDir, "rife.onnx"), nil
|
|
||||||
default:
|
|
||||||
return "", fmt.Errorf("unknown model: %s", modelName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// contains checks if string contains substring (case-insensitive)
|
|
||||||
func contains(s, substr string) bool {
|
|
||||||
return len(s) >= len(substr) &&
|
|
||||||
(s[:len(substr)] == substr ||
|
|
||||||
s[len(s)-len(substr):] == substr)
|
|
||||||
}
|
|
||||||
|
|
||||||
// min returns minimum of two floats
|
|
||||||
func min(a, b float64) float64 {
|
|
||||||
if a < b {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
@ -13,11 +13,11 @@ import (
|
||||||
// DetectionResult contains the results of interlacing analysis
|
// DetectionResult contains the results of interlacing analysis
|
||||||
type DetectionResult struct {
|
type DetectionResult struct {
|
||||||
// Frame counts from idet filter
|
// Frame counts from idet filter
|
||||||
TFF int // Top Field First frames
|
TFF int // Top Field First frames
|
||||||
BFF int // Bottom Field First frames
|
BFF int // Bottom Field First frames
|
||||||
Progressive int // Progressive frames
|
Progressive int // Progressive frames
|
||||||
Undetermined int // Undetermined frames
|
Undetermined int // Undetermined frames
|
||||||
TotalFrames int // Total frames analyzed
|
TotalFrames int // Total frames analyzed
|
||||||
|
|
||||||
// Calculated metrics
|
// Calculated metrics
|
||||||
InterlacedPercent float64 // Percentage of interlaced frames
|
InterlacedPercent float64 // Percentage of interlaced frames
|
||||||
|
|
@ -26,21 +26,21 @@ type DetectionResult struct {
|
||||||
Confidence string // "High", "Medium", "Low"
|
Confidence string // "High", "Medium", "Low"
|
||||||
|
|
||||||
// Recommendations
|
// Recommendations
|
||||||
Recommendation string // Human-readable recommendation
|
Recommendation string // Human-readable recommendation
|
||||||
SuggestDeinterlace bool // Whether deinterlacing is recommended
|
SuggestDeinterlace bool // Whether deinterlacing is recommended
|
||||||
SuggestedFilter string // "yadif", "bwdif", etc.
|
SuggestedFilter string // "yadif", "bwdif", etc.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detector analyzes video for interlacing
|
// Detector analyzes video for interlacing
|
||||||
type Detector struct {
|
type Detector struct {
|
||||||
FFmpegPath string
|
FFmpegPath string
|
||||||
FFprobePath string
|
FFprobePath string
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewDetector creates a new interlacing detector
|
// NewDetector creates a new interlacing detector
|
||||||
func NewDetector(ffmpegPath, ffprobePath string) *Detector {
|
func NewDetector(ffmpegPath, ffprobePath string) *Detector {
|
||||||
return &Detector{
|
return &Detector{
|
||||||
FFmpegPath: ffmpegPath,
|
FFmpegPath: ffmpegPath,
|
||||||
FFprobePath: ffprobePath,
|
FFprobePath: ffprobePath,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"runtime/debug"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -22,13 +21,11 @@ const historyMax = 500
|
||||||
type Category string
|
type Category string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
CatUI Category = "[UI]"
|
CatUI Category = "[UI]"
|
||||||
CatCLI Category = "[CLI]"
|
CatCLI Category = "[CLI]"
|
||||||
CatFFMPEG Category = "[FFMPEG]"
|
CatFFMPEG Category = "[FFMPEG]"
|
||||||
CatSystem Category = "[SYS]"
|
CatSystem Category = "[SYS]"
|
||||||
CatModule Category = "[MODULE]"
|
CatModule Category = "[MODULE]"
|
||||||
CatPlayer Category = "[PLAYER]"
|
|
||||||
CatEnhance Category = "[ENHANCE]"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Init initializes the logging system
|
// Init initializes the logging system
|
||||||
|
|
@ -83,50 +80,3 @@ func FilePath() string {
|
||||||
func History() []string {
|
func History() []string {
|
||||||
return history
|
return history
|
||||||
}
|
}
|
||||||
|
|
||||||
// Error logs an error message with a category (always logged, even when debug is off)
|
|
||||||
func Error(cat Category, format string, args ...interface{}) {
|
|
||||||
msg := fmt.Sprintf("%s ERROR: %s", cat, fmt.Sprintf(format, args...))
|
|
||||||
timestamp := time.Now().Format(time.RFC3339Nano)
|
|
||||||
if file != nil {
|
|
||||||
fmt.Fprintf(file, "%s %s\n", timestamp, msg)
|
|
||||||
}
|
|
||||||
history = append(history, fmt.Sprintf("%s %s", timestamp, msg))
|
|
||||||
if len(history) > historyMax {
|
|
||||||
history = history[len(history)-historyMax:]
|
|
||||||
}
|
|
||||||
logger.Printf("%s %s", timestamp, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fatal logs a fatal error and exits (always logged)
|
|
||||||
func Fatal(cat Category, format string, args ...interface{}) {
|
|
||||||
msg := fmt.Sprintf("%s FATAL: %s", cat, fmt.Sprintf(format, args...))
|
|
||||||
timestamp := time.Now().Format(time.RFC3339Nano)
|
|
||||||
if file != nil {
|
|
||||||
fmt.Fprintf(file, "%s %s\n", timestamp, msg)
|
|
||||||
file.Sync()
|
|
||||||
}
|
|
||||||
logger.Printf("%s %s", timestamp, msg)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Panic logs a panic with stack trace
|
|
||||||
func Panic(recovered interface{}) {
|
|
||||||
msg := fmt.Sprintf("%s PANIC: %v\nStack trace:\n%s", CatSystem, recovered, string(debug.Stack()))
|
|
||||||
timestamp := time.Now().Format(time.RFC3339Nano)
|
|
||||||
if file != nil {
|
|
||||||
fmt.Fprintf(file, "%s %s\n", timestamp, msg)
|
|
||||||
file.Sync()
|
|
||||||
}
|
|
||||||
history = append(history, fmt.Sprintf("%s %s", timestamp, msg))
|
|
||||||
logger.Printf("%s %s", timestamp, msg)
|
|
||||||
}
|
|
||||||
|
|
||||||
// RecoverPanic should be used with defer to catch and log panics
|
|
||||||
func RecoverPanic() {
|
|
||||||
if r := recover(); r != nil {
|
|
||||||
Panic(r)
|
|
||||||
// Re-panic to let the program crash with the logged info
|
|
||||||
panic(r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,6 @@ package modules
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -50,20 +47,7 @@ func HandleAudio(files []string) {
|
||||||
// HandleAuthor handles the disc authoring module (DVD/Blu-ray) (placeholder)
|
// HandleAuthor handles the disc authoring module (DVD/Blu-ray) (placeholder)
|
||||||
func HandleAuthor(files []string) {
|
func HandleAuthor(files []string) {
|
||||||
logging.Debug(logging.CatModule, "author handler invoked with %v", files)
|
logging.Debug(logging.CatModule, "author handler invoked with %v", files)
|
||||||
// This will be handled by the UI drag-and-drop system
|
fmt.Println("author", files)
|
||||||
// File loading is managed in buildAuthorView()
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleRip handles the rip module (placeholder)
|
|
||||||
func HandleRip(files []string) {
|
|
||||||
logging.Debug(logging.CatModule, "rip handler invoked with %v", files)
|
|
||||||
fmt.Println("rip", files)
|
|
||||||
}
|
|
||||||
|
|
||||||
// HandleBluRay handles the Blu-Ray authoring module (placeholder)
|
|
||||||
func HandleBluRay(files []string) {
|
|
||||||
logging.Debug(logging.CatModule, "bluray handler invoked with %v", files)
|
|
||||||
fmt.Println("bluray", files)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// HandleSubtitles handles the subtitles module (placeholder)
|
// HandleSubtitles handles the subtitles module (placeholder)
|
||||||
|
|
@ -95,16 +79,3 @@ func HandlePlayer(files []string) {
|
||||||
logging.Debug(logging.CatModule, "player handler invoked with %v", files)
|
logging.Debug(logging.CatModule, "player handler invoked with %v", files)
|
||||||
fmt.Println("player", files)
|
fmt.Println("player", files)
|
||||||
}
|
}
|
||||||
|
|
||||||
func HandleEnhance(files []string) {
|
|
||||||
logging.Debug(logging.CatModule, "enhance handler invoked with %v", files)
|
|
||||||
if len(files) > 0 {
|
|
||||||
dialog.ShowInformation("Enhancement", "Opening multiple files not supported yet. Select single video for enhancement.", fyne.CurrentApp().Driver().AllWindows()[0])
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(files) == 1 {
|
|
||||||
// TODO: Launch enhancement view with selected file
|
|
||||||
dialog.ShowInformation("Enhancement", "Enhancement module coming soon! This will open: "+files[0], fyne.CurrentApp().Driver().AllWindows()[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,716 +0,0 @@
|
||||||
package player
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"context"
|
|
||||||
"encoding/binary"
|
|
||||||
"fmt"
|
|
||||||
"image"
|
|
||||||
"io"
|
|
||||||
"os/exec"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
)
|
|
||||||
|
|
||||||
// UnifiedPlayer implements rock-solid video playback with proper A/V synchronization
|
|
||||||
// and frame-accurate seeking using a single FFmpeg process
|
|
||||||
type UnifiedPlayer struct {
|
|
||||||
mu sync.RWMutex
|
|
||||||
ctx context.Context
|
|
||||||
cancel context.CancelFunc
|
|
||||||
|
|
||||||
// FFmpeg process
|
|
||||||
cmd *exec.Cmd
|
|
||||||
stdin *bufio.Writer
|
|
||||||
stdout *bufio.Reader
|
|
||||||
stderr *bufio.Reader
|
|
||||||
|
|
||||||
// Video output pipes
|
|
||||||
videoPipeReader *io.PipeReader
|
|
||||||
videoPipeWriter *io.PipeWriter
|
|
||||||
audioPipeReader *io.PipeReader
|
|
||||||
audioPipeWriter *io.PipeWriter
|
|
||||||
|
|
||||||
// State tracking
|
|
||||||
currentPath string
|
|
||||||
currentTime time.Duration
|
|
||||||
currentFrame int64
|
|
||||||
duration time.Duration
|
|
||||||
frameRate float64
|
|
||||||
state PlayerState
|
|
||||||
volume float64
|
|
||||||
speed float64
|
|
||||||
muted bool
|
|
||||||
fullscreen bool
|
|
||||||
previewMode bool
|
|
||||||
|
|
||||||
// Video info
|
|
||||||
videoInfo *VideoInfo
|
|
||||||
|
|
||||||
// Synchronization
|
|
||||||
syncClock time.Time
|
|
||||||
videoPTS int64
|
|
||||||
audioPTS int64
|
|
||||||
ptsOffset int64
|
|
||||||
|
|
||||||
// Buffer management
|
|
||||||
frameBuffer *sync.Pool
|
|
||||||
audioBuffer []byte
|
|
||||||
audioBufferSize int
|
|
||||||
|
|
||||||
// Window state
|
|
||||||
windowX, windowY int
|
|
||||||
windowW, windowH int
|
|
||||||
|
|
||||||
// Callbacks
|
|
||||||
timeCallback func(time.Duration)
|
|
||||||
frameCallback func(int64)
|
|
||||||
stateCallback func(PlayerState)
|
|
||||||
|
|
||||||
// Configuration
|
|
||||||
config Config
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewUnifiedPlayer creates a new unified player with proper A/V synchronization
|
|
||||||
func NewUnifiedPlayer(config Config) *UnifiedPlayer {
|
|
||||||
player := &UnifiedPlayer{
|
|
||||||
config: config,
|
|
||||||
frameBuffer: &sync.Pool{
|
|
||||||
New: func() interface{} {
|
|
||||||
return &image.RGBA{
|
|
||||||
Pix: make([]uint8, 0),
|
|
||||||
Stride: 0,
|
|
||||||
Rect: image.Rect(0, 0, 0, 0),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
audioBufferSize: 32768, // 170ms at 48kHz for smooth playback
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx, cancel := context.WithCancel(context.Background())
|
|
||||||
player.ctx = ctx
|
|
||||||
player.cancel = cancel
|
|
||||||
|
|
||||||
return player
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load loads a video file and initializes playback
|
|
||||||
func (p *UnifiedPlayer) Load(path string, offset time.Duration) error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.currentPath = path
|
|
||||||
p.state = StateLoading
|
|
||||||
|
|
||||||
// Create pipes for FFmpeg communication
|
|
||||||
p.videoPipeReader, p.videoPipeWriter = io.Pipe()
|
|
||||||
p.audioPipeReader, p.audioPipeWriter = io.Pipe()
|
|
||||||
|
|
||||||
// Build FFmpeg command with unified A/V output
|
|
||||||
args := []string{
|
|
||||||
"-hide_banner", "-loglevel", "error",
|
|
||||||
"-ss", fmt.Sprintf("%.3f", offset.Seconds()),
|
|
||||||
"-i", path,
|
|
||||||
// Video stream to pipe 4
|
|
||||||
"-map", "0:v:0",
|
|
||||||
"-f", "rawvideo",
|
|
||||||
"-pix_fmt", "rgb24",
|
|
||||||
"-r", "24", // We'll detect actual framerate
|
|
||||||
"pipe:4",
|
|
||||||
// Audio stream to pipe 5
|
|
||||||
"-map", "0:a:0",
|
|
||||||
"-ac", "2",
|
|
||||||
"-ar", "48000",
|
|
||||||
"-f", "s16le",
|
|
||||||
"pipe:5",
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add hardware acceleration if available
|
|
||||||
if p.config.HardwareAccel {
|
|
||||||
if args = p.addHardwareAcceleration(args); args != nil {
|
|
||||||
logging.Debug(logging.CatPlayer, "Hardware acceleration enabled: %v", args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
p.cmd = exec.Command(utils.GetFFmpegPath(), args...)
|
|
||||||
p.cmd.Stdout = p.videoPipeWriter
|
|
||||||
p.cmd.Stderr = p.audioPipeWriter
|
|
||||||
|
|
||||||
utils.ApplyNoWindow(p.cmd)
|
|
||||||
|
|
||||||
if err := p.cmd.Start(); err != nil {
|
|
||||||
logging.Error(logging.CatPlayer, "Failed to start FFmpeg: %v", err)
|
|
||||||
return fmt.Errorf("failed to start FFmpeg: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Initialize audio buffer
|
|
||||||
p.audioBuffer = make([]byte, 0, p.audioBufferSize)
|
|
||||||
|
|
||||||
// Start goroutine for reading audio stream
|
|
||||||
go p.readAudioStream()
|
|
||||||
|
|
||||||
// Detect video properties
|
|
||||||
if err := p.detectVideoProperties(); err != nil {
|
|
||||||
logging.Error(logging.CatPlayer, "Failed to detect video properties: %w", err)
|
|
||||||
return fmt.Errorf("failed to detect video properties: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Loaded video: %s", path)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Play starts or resumes playback
|
|
||||||
func (p *UnifiedPlayer) Play() error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
if p.state == StateStopped {
|
|
||||||
if err := p.startVideoProcess(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
p.state = StatePlaying
|
|
||||||
} else if p.state == StatePaused {
|
|
||||||
p.state = StatePlaying
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.stateCallback != nil {
|
|
||||||
p.stateCallback(p.state)
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Playback started")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pause pauses playback
|
|
||||||
func (p *UnifiedPlayer) Pause() error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
if p.state == StatePlaying {
|
|
||||||
p.state = StatePaused
|
|
||||||
if p.stateCallback != nil {
|
|
||||||
p.stateCallback(p.state)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Playback paused")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stop stops playback and cleans up resources
|
|
||||||
func (p *UnifiedPlayer) Stop() error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
if p.cancel != nil {
|
|
||||||
p.cancel()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close pipes
|
|
||||||
if p.videoPipeReader != nil {
|
|
||||||
p.videoPipeReader.Close()
|
|
||||||
p.videoPipeWriter.Close()
|
|
||||||
}
|
|
||||||
if p.audioPipeReader != nil {
|
|
||||||
p.audioPipeReader.Close()
|
|
||||||
p.audioPipeWriter.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Wait for process to finish
|
|
||||||
if p.cmd != nil && p.cmd.Process != nil {
|
|
||||||
p.cmd.Process.Wait()
|
|
||||||
}
|
|
||||||
|
|
||||||
p.state = StateStopped
|
|
||||||
if p.stateCallback != nil {
|
|
||||||
p.stateCallback(p.state)
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Playback stopped")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeekToTime seeks to a specific time without restarting processes
|
|
||||||
func (p *UnifiedPlayer) SeekToTime(offset time.Duration) error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
if offset < 0 {
|
|
||||||
offset = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// Seek to exact time without restart
|
|
||||||
seekTime := offset.Seconds()
|
|
||||||
logging.Debug(logging.CatPlayer, "Seeking to time: %.3f seconds", seekTime)
|
|
||||||
|
|
||||||
// Send seek command to FFmpeg
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("seek %.3f\n", seekTime))
|
|
||||||
|
|
||||||
p.currentTime = offset
|
|
||||||
p.syncClock = time.Now()
|
|
||||||
|
|
||||||
if p.timeCallback != nil {
|
|
||||||
p.timeCallback(offset)
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Seek completed to %.3f seconds", offset.Seconds())
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// SeekToFrame seeks to a specific frame without restarting processes
|
|
||||||
func (p *UnifiedPlayer) SeekToFrame(frame int64) error {
|
|
||||||
if p.frameRate <= 0 {
|
|
||||||
return fmt.Errorf("invalid frame rate: %f", p.frameRate)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert frame number to time
|
|
||||||
frameTime := time.Duration(float64(frame) * float64(time.Second) / p.frameRate)
|
|
||||||
return p.SeekToTime(frameTime)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetCurrentTime returns the current playback time
|
|
||||||
func (p *UnifiedPlayer) GetCurrentTime() time.Duration {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.currentTime
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetCurrentFrame returns the current frame number
|
|
||||||
func (p *UnifiedPlayer) GetCurrentFrame() int64 {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
if p.frameRate > 0 {
|
|
||||||
return int64(p.currentTime.Seconds() * p.frameRate)
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetDuration returns the total video duration
|
|
||||||
func (p *UnifiedPlayer) GetDuration() time.Duration {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.duration
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetFrameRate returns the video frame rate
|
|
||||||
func (p *UnifiedPlayer) GetFrameRate() float64 {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.frameRate
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetVideoInfo returns video metadata
|
|
||||||
func (p *UnifiedPlayer) GetVideoInfo() *VideoInfo {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
if p.videoInfo == nil {
|
|
||||||
return &VideoInfo{}
|
|
||||||
}
|
|
||||||
return p.videoInfo
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetWindow sets the window position and size
|
|
||||||
func (p *UnifiedPlayer) SetWindow(x, y, w, h int) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.windowX, p.windowY, p.windowW, p.windowH = x, y, w, h
|
|
||||||
|
|
||||||
// Send window command to FFmpeg
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("window %d %d %d %d\n", x, y, w, h))
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetFullScreen toggles fullscreen mode
|
|
||||||
func (p *UnifiedPlayer) SetFullScreen(fullscreen bool) error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.fullscreen = fullscreen
|
|
||||||
|
|
||||||
// Send fullscreen command to FFmpeg
|
|
||||||
var cmd string
|
|
||||||
if fullscreen {
|
|
||||||
cmd = "fullscreen"
|
|
||||||
} else {
|
|
||||||
cmd = "windowed"
|
|
||||||
}
|
|
||||||
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("%s\n", cmd))
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Fullscreen set to: %v", fullscreen)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetWindowSize returns current window dimensions
|
|
||||||
func (p *UnifiedPlayer) GetWindowSize() (x, y, w, h int) {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.windowX, p.windowY, p.windowW, p.windowH
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetVolume sets the audio volume (0.0-1.0)
|
|
||||||
func (p *UnifiedPlayer) SetVolume(level float64) error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
// Clamp volume to valid range
|
|
||||||
if level < 0 {
|
|
||||||
level = 0
|
|
||||||
} else if level > 1 {
|
|
||||||
level = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
p.volume = level
|
|
||||||
|
|
||||||
// Send volume command to FFmpeg
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("volume %.3f\n", level))
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Volume set to: %.3f", level)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetVolume returns current volume level
|
|
||||||
func (p *UnifiedPlayer) GetVolume() float64 {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.volume
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetMuted sets the mute state
|
|
||||||
func (p *UnifiedPlayer) SetMuted(muted bool) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.muted = muted
|
|
||||||
|
|
||||||
// Send mute command to FFmpeg
|
|
||||||
var cmd string
|
|
||||||
if muted {
|
|
||||||
cmd = "mute"
|
|
||||||
} else {
|
|
||||||
cmd = "unmute"
|
|
||||||
}
|
|
||||||
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("%s\n", cmd))
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Mute set to: %v", muted)
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsMuted returns current mute state
|
|
||||||
func (p *UnifiedPlayer) IsMuted() bool {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.muted
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetSpeed sets playback speed
|
|
||||||
func (p *UnifiedPlayer) SetSpeed(speed float64) error {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.speed = speed
|
|
||||||
|
|
||||||
// Send speed command to FFmpeg
|
|
||||||
p.writeStringToStdin(fmt.Sprintf("speed %.2f\n", speed))
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Speed set to: %.2f", speed)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetSpeed returns current playback speed
|
|
||||||
func (p *UnifiedPlayer) GetSpeed() float64 {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.speed
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetTimeCallback sets the time update callback
|
|
||||||
func (p *UnifiedPlayer) SetTimeCallback(callback func(time.Duration)) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
p.timeCallback = callback
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetFrameCallback sets the frame update callback
|
|
||||||
func (p *UnifiedPlayer) SetFrameCallback(callback func(int64)) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
p.frameCallback = callback
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetStateCallback sets the state change callback
|
|
||||||
func (p *UnifiedPlayer) SetStateCallback(callback func(PlayerState)) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
p.stateCallback = callback
|
|
||||||
}
|
|
||||||
|
|
||||||
// EnablePreviewMode enables or disables preview mode
|
|
||||||
func (p *UnifiedPlayer) EnablePreviewMode(enabled bool) {
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.previewMode = enabled
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsPreviewMode returns current preview mode state
|
|
||||||
func (p *UnifiedPlayer) IsPreviewMode() bool {
|
|
||||||
p.mu.RLock()
|
|
||||||
defer p.mu.RUnlock()
|
|
||||||
return p.previewMode
|
|
||||||
}
|
|
||||||
|
|
||||||
// Close shuts down the player and cleans up resources
|
|
||||||
func (p *UnifiedPlayer) Close() {
|
|
||||||
p.Stop()
|
|
||||||
|
|
||||||
p.mu.Lock()
|
|
||||||
defer p.mu.Unlock()
|
|
||||||
|
|
||||||
p.frameBuffer = nil
|
|
||||||
p.audioBuffer = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper methods
|
|
||||||
|
|
||||||
// startVideoProcess starts the video processing goroutine
|
|
||||||
func (p *UnifiedPlayer) startVideoProcess() error {
|
|
||||||
go func() {
|
|
||||||
frameDuration := time.Second / time.Duration(p.frameRate)
|
|
||||||
frameTime := p.syncClock
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-p.ctx.Done():
|
|
||||||
logging.Debug(logging.CatPlayer, "Video processing goroutine stopped")
|
|
||||||
return
|
|
||||||
|
|
||||||
default:
|
|
||||||
// Read frame from video pipe
|
|
||||||
frame, err := p.readVideoFrame()
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(logging.CatPlayer, "Failed to read video frame: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if frame == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update timing
|
|
||||||
p.currentTime = frameTime.Sub(p.syncClock)
|
|
||||||
frameTime = frameTime.Add(frameDuration)
|
|
||||||
p.syncClock = time.Now()
|
|
||||||
|
|
||||||
// Notify callback
|
|
||||||
if p.frameCallback != nil {
|
|
||||||
p.frameCallback(p.GetCurrentFrame())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sleep until next frame time
|
|
||||||
sleepTime := frameTime.Sub(time.Now())
|
|
||||||
if sleepTime > 0 {
|
|
||||||
time.Sleep(sleepTime)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// readAudioStream reads and processes audio from the audio pipe
|
|
||||||
func (p *UnifiedPlayer) readAudioStream() {
|
|
||||||
buffer := make([]byte, 4096) // 85ms chunks
|
|
||||||
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-p.ctx.Done():
|
|
||||||
logging.Debug(logging.CatPlayer, "Audio reading goroutine stopped")
|
|
||||||
return
|
|
||||||
|
|
||||||
default:
|
|
||||||
// Read from audio pipe
|
|
||||||
n, err := p.audioPipeReader.Read(buffer)
|
|
||||||
if err != nil && err.Error() != "EOF" {
|
|
||||||
logging.Error(logging.CatPlayer, "Audio read error: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if n == 0 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply volume if not muted
|
|
||||||
if !p.muted && p.volume > 0 {
|
|
||||||
p.applyVolumeToBuffer(buffer[:n])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send to audio output (this would connect to audio system)
|
|
||||||
// For now, we'll store in buffer for playback sync monitoring
|
|
||||||
p.audioBuffer = append(p.audioBuffer, buffer[:n]...)
|
|
||||||
|
|
||||||
// Simple audio sync timing
|
|
||||||
p.updateAVSync()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// readVideoStream reads video frames from the video pipe
|
|
||||||
func (p *UnifiedPlayer) readVideoFrame() (*image.RGBA, error) {
|
|
||||||
// Read RGB24 frame data
|
|
||||||
frameSize := p.windowW * p.windowH * 3 // RGB24 = 3 bytes per pixel
|
|
||||||
frameData := make([]byte, frameSize)
|
|
||||||
n, err := p.videoPipeReader.Read(frameData)
|
|
||||||
|
|
||||||
if err != nil && err.Error() != "EOF" {
|
|
||||||
return nil, fmt.Errorf("video read error: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if n == 0 {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get frame from pool
|
|
||||||
img := p.frameBuffer.Get().(*image.RGBA)
|
|
||||||
img.Pix = make([]uint8, frameSize)
|
|
||||||
img.Stride = p.windowW * 3
|
|
||||||
img.Rect = image.Rect(0, 0, p.windowW, p.windowH)
|
|
||||||
|
|
||||||
// Copy RGB data to image
|
|
||||||
copy(img.Pix, frameData[:frameSize])
|
|
||||||
|
|
||||||
return img, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// detectVideoProperties analyzes the video to determine properties
|
|
||||||
func (p *UnifiedPlayer) detectVideoProperties() error {
|
|
||||||
// Use ffprobe to get video information
|
|
||||||
cmd := exec.Command(utils.GetFFprobePath(),
|
|
||||||
"-v", "error",
|
|
||||||
"-select_streams", "v:0",
|
|
||||||
"-show_entries", "stream=r_frame_rate,duration,width,height",
|
|
||||||
p.currentPath,
|
|
||||||
)
|
|
||||||
|
|
||||||
output, err := cmd.CombinedOutput()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("ffprobe failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse frame rate and duration
|
|
||||||
p.frameRate = 25.0 // Default fallback
|
|
||||||
p.duration = 0
|
|
||||||
|
|
||||||
lines := strings.Split(string(output), "\n")
|
|
||||||
for _, line := range lines {
|
|
||||||
if strings.Contains(line, "r_frame_rate=") {
|
|
||||||
if parts := strings.Split(line, "="); len(parts) > 1 {
|
|
||||||
var fr float64
|
|
||||||
if _, err := fmt.Sscanf(parts[1], "%f", &fr); err == nil {
|
|
||||||
p.frameRate = fr
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if strings.Contains(line, "duration=") {
|
|
||||||
if parts := strings.Split(line, "="); len(parts) > 1 {
|
|
||||||
if dur, err := time.ParseDuration(parts[1]); err == nil {
|
|
||||||
p.duration = dur
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if p.frameRate > 0 && p.duration > 0 {
|
|
||||||
p.videoInfo = &VideoInfo{
|
|
||||||
Width: p.windowW,
|
|
||||||
Height: p.windowH,
|
|
||||||
Duration: p.duration,
|
|
||||||
FrameRate: p.frameRate,
|
|
||||||
FrameCount: int64(p.duration.Seconds() * p.frameRate),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
p.videoInfo = &VideoInfo{
|
|
||||||
Width: p.windowW,
|
|
||||||
Height: p.windowH,
|
|
||||||
Duration: p.duration,
|
|
||||||
FrameRate: p.frameRate,
|
|
||||||
FrameCount: 0,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatPlayer, "Video properties: %dx%d@%.3ffps, %.2fs",
|
|
||||||
p.windowW, p.windowH, p.frameRate, p.duration.Seconds())
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// writeStringToStdin sends a command to FFmpeg's stdin
|
|
||||||
func (p *UnifiedPlayer) writeStringToStdin(cmd string) {
|
|
||||||
// TODO: Implement stdin command writing for interactive FFmpeg control
|
|
||||||
// Currently a no-op as stdin is not configured in this player implementation
|
|
||||||
logging.Debug(logging.CatPlayer, "Stdin command (not implemented): %s", cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
// updateAVSync maintains synchronization between audio and video
|
|
||||||
func (p *UnifiedPlayer) updateAVSync() {
|
|
||||||
// Simple drift correction using master clock reference
|
|
||||||
if p.audioPTS > 0 && p.videoPTS > 0 {
|
|
||||||
drift := p.audioPTS - p.videoPTS
|
|
||||||
if abs(drift) > 1000 { // More than 1 frame of drift
|
|
||||||
logging.Debug(logging.CatPlayer, "A/V sync drift: %d PTS", drift)
|
|
||||||
// Adjust sync clock gradually
|
|
||||||
p.ptsOffset += drift / 100
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// addHardwareAcceleration adds hardware acceleration flags to FFmpeg args
|
|
||||||
func (p *UnifiedPlayer) addHardwareAcceleration(args []string) []string {
|
|
||||||
// This is a placeholder - actual implementation would detect available hardware
|
|
||||||
// and add appropriate flags like "-hwaccel cuda", "-c:v h264_nvenc"
|
|
||||||
|
|
||||||
// For now, just log that hardware acceleration is considered
|
|
||||||
logging.Debug(logging.CatPlayer, "Hardware acceleration requested but not yet implemented")
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
|
|
||||||
// applyVolumeToBuffer applies volume adjustments to audio buffer
|
|
||||||
func (p *UnifiedPlayer) applyVolumeToBuffer(buffer []byte) {
|
|
||||||
if p.volume <= 0 {
|
|
||||||
// Muted - set to silence
|
|
||||||
for i := range buffer {
|
|
||||||
buffer[i] = 0
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Apply volume gain
|
|
||||||
gain := p.volume
|
|
||||||
for i := 0; i < len(buffer); i += 2 {
|
|
||||||
if i+1 < len(buffer) {
|
|
||||||
sample := int16(binary.LittleEndian.Uint16(buffer[i : i+2]))
|
|
||||||
adjusted := int(float64(sample) * gain)
|
|
||||||
|
|
||||||
// Clamp to int16 range
|
|
||||||
if adjusted > 32767 {
|
|
||||||
adjusted = 32767
|
|
||||||
} else if adjusted < -32768 {
|
|
||||||
adjusted = -32768
|
|
||||||
}
|
|
||||||
|
|
||||||
binary.LittleEndian.PutUint16(buffer[i:i+2], uint16(adjusted))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// abs returns absolute value of int64
|
|
||||||
func abs(x int64) int64 {
|
|
||||||
if x < 0 {
|
|
||||||
return -x
|
|
||||||
}
|
|
||||||
return x
|
|
||||||
}
|
|
||||||
|
|
@ -8,8 +8,6 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// JobType represents the type of job to execute
|
// JobType represents the type of job to execute
|
||||||
|
|
@ -24,8 +22,6 @@ const (
|
||||||
JobTypeAudio JobType = "audio"
|
JobTypeAudio JobType = "audio"
|
||||||
JobTypeThumb JobType = "thumb"
|
JobTypeThumb JobType = "thumb"
|
||||||
JobTypeSnippet JobType = "snippet"
|
JobTypeSnippet JobType = "snippet"
|
||||||
JobTypeAuthor JobType = "author"
|
|
||||||
JobTypeRip JobType = "rip"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// JobStatus represents the current state of a job
|
// JobStatus represents the current state of a job
|
||||||
|
|
@ -97,7 +93,7 @@ func (q *Queue) notifyChange() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add adds a job to the queue (at the end)
|
// Add adds a job to the queue
|
||||||
func (q *Queue) Add(job *Job) {
|
func (q *Queue) Add(job *Job) {
|
||||||
q.mu.Lock()
|
q.mu.Lock()
|
||||||
|
|
||||||
|
|
@ -117,37 +113,6 @@ func (q *Queue) Add(job *Job) {
|
||||||
q.notifyChange()
|
q.notifyChange()
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddNext adds a job to the front of the pending queue (right after any running job)
|
|
||||||
func (q *Queue) AddNext(job *Job) {
|
|
||||||
q.mu.Lock()
|
|
||||||
|
|
||||||
if job.ID == "" {
|
|
||||||
job.ID = generateID()
|
|
||||||
}
|
|
||||||
if job.CreatedAt.IsZero() {
|
|
||||||
job.CreatedAt = time.Now()
|
|
||||||
}
|
|
||||||
if job.Status == "" {
|
|
||||||
job.Status = JobStatusPending
|
|
||||||
}
|
|
||||||
|
|
||||||
// Find the position after any running jobs
|
|
||||||
insertPos := 0
|
|
||||||
for i, j := range q.jobs {
|
|
||||||
if j.Status == JobStatusRunning {
|
|
||||||
insertPos = i + 1
|
|
||||||
} else {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert at the calculated position
|
|
||||||
q.jobs = append(q.jobs[:insertPos], append([]*Job{job}, q.jobs[insertPos:]...)...)
|
|
||||||
q.rebalancePrioritiesLocked()
|
|
||||||
q.mu.Unlock()
|
|
||||||
q.notifyChange()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove removes a job from the queue by ID
|
// Remove removes a job from the queue by ID
|
||||||
func (q *Queue) Remove(id string) error {
|
func (q *Queue) Remove(id string) error {
|
||||||
q.mu.Lock()
|
q.mu.Lock()
|
||||||
|
|
@ -375,7 +340,6 @@ func (q *Queue) ResumeAll() {
|
||||||
|
|
||||||
// processJobs continuously processes pending jobs
|
// processJobs continuously processes pending jobs
|
||||||
func (q *Queue) processJobs() {
|
func (q *Queue) processJobs() {
|
||||||
defer logging.RecoverPanic() // Catch and log any panics in job processing
|
|
||||||
for {
|
for {
|
||||||
q.mu.Lock()
|
q.mu.Lock()
|
||||||
if !q.running {
|
if !q.running {
|
||||||
|
|
|
||||||
|
|
@ -9,20 +9,19 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// HardwareInfo contains system hardware information
|
// HardwareInfo contains system hardware information
|
||||||
type HardwareInfo struct {
|
type HardwareInfo struct {
|
||||||
CPU string `json:"cpu"`
|
CPU string `json:"cpu"`
|
||||||
CPUCores int `json:"cpu_cores"`
|
CPUCores int `json:"cpu_cores"`
|
||||||
CPUMHz string `json:"cpu_mhz"`
|
CPUMHz string `json:"cpu_mhz"`
|
||||||
GPU string `json:"gpu"`
|
GPU string `json:"gpu"`
|
||||||
GPUDriver string `json:"gpu_driver"`
|
GPUDriver string `json:"gpu_driver"`
|
||||||
RAM string `json:"ram"`
|
RAM string `json:"ram"`
|
||||||
RAMMBytes uint64 `json:"ram_mb"`
|
RAMMBytes uint64 `json:"ram_mb"`
|
||||||
OS string `json:"os"`
|
OS string `json:"os"`
|
||||||
Arch string `json:"arch"`
|
Arch string `json:"arch"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Detect gathers system hardware information
|
// Detect gathers system hardware information
|
||||||
|
|
@ -104,7 +103,6 @@ func detectCPULinux() (model, mhz string) {
|
||||||
func detectCPUWindows() (model, mhz string) {
|
func detectCPUWindows() (model, mhz string) {
|
||||||
// Use wmic to get CPU info
|
// Use wmic to get CPU info
|
||||||
cmd := exec.Command("wmic", "cpu", "get", "name,maxclockspeed")
|
cmd := exec.Command("wmic", "cpu", "get", "name,maxclockspeed")
|
||||||
utils.ApplyNoWindow(cmd) // Hide command window on Windows
|
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logging.Debug(logging.CatSystem, "failed to run wmic cpu: %v", err)
|
logging.Debug(logging.CatSystem, "failed to run wmic cpu: %v", err)
|
||||||
|
|
@ -210,7 +208,6 @@ func detectGPULinux() (model, driver string) {
|
||||||
func detectGPUWindows() (model, driver string) {
|
func detectGPUWindows() (model, driver string) {
|
||||||
// Use nvidia-smi if available (NVIDIA GPUs)
|
// Use nvidia-smi if available (NVIDIA GPUs)
|
||||||
cmd := exec.Command("nvidia-smi", "--query-gpu=name,driver_version", "--format=csv,noheader")
|
cmd := exec.Command("nvidia-smi", "--query-gpu=name,driver_version", "--format=csv,noheader")
|
||||||
utils.ApplyNoWindow(cmd) // Hide command window on Windows
|
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
parts := strings.Split(strings.TrimSpace(string(output)), ",")
|
parts := strings.Split(strings.TrimSpace(string(output)), ",")
|
||||||
|
|
@ -223,41 +220,21 @@ func detectGPUWindows() (model, driver string) {
|
||||||
|
|
||||||
// Try wmic for generic GPU info
|
// Try wmic for generic GPU info
|
||||||
cmd = exec.Command("wmic", "path", "win32_VideoController", "get", "name,driverversion")
|
cmd = exec.Command("wmic", "path", "win32_VideoController", "get", "name,driverversion")
|
||||||
utils.ApplyNoWindow(cmd) // Hide command window on Windows
|
|
||||||
output, err = cmd.Output()
|
output, err = cmd.Output()
|
||||||
if err == nil {
|
if err == nil {
|
||||||
lines := strings.Split(string(output), "\n")
|
lines := strings.Split(string(output), "\n")
|
||||||
// Iterate through all video controllers, skip virtual/non-physical adapters
|
if len(lines) >= 2 {
|
||||||
for i, line := range lines {
|
// Skip header, get first GPU
|
||||||
if i == 0 { // Skip header
|
line := strings.TrimSpace(lines[1])
|
||||||
continue
|
if line != "" {
|
||||||
}
|
// Parse: Name DriverVersion
|
||||||
line = strings.TrimSpace(line)
|
re := regexp.MustCompile(`^(.+?)\s+(\S+)$`)
|
||||||
if line == "" {
|
matches := re.FindStringSubmatch(line)
|
||||||
continue
|
if len(matches) == 3 {
|
||||||
}
|
model = strings.TrimSpace(matches[1])
|
||||||
|
driver = strings.TrimSpace(matches[2])
|
||||||
// Filter out virtual/software adapters
|
return model, driver
|
||||||
lineLower := strings.ToLower(line)
|
}
|
||||||
if strings.Contains(lineLower, "virtual") ||
|
|
||||||
strings.Contains(lineLower, "microsoft basic") ||
|
|
||||||
strings.Contains(lineLower, "remote") ||
|
|
||||||
strings.Contains(lineLower, "vnc") ||
|
|
||||||
strings.Contains(lineLower, "parsec") ||
|
|
||||||
strings.Contains(lineLower, "teamviewer") {
|
|
||||||
logging.Debug(logging.CatSystem, "skipping virtual GPU: %s", line)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse: Name DriverVersion
|
|
||||||
// Use flexible regex to handle varying whitespace
|
|
||||||
re := regexp.MustCompile(`^(.+?)\s+(\S+)$`)
|
|
||||||
matches := re.FindStringSubmatch(line)
|
|
||||||
if len(matches) == 3 {
|
|
||||||
model = strings.TrimSpace(matches[1])
|
|
||||||
driver = strings.TrimSpace(matches[2])
|
|
||||||
logging.Debug(logging.CatSystem, "detected physical GPU: %s (driver: %s)", model, driver)
|
|
||||||
return model, driver
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -339,7 +316,6 @@ func detectRAMLinux() (readable string, mb uint64) {
|
||||||
|
|
||||||
func detectRAMWindows() (readable string, mb uint64) {
|
func detectRAMWindows() (readable string, mb uint64) {
|
||||||
cmd := exec.Command("wmic", "computersystem", "get", "totalphysicalmemory")
|
cmd := exec.Command("wmic", "computersystem", "get", "totalphysicalmemory")
|
||||||
utils.ApplyNoWindow(cmd) // Hide command window on Windows
|
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logging.Debug(logging.CatSystem, "failed to run wmic computersystem: %v", err)
|
logging.Debug(logging.CatSystem, "failed to run wmic computersystem: %v", err)
|
||||||
|
|
|
||||||
|
|
@ -38,12 +38,12 @@ type BenchmarkProgressView struct {
|
||||||
textColor color.Color
|
textColor color.Color
|
||||||
onCancel func()
|
onCancel func()
|
||||||
|
|
||||||
container *fyne.Container
|
container *fyne.Container
|
||||||
statusLabel *widget.Label
|
statusLabel *widget.Label
|
||||||
progressBar *widget.ProgressBar
|
progressBar *widget.ProgressBar
|
||||||
currentLabel *widget.Label
|
currentLabel *widget.Label
|
||||||
resultsBox *fyne.Container
|
resultsBox *fyne.Container
|
||||||
cancelBtn *widget.Button
|
cancelBtn *widget.Button
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *BenchmarkProgressView) build() {
|
func (v *BenchmarkProgressView) build() {
|
||||||
|
|
@ -176,7 +176,7 @@ func (v *BenchmarkProgressView) AddResult(result benchmark.Result) {
|
||||||
|
|
||||||
// Status indicator
|
// Status indicator
|
||||||
statusRect := canvas.NewRectangle(statusColor)
|
statusRect := canvas.NewRectangle(statusColor)
|
||||||
// statusRect.SetMinSize(fyne.NewSize(6, 0)) // Removed for flexible sizing
|
statusRect.SetMinSize(fyne.NewSize(6, 0))
|
||||||
|
|
||||||
// Encoder label
|
// Encoder label
|
||||||
encoderLabel := widget.NewLabel(fmt.Sprintf("%s (%s)", result.Encoder, result.Preset))
|
encoderLabel := widget.NewLabel(fmt.Sprintf("%s (%s)", result.Encoder, result.Preset))
|
||||||
|
|
@ -354,7 +354,7 @@ func BuildBenchmarkResultsView(
|
||||||
|
|
||||||
resultsBox := container.NewVBox(resultItems...)
|
resultsBox := container.NewVBox(resultItems...)
|
||||||
resultsScroll := container.NewVScroll(resultsBox)
|
resultsScroll := container.NewVScroll(resultsBox)
|
||||||
// resultsScroll.SetMinSize(fyne.NewSize(0, 300)) // Removed for flexible sizing
|
resultsScroll.SetMinSize(fyne.NewSize(0, 300))
|
||||||
|
|
||||||
resultsSection := container.NewBorder(
|
resultsSection := container.NewBorder(
|
||||||
topResultsTitle,
|
topResultsTitle,
|
||||||
|
|
@ -436,7 +436,7 @@ func BuildBenchmarkHistoryView(
|
||||||
|
|
||||||
runsList := container.NewVBox(runItems...)
|
runsList := container.NewVBox(runItems...)
|
||||||
runsScroll := container.NewVScroll(runsList)
|
runsScroll := container.NewVScroll(runsList)
|
||||||
// runsScroll.SetMinSize(fyne.NewSize(0, 400)) // Removed for flexible sizing
|
runsScroll.SetMinSize(fyne.NewSize(0, 400))
|
||||||
|
|
||||||
infoLabel := widget.NewLabel("Click on a benchmark run to view detailed results")
|
infoLabel := widget.NewLabel("Click on a benchmark run to view detailed results")
|
||||||
infoLabel.Alignment = fyne.TextAlignCenter
|
infoLabel.Alignment = fyne.TextAlignCenter
|
||||||
|
|
|
||||||
|
|
@ -1,266 +0,0 @@
|
||||||
package ui
|
|
||||||
|
|
||||||
import (
|
|
||||||
"image/color"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Semantic Color System for VideoTools
|
|
||||||
// Based on professional NLE and broadcast tooling conventions
|
|
||||||
|
|
||||||
// Container / Format Colors (File Wrapper)
|
|
||||||
var (
|
|
||||||
ColorMKV = utils.MustHex("#00B3B3") // Teal / Cyan - Neutral, modern, flexible container
|
|
||||||
ColorRemux = utils.MustHex("#06B6D4") // Cyan-Glow - Lossless remux (no re-encoding)
|
|
||||||
ColorMP4 = utils.MustHex("#3B82F6") // Blue - Widely recognised, consumer-friendly
|
|
||||||
ColorMOV = utils.MustHex("#6366F1") // Indigo - Pro / Apple / QuickTime lineage
|
|
||||||
ColorAVI = utils.MustHex("#64748B") // Grey-Blue - Legacy container
|
|
||||||
ColorWEBM = utils.MustHex("#22C55E") // Green-Teal - Web-native
|
|
||||||
ColorTS = utils.MustHex("#F59E0B") // Amber - Broadcast / transport streams
|
|
||||||
ColorM2TS = utils.MustHex("#F59E0B") // Amber - Broadcast / transport streams
|
|
||||||
)
|
|
||||||
|
|
||||||
// Video Codec Colors (Compression Method)
|
|
||||||
// Modern / Efficient Codecs
|
|
||||||
var (
|
|
||||||
ColorAV1 = utils.MustHex("#10B981") // Emerald - Modern, efficient
|
|
||||||
ColorHEVC = utils.MustHex("#84CC16") // Lime-Green - Modern, efficient
|
|
||||||
ColorH265 = utils.MustHex("#84CC16") // Lime-Green - Same as HEVC
|
|
||||||
ColorVP9 = utils.MustHex("#22D3EE") // Green-Cyan - Modern, efficient
|
|
||||||
)
|
|
||||||
|
|
||||||
// Established / Legacy Video Codecs
|
|
||||||
var (
|
|
||||||
ColorH264 = utils.MustHex("#38BDF8") // Sky Blue - Compatibility
|
|
||||||
ColorAVC = utils.MustHex("#38BDF8") // Sky Blue - Same as H.264
|
|
||||||
ColorMPEG2 = utils.MustHex("#EAB308") // Yellow-Amber - Legacy / broadcast
|
|
||||||
ColorDivX = utils.MustHex("#FB923C") // Muted Orange - Legacy
|
|
||||||
ColorXviD = utils.MustHex("#FB923C") // Muted Orange - Legacy
|
|
||||||
ColorMPEG4 = utils.MustHex("#FB923C") // Muted Orange - Legacy
|
|
||||||
)
|
|
||||||
|
|
||||||
// Audio Codec Colors (Secondary but Distinct)
|
|
||||||
var (
|
|
||||||
ColorOpus = utils.MustHex("#8B5CF6") // Violet - Modern audio
|
|
||||||
ColorAAC = utils.MustHex("#7C3AED") // Purple-Blue - Common audio
|
|
||||||
ColorFLAC = utils.MustHex("#EC4899") // Magenta - Lossless audio
|
|
||||||
ColorMP3 = utils.MustHex("#F43F5E") // Rose - Legacy audio
|
|
||||||
ColorAC3 = utils.MustHex("#F97316") // Orange-Red - Surround audio
|
|
||||||
ColorVorbis = utils.MustHex("#A855F7") // Purple - Open codec
|
|
||||||
)
|
|
||||||
|
|
||||||
// Pixel Format / Colour Data (Technical Metadata)
|
|
||||||
var (
|
|
||||||
ColorYUV420P = utils.MustHex("#94A3B8") // Slate - Standard
|
|
||||||
ColorYUV422P = utils.MustHex("#64748B") // Slate-Blue - Intermediate
|
|
||||||
ColorYUV444P = utils.MustHex("#475569") // Steel - High quality
|
|
||||||
ColorHDR = utils.MustHex("#06B6D4") // Cyan-Glow - HDR content
|
|
||||||
ColorSDR = utils.MustHex("#9CA3AF") // Neutral Grey - SDR content
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetContainerColor returns the semantic color for a container format
|
|
||||||
func GetContainerColor(format string) color.Color {
|
|
||||||
switch format {
|
|
||||||
case "mkv", "matroska":
|
|
||||||
return ColorMKV
|
|
||||||
case "mp4", "m4v":
|
|
||||||
return ColorMP4
|
|
||||||
case "mov", "quicktime":
|
|
||||||
return ColorMOV
|
|
||||||
case "avi":
|
|
||||||
return ColorAVI
|
|
||||||
case "webm":
|
|
||||||
return ColorWEBM
|
|
||||||
case "ts", "m2ts", "mts":
|
|
||||||
return ColorTS
|
|
||||||
default:
|
|
||||||
return color.RGBA{100, 100, 100, 255} // Default grey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetVideoCodecColor returns the semantic color for a video codec
|
|
||||||
func GetVideoCodecColor(codec string) color.Color {
|
|
||||||
switch codec {
|
|
||||||
case "av1":
|
|
||||||
return ColorAV1
|
|
||||||
case "hevc", "h265", "h.265":
|
|
||||||
return ColorHEVC
|
|
||||||
case "vp9":
|
|
||||||
return ColorVP9
|
|
||||||
case "h264", "avc", "h.264":
|
|
||||||
return ColorH264
|
|
||||||
case "mpeg2":
|
|
||||||
return ColorMPEG2
|
|
||||||
case "divx", "xvid", "mpeg4":
|
|
||||||
return ColorDivX
|
|
||||||
default:
|
|
||||||
return color.RGBA{100, 100, 100, 255} // Default grey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetAudioCodecColor returns the semantic color for an audio codec
|
|
||||||
func GetAudioCodecColor(codec string) color.Color {
|
|
||||||
switch codec {
|
|
||||||
case "opus":
|
|
||||||
return ColorOpus
|
|
||||||
case "aac":
|
|
||||||
return ColorAAC
|
|
||||||
case "flac":
|
|
||||||
return ColorFLAC
|
|
||||||
case "mp3":
|
|
||||||
return ColorMP3
|
|
||||||
case "ac3":
|
|
||||||
return ColorAC3
|
|
||||||
case "vorbis":
|
|
||||||
return ColorVorbis
|
|
||||||
default:
|
|
||||||
return color.RGBA{100, 100, 100, 255} // Default grey
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPixelFormatColor returns the semantic color for a pixel format
|
|
||||||
func GetPixelFormatColor(pixfmt string) color.Color {
|
|
||||||
switch pixfmt {
|
|
||||||
case "yuv420p", "yuv420p10le":
|
|
||||||
return ColorYUV420P
|
|
||||||
case "yuv422p", "yuv422p10le":
|
|
||||||
return ColorYUV422P
|
|
||||||
case "yuv444p", "yuv444p10le":
|
|
||||||
return ColorYUV444P
|
|
||||||
default:
|
|
||||||
return ColorSDR
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildFormatColorMap creates a color map for format labels
|
|
||||||
// Parses labels like "MKV (AV1)" and returns appropriate container color
|
|
||||||
func BuildFormatColorMap(formatLabels []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
for _, label := range formatLabels {
|
|
||||||
// Parse format from label (e.g., "MKV (AV1)" -> "mkv")
|
|
||||||
parts := strings.Split(label, " ")
|
|
||||||
if len(parts) > 0 {
|
|
||||||
format := strings.ToLower(parts[0])
|
|
||||||
// Special case for Remux
|
|
||||||
if strings.Contains(strings.ToUpper(label), "REMUX") {
|
|
||||||
colorMap[label] = ColorRemux
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
colorMap[label] = GetContainerColor(format)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildVideoCodecColorMap creates a color map for video codec options
|
|
||||||
func BuildVideoCodecColorMap(codecs []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
for _, codec := range codecs {
|
|
||||||
switch codec {
|
|
||||||
case "H.264":
|
|
||||||
colorMap[codec] = ColorH264
|
|
||||||
case "H.265":
|
|
||||||
colorMap[codec] = ColorHEVC
|
|
||||||
case "VP9":
|
|
||||||
colorMap[codec] = ColorVP9
|
|
||||||
case "AV1":
|
|
||||||
colorMap[codec] = ColorAV1
|
|
||||||
case "MPEG-2":
|
|
||||||
colorMap[codec] = ColorMPEG2
|
|
||||||
case "Copy":
|
|
||||||
colorMap[codec] = ColorRemux // Use remux color for copy
|
|
||||||
default:
|
|
||||||
colorMap[codec] = color.RGBA{100, 100, 100, 255}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildAudioCodecColorMap creates a color map for audio codec options
|
|
||||||
func BuildAudioCodecColorMap(codecs []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
for _, codec := range codecs {
|
|
||||||
switch codec {
|
|
||||||
case "AAC":
|
|
||||||
colorMap[codec] = ColorAAC
|
|
||||||
case "Opus":
|
|
||||||
colorMap[codec] = ColorOpus
|
|
||||||
case "MP3":
|
|
||||||
colorMap[codec] = ColorMP3
|
|
||||||
case "FLAC":
|
|
||||||
colorMap[codec] = ColorFLAC
|
|
||||||
case "Copy":
|
|
||||||
colorMap[codec] = ColorRemux // Use remux color for copy
|
|
||||||
default:
|
|
||||||
colorMap[codec] = color.RGBA{100, 100, 100, 255}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildGenericColorMap creates a rainbow color map for any list of options
|
|
||||||
// Uses distinct, vibrant colors to make navigation faster
|
|
||||||
func BuildGenericColorMap(options []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
|
|
||||||
// Rainbow palette - vibrant and distinct colors
|
|
||||||
rainbowColors := []color.Color{
|
|
||||||
utils.MustHex("#EF4444"), // Red
|
|
||||||
utils.MustHex("#F97316"), // Orange
|
|
||||||
utils.MustHex("#F59E0B"), // Amber
|
|
||||||
utils.MustHex("#EAB308"), // Yellow
|
|
||||||
utils.MustHex("#84CC16"), // Lime
|
|
||||||
utils.MustHex("#22C55E"), // Green
|
|
||||||
utils.MustHex("#10B981"), // Emerald
|
|
||||||
utils.MustHex("#14B8A6"), // Teal
|
|
||||||
utils.MustHex("#06B6D4"), // Cyan
|
|
||||||
utils.MustHex("#0EA5E9"), // Sky
|
|
||||||
utils.MustHex("#3B82F6"), // Blue
|
|
||||||
utils.MustHex("#6366F1"), // Indigo
|
|
||||||
utils.MustHex("#8B5CF6"), // Violet
|
|
||||||
utils.MustHex("#A855F7"), // Purple
|
|
||||||
utils.MustHex("#D946EF"), // Fuchsia
|
|
||||||
utils.MustHex("#EC4899"), // Pink
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, opt := range options {
|
|
||||||
colorMap[opt] = rainbowColors[i%len(rainbowColors)]
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildQualityColorMap creates a gradient-based color map for quality/preset options
|
|
||||||
// Higher quality = cooler colors (blue), lower quality = warmer colors (red/orange)
|
|
||||||
func BuildQualityColorMap(options []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
|
|
||||||
// Quality gradient: red (fast/low) -> yellow -> green -> blue (slow/high)
|
|
||||||
qualityColors := []color.Color{
|
|
||||||
utils.MustHex("#EF4444"), // Red - ultrafast/lowest
|
|
||||||
utils.MustHex("#F97316"), // Orange - superfast
|
|
||||||
utils.MustHex("#F59E0B"), // Amber - veryfast
|
|
||||||
utils.MustHex("#EAB308"), // Yellow - faster
|
|
||||||
utils.MustHex("#84CC16"), // Lime - fast
|
|
||||||
utils.MustHex("#22C55E"), // Green - medium
|
|
||||||
utils.MustHex("#10B981"), // Emerald - slow
|
|
||||||
utils.MustHex("#14B8A6"), // Teal - slower
|
|
||||||
utils.MustHex("#06B6D4"), // Cyan - veryslow
|
|
||||||
utils.MustHex("#3B82F6"), // Blue - highest quality
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, opt := range options {
|
|
||||||
colorMap[opt] = qualityColors[i%len(qualityColors)]
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
||||||
// BuildPixelFormatColorMap creates a color map for pixel format options
|
|
||||||
func BuildPixelFormatColorMap(formats []string) map[string]color.Color {
|
|
||||||
colorMap := make(map[string]color.Color)
|
|
||||||
for _, format := range formats {
|
|
||||||
colorMap[format] = GetPixelFormatColor(format)
|
|
||||||
}
|
|
||||||
return colorMap
|
|
||||||
}
|
|
||||||
|
|
@ -2,7 +2,6 @@ package ui
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"image"
|
|
||||||
"image/color"
|
"image/color"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -33,38 +32,13 @@ func SetColors(grid, text color.Color) {
|
||||||
TextColor = text
|
TextColor = text
|
||||||
}
|
}
|
||||||
|
|
||||||
// MonoTheme ensures all text uses a monospace font and swaps hover/selection colors
|
// MonoTheme ensures all text uses a monospace font
|
||||||
type MonoTheme struct{}
|
type MonoTheme struct{}
|
||||||
|
|
||||||
func (m *MonoTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color {
|
func (m *MonoTheme) Color(name fyne.ThemeColorName, variant fyne.ThemeVariant) color.Color {
|
||||||
switch name {
|
|
||||||
case theme.ColorNameSelection:
|
|
||||||
// Use the default hover color for selection
|
|
||||||
return theme.DefaultTheme().Color(theme.ColorNameHover, variant)
|
|
||||||
case theme.ColorNameHover:
|
|
||||||
// Use the default selection color for hover
|
|
||||||
return theme.DefaultTheme().Color(theme.ColorNameSelection, variant)
|
|
||||||
case theme.ColorNameButton:
|
|
||||||
// Use a slightly lighter blue for buttons (92% of full selection color brightness)
|
|
||||||
selectionColor := theme.DefaultTheme().Color(theme.ColorNameSelection, variant)
|
|
||||||
r, g, b, a := selectionColor.RGBA()
|
|
||||||
// Lighten by 8% (multiply by 1.08, capped at 255)
|
|
||||||
lightness := 1.08
|
|
||||||
newR := uint8(min(int(float64(r>>8)*lightness), 255))
|
|
||||||
newG := uint8(min(int(float64(g>>8)*lightness), 255))
|
|
||||||
newB := uint8(min(int(float64(b>>8)*lightness), 255))
|
|
||||||
return color.RGBA{R: newR, G: newG, B: newB, A: uint8(a >> 8)}
|
|
||||||
}
|
|
||||||
return theme.DefaultTheme().Color(name, variant)
|
return theme.DefaultTheme().Color(name, variant)
|
||||||
}
|
}
|
||||||
|
|
||||||
func min(a, b int) int {
|
|
||||||
if a < b {
|
|
||||||
return a
|
|
||||||
}
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MonoTheme) Font(style fyne.TextStyle) fyne.Resource {
|
func (m *MonoTheme) Font(style fyne.TextStyle) fyne.Resource {
|
||||||
style.Monospace = true
|
style.Monospace = true
|
||||||
return theme.DefaultTheme().Font(style)
|
return theme.DefaultTheme().Font(style)
|
||||||
|
|
@ -75,46 +49,29 @@ func (m *MonoTheme) Icon(name fyne.ThemeIconName) fyne.Resource {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *MonoTheme) Size(name fyne.ThemeSizeName) float32 {
|
func (m *MonoTheme) Size(name fyne.ThemeSizeName) float32 {
|
||||||
// Make UI elements larger and more readable
|
|
||||||
switch name {
|
|
||||||
case theme.SizeNamePadding:
|
|
||||||
return 8 // Increased from default 6
|
|
||||||
case theme.SizeNameInnerPadding:
|
|
||||||
return 10 // Increased from default 8
|
|
||||||
case theme.SizeNameText:
|
|
||||||
return 15 // Increased from default 14
|
|
||||||
case theme.SizeNameHeadingText:
|
|
||||||
return 20 // Increased from default 18
|
|
||||||
case theme.SizeNameSubHeadingText:
|
|
||||||
return 17 // Increased from default 16
|
|
||||||
case theme.SizeNameInputBorder:
|
|
||||||
return 2 // Keep default
|
|
||||||
}
|
|
||||||
return theme.DefaultTheme().Size(name)
|
return theme.DefaultTheme().Size(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ModuleTile is a clickable tile widget for module selection
|
// ModuleTile is a clickable tile widget for module selection
|
||||||
type ModuleTile struct {
|
type ModuleTile struct {
|
||||||
widget.BaseWidget
|
widget.BaseWidget
|
||||||
label string
|
label string
|
||||||
color color.Color
|
color color.Color
|
||||||
enabled bool
|
enabled bool
|
||||||
missingDependencies bool
|
onTapped func()
|
||||||
onTapped func()
|
onDropped func([]fyne.URI)
|
||||||
onDropped func([]fyne.URI)
|
flashing bool
|
||||||
flashing bool
|
draggedOver bool
|
||||||
draggedOver bool
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewModuleTile creates a new module tile
|
// NewModuleTile creates a new module tile
|
||||||
func NewModuleTile(label string, col color.Color, enabled bool, missingDeps bool, tapped func(), dropped func([]fyne.URI)) *ModuleTile {
|
func NewModuleTile(label string, col color.Color, enabled bool, tapped func(), dropped func([]fyne.URI)) *ModuleTile {
|
||||||
m := &ModuleTile{
|
m := &ModuleTile{
|
||||||
label: strings.ToUpper(label),
|
label: strings.ToUpper(label),
|
||||||
color: col,
|
color: col,
|
||||||
missingDependencies: missingDeps,
|
enabled: enabled,
|
||||||
enabled: enabled,
|
onTapped: tapped,
|
||||||
onTapped: tapped,
|
onDropped: dropped,
|
||||||
onDropped: dropped,
|
|
||||||
}
|
}
|
||||||
m.ExtendBaseWidget(m)
|
m.ExtendBaseWidget(m)
|
||||||
return m
|
return m
|
||||||
|
|
@ -161,34 +118,19 @@ func (m *ModuleTile) Dropped(pos fyne.Position, items []fyne.URI) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// getContrastColor returns black or white text color based on background brightness
|
|
||||||
func getContrastColor(bgColor color.Color) color.Color {
|
|
||||||
r, g, b, _ := bgColor.RGBA()
|
|
||||||
// Convert from 16-bit to 8-bit
|
|
||||||
r8 := float64(r >> 8)
|
|
||||||
g8 := float64(g >> 8)
|
|
||||||
b8 := float64(b >> 8)
|
|
||||||
|
|
||||||
// Calculate relative luminance (WCAG formula)
|
|
||||||
luminance := (0.2126*r8 + 0.7152*g8 + 0.0722*b8) / 255.0
|
|
||||||
|
|
||||||
// If bright background, use dark text; if dark background, use light text
|
|
||||||
if luminance > 0.5 {
|
|
||||||
return color.NRGBA{R: 20, G: 20, B: 20, A: 255} // Dark text
|
|
||||||
}
|
|
||||||
return TextColor // Light text
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *ModuleTile) CreateRenderer() fyne.WidgetRenderer {
|
func (m *ModuleTile) CreateRenderer() fyne.WidgetRenderer {
|
||||||
tileColor := m.color
|
tileColor := m.color
|
||||||
labelColor := TextColor // White text for all modules
|
labelColor := TextColor
|
||||||
|
|
||||||
// Orange background for modules missing dependencies
|
// Dim disabled tiles
|
||||||
if m.missingDependencies {
|
if !m.enabled {
|
||||||
tileColor = color.NRGBA{R: 255, G: 152, B: 0, A: 255} // Orange
|
// Reduce opacity by mixing with dark background
|
||||||
} else if !m.enabled {
|
if c, ok := m.color.(color.NRGBA); ok {
|
||||||
// Grey background for not implemented modules
|
tileColor = color.NRGBA{R: c.R / 3, G: c.G / 3, B: c.B / 3, A: c.A}
|
||||||
tileColor = color.NRGBA{R: 80, G: 80, B: 80, A: 255}
|
}
|
||||||
|
if c, ok := TextColor.(color.NRGBA); ok {
|
||||||
|
labelColor = color.NRGBA{R: c.R / 2, G: c.G / 2, B: c.B / 2, A: c.A}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bg := canvas.NewRectangle(tileColor)
|
bg := canvas.NewRectangle(tileColor)
|
||||||
|
|
@ -201,45 +143,10 @@ func (m *ModuleTile) CreateRenderer() fyne.WidgetRenderer {
|
||||||
txt.Alignment = fyne.TextAlignCenter
|
txt.Alignment = fyne.TextAlignCenter
|
||||||
txt.TextSize = 20
|
txt.TextSize = 20
|
||||||
|
|
||||||
// Lock icon for disabled modules
|
|
||||||
lockIcon := canvas.NewText("🔒", color.NRGBA{R: 200, G: 200, B: 200, A: 255})
|
|
||||||
lockIcon.TextSize = 16
|
|
||||||
lockIcon.Alignment = fyne.TextAlignCenter
|
|
||||||
if m.enabled {
|
|
||||||
lockIcon.Hide()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Diagonal stripe overlay for disabled modules
|
|
||||||
disabledStripe := canvas.NewRaster(func(w, h int) image.Image {
|
|
||||||
img := image.NewRGBA(image.Rect(0, 0, w, h))
|
|
||||||
|
|
||||||
// Only draw stripes if disabled
|
|
||||||
if !m.enabled {
|
|
||||||
// Semi-transparent dark stripes
|
|
||||||
darkStripe := color.NRGBA{R: 0, G: 0, B: 0, A: 100}
|
|
||||||
lightStripe := color.NRGBA{R: 0, G: 0, B: 0, A: 30}
|
|
||||||
|
|
||||||
for y := 0; y < h; y++ {
|
|
||||||
for x := 0; x < w; x++ {
|
|
||||||
// Thicker diagonal stripes (dividing by 8 instead of 4)
|
|
||||||
if ((x + y) / 8 % 2) == 0 {
|
|
||||||
img.Set(x, y, darkStripe)
|
|
||||||
} else {
|
|
||||||
img.Set(x, y, lightStripe)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Return transparent image for enabled modules
|
|
||||||
return img
|
|
||||||
})
|
|
||||||
|
|
||||||
return &moduleTileRenderer{
|
return &moduleTileRenderer{
|
||||||
tile: m,
|
tile: m,
|
||||||
bg: bg,
|
bg: bg,
|
||||||
label: txt,
|
label: txt,
|
||||||
lockIcon: lockIcon,
|
|
||||||
disabledStripe: disabledStripe,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -250,62 +157,27 @@ func (m *ModuleTile) Tapped(*fyne.PointEvent) {
|
||||||
}
|
}
|
||||||
|
|
||||||
type moduleTileRenderer struct {
|
type moduleTileRenderer struct {
|
||||||
tile *ModuleTile
|
tile *ModuleTile
|
||||||
bg *canvas.Rectangle
|
bg *canvas.Rectangle
|
||||||
label *canvas.Text
|
label *canvas.Text
|
||||||
lockIcon *canvas.Text
|
|
||||||
disabledStripe *canvas.Raster
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *moduleTileRenderer) Layout(size fyne.Size) {
|
func (r *moduleTileRenderer) Layout(size fyne.Size) {
|
||||||
r.bg.Resize(size)
|
r.bg.Resize(size)
|
||||||
r.bg.Move(fyne.NewPos(0, 0))
|
|
||||||
|
|
||||||
// Stripe overlay covers entire tile
|
|
||||||
if r.disabledStripe != nil {
|
|
||||||
r.disabledStripe.Resize(size)
|
|
||||||
r.disabledStripe.Move(fyne.NewPos(0, 0))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Center the label by positioning it in the middle
|
// Center the label by positioning it in the middle
|
||||||
labelSize := r.label.MinSize()
|
labelSize := r.label.MinSize()
|
||||||
r.label.Resize(labelSize)
|
r.label.Resize(labelSize)
|
||||||
x := (size.Width - labelSize.Width) / 2
|
x := (size.Width - labelSize.Width) / 2
|
||||||
y := (size.Height - labelSize.Height) / 2
|
y := (size.Height - labelSize.Height) / 2
|
||||||
r.label.Move(fyne.NewPos(x, y))
|
r.label.Move(fyne.NewPos(x, y))
|
||||||
|
|
||||||
// Position lock icon in top-right corner
|
|
||||||
if r.lockIcon != nil {
|
|
||||||
lockSize := r.lockIcon.MinSize()
|
|
||||||
r.lockIcon.Resize(lockSize)
|
|
||||||
lockX := size.Width - lockSize.Width - 4
|
|
||||||
lockY := float32(4)
|
|
||||||
r.lockIcon.Move(fyne.NewPos(lockX, lockY))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *moduleTileRenderer) MinSize() fyne.Size {
|
func (r *moduleTileRenderer) MinSize() fyne.Size {
|
||||||
return fyne.NewSize(135, 58)
|
return fyne.NewSize(150, 65)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *moduleTileRenderer) Refresh() {
|
func (r *moduleTileRenderer) Refresh() {
|
||||||
// Update tile color and text color based on enabled state
|
r.bg.FillColor = r.tile.color
|
||||||
if r.tile.enabled {
|
|
||||||
r.bg.FillColor = r.tile.color
|
|
||||||
r.label.Color = TextColor // Always white text for enabled modules
|
|
||||||
if r.lockIcon != nil {
|
|
||||||
r.lockIcon.Hide()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Dim disabled tiles
|
|
||||||
if c, ok := r.tile.color.(color.NRGBA); ok {
|
|
||||||
r.bg.FillColor = color.NRGBA{R: c.R / 3, G: c.G / 3, B: c.B / 3, A: c.A}
|
|
||||||
}
|
|
||||||
r.label.Color = color.NRGBA{R: 100, G: 100, B: 100, A: 255}
|
|
||||||
if r.lockIcon != nil {
|
|
||||||
r.lockIcon.Show()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Apply visual feedback based on state
|
// Apply visual feedback based on state
|
||||||
if r.tile.flashing {
|
if r.tile.flashing {
|
||||||
|
|
@ -325,24 +197,18 @@ func (r *moduleTileRenderer) Refresh() {
|
||||||
r.bg.Refresh()
|
r.bg.Refresh()
|
||||||
r.label.Text = r.tile.label
|
r.label.Text = r.tile.label
|
||||||
r.label.Refresh()
|
r.label.Refresh()
|
||||||
if r.lockIcon != nil {
|
|
||||||
r.lockIcon.Refresh()
|
|
||||||
}
|
|
||||||
if r.disabledStripe != nil {
|
|
||||||
r.disabledStripe.Refresh()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *moduleTileRenderer) Destroy() {}
|
func (r *moduleTileRenderer) Destroy() {}
|
||||||
|
|
||||||
func (r *moduleTileRenderer) Objects() []fyne.CanvasObject {
|
func (r *moduleTileRenderer) Objects() []fyne.CanvasObject {
|
||||||
return []fyne.CanvasObject{r.bg, r.disabledStripe, r.label, r.lockIcon}
|
return []fyne.CanvasObject{r.bg, r.label}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TintedBar creates a colored bar container
|
// TintedBar creates a colored bar container
|
||||||
func TintedBar(col color.Color, body fyne.CanvasObject) fyne.CanvasObject {
|
func TintedBar(col color.Color, body fyne.CanvasObject) fyne.CanvasObject {
|
||||||
rect := canvas.NewRectangle(col)
|
rect := canvas.NewRectangle(col)
|
||||||
// rect.SetMinSize(fyne.NewSize(0, 48)) // Removed for flexible sizing
|
rect.SetMinSize(fyne.NewSize(0, 48))
|
||||||
padded := container.NewPadded(body)
|
padded := container.NewPadded(body)
|
||||||
return container.NewMax(rect, padded)
|
return container.NewMax(rect, padded)
|
||||||
}
|
}
|
||||||
|
|
@ -466,58 +332,6 @@ func (r *droppableRenderer) Objects() []fyne.CanvasObject {
|
||||||
return []fyne.CanvasObject{r.content}
|
return []fyne.CanvasObject{r.content}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FastVScroll creates a vertical scroll container with faster scroll speed
|
|
||||||
type FastVScroll struct {
|
|
||||||
widget.BaseWidget
|
|
||||||
scroll *container.Scroll
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewFastVScroll creates a new fast-scrolling vertical scroll container
|
|
||||||
func NewFastVScroll(content fyne.CanvasObject) *FastVScroll {
|
|
||||||
f := &FastVScroll{
|
|
||||||
scroll: container.NewVScroll(content),
|
|
||||||
}
|
|
||||||
f.ExtendBaseWidget(f)
|
|
||||||
return f
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *FastVScroll) CreateRenderer() fyne.WidgetRenderer {
|
|
||||||
return &fastScrollRenderer{scroll: f.scroll}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (f *FastVScroll) Scrolled(ev *fyne.ScrollEvent) {
|
|
||||||
// Multiply scroll speed by 12x for much faster navigation
|
|
||||||
fastEvent := &fyne.ScrollEvent{
|
|
||||||
Scrolled: fyne.Delta{
|
|
||||||
DX: ev.Scrolled.DX * 12.0,
|
|
||||||
DY: ev.Scrolled.DY * 12.0,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
f.scroll.Scrolled(fastEvent)
|
|
||||||
}
|
|
||||||
|
|
||||||
type fastScrollRenderer struct {
|
|
||||||
scroll *container.Scroll
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fastScrollRenderer) Layout(size fyne.Size) {
|
|
||||||
r.scroll.Resize(size)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fastScrollRenderer) MinSize() fyne.Size {
|
|
||||||
return r.scroll.MinSize()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fastScrollRenderer) Refresh() {
|
|
||||||
r.scroll.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fastScrollRenderer) Objects() []fyne.CanvasObject {
|
|
||||||
return []fyne.CanvasObject{r.scroll}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *fastScrollRenderer) Destroy() {}
|
|
||||||
|
|
||||||
// DraggableVScroll creates a vertical scroll container with draggable track
|
// DraggableVScroll creates a vertical scroll container with draggable track
|
||||||
type DraggableVScroll struct {
|
type DraggableVScroll struct {
|
||||||
widget.BaseWidget
|
widget.BaseWidget
|
||||||
|
|
@ -602,14 +416,7 @@ func (d *DraggableVScroll) Tapped(ev *fyne.PointEvent) {
|
||||||
|
|
||||||
// Scrolled handles scroll events (mouse wheel)
|
// Scrolled handles scroll events (mouse wheel)
|
||||||
func (d *DraggableVScroll) Scrolled(ev *fyne.ScrollEvent) {
|
func (d *DraggableVScroll) Scrolled(ev *fyne.ScrollEvent) {
|
||||||
// Multiply scroll speed by 2.5x for faster scrolling
|
d.scroll.Scrolled(ev)
|
||||||
fastEvent := &fyne.ScrollEvent{
|
|
||||||
Scrolled: fyne.Delta{
|
|
||||||
DX: ev.Scrolled.DX * 2.5,
|
|
||||||
DY: ev.Scrolled.DY * 2.5,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
d.scroll.Scrolled(fastEvent)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type draggableScrollRenderer struct {
|
type draggableScrollRenderer struct {
|
||||||
|
|
@ -898,7 +705,7 @@ func (w *FFmpegCommandWidget) SetCommand(command string) {
|
||||||
// CreateRenderer creates the widget renderer
|
// CreateRenderer creates the widget renderer
|
||||||
func (w *FFmpegCommandWidget) CreateRenderer() fyne.WidgetRenderer {
|
func (w *FFmpegCommandWidget) CreateRenderer() fyne.WidgetRenderer {
|
||||||
scroll := container.NewVScroll(w.commandLabel)
|
scroll := container.NewVScroll(w.commandLabel)
|
||||||
// scroll.SetMinSize(fyne.NewSize(0, 80)) // Removed for flexible sizing
|
scroll.SetMinSize(fyne.NewSize(0, 80))
|
||||||
|
|
||||||
content := container.NewBorder(
|
content := container.NewBorder(
|
||||||
nil,
|
nil,
|
||||||
|
|
@ -931,35 +738,29 @@ func BuildModuleBadge(jobType queue.JobType) fyne.CanvasObject {
|
||||||
|
|
||||||
switch jobType {
|
switch jobType {
|
||||||
case queue.JobTypeConvert:
|
case queue.JobTypeConvert:
|
||||||
badgeColor = utils.MustHex("#673AB7") // Deep Purple
|
badgeColor = utils.MustHex("#4A90E2")
|
||||||
badgeText = "CONVERT"
|
badgeText = "CONVERT"
|
||||||
case queue.JobTypeMerge:
|
case queue.JobTypeMerge:
|
||||||
badgeColor = utils.MustHex("#4CAF50") // Green
|
badgeColor = utils.MustHex("#E24A90")
|
||||||
badgeText = "MERGE"
|
badgeText = "MERGE"
|
||||||
case queue.JobTypeTrim:
|
case queue.JobTypeTrim:
|
||||||
badgeColor = utils.MustHex("#FFEB3B") // Yellow
|
badgeColor = utils.MustHex("#90E24A")
|
||||||
badgeText = "TRIM"
|
badgeText = "TRIM"
|
||||||
case queue.JobTypeFilter:
|
case queue.JobTypeFilter:
|
||||||
badgeColor = utils.MustHex("#00BCD4") // Cyan
|
badgeColor = utils.MustHex("#E2904A")
|
||||||
badgeText = "FILTER"
|
badgeText = "FILTER"
|
||||||
case queue.JobTypeUpscale:
|
case queue.JobTypeUpscale:
|
||||||
badgeColor = utils.MustHex("#9C27B0") // Purple
|
badgeColor = utils.MustHex("#9A4AE2")
|
||||||
badgeText = "UPSCALE"
|
badgeText = "UPSCALE"
|
||||||
case queue.JobTypeAudio:
|
case queue.JobTypeAudio:
|
||||||
badgeColor = utils.MustHex("#FFC107") // Amber
|
badgeColor = utils.MustHex("#4AE290")
|
||||||
badgeText = "AUDIO"
|
badgeText = "AUDIO"
|
||||||
case queue.JobTypeThumb:
|
case queue.JobTypeThumb:
|
||||||
badgeColor = utils.MustHex("#00ACC1") // Dark Cyan
|
badgeColor = utils.MustHex("#E2E24A")
|
||||||
badgeText = "THUMB"
|
badgeText = "THUMB"
|
||||||
case queue.JobTypeSnippet:
|
case queue.JobTypeSnippet:
|
||||||
badgeColor = utils.MustHex("#00BCD4") // Cyan (same as Convert)
|
badgeColor = utils.MustHex("#4AE2E2")
|
||||||
badgeText = "SNIPPET"
|
badgeText = "SNIPPET"
|
||||||
case queue.JobTypeAuthor:
|
|
||||||
badgeColor = utils.MustHex("#FF5722") // Deep Orange
|
|
||||||
badgeText = "AUTHOR"
|
|
||||||
case queue.JobTypeRip:
|
|
||||||
badgeColor = utils.MustHex("#FF9800") // Orange
|
|
||||||
badgeText = "RIP"
|
|
||||||
default:
|
default:
|
||||||
badgeColor = utils.MustHex("#808080")
|
badgeColor = utils.MustHex("#808080")
|
||||||
badgeText = "OTHER"
|
badgeText = "OTHER"
|
||||||
|
|
@ -967,7 +768,7 @@ func BuildModuleBadge(jobType queue.JobType) fyne.CanvasObject {
|
||||||
|
|
||||||
rect := canvas.NewRectangle(badgeColor)
|
rect := canvas.NewRectangle(badgeColor)
|
||||||
rect.CornerRadius = 3
|
rect.CornerRadius = 3
|
||||||
// rect.SetMinSize(fyne.NewSize(70, 20)) // Removed for flexible sizing
|
rect.SetMinSize(fyne.NewSize(70, 20))
|
||||||
|
|
||||||
text := canvas.NewText(badgeText, color.White)
|
text := canvas.NewText(badgeText, color.White)
|
||||||
text.Alignment = fyne.TextAlignCenter
|
text.Alignment = fyne.TextAlignCenter
|
||||||
|
|
@ -976,243 +777,3 @@ func BuildModuleBadge(jobType queue.JobType) fyne.CanvasObject {
|
||||||
|
|
||||||
return container.NewMax(rect, container.NewCenter(text))
|
return container.NewMax(rect, container.NewCenter(text))
|
||||||
}
|
}
|
||||||
|
|
||||||
// SectionHeader creates a color-coded section header for better visual separation
|
|
||||||
// Helps fix usability issue where settings sections blend together
|
|
||||||
func SectionHeader(title string, accentColor color.Color) fyne.CanvasObject {
|
|
||||||
// Left accent bar (Memphis geometric style)
|
|
||||||
accent := canvas.NewRectangle(accentColor)
|
|
||||||
// accent.SetMinSize(fyne.NewSize(4, 20)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
// Title text
|
|
||||||
label := widget.NewLabel(title)
|
|
||||||
label.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
label.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
// Combine accent bar + title with padding
|
|
||||||
content := container.NewBorder(
|
|
||||||
nil, nil,
|
|
||||||
accent,
|
|
||||||
nil,
|
|
||||||
container.NewPadded(label),
|
|
||||||
)
|
|
||||||
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
|
|
||||||
// SectionSpacer creates vertical spacing between sections for better readability
|
|
||||||
func SectionSpacer() fyne.CanvasObject {
|
|
||||||
spacer := canvas.NewRectangle(color.Transparent)
|
|
||||||
// spacer.SetMinSize(fyne.NewSize(0, 12)) // Removed for flexible sizing
|
|
||||||
return spacer
|
|
||||||
}
|
|
||||||
|
|
||||||
// ColoredDivider creates a thin horizontal divider with accent color
|
|
||||||
func ColoredDivider(accentColor color.Color) fyne.CanvasObject {
|
|
||||||
divider := canvas.NewRectangle(accentColor)
|
|
||||||
// divider.SetMinSize(fyne.NewSize(0, 2)) // Removed for flexible sizing
|
|
||||||
return divider
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewColorCodedSelectContainer wraps a Select widget with a colored left border
|
|
||||||
// The colored border visually indicates the category/type of the selection
|
|
||||||
// Returns a container with the border and a pointer to the border rectangle for color updates
|
|
||||||
func NewColorCodedSelectContainer(selectWidget *widget.Select, accentColor color.Color) (*fyne.Container, *canvas.Rectangle) {
|
|
||||||
// Create colored left border rectangle
|
|
||||||
border := canvas.NewRectangle(accentColor)
|
|
||||||
// border.SetMinSize(fyne.NewSize(4, 44)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
// Return container with [ColoredBorder][Select] and the border for future updates
|
|
||||||
container := container.NewBorder(nil, nil, border, nil, selectWidget)
|
|
||||||
return container, border
|
|
||||||
}
|
|
||||||
|
|
||||||
// ColoredSelect is a custom select widget with color-coded dropdown items
|
|
||||||
type ColoredSelect struct {
|
|
||||||
widget.BaseWidget
|
|
||||||
options []string
|
|
||||||
selected string
|
|
||||||
colorMap map[string]color.Color
|
|
||||||
onChanged func(string)
|
|
||||||
popup *widget.PopUp
|
|
||||||
window fyne.Window
|
|
||||||
placeHolder string
|
|
||||||
disabled bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewColoredSelect creates a new colored select widget
|
|
||||||
// colorMap should contain a color for each option
|
|
||||||
func NewColoredSelect(options []string, colorMap map[string]color.Color, onChange func(string), window fyne.Window) *ColoredSelect {
|
|
||||||
cs := &ColoredSelect{
|
|
||||||
options: options,
|
|
||||||
colorMap: colorMap,
|
|
||||||
onChanged: onChange,
|
|
||||||
window: window,
|
|
||||||
}
|
|
||||||
if len(options) > 0 {
|
|
||||||
cs.selected = options[0]
|
|
||||||
}
|
|
||||||
cs.ExtendBaseWidget(cs)
|
|
||||||
return cs
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetPlaceHolder sets the placeholder text when nothing is selected
|
|
||||||
func (cs *ColoredSelect) SetPlaceHolder(text string) {
|
|
||||||
cs.placeHolder = text
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetSelected sets the currently selected option
|
|
||||||
func (cs *ColoredSelect) SetSelected(option string) {
|
|
||||||
cs.selected = option
|
|
||||||
cs.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateOptions updates the available options and their colors
|
|
||||||
func (cs *ColoredSelect) UpdateOptions(options []string, colorMap map[string]color.Color) {
|
|
||||||
cs.options = options
|
|
||||||
cs.colorMap = colorMap
|
|
||||||
// If current selection is not in new options, select first option
|
|
||||||
found := false
|
|
||||||
for _, opt := range options {
|
|
||||||
if opt == cs.selected {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found && len(options) > 0 {
|
|
||||||
cs.selected = options[0]
|
|
||||||
}
|
|
||||||
cs.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Selected returns the currently selected option
|
|
||||||
func (cs *ColoredSelect) Selected() string {
|
|
||||||
return cs.selected
|
|
||||||
}
|
|
||||||
|
|
||||||
// Enable enables the widget
|
|
||||||
func (cs *ColoredSelect) Enable() {
|
|
||||||
cs.disabled = false
|
|
||||||
cs.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Disable disables the widget
|
|
||||||
func (cs *ColoredSelect) Disable() {
|
|
||||||
cs.disabled = true
|
|
||||||
cs.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateRenderer creates the renderer for the colored select
|
|
||||||
func (cs *ColoredSelect) CreateRenderer() fyne.WidgetRenderer {
|
|
||||||
// Create the button that shows current selection
|
|
||||||
displayText := cs.selected
|
|
||||||
if displayText == "" && cs.placeHolder != "" {
|
|
||||||
displayText = cs.placeHolder
|
|
||||||
}
|
|
||||||
|
|
||||||
button := widget.NewButton(displayText, func() {
|
|
||||||
cs.showPopup()
|
|
||||||
})
|
|
||||||
|
|
||||||
return &coloredSelectRenderer{
|
|
||||||
select_: cs,
|
|
||||||
button: button,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// showPopup displays the dropdown list with colored items
|
|
||||||
func (cs *ColoredSelect) showPopup() {
|
|
||||||
if cs.popup != nil {
|
|
||||||
cs.popup.Hide()
|
|
||||||
cs.popup = nil
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create list items with colors
|
|
||||||
items := make([]fyne.CanvasObject, len(cs.options))
|
|
||||||
for i, option := range cs.options {
|
|
||||||
opt := option // Capture for closure
|
|
||||||
|
|
||||||
// Get color for this option
|
|
||||||
itemColor := cs.colorMap[opt]
|
|
||||||
if itemColor == nil {
|
|
||||||
itemColor = color.NRGBA{R: 80, G: 80, B: 80, A: 255} // Default gray
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create colored indicator bar
|
|
||||||
colorBar := canvas.NewRectangle(itemColor)
|
|
||||||
// colorBar.SetMinSize(fyne.NewSize(4, 32)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
// Create label
|
|
||||||
label := widget.NewLabel(opt)
|
|
||||||
|
|
||||||
// Highlight if currently selected
|
|
||||||
if opt == cs.selected {
|
|
||||||
label.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create tappable item
|
|
||||||
itemContent := container.NewBorder(nil, nil, colorBar, nil,
|
|
||||||
container.NewPadded(label))
|
|
||||||
|
|
||||||
tappableItem := NewTappable(itemContent, func() {
|
|
||||||
cs.selected = opt
|
|
||||||
if cs.onChanged != nil {
|
|
||||||
cs.onChanged(opt)
|
|
||||||
}
|
|
||||||
cs.popup.Hide()
|
|
||||||
cs.popup = nil
|
|
||||||
cs.Refresh()
|
|
||||||
})
|
|
||||||
|
|
||||||
items[i] = tappableItem
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create scrollable list
|
|
||||||
list := container.NewVBox(items...)
|
|
||||||
scroll := container.NewVScroll(list)
|
|
||||||
// scroll.SetMinSize(fyne.NewSize(300, 200)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
// Create popup
|
|
||||||
cs.popup = widget.NewPopUp(scroll, cs.window.Canvas())
|
|
||||||
|
|
||||||
// Position popup below the select widget
|
|
||||||
popupPos := fyne.CurrentApp().Driver().AbsolutePositionForObject(cs)
|
|
||||||
popupPos.Y += cs.Size().Height
|
|
||||||
cs.popup.ShowAtPosition(popupPos)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tapped implements the Tappable interface
|
|
||||||
func (cs *ColoredSelect) Tapped(*fyne.PointEvent) {
|
|
||||||
if !cs.disabled {
|
|
||||||
cs.showPopup()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type coloredSelectRenderer struct {
|
|
||||||
select_ *ColoredSelect
|
|
||||||
button *widget.Button
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *coloredSelectRenderer) Layout(size fyne.Size) {
|
|
||||||
r.button.Resize(size)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *coloredSelectRenderer) MinSize() fyne.Size {
|
|
||||||
return r.button.MinSize()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *coloredSelectRenderer) Refresh() {
|
|
||||||
displayText := r.select_.selected
|
|
||||||
if displayText == "" && r.select_.placeHolder != "" {
|
|
||||||
displayText = r.select_.placeHolder
|
|
||||||
}
|
|
||||||
r.button.SetText(displayText)
|
|
||||||
r.button.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *coloredSelectRenderer) Destroy() {}
|
|
||||||
|
|
||||||
func (r *coloredSelectRenderer) Objects() []fyne.CanvasObject {
|
|
||||||
return []fyne.CanvasObject{r.button}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -18,12 +18,11 @@ import (
|
||||||
|
|
||||||
// ModuleInfo contains information about a module for display
|
// ModuleInfo contains information about a module for display
|
||||||
type ModuleInfo struct {
|
type ModuleInfo struct {
|
||||||
ID string
|
ID string
|
||||||
Label string
|
Label string
|
||||||
Color color.Color
|
Color color.Color
|
||||||
Enabled bool
|
Enabled bool
|
||||||
Category string
|
Category string
|
||||||
MissingDependencies bool // true if disabled due to missing dependencies
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// HistoryEntry represents a completed job in the history
|
// HistoryEntry represents a completed job in the history
|
||||||
|
|
@ -66,95 +65,61 @@ func BuildMainMenu(modules []ModuleInfo, onModuleClick func(string), onModuleDro
|
||||||
viewResultsBtn := widget.NewButton("Results", onBenchmarkHistoryClick)
|
viewResultsBtn := widget.NewButton("Results", onBenchmarkHistoryClick)
|
||||||
viewResultsBtn.Importance = widget.LowImportance
|
viewResultsBtn.Importance = widget.LowImportance
|
||||||
|
|
||||||
// Build header controls dynamically - only show logs button if callback is provided
|
logsBtn := widget.NewButton("Logs", onLogsClick)
|
||||||
headerControls := []fyne.CanvasObject{sidebarToggleBtn}
|
logsBtn.Importance = widget.LowImportance
|
||||||
if onLogsClick != nil {
|
|
||||||
logsBtn := widget.NewButton("Logs", onLogsClick)
|
|
||||||
logsBtn.Importance = widget.LowImportance
|
|
||||||
headerControls = append(headerControls, logsBtn)
|
|
||||||
}
|
|
||||||
headerControls = append(headerControls, benchmarkBtn, viewResultsBtn, queueTile)
|
|
||||||
|
|
||||||
// Compact header - title on left, controls on right
|
// Compact header - title on left, controls on right
|
||||||
header := container.NewBorder(
|
header := container.NewBorder(
|
||||||
nil, nil,
|
nil, nil,
|
||||||
title,
|
title,
|
||||||
container.NewHBox(headerControls...),
|
container.NewHBox(sidebarToggleBtn, logsBtn, benchmarkBtn, viewResultsBtn, queueTile),
|
||||||
nil,
|
nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
// Create module map for quick lookup
|
categorized := map[string][]fyne.CanvasObject{}
|
||||||
moduleMap := make(map[string]ModuleInfo)
|
for i := range modules {
|
||||||
for _, mod := range modules {
|
mod := modules[i] // Create new variable for this iteration
|
||||||
moduleMap[mod.ID] = mod
|
modID := mod.ID // Capture for closure
|
||||||
}
|
cat := mod.Category
|
||||||
|
if cat == "" {
|
||||||
// Helper to build a tile
|
cat = "General"
|
||||||
buildTile := func(modID string) fyne.CanvasObject {
|
|
||||||
mod, exists := moduleMap[modID]
|
|
||||||
if !exists {
|
|
||||||
return layout.NewSpacer()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var tapFunc func()
|
var tapFunc func()
|
||||||
var dropFunc func([]fyne.URI)
|
var dropFunc func([]fyne.URI)
|
||||||
if mod.Enabled {
|
if mod.Enabled {
|
||||||
id := modID
|
// Create new closure with properly captured modID
|
||||||
tapFunc = func() { onModuleClick(id) }
|
id := modID // Explicit capture
|
||||||
|
tapFunc = func() {
|
||||||
|
onModuleClick(id)
|
||||||
|
}
|
||||||
dropFunc = func(items []fyne.URI) {
|
dropFunc = func(items []fyne.URI) {
|
||||||
logging.Debug(logging.CatUI, "MainMenu dropFunc called for module=%s itemCount=%d", id, len(items))
|
logging.Debug(logging.CatUI, "MainMenu dropFunc called for module=%s itemCount=%d", id, len(items))
|
||||||
onModuleDrop(id, items)
|
onModuleDrop(id, items)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return buildModuleTile(mod, tapFunc, dropFunc)
|
logging.Debug(logging.CatUI, "Creating tile for module=%s enabled=%v hasDropFunc=%v", modID, mod.Enabled, dropFunc != nil)
|
||||||
|
categorized[cat] = append(categorized[cat], buildModuleTile(mod, tapFunc, dropFunc))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Helper to create category label
|
var sections []fyne.CanvasObject
|
||||||
makeCatLabel := func(text string) *canvas.Text {
|
for _, cat := range sortedKeys(categorized) {
|
||||||
label := canvas.NewText(text, textColor)
|
catLabel := canvas.NewText(cat, textColor)
|
||||||
label.TextSize = 10
|
catLabel.TextSize = 12
|
||||||
label.Alignment = fyne.TextAlignLeading
|
catLabel.TextStyle = fyne.TextStyle{Bold: true}
|
||||||
return label
|
sections = append(sections,
|
||||||
|
catLabel,
|
||||||
|
container.NewGridWithColumns(3, categorized[cat]...),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build rows with category labels above tiles
|
padding := canvas.NewRectangle(color.Transparent)
|
||||||
var rows []fyne.CanvasObject
|
padding.SetMinSize(fyne.NewSize(0, 4))
|
||||||
|
|
||||||
// Convert section
|
// Compact body without scrolling
|
||||||
rows = append(rows, makeCatLabel("Convert"))
|
body := container.NewVBox(
|
||||||
rows = append(rows, container.NewGridWithColumns(3,
|
|
||||||
buildTile("convert"), buildTile("merge"), buildTile("trim"),
|
|
||||||
))
|
|
||||||
rows = append(rows, container.NewGridWithColumns(3,
|
|
||||||
buildTile("filters"), buildTile("audio"), buildTile("subtitles"),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Inspect section
|
|
||||||
rows = append(rows, makeCatLabel("Inspect"))
|
|
||||||
rows = append(rows, container.NewGridWithColumns(3,
|
|
||||||
buildTile("compare"), buildTile("inspect"), buildTile("upscale"),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Disc section
|
|
||||||
rows = append(rows, makeCatLabel("Disc"))
|
|
||||||
rows = append(rows, container.NewGridWithColumns(3,
|
|
||||||
buildTile("author"), buildTile("rip"), buildTile("bluray"),
|
|
||||||
))
|
|
||||||
|
|
||||||
// Playback section
|
|
||||||
rows = append(rows, makeCatLabel("Playback"))
|
|
||||||
rows = append(rows, container.NewGridWithColumns(3,
|
|
||||||
buildTile("player"), buildTile("thumb"), buildTile("settings"),
|
|
||||||
))
|
|
||||||
|
|
||||||
gridBox := container.NewVBox(rows...)
|
|
||||||
scroll := container.NewVScroll(gridBox)
|
|
||||||
// scroll.SetMinSize(fyne.NewSize(0, 0)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
body := container.NewBorder(
|
|
||||||
header,
|
header,
|
||||||
nil, nil, nil,
|
padding,
|
||||||
scroll,
|
container.NewVBox(sections...),
|
||||||
)
|
)
|
||||||
|
|
||||||
// Wrap with HSplit if sidebar is visible
|
// Wrap with HSplit if sidebar is visible
|
||||||
|
|
@ -169,15 +134,15 @@ func BuildMainMenu(modules []ModuleInfo, onModuleClick func(string), onModuleDro
|
||||||
|
|
||||||
// buildModuleTile creates a single module tile
|
// buildModuleTile creates a single module tile
|
||||||
func buildModuleTile(mod ModuleInfo, tapped func(), dropped func([]fyne.URI)) fyne.CanvasObject {
|
func buildModuleTile(mod ModuleInfo, tapped func(), dropped func([]fyne.URI)) fyne.CanvasObject {
|
||||||
logging.Debug(logging.CatUI, "building tile %s color=%v enabled=%v missingDeps=%v", mod.ID, mod.Color, mod.Enabled, mod.MissingDependencies)
|
logging.Debug(logging.CatUI, "building tile %s color=%v enabled=%v", mod.ID, mod.Color, mod.Enabled)
|
||||||
return NewModuleTile(mod.Label, mod.Color, mod.Enabled, mod.MissingDependencies, tapped, dropped)
|
return NewModuleTile(mod.Label, mod.Color, mod.Enabled, tapped, dropped)
|
||||||
}
|
}
|
||||||
|
|
||||||
// buildQueueTile creates the queue status tile
|
// buildQueueTile creates the queue status tile
|
||||||
func buildQueueTile(completed, total int, queueColor, textColor color.Color, onClick func()) fyne.CanvasObject {
|
func buildQueueTile(completed, total int, queueColor, textColor color.Color, onClick func()) fyne.CanvasObject {
|
||||||
rect := canvas.NewRectangle(queueColor)
|
rect := canvas.NewRectangle(queueColor)
|
||||||
rect.CornerRadius = 6
|
rect.CornerRadius = 6
|
||||||
// rect.SetMinSize(fyne.NewSize(120, 40)) // Removed for flexible sizing
|
rect.SetMinSize(fyne.NewSize(120, 40))
|
||||||
|
|
||||||
text := canvas.NewText(fmt.Sprintf("QUEUE: %d/%d", completed, total), textColor)
|
text := canvas.NewText(fmt.Sprintf("QUEUE: %d/%d", completed, total), textColor)
|
||||||
text.Alignment = fyne.TextAlignCenter
|
text.Alignment = fyne.TextAlignCenter
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"image"
|
"image"
|
||||||
"image/color"
|
"image/color"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
"fyne.io/fyne/v2"
|
||||||
|
|
@ -24,9 +23,6 @@ type StripedProgress struct {
|
||||||
color color.Color
|
color color.Color
|
||||||
bg color.Color
|
bg color.Color
|
||||||
offset float64
|
offset float64
|
||||||
activity bool
|
|
||||||
animMu sync.Mutex
|
|
||||||
animStop chan struct{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewStripedProgress creates a new striped progress bar with the given color
|
// NewStripedProgress creates a new striped progress bar with the given color
|
||||||
|
|
@ -52,68 +48,13 @@ func (s *StripedProgress) SetProgress(p float64) {
|
||||||
s.Refresh()
|
s.Refresh()
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetActivity toggles the full-width animated background when progress is near zero.
|
|
||||||
func (s *StripedProgress) SetActivity(active bool) {
|
|
||||||
s.activity = active
|
|
||||||
s.Refresh()
|
|
||||||
}
|
|
||||||
|
|
||||||
// StartAnimation starts the stripe animation.
|
|
||||||
func (s *StripedProgress) StartAnimation() {
|
|
||||||
s.animMu.Lock()
|
|
||||||
if s.animStop != nil {
|
|
||||||
s.animMu.Unlock()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
stop := make(chan struct{})
|
|
||||||
s.animStop = stop
|
|
||||||
s.animMu.Unlock()
|
|
||||||
|
|
||||||
ticker := time.NewTicker(80 * time.Millisecond)
|
|
||||||
go func() {
|
|
||||||
defer ticker.Stop()
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ticker.C:
|
|
||||||
app := fyne.CurrentApp()
|
|
||||||
if app == nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
s.Refresh()
|
|
||||||
}, false)
|
|
||||||
case <-stop:
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
// StopAnimation stops the stripe animation.
|
|
||||||
func (s *StripedProgress) StopAnimation() {
|
|
||||||
s.animMu.Lock()
|
|
||||||
if s.animStop == nil {
|
|
||||||
s.animMu.Unlock()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
close(s.animStop)
|
|
||||||
s.animStop = nil
|
|
||||||
s.animMu.Unlock()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *StripedProgress) CreateRenderer() fyne.WidgetRenderer {
|
func (s *StripedProgress) CreateRenderer() fyne.WidgetRenderer {
|
||||||
bgRect := canvas.NewRectangle(s.bg)
|
bgRect := canvas.NewRectangle(s.bg)
|
||||||
fillRect := canvas.NewRectangle(applyAlpha(s.color, 200))
|
fillRect := canvas.NewRectangle(applyAlpha(s.color, 200))
|
||||||
stripes := canvas.NewRaster(func(w, h int) image.Image {
|
stripes := canvas.NewRaster(func(w, h int) image.Image {
|
||||||
img := image.NewRGBA(image.Rect(0, 0, w, h))
|
img := image.NewRGBA(image.Rect(0, 0, w, h))
|
||||||
lightAlpha := uint8(80)
|
light := applyAlpha(s.color, 80)
|
||||||
darkAlpha := uint8(220)
|
dark := applyAlpha(s.color, 220)
|
||||||
if s.activity && s.progress <= 0 {
|
|
||||||
lightAlpha = 40
|
|
||||||
darkAlpha = 90
|
|
||||||
}
|
|
||||||
light := applyAlpha(s.color, lightAlpha)
|
|
||||||
dark := applyAlpha(s.color, darkAlpha)
|
|
||||||
for y := 0; y < h; y++ {
|
for y := 0; y < h; y++ {
|
||||||
for x := 0; x < w; x++ {
|
for x := 0; x < w; x++ {
|
||||||
// animate diagonal stripes using offset
|
// animate diagonal stripes using offset
|
||||||
|
|
@ -152,17 +93,12 @@ func (r *stripedProgressRenderer) Layout(size fyne.Size) {
|
||||||
r.bg.Move(fyne.NewPos(0, 0))
|
r.bg.Move(fyne.NewPos(0, 0))
|
||||||
|
|
||||||
fillWidth := size.Width * float32(r.bar.progress)
|
fillWidth := size.Width * float32(r.bar.progress)
|
||||||
stripeWidth := fillWidth
|
|
||||||
if r.bar.activity && r.bar.progress <= 0 {
|
|
||||||
stripeWidth = size.Width
|
|
||||||
}
|
|
||||||
fillSize := fyne.NewSize(fillWidth, size.Height)
|
fillSize := fyne.NewSize(fillWidth, size.Height)
|
||||||
stripeSize := fyne.NewSize(stripeWidth, size.Height)
|
|
||||||
|
|
||||||
r.fill.Resize(fillSize)
|
r.fill.Resize(fillSize)
|
||||||
r.fill.Move(fyne.NewPos(0, 0))
|
r.fill.Move(fyne.NewPos(0, 0))
|
||||||
|
|
||||||
r.stripes.Resize(stripeSize)
|
r.stripes.Resize(fillSize)
|
||||||
r.stripes.Move(fyne.NewPos(0, 0))
|
r.stripes.Move(fyne.NewPos(0, 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,14 +107,8 @@ func (r *stripedProgressRenderer) MinSize() fyne.Size {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *stripedProgressRenderer) Refresh() {
|
func (r *stripedProgressRenderer) Refresh() {
|
||||||
// Only animate stripes when animation is active
|
// small drift to animate stripes
|
||||||
r.bar.animMu.Lock()
|
r.bar.offset += 2
|
||||||
shouldAnimate := r.bar.animStop != nil
|
|
||||||
r.bar.animMu.Unlock()
|
|
||||||
|
|
||||||
if shouldAnimate {
|
|
||||||
r.bar.offset += 2
|
|
||||||
}
|
|
||||||
r.Layout(r.bg.Size())
|
r.Layout(r.bg.Size())
|
||||||
canvas.Refresh(r.bg)
|
canvas.Refresh(r.bg)
|
||||||
canvas.Refresh(r.stripes)
|
canvas.Refresh(r.stripes)
|
||||||
|
|
@ -186,7 +116,7 @@ func (r *stripedProgressRenderer) Refresh() {
|
||||||
|
|
||||||
func (r *stripedProgressRenderer) BackgroundColor() color.Color { return color.Transparent }
|
func (r *stripedProgressRenderer) BackgroundColor() color.Color { return color.Transparent }
|
||||||
func (r *stripedProgressRenderer) Objects() []fyne.CanvasObject { return r.objects }
|
func (r *stripedProgressRenderer) Objects() []fyne.CanvasObject { return r.objects }
|
||||||
func (r *stripedProgressRenderer) Destroy() { r.bar.StopAnimation() }
|
func (r *stripedProgressRenderer) Destroy() {}
|
||||||
|
|
||||||
func applyAlpha(c color.Color, alpha uint8) color.Color {
|
func applyAlpha(c color.Color, alpha uint8) color.Color {
|
||||||
r, g, b, _ := c.RGBA()
|
r, g, b, _ := c.RGBA()
|
||||||
|
|
@ -212,9 +142,7 @@ func BuildQueueView(
|
||||||
onViewLog func(string),
|
onViewLog func(string),
|
||||||
onCopyCommand func(string),
|
onCopyCommand func(string),
|
||||||
titleColor, bgColor, textColor color.Color,
|
titleColor, bgColor, textColor color.Color,
|
||||||
) (fyne.CanvasObject, *container.Scroll, []*StripedProgress) {
|
) (fyne.CanvasObject, *container.Scroll) {
|
||||||
// Track active progress animations to prevent goroutine leaks
|
|
||||||
var activeProgress []*StripedProgress
|
|
||||||
// Header
|
// Header
|
||||||
title := canvas.NewText("JOB QUEUE", titleColor)
|
title := canvas.NewText("JOB QUEUE", titleColor)
|
||||||
title.TextStyle = fyne.TextStyle{Monospace: true, Bold: true}
|
title.TextStyle = fyne.TextStyle{Monospace: true, Bold: true}
|
||||||
|
|
@ -255,25 +183,15 @@ func BuildQueueView(
|
||||||
emptyMsg.Alignment = fyne.TextAlignCenter
|
emptyMsg.Alignment = fyne.TextAlignCenter
|
||||||
jobItems = append(jobItems, container.NewCenter(emptyMsg))
|
jobItems = append(jobItems, container.NewCenter(emptyMsg))
|
||||||
} else {
|
} else {
|
||||||
// Calculate queue positions for pending/paused jobs
|
|
||||||
queuePositions := make(map[string]int)
|
|
||||||
position := 1
|
|
||||||
for _, job := range jobs {
|
for _, job := range jobs {
|
||||||
if job.Status == queue.JobStatusPending || job.Status == queue.JobStatusPaused {
|
jobItems = append(jobItems, buildJobItem(job, onPause, onResume, onCancel, onRemove, onMoveUp, onMoveDown, onCopyError, onViewLog, onCopyCommand, bgColor, textColor))
|
||||||
queuePositions[job.ID] = position
|
|
||||||
position++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, job := range jobs {
|
|
||||||
jobItems = append(jobItems, buildJobItem(job, queuePositions, onPause, onResume, onCancel, onRemove, onMoveUp, onMoveDown, onCopyError, onViewLog, onCopyCommand, bgColor, textColor, &activeProgress))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
jobList := container.NewVBox(jobItems...)
|
jobList := container.NewVBox(jobItems...)
|
||||||
// Use a scroll container anchored to the top to avoid jumpy scroll-to-content behavior.
|
// Use a scroll container anchored to the top to avoid jumpy scroll-to-content behavior.
|
||||||
scrollable := container.NewScroll(jobList)
|
scrollable := container.NewScroll(jobList)
|
||||||
// scrollable.SetMinSize(fyne.NewSize(0, 0)) // Removed for flexible sizing
|
scrollable.SetMinSize(fyne.NewSize(0, 0))
|
||||||
scrollable.Offset = fyne.NewPos(0, 0)
|
scrollable.Offset = fyne.NewPos(0, 0)
|
||||||
|
|
||||||
body := container.NewBorder(
|
body := container.NewBorder(
|
||||||
|
|
@ -282,13 +200,12 @@ func BuildQueueView(
|
||||||
scrollable,
|
scrollable,
|
||||||
)
|
)
|
||||||
|
|
||||||
return container.NewPadded(body), scrollable, activeProgress
|
return container.NewPadded(body), scrollable
|
||||||
}
|
}
|
||||||
|
|
||||||
// buildJobItem creates a single job item in the queue list
|
// buildJobItem creates a single job item in the queue list
|
||||||
func buildJobItem(
|
func buildJobItem(
|
||||||
job *queue.Job,
|
job *queue.Job,
|
||||||
queuePositions map[string]int,
|
|
||||||
onPause func(string),
|
onPause func(string),
|
||||||
onResume func(string),
|
onResume func(string),
|
||||||
onCancel func(string),
|
onCancel func(string),
|
||||||
|
|
@ -299,7 +216,6 @@ func buildJobItem(
|
||||||
onViewLog func(string),
|
onViewLog func(string),
|
||||||
onCopyCommand func(string),
|
onCopyCommand func(string),
|
||||||
bgColor, textColor color.Color,
|
bgColor, textColor color.Color,
|
||||||
activeProgress *[]*StripedProgress,
|
|
||||||
) fyne.CanvasObject {
|
) fyne.CanvasObject {
|
||||||
// Status color
|
// Status color
|
||||||
statusColor := GetStatusColor(job.Status)
|
statusColor := GetStatusColor(job.Status)
|
||||||
|
|
@ -317,7 +233,7 @@ func buildJobItem(
|
||||||
|
|
||||||
descLabel := widget.NewLabel(descText)
|
descLabel := widget.NewLabel(descText)
|
||||||
descLabel.TextStyle = fyne.TextStyle{Italic: true}
|
descLabel.TextStyle = fyne.TextStyle{Italic: true}
|
||||||
descLabel.Wrapping = fyne.TextTruncate
|
descLabel.Wrapping = fyne.TextWrapWord
|
||||||
|
|
||||||
// Progress bar (for running jobs)
|
// Progress bar (for running jobs)
|
||||||
progress := NewStripedProgress(ModuleColor(job.Type))
|
progress := NewStripedProgress(ModuleColor(job.Type))
|
||||||
|
|
@ -325,25 +241,16 @@ func buildJobItem(
|
||||||
if job.Status == queue.JobStatusCompleted {
|
if job.Status == queue.JobStatusCompleted {
|
||||||
progress.SetProgress(1.0)
|
progress.SetProgress(1.0)
|
||||||
}
|
}
|
||||||
if job.Status == queue.JobStatusRunning {
|
|
||||||
progress.SetActivity(job.Progress <= 0.01)
|
|
||||||
progress.StartAnimation()
|
|
||||||
// Track active progress to stop animation on next refresh (prevents goroutine leaks)
|
|
||||||
*activeProgress = append(*activeProgress, progress)
|
|
||||||
} else {
|
|
||||||
progress.SetActivity(false)
|
|
||||||
progress.StopAnimation()
|
|
||||||
}
|
|
||||||
progressWidget := progress
|
progressWidget := progress
|
||||||
|
|
||||||
// Module badge
|
// Module badge
|
||||||
badge := BuildModuleBadge(job.Type)
|
badge := BuildModuleBadge(job.Type)
|
||||||
|
|
||||||
// Status text
|
// Status text
|
||||||
statusText := getStatusText(job, queuePositions)
|
statusText := getStatusText(job)
|
||||||
statusLabel := widget.NewLabel(statusText)
|
statusLabel := widget.NewLabel(statusText)
|
||||||
statusLabel.TextStyle = fyne.TextStyle{Monospace: true}
|
statusLabel.TextStyle = fyne.TextStyle{Monospace: true}
|
||||||
statusLabel.Wrapping = fyne.TextTruncate
|
statusLabel.Wrapping = fyne.TextWrapWord
|
||||||
|
|
||||||
// Control buttons
|
// Control buttons
|
||||||
var buttons []fyne.CanvasObject
|
var buttons []fyne.CanvasObject
|
||||||
|
|
@ -409,7 +316,6 @@ func buildJobItem(
|
||||||
// Card background
|
// Card background
|
||||||
card := canvas.NewRectangle(bgColor)
|
card := canvas.NewRectangle(bgColor)
|
||||||
card.CornerRadius = 4
|
card.CornerRadius = 4
|
||||||
// card.SetMinSize(fyne.NewSize(0, 140)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
item := container.NewPadded(
|
item := container.NewPadded(
|
||||||
container.NewMax(card, content),
|
container.NewMax(card, content),
|
||||||
|
|
@ -426,14 +332,10 @@ func buildJobItem(
|
||||||
}
|
}
|
||||||
|
|
||||||
// getStatusText returns a human-readable status string
|
// getStatusText returns a human-readable status string
|
||||||
func getStatusText(job *queue.Job, queuePositions map[string]int) string {
|
func getStatusText(job *queue.Job) string {
|
||||||
switch job.Status {
|
switch job.Status {
|
||||||
case queue.JobStatusPending:
|
case queue.JobStatusPending:
|
||||||
// Display position in queue (1 = first to run, 2 = second, etc.)
|
return fmt.Sprintf("Status: Pending | Priority: %d", job.Priority)
|
||||||
if pos, ok := queuePositions[job.ID]; ok {
|
|
||||||
return fmt.Sprintf("Status: Pending | Queue Position: %d", pos)
|
|
||||||
}
|
|
||||||
return "Status: Pending"
|
|
||||||
case queue.JobStatusRunning:
|
case queue.JobStatusRunning:
|
||||||
elapsed := ""
|
elapsed := ""
|
||||||
if job.StartedAt != nil {
|
if job.StartedAt != nil {
|
||||||
|
|
@ -456,10 +358,6 @@ func getStatusText(job *queue.Job, queuePositions map[string]int) string {
|
||||||
|
|
||||||
return fmt.Sprintf("Status: Running | Progress: %.1f%%%s%s", job.Progress, elapsed, extras)
|
return fmt.Sprintf("Status: Running | Progress: %.1f%%%s%s", job.Progress, elapsed, extras)
|
||||||
case queue.JobStatusPaused:
|
case queue.JobStatusPaused:
|
||||||
// Display position in queue for paused jobs too
|
|
||||||
if pos, ok := queuePositions[job.ID]; ok {
|
|
||||||
return fmt.Sprintf("Status: Paused | Queue Position: %d", pos)
|
|
||||||
}
|
|
||||||
return "Status: Paused"
|
return "Status: Paused"
|
||||||
case queue.JobStatusCompleted:
|
case queue.JobStatusCompleted:
|
||||||
duration := ""
|
duration := ""
|
||||||
|
|
@ -482,27 +380,24 @@ func getStatusText(job *queue.Job, queuePositions map[string]int) string {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ModuleColor returns rainbow ROYGBIV colors matching main module palette
|
// moduleColor maps job types to distinct colors matching the main module colors
|
||||||
|
// ModuleColor returns the color for a given job type
|
||||||
func ModuleColor(t queue.JobType) color.Color {
|
func ModuleColor(t queue.JobType) color.Color {
|
||||||
switch t {
|
switch t {
|
||||||
case queue.JobTypeConvert:
|
case queue.JobTypeConvert:
|
||||||
return color.RGBA{R: 103, G: 58, B: 183, A: 255} // Deep Purple (#673AB7)
|
return color.RGBA{R: 139, G: 68, B: 255, A: 255} // Violet (#8B44FF)
|
||||||
case queue.JobTypeMerge:
|
case queue.JobTypeMerge:
|
||||||
return color.RGBA{R: 76, G: 175, B: 80, A: 255} // Green (#4CAF50)
|
return color.RGBA{R: 68, G: 136, B: 255, A: 255} // Blue (#4488FF)
|
||||||
case queue.JobTypeTrim:
|
case queue.JobTypeTrim:
|
||||||
return color.RGBA{R: 255, G: 235, B: 59, A: 255} // Yellow (#FFEB3B)
|
return color.RGBA{R: 68, G: 221, B: 255, A: 255} // Cyan (#44DDFF)
|
||||||
case queue.JobTypeFilter:
|
case queue.JobTypeFilter:
|
||||||
return color.RGBA{R: 0, G: 188, B: 212, A: 255} // Cyan (#00BCD4)
|
return color.RGBA{R: 68, G: 255, B: 136, A: 255} // Green (#44FF88)
|
||||||
case queue.JobTypeUpscale:
|
case queue.JobTypeUpscale:
|
||||||
return color.RGBA{R: 156, G: 39, B: 176, A: 255} // Purple (#9C27B0)
|
return color.RGBA{R: 170, G: 255, B: 68, A: 255} // Yellow-Green (#AAFF44)
|
||||||
case queue.JobTypeAudio:
|
case queue.JobTypeAudio:
|
||||||
return color.RGBA{R: 255, G: 193, B: 7, A: 255} // Amber (#FFC107)
|
return color.RGBA{R: 255, G: 215, B: 68, A: 255} // Yellow (#FFD744)
|
||||||
case queue.JobTypeThumb:
|
case queue.JobTypeThumb:
|
||||||
return color.RGBA{R: 0, G: 172, B: 193, A: 255} // Dark Cyan (#00ACC1)
|
return color.RGBA{R: 255, G: 136, B: 68, A: 255} // Orange (#FF8844)
|
||||||
case queue.JobTypeAuthor:
|
|
||||||
return color.RGBA{R: 255, G: 87, B: 34, A: 255} // Deep Orange (#FF5722)
|
|
||||||
case queue.JobTypeRip:
|
|
||||||
return color.RGBA{R: 255, G: 152, B: 0, A: 255} // Orange (#FF9800)
|
|
||||||
default:
|
default:
|
||||||
return color.Gray{Y: 180}
|
return color.Gray{Y: 180}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os/exec"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CreateCommand is a platform-specific implementation for Unix-like systems (Linux, macOS).
|
|
||||||
// On these systems, external commands generally do not spawn new visible console windows
|
|
||||||
// unless explicitly configured to do so by the user's terminal environment.
|
|
||||||
// No special SysProcAttr is typically needed for console hiding on Unix.
|
|
||||||
func CreateCommand(ctx context.Context, name string, arg ...string) *exec.Cmd {
|
|
||||||
// For Unix-like systems, exec.CommandContext typically does not create a new console window.
|
|
||||||
// We just return the standard command.
|
|
||||||
return exec.CommandContext(ctx, name, arg...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// CreateCommandRaw is a platform-specific implementation for Unix-like systems, without a context.
|
|
||||||
// No special SysProcAttr is typically needed for console hiding on Unix.
|
|
||||||
func CreateCommandRaw(name string, arg ...string) *exec.Cmd {
|
|
||||||
// For Unix-like systems, exec.Command typically does not create a new console window.
|
|
||||||
// We just return the standard command.
|
|
||||||
return exec.Command(name, arg...)
|
|
||||||
}
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"os/exec"
|
|
||||||
"syscall"
|
|
||||||
)
|
|
||||||
|
|
||||||
// createCommandWindows is a platform-specific implementation for Windows.
|
|
||||||
// It ensures that the command is created without a new console window,
|
|
||||||
// preventing disruptive pop-ups when running console applications (like ffmpeg)
|
|
||||||
// from a GUI application.
|
|
||||||
func createCommandWindows(ctx context.Context, name string, arg ...string) *exec.Cmd {
|
|
||||||
cmd := exec.CommandContext(ctx, name, arg...)
|
|
||||||
// SysProcAttr is used to control process creation parameters on Windows.
|
|
||||||
// HideWindow: If true, the new process's console window will be hidden.
|
|
||||||
// CreationFlags: CREATE_NO_WINDOW (0x08000000) prevents the creation of a console window.
|
|
||||||
// This is crucial for a smooth GUI experience when launching CLI tools.
|
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
|
||||||
HideWindow: true,
|
|
||||||
CreationFlags: 0x08000000, // CREATE_NO_WINDOW
|
|
||||||
}
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
|
|
||||||
// createCommandRawWindows is a platform-specific implementation for Windows, without a context.
|
|
||||||
// It applies the same console hiding behavior as CreateCommand.
|
|
||||||
func createCommandRawWindows(name string, arg ...string) *exec.Cmd {
|
|
||||||
cmd := exec.Command(name, arg...)
|
|
||||||
cmd.SysProcAttr = &syscall.SysProcAttr{
|
|
||||||
HideWindow: true,
|
|
||||||
CreationFlags: 0x08000000, // CREATE_NO_WINDOW
|
|
||||||
}
|
|
||||||
return cmd
|
|
||||||
}
|
|
||||||
|
|
@ -16,42 +16,7 @@ import (
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
||||||
)
|
)
|
||||||
|
|
||||||
// --- FFmpeg Path Management ---
|
// Color utilities
|
||||||
var (
|
|
||||||
globalFFmpegPath atomic.Value
|
|
||||||
globalFFprobePath atomic.Value
|
|
||||||
)
|
|
||||||
|
|
||||||
// SetFFmpegPaths sets the global FFmpeg and FFprobe paths.
|
|
||||||
// This should be called early in the application lifecycle after platform detection.
|
|
||||||
func SetFFmpegPaths(ffmpegPath, ffprobePath string) {
|
|
||||||
globalFFmpegPath.Store(ffmpegPath)
|
|
||||||
globalFFprobePath.Store(ffprobePath)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetFFmpegPath returns the globally configured FFmpeg executable path.
|
|
||||||
// It returns "ffmpeg" as a fallback if not explicitly set.
|
|
||||||
func GetFFmpegPath() string {
|
|
||||||
if v := globalFFmpegPath.Load(); v != nil {
|
|
||||||
if s, ok := v.(string); ok {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "ffmpeg" // Fallback
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetFFprobePath returns the globally configured FFprobe executable path.
|
|
||||||
// It returns "ffprobe" as a fallback if not explicitly set.
|
|
||||||
func GetFFprobePath() string {
|
|
||||||
if v := globalFFprobePath.Load(); v != nil {
|
|
||||||
if s, ok := v.(string); ok {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "ffprobe" // Fallback
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Color utilities ---
|
|
||||||
|
|
||||||
// MustHex parses a hex color string or exits on error
|
// MustHex parses a hex color string or exits on error
|
||||||
func MustHex(h string) color.NRGBA {
|
func MustHex(h string) color.NRGBA {
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,97 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
)
|
|
||||||
|
|
||||||
type mergeConfig struct {
|
|
||||||
Format string `json:"format"`
|
|
||||||
KeepAllStreams bool `json:"keepAllStreams"`
|
|
||||||
Chapters bool `json:"chapters"`
|
|
||||||
CodecMode string `json:"codecMode"`
|
|
||||||
DVDRegion string `json:"dvdRegion"`
|
|
||||||
DVDAspect string `json:"dvdAspect"`
|
|
||||||
FrameRate string `json:"frameRate"`
|
|
||||||
MotionInterpolation bool `json:"motionInterpolation"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultMergeConfig() mergeConfig {
|
|
||||||
return mergeConfig{
|
|
||||||
Format: "mkv-copy",
|
|
||||||
KeepAllStreams: false,
|
|
||||||
Chapters: true,
|
|
||||||
CodecMode: "",
|
|
||||||
DVDRegion: "NTSC",
|
|
||||||
DVDAspect: "16:9",
|
|
||||||
FrameRate: "Source",
|
|
||||||
MotionInterpolation: false,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadPersistedMergeConfig() (mergeConfig, error) {
|
|
||||||
var cfg mergeConfig
|
|
||||||
path := moduleConfigPath("merge")
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if cfg.Format == "" {
|
|
||||||
cfg.Format = "mkv-copy"
|
|
||||||
}
|
|
||||||
if cfg.DVDRegion == "" {
|
|
||||||
cfg.DVDRegion = "NTSC"
|
|
||||||
}
|
|
||||||
if cfg.DVDAspect == "" {
|
|
||||||
cfg.DVDAspect = "16:9"
|
|
||||||
}
|
|
||||||
if cfg.FrameRate == "" {
|
|
||||||
cfg.FrameRate = "Source"
|
|
||||||
}
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func savePersistedMergeConfig(cfg mergeConfig) error {
|
|
||||||
path := moduleConfigPath("merge")
|
|
||||||
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
data, err := json.MarshalIndent(cfg, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return os.WriteFile(path, data, 0o644)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) applyMergeConfig(cfg mergeConfig) {
|
|
||||||
s.mergeFormat = cfg.Format
|
|
||||||
s.mergeKeepAll = cfg.KeepAllStreams
|
|
||||||
s.mergeChapters = cfg.Chapters
|
|
||||||
s.mergeCodecMode = cfg.CodecMode
|
|
||||||
s.mergeDVDRegion = cfg.DVDRegion
|
|
||||||
s.mergeDVDAspect = cfg.DVDAspect
|
|
||||||
s.mergeFrameRate = cfg.FrameRate
|
|
||||||
s.mergeMotionInterpolation = cfg.MotionInterpolation
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) persistMergeConfig() {
|
|
||||||
cfg := mergeConfig{
|
|
||||||
Format: s.mergeFormat,
|
|
||||||
KeepAllStreams: s.mergeKeepAll,
|
|
||||||
Chapters: s.mergeChapters,
|
|
||||||
CodecMode: s.mergeCodecMode,
|
|
||||||
DVDRegion: s.mergeDVDRegion,
|
|
||||||
DVDAspect: s.mergeDVDAspect,
|
|
||||||
FrameRate: s.mergeFrameRate,
|
|
||||||
MotionInterpolation: s.mergeMotionInterpolation,
|
|
||||||
}
|
|
||||||
if err := savePersistedMergeConfig(cfg); err != nil {
|
|
||||||
logging.Debug(logging.CatSystem, "failed to persist merge config: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -9,14 +9,6 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
func defaultOutputBase(src *videoSource) string {
|
func defaultOutputBase(src *videoSource) string {
|
||||||
if src == nil {
|
|
||||||
return "converted"
|
|
||||||
}
|
|
||||||
base := strings.TrimSuffix(src.DisplayName, filepath.Ext(src.DisplayName))
|
|
||||||
return base
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultOutputBaseWithSuffix(src *videoSource) string {
|
|
||||||
if src == nil {
|
if src == nil {
|
||||||
return "converted"
|
return "converted"
|
||||||
}
|
}
|
||||||
|
|
@ -27,13 +19,7 @@ func defaultOutputBaseWithSuffix(src *videoSource) string {
|
||||||
// resolveOutputBase returns the output base for a source.
|
// resolveOutputBase returns the output base for a source.
|
||||||
// keepExisting preserves manual edits when auto-naming is disabled; it is ignored when auto-naming is on.
|
// keepExisting preserves manual edits when auto-naming is disabled; it is ignored when auto-naming is on.
|
||||||
func (s *appState) resolveOutputBase(src *videoSource, keepExisting bool) string {
|
func (s *appState) resolveOutputBase(src *videoSource, keepExisting bool) string {
|
||||||
// Use suffix if AppendSuffix is enabled
|
fallback := defaultOutputBase(src)
|
||||||
var fallback string
|
|
||||||
if s.convert.AppendSuffix {
|
|
||||||
fallback = defaultOutputBaseWithSuffix(src)
|
|
||||||
} else {
|
|
||||||
fallback = defaultOutputBase(src)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Auto-naming overrides manual values.
|
// Auto-naming overrides manual values.
|
||||||
if s.convert.UseAutoNaming && src != nil && strings.TrimSpace(s.convert.AutoNameTemplate) != "" {
|
if s.convert.UseAutoNaming && src != nil && strings.TrimSpace(s.convert.AutoNameTemplate) != "" {
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,8 @@ func detectHardwareEncoders(cfg *PlatformConfig) []string {
|
||||||
var encoders []string
|
var encoders []string
|
||||||
|
|
||||||
// Get list of available encoders from ffmpeg
|
// Get list of available encoders from ffmpeg
|
||||||
cmd := utils.CreateCommandRaw(cfg.FFmpegPath, "-hide_banner", "-encoders")
|
cmd := exec.Command(cfg.FFmpegPath, "-hide_banner", "-encoders")
|
||||||
|
utils.ApplyNoWindow(cmd)
|
||||||
output, err := cmd.Output()
|
output, err := cmd.Output()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logging.Debug(logging.CatSystem, "Failed to query ffmpeg encoders: %v", err)
|
logging.Debug(logging.CatSystem, "Failed to query ffmpeg encoders: %v", err)
|
||||||
|
|
|
||||||
706
rip_module.go
706
rip_module.go
|
|
@ -1,706 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/queue"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
ripFormatLosslessMKV = "Lossless MKV (Copy)"
|
|
||||||
ripFormatH264MKV = "H.264 MKV (CRF 18)"
|
|
||||||
ripFormatH264MP4 = "H.264 MP4 (CRF 18)"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ripConfig struct {
|
|
||||||
Format string `json:"format"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultRipConfig() ripConfig {
|
|
||||||
return ripConfig{
|
|
||||||
Format: ripFormatLosslessMKV,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadPersistedRipConfig() (ripConfig, error) {
|
|
||||||
var cfg ripConfig
|
|
||||||
path := moduleConfigPath("rip")
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if cfg.Format == "" {
|
|
||||||
cfg.Format = ripFormatLosslessMKV
|
|
||||||
}
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func savePersistedRipConfig(cfg ripConfig) error {
|
|
||||||
path := moduleConfigPath("rip")
|
|
||||||
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
data, err := json.MarshalIndent(cfg, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return os.WriteFile(path, data, 0o644)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) applyRipConfig(cfg ripConfig) {
|
|
||||||
s.ripFormat = cfg.Format
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) persistRipConfig() {
|
|
||||||
cfg := ripConfig{
|
|
||||||
Format: s.ripFormat,
|
|
||||||
}
|
|
||||||
if err := savePersistedRipConfig(cfg); err != nil {
|
|
||||||
logging.Debug(logging.CatSystem, "failed to persist rip config: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) showRipView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "rip"
|
|
||||||
|
|
||||||
if cfg, err := loadPersistedRipConfig(); err == nil {
|
|
||||||
s.applyRipConfig(cfg)
|
|
||||||
} else if !errors.Is(err, os.ErrNotExist) {
|
|
||||||
logging.Debug(logging.CatSystem, "failed to load persisted rip config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.ripFormat == "" {
|
|
||||||
s.ripFormat = ripFormatLosslessMKV
|
|
||||||
}
|
|
||||||
if s.ripStatusLabel != nil {
|
|
||||||
s.ripStatusLabel.SetText("Ready")
|
|
||||||
}
|
|
||||||
s.setContent(buildRipView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildRipView(state *appState) fyne.CanvasObject {
|
|
||||||
ripColor := moduleColor("rip")
|
|
||||||
|
|
||||||
backBtn := widget.NewButton("< BACK", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
queueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
state.queueBtn = queueBtn
|
|
||||||
state.updateQueueButtonLabel()
|
|
||||||
|
|
||||||
clearCompletedBtn := widget.NewButton("⌫", func() {
|
|
||||||
state.clearCompletedJobs()
|
|
||||||
})
|
|
||||||
clearCompletedBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
topBar := ui.TintedBar(ripColor, container.NewHBox(backBtn, layout.NewSpacer(), clearCompletedBtn, queueBtn))
|
|
||||||
bottomBar := moduleFooter(ripColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
sourceEntry := widget.NewEntry()
|
|
||||||
sourceEntry.SetPlaceHolder("Drop DVD/ISO/VIDEO_TS path here")
|
|
||||||
sourceEntry.SetText(state.ripSourcePath)
|
|
||||||
sourceEntry.OnChanged = func(val string) {
|
|
||||||
state.ripSourcePath = strings.TrimSpace(val)
|
|
||||||
state.ripOutputPath = defaultRipOutputPath(state.ripSourcePath, state.ripFormat)
|
|
||||||
}
|
|
||||||
|
|
||||||
outputEntry := widget.NewEntry()
|
|
||||||
outputEntry.SetPlaceHolder("Output path")
|
|
||||||
outputEntry.SetText(state.ripOutputPath)
|
|
||||||
outputEntry.OnChanged = func(val string) {
|
|
||||||
state.ripOutputPath = strings.TrimSpace(val)
|
|
||||||
}
|
|
||||||
|
|
||||||
formatSelect := widget.NewSelect([]string{ripFormatLosslessMKV, ripFormatH264MKV, ripFormatH264MP4}, func(val string) {
|
|
||||||
state.ripFormat = val
|
|
||||||
state.ripOutputPath = defaultRipOutputPath(state.ripSourcePath, state.ripFormat)
|
|
||||||
outputEntry.SetText(state.ripOutputPath)
|
|
||||||
state.persistRipConfig()
|
|
||||||
})
|
|
||||||
formatSelect.SetSelected(state.ripFormat)
|
|
||||||
|
|
||||||
statusLabel := widget.NewLabel("Ready")
|
|
||||||
statusLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
state.ripStatusLabel = statusLabel
|
|
||||||
|
|
||||||
progressBar := widget.NewProgressBar()
|
|
||||||
progressBar.SetValue(state.ripProgress / 100.0)
|
|
||||||
state.ripProgressBar = progressBar
|
|
||||||
|
|
||||||
logEntry := widget.NewMultiLineEntry()
|
|
||||||
logEntry.Wrapping = fyne.TextWrapOff
|
|
||||||
logEntry.Disable()
|
|
||||||
logEntry.SetText(state.ripLogText)
|
|
||||||
state.ripLogEntry = logEntry
|
|
||||||
logScroll := container.NewVScroll(logEntry)
|
|
||||||
// logScroll.SetMinSize(fyne.NewSize(0, 200)) // Removed for flexible sizing
|
|
||||||
state.ripLogScroll = logScroll
|
|
||||||
|
|
||||||
addQueueBtn := widget.NewButton("Add Rip to Queue", func() {
|
|
||||||
if err := state.addRipToQueue(false); err != nil {
|
|
||||||
dialog.ShowError(err, state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
dialog.ShowInformation("Queue", "Rip job added to queue.", state.window)
|
|
||||||
if state.jobQueue != nil && !state.jobQueue.IsRunning() {
|
|
||||||
state.jobQueue.Start()
|
|
||||||
}
|
|
||||||
})
|
|
||||||
addQueueBtn.Importance = widget.MediumImportance
|
|
||||||
|
|
||||||
runNowBtn := widget.NewButton("Rip Now", func() {
|
|
||||||
if err := state.addRipToQueue(true); err != nil {
|
|
||||||
dialog.ShowError(err, state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if state.jobQueue != nil && !state.jobQueue.IsRunning() {
|
|
||||||
state.jobQueue.Start()
|
|
||||||
}
|
|
||||||
dialog.ShowInformation("Rip", "Rip started! Track progress in Job Queue.", state.window)
|
|
||||||
})
|
|
||||||
runNowBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
applyControls := func() {
|
|
||||||
formatSelect.SetSelected(state.ripFormat)
|
|
||||||
outputEntry.SetText(state.ripOutputPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
loadCfgBtn := widget.NewButton("Load Config", func() {
|
|
||||||
cfg, err := loadPersistedRipConfig()
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
|
||||||
dialog.ShowInformation("No Config", "No saved config found yet. It will save automatically after your first change.", state.window)
|
|
||||||
} else {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to load config: %w", err), state.window)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
state.applyRipConfig(cfg)
|
|
||||||
state.ripOutputPath = defaultRipOutputPath(state.ripSourcePath, state.ripFormat)
|
|
||||||
applyControls()
|
|
||||||
})
|
|
||||||
|
|
||||||
saveCfgBtn := widget.NewButton("Save Config", func() {
|
|
||||||
cfg := ripConfig{
|
|
||||||
Format: state.ripFormat,
|
|
||||||
}
|
|
||||||
if err := savePersistedRipConfig(cfg); err != nil {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to save config: %w", err), state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
dialog.ShowInformation("Config Saved", fmt.Sprintf("Saved to %s", moduleConfigPath("rip")), state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
resetBtn := widget.NewButton("Reset", func() {
|
|
||||||
cfg := defaultRipConfig()
|
|
||||||
state.applyRipConfig(cfg)
|
|
||||||
state.ripOutputPath = defaultRipOutputPath(state.ripSourcePath, state.ripFormat)
|
|
||||||
applyControls()
|
|
||||||
state.persistRipConfig()
|
|
||||||
})
|
|
||||||
|
|
||||||
clearISOBtn := widget.NewButton("Clear ISO", func() {
|
|
||||||
state.ripSourcePath = ""
|
|
||||||
state.ripOutputPath = ""
|
|
||||||
sourceEntry.SetText("")
|
|
||||||
outputEntry.SetText("")
|
|
||||||
})
|
|
||||||
clearISOBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
controls := container.NewVBox(
|
|
||||||
widget.NewLabelWithStyle("Source", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
ui.NewDroppable(sourceEntry, func(items []fyne.URI) {
|
|
||||||
path := firstLocalPath(items)
|
|
||||||
if path != "" {
|
|
||||||
state.ripSourcePath = path
|
|
||||||
sourceEntry.SetText(path)
|
|
||||||
state.ripOutputPath = defaultRipOutputPath(path, state.ripFormat)
|
|
||||||
outputEntry.SetText(state.ripOutputPath)
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
clearISOBtn,
|
|
||||||
widget.NewLabelWithStyle("Format", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
formatSelect,
|
|
||||||
widget.NewLabelWithStyle("Output", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
outputEntry,
|
|
||||||
container.NewHBox(addQueueBtn, runNowBtn),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
container.NewHBox(resetBtn, loadCfgBtn, saveCfgBtn),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Status", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
statusLabel,
|
|
||||||
progressBar,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Rip Log", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
logScroll,
|
|
||||||
)
|
|
||||||
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, container.NewPadded(controls))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) addRipToQueue(startNow bool) error {
|
|
||||||
if s.jobQueue == nil {
|
|
||||||
return fmt.Errorf("queue not initialized")
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(s.ripSourcePath) == "" {
|
|
||||||
return fmt.Errorf("set a DVD/ISO/VIDEO_TS source path")
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(s.ripOutputPath) == "" {
|
|
||||||
s.ripOutputPath = defaultRipOutputPath(s.ripSourcePath, s.ripFormat)
|
|
||||||
}
|
|
||||||
job := &queue.Job{
|
|
||||||
Type: queue.JobTypeRip,
|
|
||||||
Title: fmt.Sprintf("Rip DVD: %s", filepath.Base(s.ripSourcePath)),
|
|
||||||
Description: fmt.Sprintf("Output: %s", utils.ShortenMiddle(filepath.Base(s.ripOutputPath), 40)),
|
|
||||||
InputFile: s.ripSourcePath,
|
|
||||||
OutputFile: s.ripOutputPath,
|
|
||||||
Config: map[string]interface{}{
|
|
||||||
"sourcePath": s.ripSourcePath,
|
|
||||||
"outputPath": s.ripOutputPath,
|
|
||||||
"format": s.ripFormat,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
s.resetRipLog()
|
|
||||||
s.setRipStatus("Queued rip job...")
|
|
||||||
s.setRipProgress(0)
|
|
||||||
s.jobQueue.Add(job)
|
|
||||||
if startNow && !s.jobQueue.IsRunning() {
|
|
||||||
s.jobQueue.Start()
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) executeRipJob(ctx context.Context, job *queue.Job, progressCallback func(float64)) error {
|
|
||||||
cfg := job.Config
|
|
||||||
if cfg == nil {
|
|
||||||
return fmt.Errorf("rip job config missing")
|
|
||||||
}
|
|
||||||
sourcePath := toString(cfg["sourcePath"])
|
|
||||||
outputPath := toString(cfg["outputPath"])
|
|
||||||
format := toString(cfg["format"])
|
|
||||||
if sourcePath == "" || outputPath == "" {
|
|
||||||
return fmt.Errorf("rip job missing paths")
|
|
||||||
}
|
|
||||||
logFile, logPath, logErr := createRipLog(sourcePath, outputPath, format)
|
|
||||||
if logErr != nil {
|
|
||||||
logging.Debug(logging.CatSystem, "rip log open failed: %v", logErr)
|
|
||||||
} else {
|
|
||||||
job.LogPath = logPath
|
|
||||||
defer logFile.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
appendLog := func(line string) {
|
|
||||||
if logFile != nil {
|
|
||||||
fmt.Fprintln(logFile, line)
|
|
||||||
}
|
|
||||||
app := fyne.CurrentApp()
|
|
||||||
if app != nil && app.Driver() != nil {
|
|
||||||
app.Driver().DoFromGoroutine(func() {
|
|
||||||
s.appendRipLog(line)
|
|
||||||
}, false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateProgress := func(percent float64) {
|
|
||||||
progressCallback(percent)
|
|
||||||
app := fyne.CurrentApp()
|
|
||||||
if app != nil && app.Driver() != nil {
|
|
||||||
app.Driver().DoFromGoroutine(func() {
|
|
||||||
s.setRipProgress(percent)
|
|
||||||
}, false)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
appendLog(fmt.Sprintf("Rip started: %s", time.Now().Format(time.RFC3339)))
|
|
||||||
appendLog(fmt.Sprintf("Source: %s", sourcePath))
|
|
||||||
appendLog(fmt.Sprintf("Output: %s", outputPath))
|
|
||||||
appendLog(fmt.Sprintf("Format: %s", format))
|
|
||||||
|
|
||||||
videoTSPath, cleanup, err := resolveVideoTSPath(sourcePath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if cleanup != nil {
|
|
||||||
defer cleanup()
|
|
||||||
}
|
|
||||||
|
|
||||||
sets, err := collectVOBSets(videoTSPath)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if len(sets) == 0 {
|
|
||||||
return fmt.Errorf("no VOB files found in VIDEO_TS")
|
|
||||||
}
|
|
||||||
|
|
||||||
set := sets[0]
|
|
||||||
appendLog(fmt.Sprintf("Using title set: %s", set.Name))
|
|
||||||
listFile, err := buildConcatList(set.Files)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer os.Remove(listFile)
|
|
||||||
|
|
||||||
// Create output directory if it doesn't exist
|
|
||||||
outputDir := filepath.Dir(outputPath)
|
|
||||||
if err := os.MkdirAll(outputDir, 0755); err != nil {
|
|
||||||
return fmt.Errorf("failed to create output directory: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
args := buildRipFFmpegArgs(listFile, outputPath, format)
|
|
||||||
appendLog(fmt.Sprintf(">> ffmpeg %s", strings.Join(args, " ")))
|
|
||||||
updateProgress(10)
|
|
||||||
if err := runCommandWithLogger(ctx, utils.GetFFmpegPath(), args, appendLog); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
updateProgress(100)
|
|
||||||
appendLog("Rip completed successfully.")
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultRipOutputPath(sourcePath, format string) string {
|
|
||||||
if sourcePath == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil || home == "" {
|
|
||||||
home = "."
|
|
||||||
}
|
|
||||||
baseDir := filepath.Join(home, "Videos", "VideoTools", "DVD_Rips")
|
|
||||||
name := strings.TrimSuffix(filepath.Base(sourcePath), filepath.Ext(sourcePath))
|
|
||||||
if strings.EqualFold(name, "video_ts") {
|
|
||||||
name = filepath.Base(filepath.Dir(sourcePath))
|
|
||||||
}
|
|
||||||
name = sanitizeForPath(name)
|
|
||||||
if name == "" {
|
|
||||||
name = "dvd_rip"
|
|
||||||
}
|
|
||||||
ext := ".mkv"
|
|
||||||
if format == ripFormatH264MP4 {
|
|
||||||
ext = ".mp4"
|
|
||||||
}
|
|
||||||
return uniqueFilePath(filepath.Join(baseDir, name+ext))
|
|
||||||
}
|
|
||||||
|
|
||||||
func createRipLog(inputPath, outputPath, format string) (*os.File, string, error) {
|
|
||||||
base := strings.TrimSuffix(filepath.Base(outputPath), filepath.Ext(outputPath))
|
|
||||||
if base == "" {
|
|
||||||
base = "rip"
|
|
||||||
}
|
|
||||||
logPath := filepath.Join(getLogsDir(), base+"-rip"+conversionLogSuffix)
|
|
||||||
if err := os.MkdirAll(filepath.Dir(logPath), 0o755); err != nil {
|
|
||||||
return nil, logPath, fmt.Errorf("create log dir: %w", err)
|
|
||||||
}
|
|
||||||
f, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o644)
|
|
||||||
if err != nil {
|
|
||||||
return nil, logPath, err
|
|
||||||
}
|
|
||||||
header := fmt.Sprintf(`VideoTools Rip Log
|
|
||||||
Started: %s
|
|
||||||
Source: %s
|
|
||||||
Output: %s
|
|
||||||
Format: %s
|
|
||||||
|
|
||||||
`, time.Now().Format(time.RFC3339), inputPath, outputPath, format)
|
|
||||||
if _, err := f.WriteString(header); err != nil {
|
|
||||||
_ = f.Close()
|
|
||||||
return nil, logPath, err
|
|
||||||
}
|
|
||||||
return f, logPath, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveVideoTSPath(path string) (string, func(), error) {
|
|
||||||
info, err := os.Stat(path)
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, fmt.Errorf("source not found: %w", err)
|
|
||||||
}
|
|
||||||
if info.IsDir() {
|
|
||||||
if strings.EqualFold(filepath.Base(path), "VIDEO_TS") {
|
|
||||||
return path, nil, nil
|
|
||||||
}
|
|
||||||
videoTS := filepath.Join(path, "VIDEO_TS")
|
|
||||||
if info, err := os.Stat(videoTS); err == nil && info.IsDir() {
|
|
||||||
return videoTS, nil, nil
|
|
||||||
}
|
|
||||||
return "", nil, fmt.Errorf("no VIDEO_TS folder found in %s", path)
|
|
||||||
}
|
|
||||||
if strings.HasSuffix(strings.ToLower(path), ".iso") {
|
|
||||||
// Try mount-based extraction first (works for UDF ISOs)
|
|
||||||
videoTS, cleanup, err := tryMountISO(path)
|
|
||||||
if err == nil {
|
|
||||||
return videoTS, cleanup, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fall back to extraction tools
|
|
||||||
tempDir, err := os.MkdirTemp(utils.TempDir(), "videotools-iso-")
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, fmt.Errorf("failed to create temp dir: %w", err)
|
|
||||||
}
|
|
||||||
cleanup = func() {
|
|
||||||
_ = os.RemoveAll(tempDir)
|
|
||||||
}
|
|
||||||
tool, args, err := buildISOExtractCommand(path, tempDir)
|
|
||||||
if err != nil {
|
|
||||||
cleanup()
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
if err := runCommandWithLogger(context.Background(), tool, args, nil); err != nil {
|
|
||||||
cleanup()
|
|
||||||
return "", nil, err
|
|
||||||
}
|
|
||||||
videoTS = filepath.Join(tempDir, "VIDEO_TS")
|
|
||||||
if info, err := os.Stat(videoTS); err == nil && info.IsDir() {
|
|
||||||
return videoTS, cleanup, nil
|
|
||||||
}
|
|
||||||
cleanup()
|
|
||||||
return "", nil, fmt.Errorf("VIDEO_TS not found in ISO")
|
|
||||||
}
|
|
||||||
return "", nil, fmt.Errorf("unsupported source: %s", path)
|
|
||||||
}
|
|
||||||
|
|
||||||
// tryMountISO attempts to mount the ISO and copy VIDEO_TS to a temp directory
|
|
||||||
func tryMountISO(isoPath string) (string, func(), error) {
|
|
||||||
// Create mount point
|
|
||||||
mountPoint, err := os.MkdirTemp(utils.TempDir(), "videotools-mount-")
|
|
||||||
if err != nil {
|
|
||||||
return "", nil, fmt.Errorf("failed to create mount point: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to mount the ISO
|
|
||||||
mountCmd := exec.Command("mount", "-o", "loop,ro", isoPath, mountPoint)
|
|
||||||
if err := mountCmd.Run(); err != nil {
|
|
||||||
os.RemoveAll(mountPoint)
|
|
||||||
return "", nil, fmt.Errorf("mount failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if VIDEO_TS exists
|
|
||||||
videoTSMounted := filepath.Join(mountPoint, "VIDEO_TS")
|
|
||||||
if info, err := os.Stat(videoTSMounted); err != nil || !info.IsDir() {
|
|
||||||
exec.Command("umount", mountPoint).Run()
|
|
||||||
os.RemoveAll(mountPoint)
|
|
||||||
return "", nil, fmt.Errorf("VIDEO_TS not found in mounted ISO")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Copy VIDEO_TS to temp directory
|
|
||||||
tempDir, err := os.MkdirTemp(utils.TempDir(), "videotools-iso-")
|
|
||||||
if err != nil {
|
|
||||||
exec.Command("umount", mountPoint).Run()
|
|
||||||
os.RemoveAll(mountPoint)
|
|
||||||
return "", nil, fmt.Errorf("failed to create temp dir: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use cp to copy VIDEO_TS
|
|
||||||
cpCmd := exec.Command("cp", "-r", videoTSMounted, tempDir)
|
|
||||||
if err := cpCmd.Run(); err != nil {
|
|
||||||
exec.Command("umount", mountPoint).Run()
|
|
||||||
os.RemoveAll(mountPoint)
|
|
||||||
os.RemoveAll(tempDir)
|
|
||||||
return "", nil, fmt.Errorf("copy failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unmount and clean up mount point
|
|
||||||
exec.Command("umount", mountPoint).Run()
|
|
||||||
os.RemoveAll(mountPoint)
|
|
||||||
|
|
||||||
// Return path to copied VIDEO_TS
|
|
||||||
videoTS := filepath.Join(tempDir, "VIDEO_TS")
|
|
||||||
cleanup := func() {
|
|
||||||
_ = os.RemoveAll(tempDir)
|
|
||||||
}
|
|
||||||
|
|
||||||
return videoTS, cleanup, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildISOExtractCommand(isoPath, destDir string) (string, []string, error) {
|
|
||||||
// Try xorriso first (best for UDF and ISO9660)
|
|
||||||
if _, err := exec.LookPath("xorriso"); err == nil {
|
|
||||||
return "xorriso", []string{"-osirrox", "on", "-indev", isoPath, "-extract", "/VIDEO_TS", destDir}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try 7z (works well with both UDF and ISO9660)
|
|
||||||
if _, err := exec.LookPath("7z"); err == nil {
|
|
||||||
return "7z", []string{"x", "-o" + destDir, isoPath, "VIDEO_TS"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try bsdtar (works with ISO9660, may fail on UDF)
|
|
||||||
if _, err := exec.LookPath("bsdtar"); err == nil {
|
|
||||||
return "bsdtar", []string{"-C", destDir, "-xf", isoPath, "VIDEO_TS"}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return "", nil, fmt.Errorf("no ISO extraction tool found (install xorriso, 7z, or bsdtar)")
|
|
||||||
}
|
|
||||||
|
|
||||||
type vobSet struct {
|
|
||||||
Name string
|
|
||||||
Files []string
|
|
||||||
Size int64
|
|
||||||
}
|
|
||||||
|
|
||||||
func collectVOBSets(videoTS string) ([]vobSet, error) {
|
|
||||||
entries, err := os.ReadDir(videoTS)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("read VIDEO_TS: %w", err)
|
|
||||||
}
|
|
||||||
sets := map[string]*vobSet{}
|
|
||||||
for _, entry := range entries {
|
|
||||||
name := entry.Name()
|
|
||||||
if entry.IsDir() || !strings.HasSuffix(strings.ToLower(name), ".vob") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !strings.HasPrefix(strings.ToUpper(name), "VTS_") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
parts := strings.Split(strings.TrimSuffix(name, ".VOB"), "_")
|
|
||||||
if len(parts) < 3 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
setKey := strings.Join(parts[:2], "_")
|
|
||||||
if sets[setKey] == nil {
|
|
||||||
sets[setKey] = &vobSet{Name: setKey}
|
|
||||||
}
|
|
||||||
full := filepath.Join(videoTS, name)
|
|
||||||
info, err := os.Stat(full)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
sets[setKey].Files = append(sets[setKey].Files, full)
|
|
||||||
sets[setKey].Size += info.Size()
|
|
||||||
}
|
|
||||||
var result []vobSet
|
|
||||||
for _, set := range sets {
|
|
||||||
sort.Strings(set.Files)
|
|
||||||
result = append(result, *set)
|
|
||||||
}
|
|
||||||
sort.Slice(result, func(i, j int) bool {
|
|
||||||
return result[i].Size > result[j].Size
|
|
||||||
})
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildConcatList(files []string) (string, error) {
|
|
||||||
if len(files) == 0 {
|
|
||||||
return "", fmt.Errorf("no VOB files to concatenate")
|
|
||||||
}
|
|
||||||
listFile, err := os.CreateTemp(utils.TempDir(), "vt-rip-list-*.txt")
|
|
||||||
if err != nil {
|
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
writer := bufio.NewWriter(listFile)
|
|
||||||
for _, f := range files {
|
|
||||||
fmt.Fprintf(writer, "file '%s'\n", strings.ReplaceAll(f, "'", "'\\''"))
|
|
||||||
}
|
|
||||||
_ = writer.Flush()
|
|
||||||
_ = listFile.Close()
|
|
||||||
return listFile.Name(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildRipFFmpegArgs(listFile, outputPath, format string) []string {
|
|
||||||
args := []string{
|
|
||||||
"-y",
|
|
||||||
"-hide_banner",
|
|
||||||
"-loglevel", "error",
|
|
||||||
"-f", "concat",
|
|
||||||
"-safe", "0",
|
|
||||||
"-i", listFile,
|
|
||||||
}
|
|
||||||
switch format {
|
|
||||||
case ripFormatH264MKV:
|
|
||||||
args = append(args,
|
|
||||||
"-c:v", "libx264",
|
|
||||||
"-crf", "18",
|
|
||||||
"-preset", "medium",
|
|
||||||
"-c:a", "copy",
|
|
||||||
)
|
|
||||||
case ripFormatH264MP4:
|
|
||||||
args = append(args,
|
|
||||||
"-c:v", "libx264",
|
|
||||||
"-crf", "18",
|
|
||||||
"-preset", "medium",
|
|
||||||
"-c:a", "aac",
|
|
||||||
"-b:a", "192k",
|
|
||||||
)
|
|
||||||
default:
|
|
||||||
args = append(args, "-c", "copy")
|
|
||||||
}
|
|
||||||
args = append(args, outputPath)
|
|
||||||
return args
|
|
||||||
}
|
|
||||||
|
|
||||||
func firstLocalPath(items []fyne.URI) string {
|
|
||||||
for _, uri := range items {
|
|
||||||
if uri.Scheme() == "file" {
|
|
||||||
return uri.Path()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) resetRipLog() {
|
|
||||||
s.ripLogText = ""
|
|
||||||
if s.ripLogEntry != nil {
|
|
||||||
s.ripLogEntry.SetText("")
|
|
||||||
}
|
|
||||||
if s.ripLogScroll != nil {
|
|
||||||
s.ripLogScroll.ScrollToTop()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) appendRipLog(line string) {
|
|
||||||
if strings.TrimSpace(line) == "" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s.ripLogText += line + "\n"
|
|
||||||
if s.ripLogEntry != nil {
|
|
||||||
s.ripLogEntry.SetText(s.ripLogText)
|
|
||||||
}
|
|
||||||
if s.ripLogScroll != nil {
|
|
||||||
s.ripLogScroll.ScrollToBottom()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) setRipStatus(text string) {
|
|
||||||
if text == "" {
|
|
||||||
text = "Ready"
|
|
||||||
}
|
|
||||||
if s.ripStatusLabel != nil {
|
|
||||||
s.ripStatusLabel.SetText(text)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) setRipProgress(percent float64) {
|
|
||||||
if percent < 0 {
|
|
||||||
percent = 0
|
|
||||||
}
|
|
||||||
if percent > 100 {
|
|
||||||
percent = 100
|
|
||||||
}
|
|
||||||
s.ripProgress = percent
|
|
||||||
if s.ripProgressBar != nil {
|
|
||||||
s.ripProgressBar.SetValue(percent / 100.0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -2,18 +2,6 @@
|
||||||
|
|
||||||
This directory contains scripts for building and managing VideoTools on different platforms.
|
This directory contains scripts for building and managing VideoTools on different platforms.
|
||||||
|
|
||||||
## Recommended Workflow
|
|
||||||
|
|
||||||
For development on any platform:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./scripts/install.sh
|
|
||||||
./scripts/build.sh
|
|
||||||
./scripts/run.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
Use `./scripts/install.sh` whenever you add new dependencies or need to reinstall.
|
|
||||||
|
|
||||||
## Linux
|
## Linux
|
||||||
|
|
||||||
### Install Dependencies
|
### Install Dependencies
|
||||||
|
|
@ -85,7 +73,6 @@ Run in PowerShell as Administrator:
|
||||||
- MinGW-w64 (GCC compiler)
|
- MinGW-w64 (GCC compiler)
|
||||||
- ffmpeg
|
- ffmpeg
|
||||||
- Git (optional, for development)
|
- Git (optional, for development)
|
||||||
- DVD authoring tools (via DVDStyler portable: dvdauthor + mkisofs)
|
|
||||||
|
|
||||||
**Package managers supported:**
|
**Package managers supported:**
|
||||||
- Chocolatey (default, requires admin)
|
- Chocolatey (default, requires admin)
|
||||||
|
|
|
||||||
|
|
@ -1,83 +0,0 @@
|
||||||
# Add Windows Defender Exclusions for VideoTools Build Performance
|
|
||||||
# This script adds build directories to Windows Defender exclusions
|
|
||||||
# Saves 2-5 minutes on build times!
|
|
||||||
|
|
||||||
# Check if running as Administrator
|
|
||||||
$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
|
|
||||||
|
|
||||||
if (-not $isAdmin) {
|
|
||||||
Write-Host "❌ ERROR: This script must be run as Administrator!" -ForegroundColor Red
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "To run as Administrator:" -ForegroundColor Yellow
|
|
||||||
Write-Host " 1. Right-click PowerShell" -ForegroundColor White
|
|
||||||
Write-Host " 2. Select 'Run as Administrator'" -ForegroundColor White
|
|
||||||
Write-Host " 3. Navigate to this directory" -ForegroundColor White
|
|
||||||
Write-Host " 4. Run: .\scripts\add-defender-exclusions.ps1" -ForegroundColor White
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "Or from Git Bash (as Administrator):" -ForegroundColor Yellow
|
|
||||||
Write-Host " powershell.exe -ExecutionPolicy Bypass -File ./scripts/add-defender-exclusions.ps1" -ForegroundColor White
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
|
||||||
Write-Host " Adding Windows Defender Exclusions for VideoTools" -ForegroundColor Cyan
|
|
||||||
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
# Get paths
|
|
||||||
$goBuildCache = "$env:LOCALAPPDATA\go-build"
|
|
||||||
$goModCache = "$env:USERPROFILE\go"
|
|
||||||
$projectDir = Split-Path -Parent $PSScriptRoot
|
|
||||||
$msys64 = "C:\msys64"
|
|
||||||
|
|
||||||
Write-Host "Adding exclusions..." -ForegroundColor Yellow
|
|
||||||
Write-Host ""
|
|
||||||
|
|
||||||
# Add Go build cache
|
|
||||||
try {
|
|
||||||
Add-MpPreference -ExclusionPath $goBuildCache -ErrorAction Stop
|
|
||||||
Write-Host "✓ Added: $goBuildCache" -ForegroundColor Green
|
|
||||||
} catch {
|
|
||||||
Write-Host "⚠ Already excluded or failed: $goBuildCache" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add Go module cache
|
|
||||||
try {
|
|
||||||
Add-MpPreference -ExclusionPath $goModCache -ErrorAction Stop
|
|
||||||
Write-Host "✓ Added: $goModCache" -ForegroundColor Green
|
|
||||||
} catch {
|
|
||||||
Write-Host "⚠ Already excluded or failed: $goModCache" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add project directory
|
|
||||||
try {
|
|
||||||
Add-MpPreference -ExclusionPath $projectDir -ErrorAction Stop
|
|
||||||
Write-Host "✓ Added: $projectDir" -ForegroundColor Green
|
|
||||||
} catch {
|
|
||||||
Write-Host "⚠ Already excluded or failed: $projectDir" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
|
|
||||||
# Add MSYS2 if it exists
|
|
||||||
if (Test-Path $msys64) {
|
|
||||||
try {
|
|
||||||
Add-MpPreference -ExclusionPath $msys64 -ErrorAction Stop
|
|
||||||
Write-Host "✓ Added: $msys64" -ForegroundColor Green
|
|
||||||
} catch {
|
|
||||||
Write-Host "⚠ Already excluded or failed: $msys64" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Write-Host "⊘ Skipped: $msys64 (not found)" -ForegroundColor Gray
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
|
||||||
Write-Host "✅ EXCLUSIONS ADDED" -ForegroundColor Green
|
|
||||||
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "Expected build time improvement: 5+ minutes → 30-90 seconds" -ForegroundColor Green
|
|
||||||
Write-Host ""
|
|
||||||
Write-Host "Next steps:" -ForegroundColor Yellow
|
|
||||||
Write-Host " 1. Close and reopen your terminal" -ForegroundColor White
|
|
||||||
Write-Host " 2. Run: ./scripts/build.ps1 (PowerShell) or ./scripts/build.bat" -ForegroundColor White
|
|
||||||
Write-Host " 3. Or from Git Bash: ./scripts/build.sh" -ForegroundColor White
|
|
||||||
Write-Host ""
|
|
||||||
|
|
@ -9,18 +9,28 @@ alias VideoTools="bash $PROJECT_ROOT/scripts/run.sh"
|
||||||
|
|
||||||
# Also create a rebuild function for quick rebuilds
|
# Also create a rebuild function for quick rebuilds
|
||||||
VideoToolsRebuild() {
|
VideoToolsRebuild() {
|
||||||
echo "Rebuilding VideoTools..."
|
echo "🔨 Rebuilding VideoTools..."
|
||||||
bash "$PROJECT_ROOT/scripts/build.sh"
|
bash "$PROJECT_ROOT/scripts/build.sh"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Create a clean function
|
# Create a clean function
|
||||||
VideoToolsClean() {
|
VideoToolsClean() {
|
||||||
echo "Cleaning VideoTools build artifacts..."
|
echo "🧹 Cleaning VideoTools build artifacts..."
|
||||||
cd "$PROJECT_ROOT"
|
cd "$PROJECT_ROOT"
|
||||||
go clean -cache -modcache -testcache
|
go clean -cache -modcache -testcache
|
||||||
rm -f "$PROJECT_ROOT/VideoTools"
|
rm -f "$PROJECT_ROOT/VideoTools"
|
||||||
echo "Clean complete"
|
echo "✓ Clean complete"
|
||||||
}
|
}
|
||||||
|
|
||||||
# VideoTools commands loaded silently
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
# Available commands: VideoTools, VideoToolsRebuild, VideoToolsClean
|
echo "✅ VideoTools Commands Available"
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo ""
|
||||||
|
echo "Commands:"
|
||||||
|
echo " VideoTools - Run VideoTools (auto-builds if needed)"
|
||||||
|
echo " VideoToolsRebuild - Force rebuild of VideoTools"
|
||||||
|
echo " VideoToolsClean - Clean build artifacts and cache"
|
||||||
|
echo ""
|
||||||
|
echo "To make these permanent, add this line to your ~/.bashrc or ~/.zshrc:"
|
||||||
|
echo " source $PROJECT_ROOT/scripts/alias.sh"
|
||||||
|
echo ""
|
||||||
|
|
|
||||||
|
|
@ -17,49 +17,49 @@ echo ""
|
||||||
|
|
||||||
# Check if go is installed
|
# Check if go is installed
|
||||||
if ! command -v go &> /dev/null; then
|
if ! command -v go &> /dev/null; then
|
||||||
echo "ERROR: Go is not installed. Please install Go 1.21 or later."
|
echo "❌ ERROR: Go is not installed. Please install Go 1.21 or later."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Go version:"
|
echo "📦 Go version:"
|
||||||
go version
|
go version
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Change to project directory
|
# Change to project directory
|
||||||
cd "$PROJECT_ROOT"
|
cd "$PROJECT_ROOT"
|
||||||
|
|
||||||
echo "Cleaning previous builds and cache..."
|
echo "🧹 Cleaning previous builds and cache..."
|
||||||
go clean -cache -testcache 2>/dev/null || true
|
go clean -cache -testcache 2>/dev/null || true
|
||||||
rm -f "$BUILD_OUTPUT" 2>/dev/null || true
|
rm -f "$BUILD_OUTPUT" 2>/dev/null || true
|
||||||
# Also clear build cache directory to avoid permission issues
|
# Also clear build cache directory to avoid permission issues
|
||||||
rm -rf "${GOCACHE:-$HOME/.cache/go-build}" 2>/dev/null || true
|
rm -rf "${GOCACHE:-$HOME/.cache/go-build}" 2>/dev/null || true
|
||||||
echo "Cache cleaned"
|
echo "✓ Cache cleaned"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Downloading and verifying dependencies (skips if already cached)..."
|
echo "⬇️ Downloading and verifying dependencies (skips if already cached)..."
|
||||||
if go list -m all >/dev/null 2>&1; then
|
if go list -m all >/dev/null 2>&1; then
|
||||||
echo "Dependencies already present"
|
echo "✓ Dependencies already present"
|
||||||
else
|
else
|
||||||
if go mod download && go mod verify; then
|
if go mod download && go mod verify; then
|
||||||
echo "Dependencies downloaded and verified"
|
echo "✓ Dependencies downloaded and verified"
|
||||||
else
|
else
|
||||||
echo "Failed to download/verify modules. Check network/GOPROXY or try again."
|
echo "❌ Failed to download/verify modules. Check network/GOPROXY or try again."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Building VideoTools..."
|
echo "🔨 Building VideoTools..."
|
||||||
# Fyne needs cgo for GLFW/OpenGL bindings; build with CGO enabled.
|
# Fyne needs cgo for GLFW/OpenGL bindings; build with CGO enabled.
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
export GOCACHE="$PROJECT_ROOT/.cache/go-build"
|
export GOCACHE="$PROJECT_ROOT/.cache/go-build"
|
||||||
export GOMODCACHE="$PROJECT_ROOT/.cache/go-mod"
|
export GOMODCACHE="$PROJECT_ROOT/.cache/go-mod"
|
||||||
mkdir -p "$GOCACHE" "$GOMODCACHE"
|
mkdir -p "$GOCACHE" "$GOMODCACHE"
|
||||||
if go build -o "$BUILD_OUTPUT" .; then
|
if go build -o "$BUILD_OUTPUT" .; then
|
||||||
echo "Build successful! (VideoTools $APP_VERSION)"
|
echo "✓ Build successful! (VideoTools $APP_VERSION)"
|
||||||
echo ""
|
echo ""
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo "BUILD COMPLETE - $APP_VERSION"
|
echo "✅ BUILD COMPLETE - $APP_VERSION"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Output: $BUILD_OUTPUT"
|
echo "Output: $BUILD_OUTPUT"
|
||||||
|
|
@ -74,7 +74,7 @@ if go build -o "$BUILD_OUTPUT" .; then
|
||||||
echo " VideoTools"
|
echo " VideoTools"
|
||||||
echo ""
|
echo ""
|
||||||
else
|
else
|
||||||
echo "Build failed! (VideoTools $APP_VERSION)"
|
echo "❌ Build failed! (VideoTools $APP_VERSION)"
|
||||||
echo "Diagnostics: version=$APP_VERSION os=$(uname -s) arch=$(uname -m) go=$(go version | awk '{print $3}')"
|
echo "Diagnostics: version=$APP_VERSION os=$(uname -s) arch=$(uname -m) go=$(go version | awk '{print $3}')"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Help: check the Go error messages above."
|
echo "Help: check the Go error messages above."
|
||||||
|
|
|
||||||
|
|
@ -15,17 +15,17 @@ echo ""
|
||||||
|
|
||||||
# Check if go is installed
|
# Check if go is installed
|
||||||
if ! command -v go &> /dev/null; then
|
if ! command -v go &> /dev/null; then
|
||||||
echo "ERROR: Go is not installed. Please install Go 1.21 or later."
|
echo "❌ ERROR: Go is not installed. Please install Go 1.21 or later."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Go version:"
|
echo "📦 Go version:"
|
||||||
go version
|
go version
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Check if MinGW-w64 is installed
|
# Check if MinGW-w64 is installed
|
||||||
if ! command -v x86_64-w64-mingw32-gcc &> /dev/null; then
|
if ! command -v x86_64-w64-mingw32-gcc &> /dev/null; then
|
||||||
echo "ERROR: MinGW-w64 cross-compiler not found!"
|
echo "❌ ERROR: MinGW-w64 cross-compiler not found!"
|
||||||
echo ""
|
echo ""
|
||||||
echo "To install on Fedora/RHEL:"
|
echo "To install on Fedora/RHEL:"
|
||||||
echo " sudo dnf install mingw64-gcc mingw64-winpthreads-static"
|
echo " sudo dnf install mingw64-gcc mingw64-winpthreads-static"
|
||||||
|
|
@ -36,26 +36,26 @@ if ! command -v x86_64-w64-mingw32-gcc &> /dev/null; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "MinGW-w64 detected:"
|
echo "🔧 MinGW-w64 detected:"
|
||||||
x86_64-w64-mingw32-gcc --version | head -1
|
x86_64-w64-mingw32-gcc --version | head -1
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Change to project directory
|
# Change to project directory
|
||||||
cd "$PROJECT_ROOT"
|
cd "$PROJECT_ROOT"
|
||||||
|
|
||||||
echo "Cleaning previous Windows builds..."
|
echo "🧹 Cleaning previous Windows builds..."
|
||||||
rm -f "$BUILD_OUTPUT" 2>/dev/null || true
|
rm -f "$BUILD_OUTPUT" 2>/dev/null || true
|
||||||
rm -rf "$DIST_DIR" 2>/dev/null || true
|
rm -rf "$DIST_DIR" 2>/dev/null || true
|
||||||
echo "Previous builds cleaned"
|
echo "✓ Previous builds cleaned"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Downloading and verifying dependencies..."
|
echo "⬇️ Downloading and verifying dependencies..."
|
||||||
go mod download
|
go mod download
|
||||||
go mod verify
|
go mod verify
|
||||||
echo "Dependencies verified"
|
echo "✓ Dependencies verified"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Cross-compiling for Windows (amd64)..."
|
echo "🔨 Cross-compiling for Windows (amd64)..."
|
||||||
echo " Target: windows/amd64"
|
echo " Target: windows/amd64"
|
||||||
echo " Compiler: x86_64-w64-mingw32-gcc"
|
echo " Compiler: x86_64-w64-mingw32-gcc"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
@ -73,27 +73,27 @@ export CXX=x86_64-w64-mingw32-g++
|
||||||
LDFLAGS="-H windowsgui -s -w"
|
LDFLAGS="-H windowsgui -s -w"
|
||||||
|
|
||||||
if go build -ldflags="$LDFLAGS" -o "$BUILD_OUTPUT" .; then
|
if go build -ldflags="$LDFLAGS" -o "$BUILD_OUTPUT" .; then
|
||||||
echo "Cross-compilation successful!"
|
echo "✓ Cross-compilation successful!"
|
||||||
echo ""
|
echo ""
|
||||||
else
|
else
|
||||||
echo "Build failed!"
|
echo "❌ Build failed!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Creating distribution package..."
|
echo "📦 Creating distribution package..."
|
||||||
mkdir -p "$DIST_DIR"
|
mkdir -p "$DIST_DIR"
|
||||||
|
|
||||||
# Copy executable
|
# Copy executable
|
||||||
cp "$BUILD_OUTPUT" "$DIST_DIR/"
|
cp "$BUILD_OUTPUT" "$DIST_DIR/"
|
||||||
echo "Copied VideoTools.exe"
|
echo "✓ Copied VideoTools.exe"
|
||||||
|
|
||||||
# Copy documentation
|
# Copy documentation
|
||||||
cp README.md "$DIST_DIR/" 2>/dev/null || echo "WARNING: README.md not found"
|
cp README.md "$DIST_DIR/" 2>/dev/null || echo "⚠️ README.md not found"
|
||||||
cp LICENSE "$DIST_DIR/" 2>/dev/null || echo "WARNING: LICENSE not found"
|
cp LICENSE "$DIST_DIR/" 2>/dev/null || echo "⚠️ LICENSE not found"
|
||||||
|
|
||||||
# Download and bundle FFmpeg automatically
|
# Download and bundle FFmpeg automatically
|
||||||
if [ ! -f "ffmpeg.exe" ]; then
|
if [ ! -f "ffmpeg.exe" ]; then
|
||||||
echo "FFmpeg not found locally, downloading..."
|
echo "📥 FFmpeg not found locally, downloading..."
|
||||||
FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip"
|
FFMPEG_URL="https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/ffmpeg-master-latest-win64-gpl.zip"
|
||||||
FFMPEG_ZIP="$PROJECT_ROOT/ffmpeg-windows.zip"
|
FFMPEG_ZIP="$PROJECT_ROOT/ffmpeg-windows.zip"
|
||||||
|
|
||||||
|
|
@ -102,14 +102,14 @@ if [ ! -f "ffmpeg.exe" ]; then
|
||||||
elif command -v curl &> /dev/null; then
|
elif command -v curl &> /dev/null; then
|
||||||
curl -L "$FFMPEG_URL" -o "$FFMPEG_ZIP" --progress-bar
|
curl -L "$FFMPEG_URL" -o "$FFMPEG_ZIP" --progress-bar
|
||||||
else
|
else
|
||||||
echo "WARNING: wget or curl not found. Cannot download FFmpeg automatically."
|
echo "⚠️ wget or curl not found. Cannot download FFmpeg automatically."
|
||||||
echo " Please download manually from: $FFMPEG_URL"
|
echo " Please download manually from: $FFMPEG_URL"
|
||||||
echo " Extract ffmpeg.exe and ffprobe.exe to project root"
|
echo " Extract ffmpeg.exe and ffprobe.exe to project root"
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "$FFMPEG_ZIP" ]; then
|
if [ -f "$FFMPEG_ZIP" ]; then
|
||||||
echo "Extracting FFmpeg..."
|
echo "📦 Extracting FFmpeg..."
|
||||||
unzip -q "$FFMPEG_ZIP" "*/bin/ffmpeg.exe" "*/bin/ffprobe.exe" -d "$PROJECT_ROOT/ffmpeg-temp"
|
unzip -q "$FFMPEG_ZIP" "*/bin/ffmpeg.exe" "*/bin/ffprobe.exe" -d "$PROJECT_ROOT/ffmpeg-temp"
|
||||||
|
|
||||||
# Find and copy the executables (they're nested in a versioned directory)
|
# Find and copy the executables (they're nested in a versioned directory)
|
||||||
|
|
@ -118,28 +118,28 @@ if [ ! -f "ffmpeg.exe" ]; then
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
rm -rf "$PROJECT_ROOT/ffmpeg-temp" "$FFMPEG_ZIP"
|
rm -rf "$PROJECT_ROOT/ffmpeg-temp" "$FFMPEG_ZIP"
|
||||||
echo "FFmpeg downloaded and extracted"
|
echo "✓ FFmpeg downloaded and extracted"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Bundle FFmpeg with the distribution
|
# Bundle FFmpeg with the distribution
|
||||||
if [ -f "ffmpeg.exe" ]; then
|
if [ -f "ffmpeg.exe" ]; then
|
||||||
cp ffmpeg.exe "$DIST_DIR/"
|
cp ffmpeg.exe "$DIST_DIR/"
|
||||||
echo "Bundled ffmpeg.exe"
|
echo "✓ Bundled ffmpeg.exe"
|
||||||
else
|
else
|
||||||
echo "WARNING: ffmpeg.exe not found - distribution will require separate FFmpeg installation"
|
echo "⚠️ ffmpeg.exe not found - distribution will require separate FFmpeg installation"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f "ffprobe.exe" ]; then
|
if [ -f "ffprobe.exe" ]; then
|
||||||
cp ffprobe.exe "$DIST_DIR/"
|
cp ffprobe.exe "$DIST_DIR/"
|
||||||
echo "Bundled ffprobe.exe"
|
echo "✓ Bundled ffprobe.exe"
|
||||||
else
|
else
|
||||||
echo "WARNING: ffprobe.exe not found"
|
echo "⚠️ ffprobe.exe not found"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo "WINDOWS BUILD COMPLETE"
|
echo "✅ WINDOWS BUILD COMPLETE"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Output directory: $DIST_DIR"
|
echo "Output directory: $DIST_DIR"
|
||||||
|
|
|
||||||
|
|
@ -183,18 +183,7 @@ echo [INFO] Building VideoTools.exe...
|
||||||
REM Enable CGO for Windows build (required for Fyne)
|
REM Enable CGO for Windows build (required for Fyne)
|
||||||
set CGO_ENABLED=1
|
set CGO_ENABLED=1
|
||||||
|
|
||||||
REM Detect CPU cores for parallel compilation
|
|
||||||
for /f "tokens=2 delims==" %%I in ('wmic cpu get NumberOfLogicalProcessors /value ^| find "="') do set NUM_CORES=%%I
|
|
||||||
if not defined NUM_CORES set NUM_CORES=4
|
|
||||||
echo [INFO] Using %NUM_CORES% parallel build processes
|
|
||||||
|
|
||||||
REM Build with optimizations:
|
|
||||||
REM -p: Parallel build processes (use all CPU cores)
|
|
||||||
REM -trimpath: Remove absolute paths (faster builds, smaller binary)
|
|
||||||
REM -ldflags: Strip debug info (-s -w) and use Windows GUI mode (-H windowsgui)
|
|
||||||
go build ^
|
go build ^
|
||||||
-p %NUM_CORES% ^
|
|
||||||
-trimpath ^
|
|
||||||
-ldflags="-H windowsgui -s -w" ^
|
-ldflags="-H windowsgui -s -w" ^
|
||||||
-o VideoTools.exe ^
|
-o VideoTools.exe ^
|
||||||
.
|
.
|
||||||
|
|
|
||||||
|
|
@ -59,18 +59,8 @@ Write-Host ""
|
||||||
# Fyne needs CGO for GLFW/OpenGL bindings
|
# Fyne needs CGO for GLFW/OpenGL bindings
|
||||||
$env:CGO_ENABLED = "1"
|
$env:CGO_ENABLED = "1"
|
||||||
|
|
||||||
# Detect number of CPU cores for parallel compilation
|
# Build the application
|
||||||
$numCores = (Get-CimInstance Win32_ComputerSystem).NumberOfLogicalProcessors
|
go build -o $BUILD_OUTPUT .
|
||||||
if (-not $numCores -or $numCores -lt 1) {
|
|
||||||
$numCores = 4 # Fallback to 4 if detection fails
|
|
||||||
}
|
|
||||||
Write-Host "Using $numCores parallel build processes" -ForegroundColor Cyan
|
|
||||||
|
|
||||||
# Build the application with optimizations
|
|
||||||
# -p: Number of parallel build processes (use all cores)
|
|
||||||
# -ldflags="-s -w": Strip debug info and symbol table (faster linking, smaller binary)
|
|
||||||
# -trimpath: Remove absolute file paths from binary (faster builds, smaller binary)
|
|
||||||
go build -p $numCores -ldflags="-s -w" -trimpath -o $BUILD_OUTPUT .
|
|
||||||
|
|
||||||
if ($LASTEXITCODE -eq 0) {
|
if ($LASTEXITCODE -eq 0) {
|
||||||
Write-Host "✓ Build successful!" -ForegroundColor Green
|
Write-Host "✓ Build successful!" -ForegroundColor Green
|
||||||
|
|
|
||||||
|
|
@ -9,29 +9,29 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
APP_VERSION="$(grep -m1 'appVersion' "$PROJECT_ROOT/main.go" | sed -E 's/.*\"([^\"]+)\".*/\1/')"
|
APP_VERSION="$(grep -m1 'appVersion' "$PROJECT_ROOT/main.go" | sed -E 's/.*\"([^\"]+)\".*/\1/')"
|
||||||
[ -z "$APP_VERSION" ] && APP_VERSION="(version unknown)"
|
[ -z "$APP_VERSION" ] && APP_VERSION="(version unknown)"
|
||||||
|
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo " VideoTools Universal Build Script"
|
||||||
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
|
echo ""
|
||||||
|
|
||||||
# Detect platform
|
# Detect platform
|
||||||
PLATFORM="$(uname -s)"
|
PLATFORM="$(uname -s)"
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
Linux*) OS="Linux" ;;
|
Linux*) OS="Linux" ;;
|
||||||
Darwin*) OS="macOS" ;;
|
Darwin*) OS="macOS" ;;
|
||||||
CYGWIN*|MINGW*|MSYS*) OS="Windows" ;;
|
CYGWIN*|MINGW*|MSYS*) OS="Windows" ;;
|
||||||
*) echo "Unknown platform: $PLATFORM"; exit 1 ;;
|
*) echo "❌ Unknown platform: $PLATFORM"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
echo "🔍 Detected platform: $OS"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo " VideoTools ${OS} Build"
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo ""
|
|
||||||
echo "Detected platform: $OS"
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Go check
|
# Go check
|
||||||
if ! command -v go >/dev/null 2>&1; then
|
if ! command -v go >/dev/null 2>&1; then
|
||||||
echo "ERROR: Go is not installed. Please install Go 1.21+ (go version currently missing)."
|
echo "❌ ERROR: Go is not installed. Please install Go 1.21+ (go version currently missing)."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Go version:"
|
echo "📦 Go version:"
|
||||||
go version
|
go version
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|
@ -50,26 +50,26 @@ case "$OS" in
|
||||||
echo ""
|
echo ""
|
||||||
cd "$PROJECT_ROOT"
|
cd "$PROJECT_ROOT"
|
||||||
|
|
||||||
echo "Cleaning previous builds..."
|
echo "🧹 Cleaning previous builds..."
|
||||||
rm -f VideoTools.exe 2>/dev/null || true
|
rm -f VideoTools.exe 2>/dev/null || true
|
||||||
# Clear Go cache to avoid permission issues
|
# Clear Go cache to avoid permission issues
|
||||||
go clean -cache -modcache -testcache 2>/dev/null || true
|
go clean -cache -modcache -testcache 2>/dev/null || true
|
||||||
echo "Cache cleaned"
|
echo "✓ Cache cleaned"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Downloading dependencies..."
|
echo "⬇️ Downloading dependencies..."
|
||||||
go mod download
|
go mod download
|
||||||
echo "Dependencies downloaded"
|
echo "✓ Dependencies downloaded"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
echo "Building VideoTools $APP_VERSION for Windows..."
|
echo "🔨 Building VideoTools $APP_VERSION for Windows..."
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
if go build -ldflags="-H windowsgui -s -w" -o VideoTools.exe .; then
|
if go build -ldflags="-H windowsgui -s -w" -o VideoTools.exe .; then
|
||||||
echo "Build successful! (VideoTools $APP_VERSION)"
|
echo "✓ Build successful! (VideoTools $APP_VERSION)"
|
||||||
echo ""
|
echo ""
|
||||||
if [ -f "setup-windows.bat" ]; then
|
if [ -f "setup-windows.bat" ]; then
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo "BUILD COMPLETE - $APP_VERSION"
|
echo "✅ BUILD COMPLETE - $APP_VERSION"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Output: VideoTools.exe"
|
echo "Output: VideoTools.exe"
|
||||||
|
|
@ -93,11 +93,11 @@ case "$OS" in
|
||||||
echo "You can skip if FFmpeg is already installed elsewhere."
|
echo "You can skip if FFmpeg is already installed elsewhere."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Build complete: VideoTools.exe"
|
echo "✓ Build complete: VideoTools.exe"
|
||||||
diagnostics
|
diagnostics
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Build failed! (VideoTools $APP_VERSION)"
|
echo "❌ Build failed! (VideoTools $APP_VERSION)"
|
||||||
diagnostics
|
diagnostics
|
||||||
echo ""
|
echo ""
|
||||||
echo "Help: check the Go error messages above."
|
echo "Help: check the Go error messages above."
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo " VideoTools Linux Installation"
|
echo " VideoTools Dependency Installer (Linux)"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,22 +4,60 @@ chcp 65001 >nul
|
||||||
title VideoTools Windows Dependency Installer
|
title VideoTools Windows Dependency Installer
|
||||||
|
|
||||||
echo ========================================================
|
echo ========================================================
|
||||||
echo VideoTools Windows Installation
|
echo VideoTools Windows Dependency Installer (.bat)
|
||||||
echo Delegating to PowerShell for full dependency setup
|
echo Installs Go, MinGW (GCC), Git, and FFmpeg
|
||||||
echo ========================================================
|
echo ========================================================
|
||||||
echo.
|
echo.
|
||||||
|
|
||||||
powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0install-deps-windows.ps1"
|
REM Prefer Chocolatey if available; otherwise fall back to winget.
|
||||||
set EXIT_CODE=%errorlevel%
|
where choco >nul 2>&1
|
||||||
|
if %errorlevel%==0 (
|
||||||
if not %EXIT_CODE%==0 (
|
echo Using Chocolatey...
|
||||||
echo.
|
call :install_choco
|
||||||
echo Dependency installer failed with exit code %EXIT_CODE%.
|
goto :verify
|
||||||
pause
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
where winget >nul 2>&1
|
||||||
|
if %errorlevel%==0 (
|
||||||
|
echo Chocolatey not found; using winget...
|
||||||
|
call :install_winget
|
||||||
|
goto :verify
|
||||||
|
)
|
||||||
|
|
||||||
|
echo Neither Chocolatey nor winget found.
|
||||||
|
echo Please install Chocolatey (recommended): https://chocolatey.org/install
|
||||||
|
echo Then re-run this script.
|
||||||
|
pause
|
||||||
|
exit /b 1
|
||||||
|
|
||||||
|
:install_choco
|
||||||
echo.
|
echo.
|
||||||
echo Done. Restart your terminal to refresh PATH.
|
echo Installing dependencies via Chocolatey...
|
||||||
|
choco install -y golang mingw git ffmpeg
|
||||||
|
goto :eof
|
||||||
|
|
||||||
|
:install_winget
|
||||||
|
echo.
|
||||||
|
echo Installing dependencies via winget...
|
||||||
|
REM Winget package IDs can vary; these are common defaults.
|
||||||
|
winget install -e --id GoLang.Go
|
||||||
|
winget install -e --id Git.Git
|
||||||
|
winget install -e --id GnuWin32.Mingw
|
||||||
|
winget install -e --id Gyan.FFmpeg
|
||||||
|
goto :eof
|
||||||
|
|
||||||
|
:verify
|
||||||
|
echo.
|
||||||
|
echo ========================================================
|
||||||
|
echo Verifying installs
|
||||||
|
echo ========================================================
|
||||||
|
where go >nul 2>&1 && go version
|
||||||
|
where gcc >nul 2>&1 && gcc --version | findstr /R /C:"gcc"
|
||||||
|
where git >nul 2>&1 && git --version
|
||||||
|
where ffmpeg >nul 2>&1 && ffmpeg -version | head -n 1
|
||||||
|
|
||||||
|
echo.
|
||||||
|
echo Done. If any tool is missing, ensure its bin folder is in PATH
|
||||||
|
echo (restart terminal after installation).
|
||||||
pause
|
pause
|
||||||
exit /b 0
|
exit /b 0
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,21 @@
|
||||||
# VideoTools Dependency Installer for Windows
|
# VideoTools Dependency Installer for Windows
|
||||||
# Installs all required build and runtime dependencies using Chocolatey or Scoop
|
# Installs all required build and runtime dependencies using Chocolatey or Scoop
|
||||||
|
|
||||||
param(
|
param(
|
||||||
[switch]$UseScoop = $false,
|
[switch]$UseScoop = $false,
|
||||||
[switch]$SkipFFmpeg = $false,
|
[switch]$SkipFFmpeg = $false
|
||||||
[string]$DvdStylerUrl = "",
|
|
||||||
[string]$DvdStylerZip = "",
|
|
||||||
[switch]$SkipDvdStyler = $false
|
|
||||||
)
|
)
|
||||||
|
|
||||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
||||||
Write-Host " VideoTools Windows Installation" -ForegroundColor Cyan
|
Write-Host " VideoTools Dependency Installer (Windows)" -ForegroundColor Cyan
|
||||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
||||||
# Check if running as administrator
|
# Check if running as administrator
|
||||||
$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
|
$isAdmin = ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
|
||||||
|
|
||||||
if (-not $isAdmin) {
|
if (-not $isAdmin) {
|
||||||
Write-Host "[WARN] This script should be run as Administrator for best results" -ForegroundColor Yellow
|
Write-Host "⚠️ This script should be run as Administrator for best results" -ForegroundColor Yellow
|
||||||
Write-Host " Right-click PowerShell and select 'Run as Administrator'" -ForegroundColor Yellow
|
Write-Host " Right-click PowerShell and select 'Run as Administrator'" -ForegroundColor Yellow
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
$continue = Read-Host "Continue anyway? (y/N)"
|
$continue = Read-Host "Continue anyway? (y/N)"
|
||||||
|
|
@ -28,10 +25,6 @@ if (-not $isAdmin) {
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($DvdStylerUrl) {
|
|
||||||
$env:VT_DVDSTYLER_URL = $DvdStylerUrl
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to check if a command exists
|
# Function to check if a command exists
|
||||||
function Test-Command {
|
function Test-Command {
|
||||||
param($Command)
|
param($Command)
|
||||||
|
|
@ -39,159 +32,9 @@ function Test-Command {
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
# Ensure DVD authoring tools exist on Windows by downloading DVDStyler portable
|
|
||||||
function Ensure-DVDStylerTools {
|
|
||||||
if ($SkipDvdStyler) {
|
|
||||||
Write-Host "[SKIP] DVD authoring tools skipped (DVDStyler)" -ForegroundColor Yellow
|
|
||||||
return
|
|
||||||
}
|
|
||||||
$toolsRoot = Join-Path $PSScriptRoot "tools"
|
|
||||||
$dvdstylerDir = Join-Path $toolsRoot "dvdstyler"
|
|
||||||
$dvdstylerBin = Join-Path $dvdstylerDir "bin"
|
|
||||||
$dvdstylerReferer = "https://sourceforge.net/projects/dvdstyler/"
|
|
||||||
$dvdstylerUrls = @(
|
|
||||||
"https://downloads.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://netcologne.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://cfhcable.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://pilotfiber.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://versaweb.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://liquidtelecom.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://master.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://ufpr.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip",
|
|
||||||
"https://sourceforge.net/projects/dvdstyler/files/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip/download"
|
|
||||||
)
|
|
||||||
if ($env:VT_DVDSTYLER_URL) {
|
|
||||||
$dvdstylerUrls = @($env:VT_DVDSTYLER_URL) + $dvdstylerUrls
|
|
||||||
}
|
|
||||||
$dvdstylerZip = Join-Path $env:TEMP "dvdstyler-win64.zip"
|
|
||||||
$needsDVDTools = (-not (Test-Command dvdauthor)) -or (-not (Test-Command mkisofs))
|
|
||||||
|
|
||||||
if (-not $needsDVDTools) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
Write-Host "Installing DVD authoring tools (DVDStyler portable)..." -ForegroundColor Yellow
|
|
||||||
if (-not (Test-Path $toolsRoot)) {
|
|
||||||
New-Item -ItemType Directory -Force -Path $toolsRoot | Out-Null
|
|
||||||
}
|
|
||||||
if (Test-Path $dvdstylerDir) {
|
|
||||||
Remove-Item -Recurse -Force $dvdstylerDir
|
|
||||||
}
|
|
||||||
|
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor 3072
|
|
||||||
$userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
|
|
||||||
$downloaded = $false
|
|
||||||
$lastUrl = ""
|
|
||||||
if ($DvdStylerZip) {
|
|
||||||
if (Test-Path $DvdStylerZip) {
|
|
||||||
Copy-Item -Path $DvdStylerZip -Destination $dvdstylerZip -Force
|
|
||||||
$downloaded = $true
|
|
||||||
$lastUrl = $DvdStylerZip
|
|
||||||
} else {
|
|
||||||
Write-Host "[ERROR] Provided DVDStyler ZIP not found: $DvdStylerZip" -ForegroundColor Red
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
foreach ($url in $dvdstylerUrls) {
|
|
||||||
$lastUrl = $url
|
|
||||||
$downloadOk = $false
|
|
||||||
if (Test-Path $dvdstylerZip) {
|
|
||||||
Remove-Item -Force $dvdstylerZip
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
Invoke-WebRequest -Uri $url -OutFile $dvdstylerZip -UseBasicParsing -MaximumRedirection 10 -UserAgent $userAgent -Headers @{
|
|
||||||
"Referer" = $dvdstylerReferer
|
|
||||||
"Accept" = "application/zip"
|
|
||||||
}
|
|
||||||
$downloadOk = $true
|
|
||||||
} catch {
|
|
||||||
$downloadOk = $false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not $downloadOk) {
|
|
||||||
try {
|
|
||||||
Start-BitsTransfer -Source $url -Destination $dvdstylerZip -ErrorAction Stop
|
|
||||||
$downloadOk = $true
|
|
||||||
} catch {
|
|
||||||
$downloadOk = $false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not $downloadOk -and (Test-Command curl.exe)) {
|
|
||||||
try {
|
|
||||||
& curl.exe -L --retry 3 --user-agent $userAgent -o $dvdstylerZip $url | Out-Null
|
|
||||||
if ($LASTEXITCODE -eq 0) {
|
|
||||||
$downloadOk = $true
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
$downloadOk = $false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (-not $downloadOk -or -not (Test-Path $dvdstylerZip)) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$fs = [System.IO.File]::OpenRead($dvdstylerZip)
|
|
||||||
try {
|
|
||||||
$fileSize = (Get-Item $dvdstylerZip).Length
|
|
||||||
if ($fileSize -lt 102400) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
$sig = New-Object byte[] 2
|
|
||||||
$null = $fs.Read($sig, 0, 2)
|
|
||||||
if ($sig[0] -eq 0x50 -and $sig[1] -eq 0x4B) {
|
|
||||||
$downloaded = $true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
$fs.Close()
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
# Try next URL
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (-not $downloaded) {
|
|
||||||
Write-Host "[ERROR] Failed to download DVDStyler ZIP (invalid archive)" -ForegroundColor Red
|
|
||||||
Write-Host "Last URL tried: $lastUrl" -ForegroundColor Yellow
|
|
||||||
Write-Host "Tip: Set VT_DVDSTYLER_URL to a direct ZIP link and retry." -ForegroundColor Yellow
|
|
||||||
Write-Host "Manual download page: https://sourceforge.net/projects/dvdstyler/files/DVDStyler/3.2.1/" -ForegroundColor Yellow
|
|
||||||
Write-Host "After download, extract and ensure bin\\dvdauthor.exe and bin\\mkisofs.exe are on PATH." -ForegroundColor Yellow
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
$extractRoot = Join-Path $env:TEMP ("dvdstyler-extract-" + [System.Guid]::NewGuid().ToString())
|
|
||||||
New-Item -ItemType Directory -Force -Path $extractRoot | Out-Null
|
|
||||||
Expand-Archive -Path $dvdstylerZip -DestinationPath $extractRoot -Force
|
|
||||||
|
|
||||||
$entries = Get-ChildItem -Path $extractRoot
|
|
||||||
if ($entries.Count -eq 1 -and $entries[0].PSIsContainer) {
|
|
||||||
Copy-Item -Path (Join-Path $entries[0].FullName "*") -Destination $dvdstylerDir -Recurse -Force
|
|
||||||
} else {
|
|
||||||
Copy-Item -Path (Join-Path $extractRoot "*") -Destination $dvdstylerDir -Recurse -Force
|
|
||||||
}
|
|
||||||
|
|
||||||
Remove-Item -Force $dvdstylerZip
|
|
||||||
Remove-Item -Recurse -Force $extractRoot
|
|
||||||
|
|
||||||
if (Test-Path $dvdstylerBin) {
|
|
||||||
$env:Path = "$dvdstylerBin;$env:Path"
|
|
||||||
$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
|
|
||||||
if ($userPath -notmatch [Regex]::Escape($dvdstylerBin)) {
|
|
||||||
[Environment]::SetEnvironmentVariable("Path", "$dvdstylerBin;$userPath", "User")
|
|
||||||
}
|
|
||||||
Write-Host "[OK] DVD authoring tools installed to $dvdstylerDir" -ForegroundColor Green
|
|
||||||
} else {
|
|
||||||
Write-Host "[ERROR] DVDStyler tools missing after install" -ForegroundColor Red
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to install via Chocolatey
|
# Function to install via Chocolatey
|
||||||
function Install-ViaChocolatey {
|
function Install-ViaChocolatey {
|
||||||
Write-Host " Using Chocolatey package manager..." -ForegroundColor Green
|
Write-Host "📦 Using Chocolatey package manager..." -ForegroundColor Green
|
||||||
|
|
||||||
# Check if Chocolatey is installed
|
# Check if Chocolatey is installed
|
||||||
if (-not (Test-Command choco)) {
|
if (-not (Test-Command choco)) {
|
||||||
|
|
@ -201,12 +44,12 @@ function Install-ViaChocolatey {
|
||||||
Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
|
Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
|
||||||
|
|
||||||
if (-not (Test-Command choco)) {
|
if (-not (Test-Command choco)) {
|
||||||
Write-Host "[ERROR] Failed to install Chocolatey" -ForegroundColor Red
|
Write-Host "❌ Failed to install Chocolatey" -ForegroundColor Red
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host "[OK] Chocolatey installed" -ForegroundColor Green
|
Write-Host "✓ Chocolatey installed" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Chocolatey already installed" -ForegroundColor Green
|
Write-Host "✓ Chocolatey already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
@ -217,7 +60,7 @@ function Install-ViaChocolatey {
|
||||||
Write-Host "Installing Go..." -ForegroundColor Yellow
|
Write-Host "Installing Go..." -ForegroundColor Yellow
|
||||||
choco install -y golang
|
choco install -y golang
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Go already installed" -ForegroundColor Green
|
Write-Host "✓ Go already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install GCC (via TDM-GCC or mingw)
|
# Install GCC (via TDM-GCC or mingw)
|
||||||
|
|
@ -225,7 +68,7 @@ function Install-ViaChocolatey {
|
||||||
Write-Host "Installing MinGW-w64 (GCC)..." -ForegroundColor Yellow
|
Write-Host "Installing MinGW-w64 (GCC)..." -ForegroundColor Yellow
|
||||||
choco install -y mingw
|
choco install -y mingw
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] GCC already installed" -ForegroundColor Green
|
Write-Host "✓ GCC already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install Git (useful for development)
|
# Install Git (useful for development)
|
||||||
|
|
@ -233,7 +76,7 @@ function Install-ViaChocolatey {
|
||||||
Write-Host "Installing Git..." -ForegroundColor Yellow
|
Write-Host "Installing Git..." -ForegroundColor Yellow
|
||||||
choco install -y git
|
choco install -y git
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Git already installed" -ForegroundColor Green
|
Write-Host "✓ Git already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install ffmpeg
|
# Install ffmpeg
|
||||||
|
|
@ -242,16 +85,16 @@ function Install-ViaChocolatey {
|
||||||
Write-Host "Installing ffmpeg..." -ForegroundColor Yellow
|
Write-Host "Installing ffmpeg..." -ForegroundColor Yellow
|
||||||
choco install -y ffmpeg
|
choco install -y ffmpeg
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] ffmpeg already installed" -ForegroundColor Green
|
Write-Host "✓ ffmpeg already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "[OK] Chocolatey installation complete" -ForegroundColor Green
|
Write-Host "✓ Chocolatey installation complete" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Function to install via Scoop
|
# Function to install via Scoop
|
||||||
function Install-ViaScoop {
|
function Install-ViaScoop {
|
||||||
Write-Host " Using Scoop package manager..." -ForegroundColor Green
|
Write-Host "📦 Using Scoop package manager..." -ForegroundColor Green
|
||||||
|
|
||||||
# Check if Scoop is installed
|
# Check if Scoop is installed
|
||||||
if (-not (Test-Command scoop)) {
|
if (-not (Test-Command scoop)) {
|
||||||
|
|
@ -260,12 +103,12 @@ function Install-ViaScoop {
|
||||||
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
|
Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
|
||||||
|
|
||||||
if (-not (Test-Command scoop)) {
|
if (-not (Test-Command scoop)) {
|
||||||
Write-Host "[ERROR] Failed to install Scoop" -ForegroundColor Red
|
Write-Host "❌ Failed to install Scoop" -ForegroundColor Red
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host "[OK] Scoop installed" -ForegroundColor Green
|
Write-Host "✓ Scoop installed" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Scoop already installed" -ForegroundColor Green
|
Write-Host "✓ Scoop already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
@ -276,7 +119,7 @@ function Install-ViaScoop {
|
||||||
Write-Host "Installing Go..." -ForegroundColor Yellow
|
Write-Host "Installing Go..." -ForegroundColor Yellow
|
||||||
scoop install go
|
scoop install go
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Go already installed" -ForegroundColor Green
|
Write-Host "✓ Go already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install GCC
|
# Install GCC
|
||||||
|
|
@ -284,7 +127,7 @@ function Install-ViaScoop {
|
||||||
Write-Host "Installing MinGW-w64 (GCC)..." -ForegroundColor Yellow
|
Write-Host "Installing MinGW-w64 (GCC)..." -ForegroundColor Yellow
|
||||||
scoop install mingw
|
scoop install mingw
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] GCC already installed" -ForegroundColor Green
|
Write-Host "✓ GCC already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install Git
|
# Install Git
|
||||||
|
|
@ -292,7 +135,7 @@ function Install-ViaScoop {
|
||||||
Write-Host "Installing Git..." -ForegroundColor Yellow
|
Write-Host "Installing Git..." -ForegroundColor Yellow
|
||||||
scoop install git
|
scoop install git
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] Git already installed" -ForegroundColor Green
|
Write-Host "✓ Git already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Install ffmpeg
|
# Install ffmpeg
|
||||||
|
|
@ -301,11 +144,11 @@ function Install-ViaScoop {
|
||||||
Write-Host "Installing ffmpeg..." -ForegroundColor Yellow
|
Write-Host "Installing ffmpeg..." -ForegroundColor Yellow
|
||||||
scoop install ffmpeg
|
scoop install ffmpeg
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[OK] ffmpeg already installed" -ForegroundColor Green
|
Write-Host "✓ ffmpeg already installed" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host "[OK] Scoop installation complete" -ForegroundColor Green
|
Write-Host "✓ Scoop installation complete" -ForegroundColor Green
|
||||||
}
|
}
|
||||||
|
|
||||||
# Main installation logic
|
# Main installation logic
|
||||||
|
|
@ -317,7 +160,7 @@ $osVersion = [System.Environment]::OSVersion.Version
|
||||||
Write-Host "Windows Version: $($osVersion.Major).$($osVersion.Minor) (Build $($osVersion.Build))" -ForegroundColor Cyan
|
Write-Host "Windows Version: $($osVersion.Major).$($osVersion.Minor) (Build $($osVersion.Build))" -ForegroundColor Cyan
|
||||||
|
|
||||||
if ($osVersion.Major -lt 10) {
|
if ($osVersion.Major -lt 10) {
|
||||||
Write-Host "[WARN] Warning: Windows 10 or later is recommended" -ForegroundColor Yellow
|
Write-Host "⚠️ Warning: Windows 10 or later is recommended" -ForegroundColor Yellow
|
||||||
}
|
}
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
||||||
|
|
@ -348,12 +191,10 @@ if ($UseScoop) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ensure-DVDStylerTools
|
|
||||||
|
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
||||||
Write-Host "[OK] DEPENDENCIES INSTALLED" -ForegroundColor Green
|
Write-Host "✅ DEPENDENCIES INSTALLED" -ForegroundColor Green
|
||||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
|
|
||||||
# Refresh environment variables
|
# Refresh environment variables
|
||||||
|
|
@ -365,51 +206,39 @@ Write-Host ""
|
||||||
|
|
||||||
if (Test-Command go) {
|
if (Test-Command go) {
|
||||||
$goVersion = go version
|
$goVersion = go version
|
||||||
Write-Host "[OK] Go: $goVersion" -ForegroundColor Green
|
Write-Host "✓ Go: $goVersion" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[WARN] Go not found in PATH (restart terminal)" -ForegroundColor Yellow
|
Write-Host "⚠️ Go not found in PATH (restart terminal)" -ForegroundColor Yellow
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Command gcc) {
|
if (Test-Command gcc) {
|
||||||
$gccVersion = gcc --version | Select-Object -First 1
|
$gccVersion = gcc --version | Select-Object -First 1
|
||||||
Write-Host "[OK] GCC: $gccVersion" -ForegroundColor Green
|
Write-Host "✓ GCC: $gccVersion" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[WARN] GCC not found in PATH (restart terminal)" -ForegroundColor Yellow
|
Write-Host "⚠️ GCC not found in PATH (restart terminal)" -ForegroundColor Yellow
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Command ffmpeg) {
|
if (Test-Command ffmpeg) {
|
||||||
$ffmpegVersion = ffmpeg -version | Select-Object -First 1
|
$ffmpegVersion = ffmpeg -version | Select-Object -First 1
|
||||||
Write-Host "[OK] ffmpeg: $ffmpegVersion" -ForegroundColor Green
|
Write-Host "✓ ffmpeg: $ffmpegVersion" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
if ($SkipFFmpeg) {
|
if ($SkipFFmpeg) {
|
||||||
Write-Host "[INFO] ffmpeg skipped (use -SkipFFmpeg:$false to install)" -ForegroundColor Cyan
|
Write-Host "ℹ️ ffmpeg skipped (use -SkipFFmpeg:$false to install)" -ForegroundColor Cyan
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[WARN] ffmpeg not found in PATH (restart terminal)" -ForegroundColor Yellow
|
Write-Host "⚠️ ffmpeg not found in PATH (restart terminal)" -ForegroundColor Yellow
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Test-Command dvdauthor) {
|
|
||||||
Write-Host "[OK] dvdauthor: found" -ForegroundColor Green
|
|
||||||
} else {
|
|
||||||
Write-Host "[WARN] dvdauthor not found in PATH (restart terminal)" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Test-Command mkisofs) {
|
|
||||||
Write-Host "[OK] mkisofs: found" -ForegroundColor Green
|
|
||||||
} else {
|
|
||||||
Write-Host "[WARN] mkisofs not found in PATH (restart terminal)" -ForegroundColor Yellow
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Test-Command git) {
|
if (Test-Command git) {
|
||||||
$gitVersion = git --version
|
$gitVersion = git --version
|
||||||
Write-Host "[OK] Git: $gitVersion" -ForegroundColor Green
|
Write-Host "✓ Git: $gitVersion" -ForegroundColor Green
|
||||||
} else {
|
} else {
|
||||||
Write-Host "[INFO] Git not installed (optional)" -ForegroundColor Cyan
|
Write-Host "ℹ️ Git not installed (optional)" -ForegroundColor Cyan
|
||||||
}
|
}
|
||||||
|
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
Write-Host "===============================================================" -ForegroundColor Cyan
|
Write-Host "════════════════════════════════════════════════════════════════" -ForegroundColor Cyan
|
||||||
Write-Host " Setup complete!" -ForegroundColor Green
|
Write-Host "🎉 Setup complete!" -ForegroundColor Green
|
||||||
Write-Host ""
|
Write-Host ""
|
||||||
Write-Host "Next steps:" -ForegroundColor Yellow
|
Write-Host "Next steps:" -ForegroundColor Yellow
|
||||||
Write-Host " 1. Restart your terminal/PowerShell" -ForegroundColor White
|
Write-Host " 1. Restart your terminal/PowerShell" -ForegroundColor White
|
||||||
|
|
|
||||||
|
|
@ -1,397 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# Colors for output
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;32m'
|
|
||||||
YELLOW='\033[1;33m'
|
|
||||||
BLUE='\033[0;34m'
|
|
||||||
CYAN='\033[0;36m'
|
|
||||||
NC='\033[0m' # No Color
|
|
||||||
|
|
||||||
# Spinner function
|
|
||||||
spinner() {
|
|
||||||
local pid=$1
|
|
||||||
local task=$2
|
|
||||||
local spin='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
|
|
||||||
local i=0
|
|
||||||
|
|
||||||
while kill -0 $pid 2>/dev/null; do
|
|
||||||
i=$(( (i+1) %10 ))
|
|
||||||
printf "\r${BLUE}${spin:$i:1}${NC} %s..." "$task"
|
|
||||||
sleep 0.1
|
|
||||||
done
|
|
||||||
printf "\r"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Configuration
|
|
||||||
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
||||||
|
|
||||||
# Args
|
|
||||||
DVDSTYLER_URL=""
|
|
||||||
DVDSTYLER_ZIP=""
|
|
||||||
SKIP_DVD_TOOLS=""
|
|
||||||
SKIP_AI_TOOLS=""
|
|
||||||
SKIP_WHISPER=""
|
|
||||||
while [ $# -gt 0 ]; do
|
|
||||||
case "$1" in
|
|
||||||
--dvdstyler-url=*)
|
|
||||||
DVDSTYLER_URL="${1#*=}"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--dvdstyler-url)
|
|
||||||
DVDSTYLER_URL="$2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
--dvdstyler-zip=*)
|
|
||||||
DVDSTYLER_ZIP="${1#*=}"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--dvdstyler-zip)
|
|
||||||
DVDSTYLER_ZIP="$2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
--skip-dvd)
|
|
||||||
SKIP_DVD_TOOLS=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--skip-ai)
|
|
||||||
SKIP_AI_TOOLS=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--skip-whisper)
|
|
||||||
SKIP_WHISPER=true
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "Unknown option: $1"
|
|
||||||
echo "Usage: $0 [--dvdstyler-url URL] [--dvdstyler-zip PATH] [--skip-dvd] [--skip-ai] [--skip-whisper]"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Platform detection
|
|
||||||
UNAME_S="$(uname -s)"
|
|
||||||
IS_WINDOWS=false
|
|
||||||
IS_DARWIN=false
|
|
||||||
IS_LINUX=false
|
|
||||||
case "$UNAME_S" in
|
|
||||||
MINGW*|MSYS*|CYGWIN*)
|
|
||||||
IS_WINDOWS=true
|
|
||||||
;;
|
|
||||||
Darwin*)
|
|
||||||
IS_DARWIN=true
|
|
||||||
;;
|
|
||||||
Linux*)
|
|
||||||
IS_LINUX=true
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
INSTALL_TITLE="VideoTools Installation"
|
|
||||||
if [ "$IS_WINDOWS" = true ]; then
|
|
||||||
INSTALL_TITLE="VideoTools Windows Installation"
|
|
||||||
elif [ "$IS_DARWIN" = true ]; then
|
|
||||||
INSTALL_TITLE="VideoTools macOS Installation"
|
|
||||||
elif [ "$IS_LINUX" = true ]; then
|
|
||||||
INSTALL_TITLE="VideoTools Linux Installation"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo " $INSTALL_TITLE"
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# Step 1: Check if Go is installed
|
|
||||||
echo -e "${CYAN}[1/2]${NC} Checking Go installation..."
|
|
||||||
if ! command -v go &> /dev/null; then
|
|
||||||
echo -e "${RED}[ERROR] Error: Go is not installed or not in PATH${NC}"
|
|
||||||
echo "Please install Go 1.21+ from https://go.dev/dl/"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
GO_VERSION=$(go version | awk '{print $3}' | sed 's/go//')
|
|
||||||
echo -e "${GREEN}[OK]${NC} Found Go version: $GO_VERSION"
|
|
||||||
|
|
||||||
# Step 2: Check authoring dependencies
|
|
||||||
echo ""
|
|
||||||
echo -e "${CYAN}[2/2]${NC} Checking authoring dependencies..."
|
|
||||||
|
|
||||||
if [ "$IS_WINDOWS" = true ]; then
|
|
||||||
echo "Detected Windows environment."
|
|
||||||
if [ -z "$SKIP_DVD_TOOLS" ]; then
|
|
||||||
# Check if DVDStyler is already installed (Windows)
|
|
||||||
if command -v dvdstyler &> /dev/null || [ -f "/c/Program Files/DVDStyler/DVDStyler.exe" ] || [ -f "C:\\Program Files\\DVDStyler\\DVDStyler.exe" ]; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} DVDStyler already installed"
|
|
||||||
SKIP_DVD_TOOLS=true
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
read -p "Install DVD authoring tools (DVDStyler)? [y/N]: " dvd_choice
|
|
||||||
if [[ "$dvd_choice" =~ ^[Yy]$ ]]; then
|
|
||||||
SKIP_DVD_TOOLS=false
|
|
||||||
else
|
|
||||||
SKIP_DVD_TOOLS=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if command -v powershell.exe &> /dev/null; then
|
|
||||||
PS_ARGS=()
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
PS_ARGS+=("-SkipDvdStyler")
|
|
||||||
fi
|
|
||||||
if [ -n "$DVDSTYLER_ZIP" ]; then
|
|
||||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$PROJECT_ROOT/scripts/install-deps-windows.ps1" -DvdStylerZip "$DVDSTYLER_ZIP" "${PS_ARGS[@]}"
|
|
||||||
elif [ -n "$DVDSTYLER_URL" ]; then
|
|
||||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$PROJECT_ROOT/scripts/install-deps-windows.ps1" -DvdStylerUrl "$DVDSTYLER_URL" "${PS_ARGS[@]}"
|
|
||||||
else
|
|
||||||
powershell.exe -NoProfile -ExecutionPolicy Bypass -File "$PROJECT_ROOT/scripts/install-deps-windows.ps1" "${PS_ARGS[@]}"
|
|
||||||
fi
|
|
||||||
if [ $? -ne 0 ]; then
|
|
||||||
echo -e "${RED}[ERROR] Windows dependency installer failed.${NC}"
|
|
||||||
echo "If DVDStyler download failed, retry with a direct mirror:"
|
|
||||||
echo ""
|
|
||||||
echo "Git Bash:"
|
|
||||||
echo " export VT_DVDSTYLER_URL=\"https://netcologne.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip\""
|
|
||||||
echo " ./scripts/install.sh"
|
|
||||||
echo ""
|
|
||||||
echo "PowerShell:"
|
|
||||||
echo " \$env:VT_DVDSTYLER_URL=\"https://netcologne.dl.sourceforge.net/project/dvdstyler/DVDStyler/3.2.1/DVDStyler-3.2.1-win64.zip\""
|
|
||||||
echo " .\\scripts\\install-deps-windows.ps1"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
echo -e "${GREEN}[OK]${NC} Windows dependency installer completed"
|
|
||||||
else
|
|
||||||
echo -e "${RED}[ERROR] powershell.exe not found.${NC}"
|
|
||||||
echo "Please run: $PROJECT_ROOT\\scripts\\install-deps-windows.ps1"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
missing_deps=()
|
|
||||||
if ! command -v ffmpeg &> /dev/null; then
|
|
||||||
missing_deps+=("ffmpeg")
|
|
||||||
fi
|
|
||||||
if [ -z "$SKIP_DVD_TOOLS" ]; then
|
|
||||||
# Check if DVD tools are already installed
|
|
||||||
if command -v dvdauthor &> /dev/null && command -v xorriso &> /dev/null; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} DVD authoring tools already installed"
|
|
||||||
SKIP_DVD_TOOLS=true
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
read -p "Install DVD authoring tools (dvdauthor + ISO tools)? [y/N]: " dvd_choice
|
|
||||||
if [[ "$dvd_choice" =~ ^[Yy]$ ]]; then
|
|
||||||
SKIP_DVD_TOOLS=false
|
|
||||||
else
|
|
||||||
SKIP_DVD_TOOLS=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = false ]; then
|
|
||||||
if ! command -v dvdauthor &> /dev/null; then
|
|
||||||
missing_deps+=("dvdauthor")
|
|
||||||
fi
|
|
||||||
if ! command -v xorriso &> /dev/null; then
|
|
||||||
missing_deps+=("xorriso")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ask about AI upscaling tools
|
|
||||||
if [ -z "$SKIP_AI_TOOLS" ]; then
|
|
||||||
# Check if Real-ESRGAN is already installed
|
|
||||||
if command -v realesrgan-ncnn-vulkan &> /dev/null; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} Real-ESRGAN NCNN already installed"
|
|
||||||
SKIP_AI_TOOLS=true
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
read -p "Install AI upscaling tools (Real-ESRGAN NCNN)? [y/N]: " ai_choice
|
|
||||||
if [[ "$ai_choice" =~ ^[Yy]$ ]]; then
|
|
||||||
SKIP_AI_TOOLS=false
|
|
||||||
else
|
|
||||||
SKIP_AI_TOOLS=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$SKIP_AI_TOOLS" = false ]; then
|
|
||||||
if ! command -v realesrgan-ncnn-vulkan &> /dev/null; then
|
|
||||||
missing_deps+=("realesrgan-ncnn-vulkan")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ask about Whisper for subtitling
|
|
||||||
if [ -z "$SKIP_WHISPER" ]; then
|
|
||||||
# Check if Whisper is already installed
|
|
||||||
if command -v whisper &> /dev/null || command -v whisper.cpp &> /dev/null; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} Whisper already installed"
|
|
||||||
SKIP_WHISPER=true
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
read -p "Install Whisper for automated subtitling? [y/N]: " whisper_choice
|
|
||||||
if [[ "$whisper_choice" =~ ^[Yy]$ ]]; then
|
|
||||||
SKIP_WHISPER=false
|
|
||||||
else
|
|
||||||
SKIP_WHISPER=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$SKIP_WHISPER" = false ]; then
|
|
||||||
if ! command -v whisper &> /dev/null && ! command -v whisper.cpp &> /dev/null; then
|
|
||||||
missing_deps+=("whisper")
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
install_deps=false
|
|
||||||
if [ ${#missing_deps[@]} -gt 0 ]; then
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Missing dependencies: ${missing_deps[*]}"
|
|
||||||
echo "Installing missing dependencies..."
|
|
||||||
install_deps=true
|
|
||||||
else
|
|
||||||
echo -e "${GREEN}[OK]${NC} All authoring dependencies found"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$install_deps" = true ]; then
|
|
||||||
if command -v apt-get &> /dev/null; then
|
|
||||||
sudo apt-get update
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
sudo apt-get install -y ffmpeg
|
|
||||||
else
|
|
||||||
sudo apt-get install -y ffmpeg dvdauthor xorriso
|
|
||||||
fi
|
|
||||||
elif command -v dnf &> /dev/null; then
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
sudo dnf install -y ffmpeg
|
|
||||||
else
|
|
||||||
sudo dnf install -y ffmpeg dvdauthor xorriso
|
|
||||||
fi
|
|
||||||
elif command -v pacman &> /dev/null; then
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
sudo pacman -Sy --noconfirm ffmpeg
|
|
||||||
else
|
|
||||||
sudo pacman -Sy --noconfirm ffmpeg dvdauthor cdrtools
|
|
||||||
fi
|
|
||||||
elif command -v zypper &> /dev/null; then
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
sudo zypper install -y ffmpeg
|
|
||||||
else
|
|
||||||
sudo zypper install -y ffmpeg dvdauthor xorriso
|
|
||||||
fi
|
|
||||||
elif command -v brew &> /dev/null; then
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = true ]; then
|
|
||||||
brew install ffmpeg
|
|
||||||
else
|
|
||||||
brew install ffmpeg dvdauthor xorriso
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo -e "${RED}[ERROR] No supported package manager found.${NC}"
|
|
||||||
echo "Please install: ffmpeg, dvdauthor, and mkisofs/genisoimage/xorriso"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install Real-ESRGAN NCNN if requested and not available
|
|
||||||
if [ "$SKIP_AI_TOOLS" = false ] && ! command -v realesrgan-ncnn-vulkan &> /dev/null; then
|
|
||||||
echo ""
|
|
||||||
echo "Installing Real-ESRGAN NCNN..."
|
|
||||||
|
|
||||||
# Detect architecture
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
if [ "$ARCH" = "x86_64" ]; then
|
|
||||||
ESRGAN_ARCH="ubuntu"
|
|
||||||
elif [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} ARM architecture detected. You may need to build realesrgan-ncnn-vulkan from source."
|
|
||||||
echo "See: https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"
|
|
||||||
ESRGAN_ARCH=""
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Unsupported architecture: $ARCH"
|
|
||||||
ESRGAN_ARCH=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -n "$ESRGAN_ARCH" ]; then
|
|
||||||
ESRGAN_URL="https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesrgan-ncnn-vulkan-20220424-ubuntu.zip"
|
|
||||||
TEMP_DIR=$(mktemp -d)
|
|
||||||
|
|
||||||
if command -v wget &> /dev/null; then
|
|
||||||
wget -q "$ESRGAN_URL" -O "$TEMP_DIR/realesrgan.zip"
|
|
||||||
elif command -v curl &> /dev/null; then
|
|
||||||
curl -sL "$ESRGAN_URL" -o "$TEMP_DIR/realesrgan.zip"
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Neither wget nor curl found. Cannot download Real-ESRGAN."
|
|
||||||
echo "Please install manually from: https://github.com/xinntao/Real-ESRGAN/releases"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f "$TEMP_DIR/realesrgan.zip" ]; then
|
|
||||||
unzip -q "$TEMP_DIR/realesrgan.zip" -d "$TEMP_DIR"
|
|
||||||
sudo install -m 755 "$TEMP_DIR/realesrgan-ncnn-vulkan" /usr/local/bin/ 2>/dev/null || \
|
|
||||||
install -m 755 "$TEMP_DIR/realesrgan-ncnn-vulkan" "$HOME/.local/bin/" 2>/dev/null || \
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Could not install to /usr/local/bin or ~/.local/bin"
|
|
||||||
rm -rf "$TEMP_DIR"
|
|
||||||
|
|
||||||
if command -v realesrgan-ncnn-vulkan &> /dev/null; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} Real-ESRGAN NCNN installed successfully"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Install Whisper if requested and not available
|
|
||||||
if [ "$SKIP_WHISPER" = false ] && ! command -v whisper &> /dev/null; then
|
|
||||||
echo ""
|
|
||||||
echo "Installing Whisper for automated subtitling..."
|
|
||||||
|
|
||||||
# Check if Python 3 and pip are available
|
|
||||||
if command -v python3 &> /dev/null && command -v pip3 &> /dev/null; then
|
|
||||||
# Install openai-whisper
|
|
||||||
if pip3 install --user openai-whisper 2>/dev/null; then
|
|
||||||
echo -e "${GREEN}[OK]${NC} Whisper installed successfully"
|
|
||||||
echo "To download models, run: whisper --model base dummy.mp3"
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Failed to install Whisper via pip3"
|
|
||||||
echo "You can install it manually with: pip3 install openai-whisper"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo -e "${YELLOW}WARNING:${NC} Python 3 and pip3 are required for Whisper"
|
|
||||||
echo "Please install Python 3 and pip3, then run: pip3 install openai-whisper"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Ensure ~/.local/bin is in PATH for user-installed packages
|
|
||||||
if [ -d "$HOME/.local/bin" ] && [[ ":$PATH:" != *":$HOME/.local/bin:"* ]]; then
|
|
||||||
echo ""
|
|
||||||
echo -e "${YELLOW}NOTE:${NC} Add ~/.local/bin to your PATH to use Whisper:"
|
|
||||||
echo " echo 'export PATH=\"\$HOME/.local/bin:\$PATH\"' >> ~/.bashrc"
|
|
||||||
echo " source ~/.bashrc"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! command -v ffmpeg &> /dev/null; then
|
|
||||||
echo -e "${RED}[ERROR] Missing required dependencies after install attempt.${NC}"
|
|
||||||
echo "Please install: ffmpeg"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ "$SKIP_DVD_TOOLS" = false ]; then
|
|
||||||
if ! command -v dvdauthor &> /dev/null; then
|
|
||||||
echo -e "${RED}[ERROR] Missing required dependencies after install attempt.${NC}"
|
|
||||||
echo "Please install: dvdauthor"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if ! command -v xorriso &> /dev/null; then
|
|
||||||
echo -e "${RED}[ERROR] Missing xorriso after install attempt.${NC}"
|
|
||||||
echo "Please install: xorriso (required for DVD ISO extraction)"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo "Dependency Installation Complete!"
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
|
||||||
echo ""
|
|
||||||
echo "Next steps:"
|
|
||||||
echo ""
|
|
||||||
echo "1. Build VideoTools:"
|
|
||||||
echo " ./scripts/build.sh"
|
|
||||||
echo ""
|
|
||||||
echo "2. Run VideoTools:"
|
|
||||||
echo " ./scripts/run.sh"
|
|
||||||
echo ""
|
|
||||||
echo "For more information, see BUILD_AND_RUN.md and DVD_USER_GUIDE.md"
|
|
||||||
echo ""
|
|
||||||
|
|
@ -5,17 +5,8 @@
|
||||||
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||||
BUILD_OUTPUT="$PROJECT_ROOT/VideoTools"
|
BUILD_OUTPUT="$PROJECT_ROOT/VideoTools"
|
||||||
|
|
||||||
# Detect platform
|
|
||||||
PLATFORM="$(uname -s)"
|
|
||||||
case "$PLATFORM" in
|
|
||||||
Linux*) OS="Linux" ;;
|
|
||||||
Darwin*) OS="macOS" ;;
|
|
||||||
CYGWIN*|MINGW*|MSYS*) OS="Windows" ;;
|
|
||||||
*) echo "❌ Unknown platform: $PLATFORM"; exit 1 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo " VideoTools ${OS} Run"
|
echo " VideoTools - Run Script"
|
||||||
echo "════════════════════════════════════════════════════════════════"
|
echo "════════════════════════════════════════════════════════════════"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,343 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"image/color"
|
|
||||||
"os/exec"
|
|
||||||
"runtime"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/canvas"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Dependency represents a system dependency
|
|
||||||
type Dependency struct {
|
|
||||||
Name string
|
|
||||||
Command string // Command to check if installed
|
|
||||||
Required bool // If true, core functionality requires this
|
|
||||||
Description string
|
|
||||||
InstallCmd string // Command to install (platform-specific)
|
|
||||||
}
|
|
||||||
|
|
||||||
// ModuleDependencies maps module IDs to their required dependencies
|
|
||||||
var moduleDependencies = map[string][]string{
|
|
||||||
"convert": {"ffmpeg"},
|
|
||||||
"merge": {"ffmpeg"},
|
|
||||||
"trim": {"ffmpeg"},
|
|
||||||
"filters": {"ffmpeg"},
|
|
||||||
"upscale": {"ffmpeg", "realesrgan-ncnn-vulkan"},
|
|
||||||
"audio": {"ffmpeg"},
|
|
||||||
"author": {"ffmpeg", "dvdauthor", "xorriso"},
|
|
||||||
"rip": {"ffmpeg", "xorriso"},
|
|
||||||
"bluray": {"ffmpeg"},
|
|
||||||
"subtitles": {"ffmpeg", "whisper"},
|
|
||||||
"thumb": {"ffmpeg"},
|
|
||||||
"compare": {"ffmpeg"},
|
|
||||||
"inspect": {"ffmpeg"},
|
|
||||||
"player": {"ffmpeg"},
|
|
||||||
}
|
|
||||||
|
|
||||||
// AllDependencies defines all possible dependencies
|
|
||||||
var allDependencies = map[string]Dependency{
|
|
||||||
"ffmpeg": {
|
|
||||||
Name: "FFmpeg",
|
|
||||||
Command: "ffmpeg",
|
|
||||||
Required: true,
|
|
||||||
Description: "Core video processing engine",
|
|
||||||
InstallCmd: getFFmpegInstallCmd(),
|
|
||||||
},
|
|
||||||
"dvdauthor": {
|
|
||||||
Name: "DVDAuthor",
|
|
||||||
Command: "dvdauthor",
|
|
||||||
Required: false,
|
|
||||||
Description: "DVD authoring tool",
|
|
||||||
InstallCmd: getDVDAuthorInstallCmd(),
|
|
||||||
},
|
|
||||||
"xorriso": {
|
|
||||||
Name: "xorriso",
|
|
||||||
Command: "xorriso",
|
|
||||||
Required: false,
|
|
||||||
Description: "ISO creation and extraction",
|
|
||||||
InstallCmd: getXorrisoInstallCmd(),
|
|
||||||
},
|
|
||||||
"realesrgan-ncnn-vulkan": {
|
|
||||||
Name: "Real-ESRGAN",
|
|
||||||
Command: "realesrgan-ncnn-vulkan",
|
|
||||||
Required: false,
|
|
||||||
Description: "AI video upscaling",
|
|
||||||
InstallCmd: "See install.sh --skip-ai=false",
|
|
||||||
},
|
|
||||||
"whisper": {
|
|
||||||
Name: "Whisper",
|
|
||||||
Command: "whisper",
|
|
||||||
Required: false,
|
|
||||||
Description: "AI subtitle generation",
|
|
||||||
InstallCmd: "pip3 install --user openai-whisper",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func getFFmpegInstallCmd() string {
|
|
||||||
switch runtime.GOOS {
|
|
||||||
case "linux":
|
|
||||||
return "sudo apt-get install ffmpeg # or dnf/pacman/zypper"
|
|
||||||
case "darwin":
|
|
||||||
return "brew install ffmpeg"
|
|
||||||
case "windows":
|
|
||||||
return "Download from ffmpeg.org"
|
|
||||||
default:
|
|
||||||
return "See ffmpeg.org for installation"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func getDVDAuthorInstallCmd() string {
|
|
||||||
switch runtime.GOOS {
|
|
||||||
case "linux":
|
|
||||||
return "sudo apt-get install dvdauthor # or dnf/pacman/zypper"
|
|
||||||
case "darwin":
|
|
||||||
return "brew install dvdauthor"
|
|
||||||
default:
|
|
||||||
return "./scripts/install.sh"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func getXorrisoInstallCmd() string {
|
|
||||||
switch runtime.GOOS {
|
|
||||||
case "linux":
|
|
||||||
return "sudo apt-get install xorriso # or dnf/pacman/zypper"
|
|
||||||
case "darwin":
|
|
||||||
return "brew install xorriso"
|
|
||||||
default:
|
|
||||||
return "./scripts/install.sh"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// checkDependency checks if a command is available
|
|
||||||
func checkDependency(command string) bool {
|
|
||||||
_, err := exec.LookPath(command)
|
|
||||||
return err == nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// getModuleDependencyStatus checks which dependencies a module is missing
|
|
||||||
func getModuleDependencyStatus(moduleID string) (missing []string, hasAll bool) {
|
|
||||||
deps, ok := moduleDependencies[moduleID]
|
|
||||||
if !ok {
|
|
||||||
return nil, true // Module has no dependencies
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, depName := range deps {
|
|
||||||
dep, exists := allDependencies[depName]
|
|
||||||
if !exists {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if !checkDependency(dep.Command) {
|
|
||||||
missing = append(missing, depName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return missing, len(missing) == 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// isModuleAvailable returns true if all required dependencies are installed
|
|
||||||
func isModuleAvailable(moduleID string) bool {
|
|
||||||
_, hasAll := getModuleDependencyStatus(moduleID)
|
|
||||||
return hasAll
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildSettingsView(state *appState) fyne.CanvasObject {
|
|
||||||
settingsColor := utils.MustHex("#607D8B") // Blue Grey for settings
|
|
||||||
|
|
||||||
backBtn := widget.NewButton("< BACK", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
topBar := ui.TintedBar(settingsColor, container.NewHBox(backBtn, layout.NewSpacer()))
|
|
||||||
bottomBar := moduleFooter(settingsColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
tabs := container.NewAppTabs(
|
|
||||||
container.NewTabItem("Dependencies", buildDependenciesTab(state)),
|
|
||||||
container.NewTabItem("Benchmark", buildBenchmarkTab(state)),
|
|
||||||
container.NewTabItem("Preferences", buildPreferencesTab(state)),
|
|
||||||
)
|
|
||||||
tabs.SetTabLocation(container.TabLocationTop)
|
|
||||||
|
|
||||||
// Single fast scroll container for entire tabs area (12x speed)
|
|
||||||
scrollableTabs := ui.NewFastVScroll(tabs)
|
|
||||||
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, scrollableTabs)
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildDependenciesTab(state *appState) fyne.CanvasObject {
|
|
||||||
content := container.NewVBox()
|
|
||||||
|
|
||||||
// Header
|
|
||||||
header := widget.NewLabel("System Dependencies")
|
|
||||||
header.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
content.Add(header)
|
|
||||||
|
|
||||||
desc := widget.NewLabel("Manage VideoTools dependencies. Some modules require specific tools to be installed.")
|
|
||||||
desc.Wrapping = fyne.TextWrapWord
|
|
||||||
content.Add(desc)
|
|
||||||
|
|
||||||
content.Add(widget.NewSeparator())
|
|
||||||
|
|
||||||
// Check all dependencies
|
|
||||||
for depName, dep := range allDependencies {
|
|
||||||
isInstalled := checkDependency(dep.Command)
|
|
||||||
|
|
||||||
nameLabel := widget.NewLabel(dep.Name)
|
|
||||||
nameLabel.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
|
|
||||||
statusLabel := widget.NewLabel("")
|
|
||||||
if isInstalled {
|
|
||||||
statusLabel.SetText("✓ Installed")
|
|
||||||
statusLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
} else {
|
|
||||||
statusLabel.SetText("✗ Not Installed")
|
|
||||||
statusLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
}
|
|
||||||
|
|
||||||
descLabel := widget.NewLabel(dep.Description)
|
|
||||||
descLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
descLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
|
|
||||||
installLabel := widget.NewLabel(dep.InstallCmd)
|
|
||||||
installLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
|
|
||||||
var statusColor color.Color
|
|
||||||
if isInstalled {
|
|
||||||
statusColor = utils.MustHex("#4CAF50") // Green
|
|
||||||
} else {
|
|
||||||
statusColor = utils.MustHex("#F44336") // Red
|
|
||||||
}
|
|
||||||
|
|
||||||
statusBg := canvas.NewRectangle(statusColor)
|
|
||||||
statusBg.CornerRadius = 3
|
|
||||||
// statusBg.SetMinSize(fyne.NewSize(12, 12)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
statusRow := container.NewHBox(statusBg, statusLabel)
|
|
||||||
|
|
||||||
infoBox := container.NewVBox(
|
|
||||||
container.NewHBox(nameLabel, layout.NewSpacer(), statusRow),
|
|
||||||
descLabel,
|
|
||||||
)
|
|
||||||
|
|
||||||
if !isInstalled {
|
|
||||||
installCmdLabel := widget.NewLabel("Install: " + installLabel.Text)
|
|
||||||
installCmdLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
infoBox.Add(installCmdLabel)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check which modules need this dependency
|
|
||||||
modulesNeeding := []string{}
|
|
||||||
for modID, deps := range moduleDependencies {
|
|
||||||
for _, d := range deps {
|
|
||||||
if d == depName {
|
|
||||||
// Find module name
|
|
||||||
for _, m := range modulesList {
|
|
||||||
if m.ID == modID {
|
|
||||||
modulesNeeding = append(modulesNeeding, m.Label)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(modulesNeeding) > 0 {
|
|
||||||
neededLabel := widget.NewLabel("Required by: " + strings.Join(modulesNeeding, ", "))
|
|
||||||
neededLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
neededLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
infoBox.Add(neededLabel)
|
|
||||||
}
|
|
||||||
|
|
||||||
cardBg := canvas.NewRectangle(utils.MustHex("#171C2A"))
|
|
||||||
cardBg.CornerRadius = 6
|
|
||||||
card := container.NewPadded(container.NewMax(cardBg, infoBox))
|
|
||||||
content.Add(card)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Refresh button
|
|
||||||
content.Add(widget.NewSeparator())
|
|
||||||
refreshBtn := widget.NewButton("Refresh Status", func() {
|
|
||||||
state.showSettingsView()
|
|
||||||
})
|
|
||||||
content.Add(refreshBtn)
|
|
||||||
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildBenchmarkTab(state *appState) fyne.CanvasObject {
|
|
||||||
content := container.NewVBox()
|
|
||||||
|
|
||||||
// Header
|
|
||||||
header := widget.NewLabel("Hardware Benchmark")
|
|
||||||
header.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
content.Add(header)
|
|
||||||
|
|
||||||
desc := widget.NewLabel("Test your system's video encoding performance to get optimal encoder recommendations.")
|
|
||||||
desc.Wrapping = fyne.TextWrapWord
|
|
||||||
content.Add(desc)
|
|
||||||
|
|
||||||
content.Add(widget.NewSeparator())
|
|
||||||
|
|
||||||
// Run benchmark button
|
|
||||||
runBtn := widget.NewButton("Run Hardware Benchmark", func() {
|
|
||||||
state.showBenchmark()
|
|
||||||
})
|
|
||||||
runBtn.Importance = widget.MediumImportance
|
|
||||||
content.Add(container.NewCenter(runBtn))
|
|
||||||
|
|
||||||
// Show recent results if available
|
|
||||||
cfg, err := loadBenchmarkConfig()
|
|
||||||
if err == nil && len(cfg.History) > 0 {
|
|
||||||
content.Add(widget.NewSeparator())
|
|
||||||
|
|
||||||
recentHeader := widget.NewLabel("Recent Benchmarks")
|
|
||||||
recentHeader.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
content.Add(recentHeader)
|
|
||||||
|
|
||||||
for _, run := range cfg.History[:min(3, len(cfg.History))] {
|
|
||||||
timestamp := run.Timestamp.Format("Jan 2, 2006 at 3:04 PM")
|
|
||||||
summary := fmt.Sprintf("%s - Recommended: %s (%s)",
|
|
||||||
timestamp, run.RecommendedEncoder, run.RecommendedPreset)
|
|
||||||
|
|
||||||
runLabel := widget.NewLabel(summary)
|
|
||||||
runLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
content.Add(runLabel)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildPreferencesTab(state *appState) fyne.CanvasObject {
|
|
||||||
content := container.NewVBox()
|
|
||||||
|
|
||||||
header := widget.NewLabel("Application Preferences")
|
|
||||||
header.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
content.Add(header)
|
|
||||||
|
|
||||||
content.Add(widget.NewLabel("Preferences panel - Coming soon"))
|
|
||||||
content.Add(widget.NewLabel("This will include settings for:"))
|
|
||||||
content.Add(widget.NewLabel("• Default output directories"))
|
|
||||||
content.Add(widget.NewLabel("• Default encoding presets"))
|
|
||||||
content.Add(widget.NewLabel("• UI theme preferences"))
|
|
||||||
content.Add(widget.NewLabel("• Automatic updates"))
|
|
||||||
|
|
||||||
return content
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) showSettingsView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "settings"
|
|
||||||
s.setContent(buildSettingsView(s))
|
|
||||||
}
|
|
||||||
|
|
@ -1,996 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"path/filepath"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/canvas"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
subtitleModeExternal = "External SRT"
|
|
||||||
subtitleModeEmbed = "Embed Subtitle Track"
|
|
||||||
subtitleModeBurn = "Burn In Subtitles"
|
|
||||||
)
|
|
||||||
|
|
||||||
type subtitleCue struct {
|
|
||||||
Start float64
|
|
||||||
End float64
|
|
||||||
Text string
|
|
||||||
}
|
|
||||||
|
|
||||||
type subtitlesConfig struct {
|
|
||||||
OutputMode string `json:"outputMode"`
|
|
||||||
ModelPath string `json:"modelPath"`
|
|
||||||
BackendPath string `json:"backendPath"`
|
|
||||||
BurnOutput string `json:"burnOutput"`
|
|
||||||
TimeOffset float64 `json:"timeOffset"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultSubtitlesConfig() subtitlesConfig {
|
|
||||||
return subtitlesConfig{
|
|
||||||
OutputMode: subtitleModeExternal,
|
|
||||||
ModelPath: "",
|
|
||||||
BackendPath: "",
|
|
||||||
BurnOutput: "",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadPersistedSubtitlesConfig() (subtitlesConfig, error) {
|
|
||||||
var cfg subtitlesConfig
|
|
||||||
path := moduleConfigPath("subtitles")
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if err := json.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return cfg, err
|
|
||||||
}
|
|
||||||
if cfg.OutputMode == "" {
|
|
||||||
cfg.OutputMode = subtitleModeExternal
|
|
||||||
}
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func savePersistedSubtitlesConfig(cfg subtitlesConfig) error {
|
|
||||||
path := moduleConfigPath("subtitles")
|
|
||||||
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
data, err := json.MarshalIndent(cfg, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return os.WriteFile(path, data, 0o644)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) applySubtitlesConfig(cfg subtitlesConfig) {
|
|
||||||
s.subtitleOutputMode = cfg.OutputMode
|
|
||||||
s.subtitleModelPath = cfg.ModelPath
|
|
||||||
s.subtitleBackendPath = cfg.BackendPath
|
|
||||||
s.subtitleBurnOutput = cfg.BurnOutput
|
|
||||||
s.subtitleTimeOffset = cfg.TimeOffset
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) persistSubtitlesConfig() {
|
|
||||||
cfg := subtitlesConfig{
|
|
||||||
OutputMode: s.subtitleOutputMode,
|
|
||||||
ModelPath: s.subtitleModelPath,
|
|
||||||
BackendPath: s.subtitleBackendPath,
|
|
||||||
BurnOutput: s.subtitleBurnOutput,
|
|
||||||
TimeOffset: s.subtitleTimeOffset,
|
|
||||||
}
|
|
||||||
if err := savePersistedSubtitlesConfig(cfg); err != nil {
|
|
||||||
logging.Debug(logging.CatSystem, "failed to persist subtitles config: %v", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) showSubtitlesView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "subtitles"
|
|
||||||
|
|
||||||
if cfg, err := loadPersistedSubtitlesConfig(); err == nil {
|
|
||||||
s.applySubtitlesConfig(cfg)
|
|
||||||
} else if !errors.Is(err, os.ErrNotExist) {
|
|
||||||
logging.Debug(logging.CatSystem, "failed to load persisted subtitles config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if s.subtitleOutputMode == "" {
|
|
||||||
s.subtitleOutputMode = subtitleModeExternal
|
|
||||||
}
|
|
||||||
|
|
||||||
s.setContent(buildSubtitlesView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildSubtitlesView(state *appState) fyne.CanvasObject {
|
|
||||||
subtitlesColor := moduleColor("subtitles")
|
|
||||||
|
|
||||||
backBtn := widget.NewButton("< BACK", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
queueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
state.queueBtn = queueBtn
|
|
||||||
state.updateQueueButtonLabel()
|
|
||||||
|
|
||||||
clearCompletedBtn := widget.NewButton("⌫", func() {
|
|
||||||
state.clearCompletedJobs()
|
|
||||||
})
|
|
||||||
clearCompletedBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
topBar := ui.TintedBar(subtitlesColor, container.NewHBox(backBtn, layout.NewSpacer(), clearCompletedBtn, queueBtn))
|
|
||||||
bottomBar := moduleFooter(subtitlesColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
videoEntry := widget.NewEntry()
|
|
||||||
videoEntry.SetPlaceHolder("Video file path")
|
|
||||||
logging.Debug(logging.CatModule, "buildSubtitlesView: creating videoEntry with subtitleVideoPath=%s", state.subtitleVideoPath)
|
|
||||||
videoEntry.SetText(state.subtitleVideoPath)
|
|
||||||
videoEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleVideoPath = strings.TrimSpace(val)
|
|
||||||
}
|
|
||||||
|
|
||||||
subtitleEntry := widget.NewEntry()
|
|
||||||
subtitleEntry.SetPlaceHolder("Subtitle file (.srt or .vtt)")
|
|
||||||
subtitleEntry.SetText(state.subtitleFilePath)
|
|
||||||
subtitleEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleFilePath = strings.TrimSpace(val)
|
|
||||||
}
|
|
||||||
|
|
||||||
modelEntry := widget.NewEntry()
|
|
||||||
modelEntry.SetPlaceHolder("Whisper model path (ggml-*.bin)")
|
|
||||||
modelEntry.SetText(state.subtitleModelPath)
|
|
||||||
modelEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleModelPath = strings.TrimSpace(val)
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
}
|
|
||||||
|
|
||||||
backendEntry := widget.NewEntry()
|
|
||||||
backendEntry.SetPlaceHolder("Whisper backend path (whisper.cpp/main)")
|
|
||||||
backendEntry.SetText(state.subtitleBackendPath)
|
|
||||||
backendEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleBackendPath = strings.TrimSpace(val)
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
}
|
|
||||||
|
|
||||||
outputEntry := widget.NewEntry()
|
|
||||||
outputEntry.SetPlaceHolder("Output video path (for embed/burn)")
|
|
||||||
outputEntry.SetText(state.subtitleBurnOutput)
|
|
||||||
outputEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleBurnOutput = strings.TrimSpace(val)
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
}
|
|
||||||
|
|
||||||
statusLabel := widget.NewLabel("")
|
|
||||||
statusLabel.Wrapping = fyne.TextWrapWord
|
|
||||||
state.subtitleStatusLabel = statusLabel
|
|
||||||
if state.subtitleStatus != "" {
|
|
||||||
statusLabel.SetText(state.subtitleStatus)
|
|
||||||
}
|
|
||||||
|
|
||||||
var rebuildCues func()
|
|
||||||
cueList := container.NewVBox()
|
|
||||||
listScroll := container.NewVScroll(cueList)
|
|
||||||
var emptyOverlay *fyne.Container
|
|
||||||
rebuildCues = func() {
|
|
||||||
cueList.Objects = nil
|
|
||||||
if len(state.subtitleCues) == 0 {
|
|
||||||
if emptyOverlay != nil {
|
|
||||||
emptyOverlay.Show()
|
|
||||||
}
|
|
||||||
cueList.Refresh()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if emptyOverlay != nil {
|
|
||||||
emptyOverlay.Hide()
|
|
||||||
}
|
|
||||||
for i, cue := range state.subtitleCues {
|
|
||||||
idx := i
|
|
||||||
|
|
||||||
startEntry := widget.NewEntry()
|
|
||||||
startEntry.SetPlaceHolder("00:00:00,000")
|
|
||||||
startEntry.SetText(formatSRTTimestamp(cue.Start))
|
|
||||||
startEntry.OnChanged = func(val string) {
|
|
||||||
if seconds, ok := parseSRTTimestamp(val); ok {
|
|
||||||
state.subtitleCues[idx].Start = seconds
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
endEntry := widget.NewEntry()
|
|
||||||
endEntry.SetPlaceHolder("00:00:00,000")
|
|
||||||
endEntry.SetText(formatSRTTimestamp(cue.End))
|
|
||||||
endEntry.OnChanged = func(val string) {
|
|
||||||
if seconds, ok := parseSRTTimestamp(val); ok {
|
|
||||||
state.subtitleCues[idx].End = seconds
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
textEntry := widget.NewMultiLineEntry()
|
|
||||||
textEntry.SetText(cue.Text)
|
|
||||||
textEntry.Wrapping = fyne.TextWrapWord
|
|
||||||
textEntry.OnChanged = func(val string) {
|
|
||||||
state.subtitleCues[idx].Text = val
|
|
||||||
}
|
|
||||||
|
|
||||||
removeBtn := widget.NewButton("Remove", func() {
|
|
||||||
state.subtitleCues = append(state.subtitleCues[:idx], state.subtitleCues[idx+1:]...)
|
|
||||||
rebuildCues()
|
|
||||||
})
|
|
||||||
removeBtn.Importance = widget.MediumImportance
|
|
||||||
|
|
||||||
timesCol := container.NewVBox(
|
|
||||||
widget.NewLabel("Start"),
|
|
||||||
startEntry,
|
|
||||||
widget.NewLabel("End"),
|
|
||||||
endEntry,
|
|
||||||
)
|
|
||||||
|
|
||||||
row := container.NewBorder(nil, nil, timesCol, removeBtn, textEntry)
|
|
||||||
cardBg := canvas.NewRectangle(utils.MustHex("#171C2A"))
|
|
||||||
cardBg.CornerRadius = 6
|
|
||||||
// cardBg.SetMinSize(fyne.NewSize(0, startEntry.MinSize().Height+endEntry.MinSize().Height+textEntry.MinSize().Height+24)) // Removed for flexible sizing
|
|
||||||
cueList.Add(container.NewPadded(container.NewMax(cardBg, row)))
|
|
||||||
}
|
|
||||||
cueList.Refresh()
|
|
||||||
}
|
|
||||||
state.subtitleCuesRefresh = rebuildCues
|
|
||||||
|
|
||||||
handleDrop := func(items []fyne.URI) {
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop called with %d items", len(items))
|
|
||||||
var videoPath string
|
|
||||||
var subtitlePath string
|
|
||||||
for _, uri := range items {
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: uri scheme=%s path=%s", uri.Scheme(), uri.Path())
|
|
||||||
if uri.Scheme() != "file" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
path := uri.Path()
|
|
||||||
if videoPath == "" && state.isVideoFile(path) {
|
|
||||||
videoPath = path
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: identified as video: %s", path)
|
|
||||||
}
|
|
||||||
if subtitlePath == "" && state.isSubtitleFile(path) {
|
|
||||||
subtitlePath = path
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: identified as subtitle: %s", path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if videoPath != "" {
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: setting video path to %s", videoPath)
|
|
||||||
state.subtitleVideoPath = videoPath
|
|
||||||
videoEntry.SetText(videoPath)
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: videoEntry text set to %s", videoPath)
|
|
||||||
}
|
|
||||||
if subtitlePath != "" {
|
|
||||||
logging.Debug(logging.CatModule, "subtitles handleDrop: setting subtitle path to %s", subtitlePath)
|
|
||||||
subtitleEntry.SetText(subtitlePath)
|
|
||||||
if err := state.loadSubtitleFile(subtitlePath); err != nil {
|
|
||||||
state.setSubtitleStatus(err.Error())
|
|
||||||
}
|
|
||||||
rebuildCues()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
emptyLabel := widget.NewLabel("Drag and drop subtitle files here\nor generate subtitles from speech")
|
|
||||||
emptyLabel.Alignment = fyne.TextAlignCenter
|
|
||||||
emptyOverlay = container.NewCenter(emptyLabel)
|
|
||||||
|
|
||||||
listArea := container.NewMax(listScroll, emptyOverlay)
|
|
||||||
|
|
||||||
addCueBtn := widget.NewButton("Add Cue", func() {
|
|
||||||
start := 0.0
|
|
||||||
if len(state.subtitleCues) > 0 {
|
|
||||||
start = state.subtitleCues[len(state.subtitleCues)-1].End
|
|
||||||
}
|
|
||||||
state.subtitleCues = append(state.subtitleCues, subtitleCue{
|
|
||||||
Start: start,
|
|
||||||
End: start + 2.0,
|
|
||||||
Text: "",
|
|
||||||
})
|
|
||||||
rebuildCues()
|
|
||||||
})
|
|
||||||
addCueBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
clearBtn := widget.NewButton("Clear All", func() {
|
|
||||||
state.subtitleCues = nil
|
|
||||||
rebuildCues()
|
|
||||||
})
|
|
||||||
|
|
||||||
loadBtn := widget.NewButton("Load Subtitles", func() {
|
|
||||||
if err := state.loadSubtitleFile(state.subtitleFilePath); err != nil {
|
|
||||||
state.setSubtitleStatus(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
rebuildCues()
|
|
||||||
})
|
|
||||||
|
|
||||||
saveBtn := widget.NewButton("Save Subtitles", func() {
|
|
||||||
path := strings.TrimSpace(state.subtitleFilePath)
|
|
||||||
if path == "" {
|
|
||||||
path = defaultSubtitlePath(state.subtitleVideoPath)
|
|
||||||
state.subtitleFilePath = path
|
|
||||||
subtitleEntry.SetText(path)
|
|
||||||
}
|
|
||||||
if err := state.saveSubtitleFile(path); err != nil {
|
|
||||||
state.setSubtitleStatus(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
state.setSubtitleStatus(fmt.Sprintf("Saved subtitles to %s", filepath.Base(path)))
|
|
||||||
})
|
|
||||||
|
|
||||||
generateBtn := widget.NewButton("Generate From Speech (Offline)", func() {
|
|
||||||
state.generateSubtitlesFromSpeech()
|
|
||||||
rebuildCues()
|
|
||||||
})
|
|
||||||
generateBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
outputModeSelect := widget.NewSelect(
|
|
||||||
[]string{subtitleModeExternal, subtitleModeEmbed, subtitleModeBurn},
|
|
||||||
func(val string) {
|
|
||||||
state.subtitleOutputMode = val
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
},
|
|
||||||
)
|
|
||||||
outputModeSelect.SetSelected(state.subtitleOutputMode)
|
|
||||||
|
|
||||||
applyBtn := widget.NewButton("Create Output", func() {
|
|
||||||
state.applySubtitlesToVideo()
|
|
||||||
})
|
|
||||||
applyBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
browseVideoBtn := widget.NewButton("Browse", func() {
|
|
||||||
dialog.ShowFileOpen(func(file fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || file == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
path := file.URI().Path()
|
|
||||||
state.subtitleVideoPath = path
|
|
||||||
videoEntry.SetText(path)
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
browseSubtitleBtn := widget.NewButton("Browse", func() {
|
|
||||||
dialog.ShowFileOpen(func(file fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || file == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
path := file.URI().Path()
|
|
||||||
if err := state.loadSubtitleFile(path); err != nil {
|
|
||||||
state.setSubtitleStatus(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
subtitleEntry.SetText(path)
|
|
||||||
rebuildCues()
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
offsetEntry := widget.NewEntry()
|
|
||||||
offsetEntry.SetPlaceHolder("0.0")
|
|
||||||
offsetEntry.SetText(fmt.Sprintf("%.2f", state.subtitleTimeOffset))
|
|
||||||
offsetEntry.OnChanged = func(val string) {
|
|
||||||
if offset, err := strconv.ParseFloat(strings.TrimSpace(val), 64); err == nil {
|
|
||||||
state.subtitleTimeOffset = offset
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
applyOffsetBtn := widget.NewButton("Apply Offset", func() {
|
|
||||||
state.applySubtitleTimeOffset(state.subtitleTimeOffset)
|
|
||||||
})
|
|
||||||
applyOffsetBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
offsetPlus1Btn := widget.NewButton("+1s", func() {
|
|
||||||
state.applySubtitleTimeOffset(1.0)
|
|
||||||
})
|
|
||||||
|
|
||||||
offsetMinus1Btn := widget.NewButton("-1s", func() {
|
|
||||||
state.applySubtitleTimeOffset(-1.0)
|
|
||||||
})
|
|
||||||
|
|
||||||
offsetPlus01Btn := widget.NewButton("+0.1s", func() {
|
|
||||||
state.applySubtitleTimeOffset(0.1)
|
|
||||||
})
|
|
||||||
|
|
||||||
offsetMinus01Btn := widget.NewButton("-0.1s", func() {
|
|
||||||
state.applySubtitleTimeOffset(-0.1)
|
|
||||||
})
|
|
||||||
|
|
||||||
applyControls := func() {
|
|
||||||
outputModeSelect.SetSelected(state.subtitleOutputMode)
|
|
||||||
backendEntry.SetText(state.subtitleBackendPath)
|
|
||||||
modelEntry.SetText(state.subtitleModelPath)
|
|
||||||
outputEntry.SetText(state.subtitleBurnOutput)
|
|
||||||
offsetEntry.SetText(fmt.Sprintf("%.2f", state.subtitleTimeOffset))
|
|
||||||
}
|
|
||||||
|
|
||||||
loadCfgBtn := widget.NewButton("Load Config", func() {
|
|
||||||
cfg, err := loadPersistedSubtitlesConfig()
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
|
||||||
dialog.ShowInformation("No Config", "No saved config found yet. It will save automatically after your first change.", state.window)
|
|
||||||
} else {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to load config: %w", err), state.window)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
state.applySubtitlesConfig(cfg)
|
|
||||||
applyControls()
|
|
||||||
})
|
|
||||||
|
|
||||||
saveCfgBtn := widget.NewButton("Save Config", func() {
|
|
||||||
cfg := subtitlesConfig{
|
|
||||||
OutputMode: state.subtitleOutputMode,
|
|
||||||
ModelPath: state.subtitleModelPath,
|
|
||||||
BackendPath: state.subtitleBackendPath,
|
|
||||||
BurnOutput: state.subtitleBurnOutput,
|
|
||||||
TimeOffset: state.subtitleTimeOffset,
|
|
||||||
}
|
|
||||||
if err := savePersistedSubtitlesConfig(cfg); err != nil {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to save config: %w", err), state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
dialog.ShowInformation("Config Saved", fmt.Sprintf("Saved to %s", moduleConfigPath("subtitles")), state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
resetBtn := widget.NewButton("Reset", func() {
|
|
||||||
cfg := defaultSubtitlesConfig()
|
|
||||||
state.applySubtitlesConfig(cfg)
|
|
||||||
applyControls()
|
|
||||||
state.persistSubtitlesConfig()
|
|
||||||
})
|
|
||||||
|
|
||||||
left := container.NewVBox(
|
|
||||||
widget.NewLabelWithStyle("Sources", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
container.NewBorder(nil, nil, nil, browseVideoBtn, videoEntry),
|
|
||||||
container.NewBorder(nil, nil, nil, browseSubtitleBtn, subtitleEntry),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Timing Adjustment", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
widget.NewLabel("Shift all subtitle times by offset (seconds):"),
|
|
||||||
offsetEntry,
|
|
||||||
container.NewHBox(offsetMinus1Btn, offsetMinus01Btn, offsetPlus01Btn, offsetPlus1Btn),
|
|
||||||
applyOffsetBtn,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Offline Speech-to-Text (whisper.cpp)", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
backendEntry,
|
|
||||||
modelEntry,
|
|
||||||
container.NewHBox(generateBtn),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Output", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
outputModeSelect,
|
|
||||||
outputEntry,
|
|
||||||
applyBtn,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabelWithStyle("Status", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
statusLabel,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
container.NewHBox(resetBtn, loadCfgBtn, saveCfgBtn),
|
|
||||||
)
|
|
||||||
|
|
||||||
right := container.NewBorder(
|
|
||||||
container.NewVBox(
|
|
||||||
widget.NewLabelWithStyle("Subtitle Cues", fyne.TextAlignLeading, fyne.TextStyle{Bold: true}),
|
|
||||||
container.NewHBox(addCueBtn, clearBtn, loadBtn, saveBtn),
|
|
||||||
),
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
listArea,
|
|
||||||
)
|
|
||||||
|
|
||||||
rebuildCues()
|
|
||||||
|
|
||||||
// Wrap both panels in droppable so drops anywhere will work
|
|
||||||
droppableLeft := ui.NewDroppable(left, handleDrop)
|
|
||||||
droppableRight := ui.NewDroppable(right, handleDrop)
|
|
||||||
content := container.NewGridWithColumns(2, droppableLeft, droppableRight)
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, content)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) setSubtitleStatus(msg string) {
|
|
||||||
s.subtitleStatus = msg
|
|
||||||
if s.subtitleStatusLabel != nil {
|
|
||||||
s.subtitleStatusLabel.SetText(msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) setSubtitleStatusAsync(msg string) {
|
|
||||||
app := fyne.CurrentApp()
|
|
||||||
if app == nil || app.Driver() == nil {
|
|
||||||
s.setSubtitleStatus(msg)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
app.Driver().DoFromGoroutine(func() {
|
|
||||||
s.setSubtitleStatus(msg)
|
|
||||||
}, false)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) handleSubtitlesModuleDrop(items []fyne.URI) {
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop called with %d items", len(items))
|
|
||||||
var videoPath string
|
|
||||||
var subtitlePath string
|
|
||||||
for _, uri := range items {
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: uri scheme=%s path=%s", uri.Scheme(), uri.Path())
|
|
||||||
if uri.Scheme() != "file" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
path := uri.Path()
|
|
||||||
if videoPath == "" && s.isVideoFile(path) {
|
|
||||||
videoPath = path
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: identified as video: %s", path)
|
|
||||||
}
|
|
||||||
if subtitlePath == "" && s.isSubtitleFile(path) {
|
|
||||||
subtitlePath = path
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: identified as subtitle: %s", path)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if videoPath == "" && subtitlePath == "" {
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: no video or subtitle found, returning")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if videoPath != "" {
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: setting subtitleVideoPath to %s", videoPath)
|
|
||||||
s.subtitleVideoPath = videoPath
|
|
||||||
}
|
|
||||||
if subtitlePath != "" {
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: loading subtitle file %s", subtitlePath)
|
|
||||||
if err := s.loadSubtitleFile(subtitlePath); err != nil {
|
|
||||||
s.setSubtitleStatus(err.Error())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Switch to subtitles module to show the loaded files
|
|
||||||
logging.Debug(logging.CatModule, "handleSubtitlesModuleDrop: calling showModule(subtitles), subtitleVideoPath=%s", s.subtitleVideoPath)
|
|
||||||
s.showModule("subtitles")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) loadSubtitleFile(path string) error {
|
|
||||||
path = strings.TrimSpace(path)
|
|
||||||
if path == "" {
|
|
||||||
return fmt.Errorf("subtitle path is empty")
|
|
||||||
}
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to read subtitles: %w", err)
|
|
||||||
}
|
|
||||||
cues, err := parseSubtitlePayload(path, string(data))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
s.subtitleFilePath = path
|
|
||||||
s.subtitleCues = cues
|
|
||||||
s.setSubtitleStatus(fmt.Sprintf("Loaded %d subtitle cues", len(cues)))
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) saveSubtitleFile(path string) error {
|
|
||||||
path = strings.TrimSpace(path)
|
|
||||||
if path == "" {
|
|
||||||
return fmt.Errorf("subtitle output path is empty")
|
|
||||||
}
|
|
||||||
if len(s.subtitleCues) == 0 {
|
|
||||||
return fmt.Errorf("no subtitle cues to save")
|
|
||||||
}
|
|
||||||
payload := formatSRT(s.subtitleCues)
|
|
||||||
if err := os.WriteFile(path, []byte(payload), 0644); err != nil {
|
|
||||||
return fmt.Errorf("failed to write subtitles: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) applySubtitleTimeOffset(offsetSeconds float64) {
|
|
||||||
if len(s.subtitleCues) == 0 {
|
|
||||||
s.setSubtitleStatus("No subtitle cues to adjust")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for i := range s.subtitleCues {
|
|
||||||
s.subtitleCues[i].Start += offsetSeconds
|
|
||||||
s.subtitleCues[i].End += offsetSeconds
|
|
||||||
if s.subtitleCues[i].Start < 0 {
|
|
||||||
s.subtitleCues[i].Start = 0
|
|
||||||
}
|
|
||||||
if s.subtitleCues[i].End < 0 {
|
|
||||||
s.subtitleCues[i].End = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if s.subtitleCuesRefresh != nil {
|
|
||||||
s.subtitleCuesRefresh()
|
|
||||||
}
|
|
||||||
s.setSubtitleStatus(fmt.Sprintf("Applied %.2fs offset to %d subtitle cues", offsetSeconds, len(s.subtitleCues)))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) generateSubtitlesFromSpeech() {
|
|
||||||
videoPath := strings.TrimSpace(s.subtitleVideoPath)
|
|
||||||
if videoPath == "" {
|
|
||||||
s.setSubtitleStatus("Set a video file to generate subtitles.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, err := os.Stat(videoPath); err != nil {
|
|
||||||
s.setSubtitleStatus("Video file not found.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
modelPath := strings.TrimSpace(s.subtitleModelPath)
|
|
||||||
if modelPath == "" {
|
|
||||||
s.setSubtitleStatus("Set a whisper model path.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
backendPath := strings.TrimSpace(s.subtitleBackendPath)
|
|
||||||
if backendPath == "" {
|
|
||||||
if detected := detectWhisperBackend(); detected != "" {
|
|
||||||
backendPath = detected
|
|
||||||
s.subtitleBackendPath = detected
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if backendPath == "" {
|
|
||||||
s.setSubtitleStatus("Whisper backend not found. Set the backend path.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
outputPath := strings.TrimSpace(s.subtitleFilePath)
|
|
||||||
if outputPath == "" {
|
|
||||||
outputPath = defaultSubtitlePath(videoPath)
|
|
||||||
s.subtitleFilePath = outputPath
|
|
||||||
}
|
|
||||||
baseOutput := strings.TrimSuffix(outputPath, filepath.Ext(outputPath))
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
tmpWav := filepath.Join(os.TempDir(), fmt.Sprintf("vt-stt-%d.wav", time.Now().UnixNano()))
|
|
||||||
defer os.Remove(tmpWav)
|
|
||||||
|
|
||||||
s.setSubtitleStatusAsync("Extracting audio for speech-to-text...")
|
|
||||||
if err := runFFmpeg([]string{
|
|
||||||
"-y",
|
|
||||||
"-i", videoPath,
|
|
||||||
"-vn",
|
|
||||||
"-ac", "1",
|
|
||||||
"-ar", "16000",
|
|
||||||
"-f", "wav",
|
|
||||||
tmpWav,
|
|
||||||
}); err != nil {
|
|
||||||
s.setSubtitleStatusAsync(fmt.Sprintf("Audio extraction failed: %v", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
s.setSubtitleStatusAsync("Running offline speech-to-text...")
|
|
||||||
if err := runWhisper(backendPath, modelPath, tmpWav, baseOutput); err != nil {
|
|
||||||
s.setSubtitleStatusAsync(fmt.Sprintf("Speech-to-text failed: %v", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
finalPath := baseOutput + ".srt"
|
|
||||||
if err := s.loadSubtitleFile(finalPath); err != nil {
|
|
||||||
s.setSubtitleStatusAsync(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s.setSubtitleStatusAsync(fmt.Sprintf("Generated subtitles: %s", filepath.Base(finalPath)))
|
|
||||||
app := fyne.CurrentApp()
|
|
||||||
if app != nil && app.Driver() != nil {
|
|
||||||
app.Driver().DoFromGoroutine(func() {
|
|
||||||
if s.active == "subtitles" {
|
|
||||||
s.showSubtitlesView()
|
|
||||||
}
|
|
||||||
}, false)
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) applySubtitlesToVideo() {
|
|
||||||
videoPath := strings.TrimSpace(s.subtitleVideoPath)
|
|
||||||
if videoPath == "" {
|
|
||||||
s.setSubtitleStatus("Set a video file before creating output.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, err := os.Stat(videoPath); err != nil {
|
|
||||||
s.setSubtitleStatus("Video file not found.")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
mode := s.subtitleOutputMode
|
|
||||||
if mode == "" {
|
|
||||||
mode = subtitleModeExternal
|
|
||||||
}
|
|
||||||
|
|
||||||
subPath := strings.TrimSpace(s.subtitleFilePath)
|
|
||||||
if subPath == "" {
|
|
||||||
subPath = defaultSubtitlePath(videoPath)
|
|
||||||
s.subtitleFilePath = subPath
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := s.saveSubtitleFile(subPath); err != nil {
|
|
||||||
s.setSubtitleStatus(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if mode == subtitleModeExternal {
|
|
||||||
s.setSubtitleStatus(fmt.Sprintf("Saved subtitles to %s", filepath.Base(subPath)))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
outputPath := strings.TrimSpace(s.subtitleBurnOutput)
|
|
||||||
if outputPath == "" {
|
|
||||||
outputPath = defaultSubtitleOutputPath(videoPath)
|
|
||||||
s.subtitleBurnOutput = outputPath
|
|
||||||
}
|
|
||||||
|
|
||||||
go func() {
|
|
||||||
s.setSubtitleStatusAsync("Creating output with subtitles...")
|
|
||||||
var args []string
|
|
||||||
switch mode {
|
|
||||||
case subtitleModeEmbed:
|
|
||||||
subCodec := subtitleCodecForOutput(outputPath)
|
|
||||||
args = []string{
|
|
||||||
"-y",
|
|
||||||
"-i", videoPath,
|
|
||||||
"-i", subPath,
|
|
||||||
"-map", "0",
|
|
||||||
"-map", "1",
|
|
||||||
"-c", "copy",
|
|
||||||
"-c:s", subCodec,
|
|
||||||
outputPath,
|
|
||||||
}
|
|
||||||
case subtitleModeBurn:
|
|
||||||
filterPath := escapeFFmpegFilterPath(subPath)
|
|
||||||
args = []string{
|
|
||||||
"-y",
|
|
||||||
"-i", videoPath,
|
|
||||||
"-vf", fmt.Sprintf("subtitles=%s", filterPath),
|
|
||||||
"-c:v", "libx264",
|
|
||||||
"-crf", "18",
|
|
||||||
"-preset", "fast",
|
|
||||||
"-c:a", "copy",
|
|
||||||
outputPath,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := runFFmpeg(args); err != nil {
|
|
||||||
s.setSubtitleStatusAsync(fmt.Sprintf("Subtitle output failed: %v", err))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
s.setSubtitleStatusAsync(fmt.Sprintf("Output created: %s", filepath.Base(outputPath)))
|
|
||||||
}()
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseSubtitlePayload(path, content string) ([]subtitleCue, error) {
|
|
||||||
ext := strings.ToLower(filepath.Ext(path))
|
|
||||||
switch ext {
|
|
||||||
case ".vtt":
|
|
||||||
content = stripVTTHeader(content)
|
|
||||||
return parseSRT(content), nil
|
|
||||||
case ".srt":
|
|
||||||
return parseSRT(content), nil
|
|
||||||
case ".ass", ".ssa":
|
|
||||||
return nil, fmt.Errorf("ASS/SSA subtitles are not supported yet")
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unsupported subtitle format")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func stripVTTHeader(content string) string {
|
|
||||||
content = strings.ReplaceAll(content, "\r\n", "\n")
|
|
||||||
lines := strings.Split(content, "\n")
|
|
||||||
var kept []string
|
|
||||||
for i, line := range lines {
|
|
||||||
if i == 0 && strings.HasPrefix(strings.TrimSpace(line), "WEBVTT") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if strings.HasPrefix(strings.TrimSpace(line), "NOTE") {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
kept = append(kept, line)
|
|
||||||
}
|
|
||||||
return strings.Join(kept, "\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseSRT(content string) []subtitleCue {
|
|
||||||
content = strings.ReplaceAll(content, "\r\n", "\n")
|
|
||||||
scanner := bufio.NewScanner(strings.NewReader(content))
|
|
||||||
var cues []subtitleCue
|
|
||||||
var inCue bool
|
|
||||||
var start float64
|
|
||||||
var end float64
|
|
||||||
var lines []string
|
|
||||||
|
|
||||||
flush := func() {
|
|
||||||
if inCue && len(lines) > 0 {
|
|
||||||
cues = append(cues, subtitleCue{
|
|
||||||
Start: start,
|
|
||||||
End: end,
|
|
||||||
Text: strings.Join(lines, "\n"),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
inCue = false
|
|
||||||
lines = nil
|
|
||||||
}
|
|
||||||
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := strings.TrimSpace(scanner.Text())
|
|
||||||
if line == "" {
|
|
||||||
flush()
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if strings.Contains(line, "-->") {
|
|
||||||
parts := strings.Split(line, "-->")
|
|
||||||
if len(parts) >= 2 {
|
|
||||||
if s, ok := parseSRTTimestamp(strings.TrimSpace(parts[0])); ok {
|
|
||||||
if e, ok := parseSRTTimestamp(strings.TrimSpace(parts[1])); ok {
|
|
||||||
start = s
|
|
||||||
end = e
|
|
||||||
inCue = true
|
|
||||||
lines = nil
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if !inCue {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
lines = append(lines, line)
|
|
||||||
}
|
|
||||||
|
|
||||||
flush()
|
|
||||||
return cues
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseSRTTimestamp(value string) (float64, bool) {
|
|
||||||
value = strings.TrimSpace(value)
|
|
||||||
if value == "" {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
value = strings.ReplaceAll(value, ",", ".")
|
|
||||||
parts := strings.Split(value, ":")
|
|
||||||
if len(parts) != 3 {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
hours, err := strconv.Atoi(parts[0])
|
|
||||||
if err != nil {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
minutes, err := strconv.Atoi(parts[1])
|
|
||||||
if err != nil {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
secParts := strings.SplitN(parts[2], ".", 2)
|
|
||||||
seconds, err := strconv.Atoi(secParts[0])
|
|
||||||
if err != nil {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
ms := 0
|
|
||||||
if len(secParts) == 2 {
|
|
||||||
msStr := secParts[1]
|
|
||||||
if len(msStr) > 3 {
|
|
||||||
msStr = msStr[:3]
|
|
||||||
}
|
|
||||||
for len(msStr) < 3 {
|
|
||||||
msStr += "0"
|
|
||||||
}
|
|
||||||
ms, err = strconv.Atoi(msStr)
|
|
||||||
if err != nil {
|
|
||||||
return 0, false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
totalMs := ((hours*60+minutes)*60+seconds)*1000 + ms
|
|
||||||
return float64(totalMs) / 1000.0, true
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatSRTTimestamp(seconds float64) string {
|
|
||||||
if seconds < 0 {
|
|
||||||
seconds = 0
|
|
||||||
}
|
|
||||||
totalMs := int64(seconds*1000 + 0.5)
|
|
||||||
hours := totalMs / 3600000
|
|
||||||
minutes := (totalMs % 3600000) / 60000
|
|
||||||
secs := (totalMs % 60000) / 1000
|
|
||||||
ms := totalMs % 1000
|
|
||||||
return fmt.Sprintf("%02d:%02d:%02d,%03d", hours, minutes, secs, ms)
|
|
||||||
}
|
|
||||||
|
|
||||||
func formatSRT(cues []subtitleCue) string {
|
|
||||||
var b strings.Builder
|
|
||||||
for i, cue := range cues {
|
|
||||||
b.WriteString(fmt.Sprintf("%d\n", i+1))
|
|
||||||
b.WriteString(fmt.Sprintf("%s --> %s\n", formatSRTTimestamp(cue.Start), formatSRTTimestamp(cue.End)))
|
|
||||||
b.WriteString(strings.TrimSpace(cue.Text))
|
|
||||||
b.WriteString("\n\n")
|
|
||||||
}
|
|
||||||
return b.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultSubtitlePath(videoPath string) string {
|
|
||||||
if videoPath == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
dir := filepath.Dir(videoPath)
|
|
||||||
base := strings.TrimSuffix(filepath.Base(videoPath), filepath.Ext(videoPath))
|
|
||||||
return filepath.Join(dir, base+".srt")
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultSubtitleOutputPath(videoPath string) string {
|
|
||||||
if videoPath == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
dir := filepath.Dir(videoPath)
|
|
||||||
base := strings.TrimSuffix(filepath.Base(videoPath), filepath.Ext(videoPath))
|
|
||||||
ext := filepath.Ext(videoPath)
|
|
||||||
if ext == "" {
|
|
||||||
ext = ".mp4"
|
|
||||||
}
|
|
||||||
return filepath.Join(dir, base+"-subtitled"+ext)
|
|
||||||
}
|
|
||||||
|
|
||||||
func subtitleCodecForOutput(outputPath string) string {
|
|
||||||
ext := strings.ToLower(filepath.Ext(outputPath))
|
|
||||||
switch ext {
|
|
||||||
case ".mp4", ".m4v", ".mov":
|
|
||||||
return "mov_text"
|
|
||||||
default:
|
|
||||||
return "srt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func escapeFFmpegFilterPath(path string) string {
|
|
||||||
escaped := strings.ReplaceAll(path, "\\", "\\\\")
|
|
||||||
escaped = strings.ReplaceAll(escaped, ":", "\\:")
|
|
||||||
escaped = strings.ReplaceAll(escaped, "'", "\\'")
|
|
||||||
return escaped
|
|
||||||
}
|
|
||||||
|
|
||||||
func detectWhisperBackend() string {
|
|
||||||
candidates := []string{"whisper.cpp", "whisper", "main", "main.exe", "whisper.exe"}
|
|
||||||
for _, candidate := range candidates {
|
|
||||||
if found, err := exec.LookPath(candidate); err == nil {
|
|
||||||
return found
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func runWhisper(binaryPath, modelPath, inputPath, outputBase string) error {
|
|
||||||
args := []string{
|
|
||||||
"-m", modelPath,
|
|
||||||
"-f", inputPath,
|
|
||||||
"-of", outputBase,
|
|
||||||
"-osrt",
|
|
||||||
}
|
|
||||||
cmd := exec.Command(binaryPath, args...)
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
var stderr bytes.Buffer
|
|
||||||
cmd.Stderr = &stderr
|
|
||||||
if err := cmd.Run(); err != nil {
|
|
||||||
return fmt.Errorf("whisper failed: %w (%s)", err, strings.TrimSpace(stderr.String()))
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func runFFmpeg(args []string) error {
|
|
||||||
cmd := exec.Command(utils.GetFFmpegPath(), args...)
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
var stderr bytes.Buffer
|
|
||||||
cmd.Stderr = &stderr
|
|
||||||
if err := cmd.Run(); err != nil {
|
|
||||||
return fmt.Errorf("ffmpeg failed: %w (%s)", err, strings.TrimSpace(stderr.String()))
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
413
thumb_module.go
413
thumb_module.go
|
|
@ -1,413 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"fyne.io/fyne/v2"
|
|
||||||
"fyne.io/fyne/v2/canvas"
|
|
||||||
"fyne.io/fyne/v2/container"
|
|
||||||
"fyne.io/fyne/v2/dialog"
|
|
||||||
"fyne.io/fyne/v2/layout"
|
|
||||||
"fyne.io/fyne/v2/widget"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/logging"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/queue"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/thumbnail"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/ui"
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s *appState) showThumbView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "thumb"
|
|
||||||
s.setContent(buildThumbView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildThumbView(state *appState) fyne.CanvasObject {
|
|
||||||
thumbColor := moduleColor("thumb")
|
|
||||||
|
|
||||||
// Back button
|
|
||||||
backBtn := widget.NewButton("< THUMBNAILS", func() {
|
|
||||||
state.showMainMenu()
|
|
||||||
})
|
|
||||||
backBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
// Top bar with module color
|
|
||||||
queueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
state.queueBtn = queueBtn
|
|
||||||
state.updateQueueButtonLabel()
|
|
||||||
|
|
||||||
clearCompletedBtn := widget.NewButton("⌫", func() {
|
|
||||||
state.clearCompletedJobs()
|
|
||||||
})
|
|
||||||
clearCompletedBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
topBar := ui.TintedBar(thumbColor, container.NewHBox(backBtn, layout.NewSpacer(), clearCompletedBtn, queueBtn))
|
|
||||||
|
|
||||||
// Instructions
|
|
||||||
instructions := widget.NewLabel("Generate thumbnails from a video file. Load a video and configure settings.")
|
|
||||||
instructions.Wrapping = fyne.TextWrapWord
|
|
||||||
instructions.Alignment = fyne.TextAlignCenter
|
|
||||||
|
|
||||||
// Initialize state defaults
|
|
||||||
if state.thumbCount == 0 {
|
|
||||||
state.thumbCount = 24 // Default to 24 thumbnails (good for contact sheets)
|
|
||||||
}
|
|
||||||
if state.thumbWidth == 0 {
|
|
||||||
state.thumbWidth = 320
|
|
||||||
}
|
|
||||||
if state.thumbColumns == 0 {
|
|
||||||
state.thumbColumns = 4 // 4 columns works well for widescreen videos
|
|
||||||
}
|
|
||||||
if state.thumbRows == 0 {
|
|
||||||
state.thumbRows = 6 // 4x6 = 24 thumbnails
|
|
||||||
}
|
|
||||||
|
|
||||||
// File label and video preview
|
|
||||||
fileLabel := widget.NewLabel("No file loaded")
|
|
||||||
fileLabel.TextStyle = fyne.TextStyle{Bold: true}
|
|
||||||
|
|
||||||
var videoContainer fyne.CanvasObject
|
|
||||||
if state.thumbFile != nil {
|
|
||||||
fileLabel.SetText(fmt.Sprintf("File: %s", filepath.Base(state.thumbFile.Path)))
|
|
||||||
videoContainer = buildVideoPane(state, fyne.NewSize(480, 270), state.thumbFile, nil)
|
|
||||||
} else {
|
|
||||||
videoContainer = container.NewCenter(widget.NewLabel("No video loaded"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load button
|
|
||||||
loadBtn := widget.NewButton("Load Video", func() {
|
|
||||||
dialog.ShowFileOpen(func(reader fyne.URIReadCloser, err error) {
|
|
||||||
if err != nil || reader == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
path := reader.URI().Path()
|
|
||||||
reader.Close()
|
|
||||||
|
|
||||||
src, err := probeVideo(path)
|
|
||||||
if err != nil {
|
|
||||||
dialog.ShowError(fmt.Errorf("failed to load video: %w", err), state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
state.thumbFile = src
|
|
||||||
state.showThumbView()
|
|
||||||
logging.Debug(logging.CatModule, "loaded thumbnail file: %s", path)
|
|
||||||
}, state.window)
|
|
||||||
})
|
|
||||||
|
|
||||||
// Clear button
|
|
||||||
clearBtn := widget.NewButton("Clear", func() {
|
|
||||||
state.thumbFile = nil
|
|
||||||
state.showThumbView()
|
|
||||||
})
|
|
||||||
clearBtn.Importance = widget.LowImportance
|
|
||||||
|
|
||||||
// Contact sheet checkbox
|
|
||||||
contactSheetCheck := widget.NewCheck("Generate Contact Sheet (single image)", func(checked bool) {
|
|
||||||
state.thumbContactSheet = checked
|
|
||||||
state.showThumbView()
|
|
||||||
})
|
|
||||||
contactSheetCheck.Checked = state.thumbContactSheet
|
|
||||||
|
|
||||||
// Conditional settings based on contact sheet mode
|
|
||||||
var settingsOptions fyne.CanvasObject
|
|
||||||
if state.thumbContactSheet {
|
|
||||||
// Contact sheet mode: show columns and rows
|
|
||||||
colLabel := widget.NewLabel(fmt.Sprintf("Columns: %d", state.thumbColumns))
|
|
||||||
rowLabel := widget.NewLabel(fmt.Sprintf("Rows: %d", state.thumbRows))
|
|
||||||
|
|
||||||
totalThumbs := state.thumbColumns * state.thumbRows
|
|
||||||
totalLabel := widget.NewLabel(fmt.Sprintf("Total thumbnails: %d", totalThumbs))
|
|
||||||
totalLabel.TextStyle = fyne.TextStyle{Italic: true}
|
|
||||||
|
|
||||||
colSlider := widget.NewSlider(2, 12)
|
|
||||||
colSlider.Value = float64(state.thumbColumns)
|
|
||||||
colSlider.Step = 1
|
|
||||||
colSlider.OnChanged = func(val float64) {
|
|
||||||
state.thumbColumns = int(val)
|
|
||||||
colLabel.SetText(fmt.Sprintf("Columns: %d", int(val)))
|
|
||||||
totalLabel.SetText(fmt.Sprintf("Total thumbnails: %d", state.thumbColumns*state.thumbRows))
|
|
||||||
}
|
|
||||||
|
|
||||||
rowSlider := widget.NewSlider(2, 12)
|
|
||||||
rowSlider.Value = float64(state.thumbRows)
|
|
||||||
rowSlider.Step = 1
|
|
||||||
rowSlider.OnChanged = func(val float64) {
|
|
||||||
state.thumbRows = int(val)
|
|
||||||
rowLabel.SetText(fmt.Sprintf("Rows: %d", int(val)))
|
|
||||||
totalLabel.SetText(fmt.Sprintf("Total thumbnails: %d", state.thumbColumns*state.thumbRows))
|
|
||||||
}
|
|
||||||
|
|
||||||
settingsOptions = container.NewVBox(
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabel("Contact Sheet Grid:"),
|
|
||||||
colLabel,
|
|
||||||
colSlider,
|
|
||||||
rowLabel,
|
|
||||||
rowSlider,
|
|
||||||
totalLabel,
|
|
||||||
)
|
|
||||||
} else {
|
|
||||||
// Individual thumbnails mode: show count and width
|
|
||||||
countLabel := widget.NewLabel(fmt.Sprintf("Thumbnail Count: %d", state.thumbCount))
|
|
||||||
countSlider := widget.NewSlider(3, 50)
|
|
||||||
countSlider.Value = float64(state.thumbCount)
|
|
||||||
countSlider.Step = 1
|
|
||||||
countSlider.OnChanged = func(val float64) {
|
|
||||||
state.thumbCount = int(val)
|
|
||||||
countLabel.SetText(fmt.Sprintf("Thumbnail Count: %d", int(val)))
|
|
||||||
}
|
|
||||||
|
|
||||||
widthLabel := widget.NewLabel(fmt.Sprintf("Thumbnail Width: %d px", state.thumbWidth))
|
|
||||||
widthSlider := widget.NewSlider(160, 640)
|
|
||||||
widthSlider.Value = float64(state.thumbWidth)
|
|
||||||
widthSlider.Step = 32
|
|
||||||
widthSlider.OnChanged = func(val float64) {
|
|
||||||
state.thumbWidth = int(val)
|
|
||||||
widthLabel.SetText(fmt.Sprintf("Thumbnail Width: %d px", int(val)))
|
|
||||||
}
|
|
||||||
|
|
||||||
settingsOptions = container.NewVBox(
|
|
||||||
widget.NewSeparator(),
|
|
||||||
widget.NewLabel("Individual Thumbnails:"),
|
|
||||||
countLabel,
|
|
||||||
countSlider,
|
|
||||||
widthLabel,
|
|
||||||
widthSlider,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Helper function to create thumbnail job
|
|
||||||
createThumbJob := func() *queue.Job {
|
|
||||||
// Create output directory in same folder as video
|
|
||||||
videoDir := filepath.Dir(state.thumbFile.Path)
|
|
||||||
videoBaseName := strings.TrimSuffix(filepath.Base(state.thumbFile.Path), filepath.Ext(state.thumbFile.Path))
|
|
||||||
outputDir := filepath.Join(videoDir, fmt.Sprintf("%s_thumbnails", videoBaseName))
|
|
||||||
|
|
||||||
// Configure based on mode
|
|
||||||
var count, width int
|
|
||||||
var description string
|
|
||||||
if state.thumbContactSheet {
|
|
||||||
// Contact sheet: count is determined by grid, use larger width for analyzable screenshots
|
|
||||||
count = state.thumbColumns * state.thumbRows
|
|
||||||
width = 280 // Larger width for contact sheets to make screenshots analyzable (4x8 grid = ~1144x1416)
|
|
||||||
description = fmt.Sprintf("Contact sheet: %dx%d grid (%d thumbnails)", state.thumbColumns, state.thumbRows, count)
|
|
||||||
} else {
|
|
||||||
// Individual thumbnails: use user settings
|
|
||||||
count = state.thumbCount
|
|
||||||
width = state.thumbWidth
|
|
||||||
description = fmt.Sprintf("%d individual thumbnails (%dpx width)", count, width)
|
|
||||||
}
|
|
||||||
|
|
||||||
return &queue.Job{
|
|
||||||
Type: queue.JobTypeThumb,
|
|
||||||
Title: "Thumbnails: " + filepath.Base(state.thumbFile.Path),
|
|
||||||
Description: description,
|
|
||||||
InputFile: state.thumbFile.Path,
|
|
||||||
OutputFile: outputDir,
|
|
||||||
Config: map[string]interface{}{
|
|
||||||
"inputPath": state.thumbFile.Path,
|
|
||||||
"outputDir": outputDir,
|
|
||||||
"count": float64(count),
|
|
||||||
"width": float64(width),
|
|
||||||
"contactSheet": state.thumbContactSheet,
|
|
||||||
"columns": float64(state.thumbColumns),
|
|
||||||
"rows": float64(state.thumbRows),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Generate Now button - adds to queue and starts it
|
|
||||||
generateNowBtn := widget.NewButton("GENERATE NOW", func() {
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
dialog.ShowInformation("No Video", "Please load a video file first.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.jobQueue == nil {
|
|
||||||
dialog.ShowInformation("Queue", "Queue not initialized.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
job := createThumbJob()
|
|
||||||
state.jobQueue.Add(job)
|
|
||||||
|
|
||||||
// Start queue if not already running
|
|
||||||
if !state.jobQueue.IsRunning() {
|
|
||||||
state.jobQueue.Start()
|
|
||||||
logging.Debug(logging.CatSystem, "started queue from Generate Now")
|
|
||||||
}
|
|
||||||
|
|
||||||
dialog.ShowInformation("Thumbnails", "Thumbnail generation started! View progress in Job Queue.", state.window)
|
|
||||||
})
|
|
||||||
generateNowBtn.Importance = widget.HighImportance
|
|
||||||
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
generateNowBtn.Disable()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add to Queue button
|
|
||||||
addQueueBtn := widget.NewButton("Add to Queue", func() {
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
dialog.ShowInformation("No Video", "Please load a video file first.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if state.jobQueue == nil {
|
|
||||||
dialog.ShowInformation("Queue", "Queue not initialized.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
job := createThumbJob()
|
|
||||||
state.jobQueue.Add(job)
|
|
||||||
|
|
||||||
dialog.ShowInformation("Queue", "Thumbnail job added to queue!", state.window)
|
|
||||||
})
|
|
||||||
addQueueBtn.Importance = widget.MediumImportance
|
|
||||||
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
addQueueBtn.Disable()
|
|
||||||
}
|
|
||||||
|
|
||||||
// View Queue button
|
|
||||||
viewQueueBtn := widget.NewButton("View Queue", func() {
|
|
||||||
state.showQueue()
|
|
||||||
})
|
|
||||||
viewQueueBtn.Importance = widget.MediumImportance
|
|
||||||
|
|
||||||
// View Results button - shows output folder if it exists
|
|
||||||
viewResultsBtn := widget.NewButton("View Results", func() {
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
dialog.ShowInformation("No Video", "Load a video first to locate results.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
videoDir := filepath.Dir(state.thumbFile.Path)
|
|
||||||
videoBaseName := strings.TrimSuffix(filepath.Base(state.thumbFile.Path), filepath.Ext(state.thumbFile.Path))
|
|
||||||
outputDir := filepath.Join(videoDir, fmt.Sprintf("%s_thumbnails", videoBaseName))
|
|
||||||
|
|
||||||
// Check if output exists
|
|
||||||
if _, err := os.Stat(outputDir); os.IsNotExist(err) {
|
|
||||||
dialog.ShowInformation("No Results", "No generated thumbnails found. Generate thumbnails first.", state.window)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// If contact sheet mode, try to show contact sheet image
|
|
||||||
if state.thumbContactSheet {
|
|
||||||
contactSheetPath := filepath.Join(outputDir, "contact_sheet.jpg")
|
|
||||||
if _, err := os.Stat(contactSheetPath); err == nil {
|
|
||||||
// Show contact sheet in a dialog
|
|
||||||
go func() {
|
|
||||||
img := canvas.NewImageFromFile(contactSheetPath)
|
|
||||||
img.FillMode = canvas.ImageFillContain
|
|
||||||
// Adaptive size for small screens - use scrollable dialog
|
|
||||||
// img.SetMinSize(fyne.NewSize(640, 480)) // Removed for flexible sizing
|
|
||||||
|
|
||||||
fyne.CurrentApp().Driver().DoFromGoroutine(func() {
|
|
||||||
// Wrap in scroll container for large contact sheets
|
|
||||||
scroll := container.NewScroll(img)
|
|
||||||
d := dialog.NewCustom("Contact Sheet", "Close", scroll, state.window)
|
|
||||||
// Adaptive dialog size that fits on 1280x768 screens
|
|
||||||
d.Resize(fyne.NewSize(700, 600))
|
|
||||||
d.Show()
|
|
||||||
}, false)
|
|
||||||
}()
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Otherwise, open folder
|
|
||||||
openFolder(outputDir)
|
|
||||||
})
|
|
||||||
viewResultsBtn.Importance = widget.MediumImportance
|
|
||||||
if state.thumbFile == nil {
|
|
||||||
viewResultsBtn.Disable()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Settings panel
|
|
||||||
settingsPanel := container.NewVBox(
|
|
||||||
widget.NewLabel("Settings:"),
|
|
||||||
widget.NewSeparator(),
|
|
||||||
contactSheetCheck,
|
|
||||||
settingsOptions,
|
|
||||||
widget.NewSeparator(),
|
|
||||||
generateNowBtn,
|
|
||||||
addQueueBtn,
|
|
||||||
viewQueueBtn,
|
|
||||||
viewResultsBtn,
|
|
||||||
)
|
|
||||||
|
|
||||||
// Main content - split layout with preview on left, settings on right
|
|
||||||
leftColumn := container.NewVBox(
|
|
||||||
videoContainer,
|
|
||||||
)
|
|
||||||
|
|
||||||
rightColumn := container.NewVBox(
|
|
||||||
settingsPanel,
|
|
||||||
)
|
|
||||||
|
|
||||||
mainContent := container.New(&fixedHSplitLayout{ratio: 0.6}, leftColumn, rightColumn)
|
|
||||||
|
|
||||||
content := container.NewBorder(
|
|
||||||
container.NewVBox(instructions, widget.NewSeparator(), fileLabel, container.NewHBox(loadBtn, clearBtn)),
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
nil,
|
|
||||||
mainContent,
|
|
||||||
)
|
|
||||||
|
|
||||||
bottomBar := moduleFooter(thumbColor, layout.NewSpacer(), state.statsBar)
|
|
||||||
|
|
||||||
return container.NewBorder(topBar, bottomBar, nil, nil, content)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) executeThumbJob(ctx context.Context, job *queue.Job, progressCallback func(float64)) error {
|
|
||||||
cfg := job.Config
|
|
||||||
inputPath := cfg["inputPath"].(string)
|
|
||||||
outputDir := cfg["outputDir"].(string)
|
|
||||||
count := int(cfg["count"].(float64))
|
|
||||||
width := int(cfg["width"].(float64))
|
|
||||||
contactSheet := cfg["contactSheet"].(bool)
|
|
||||||
columns := int(cfg["columns"].(float64))
|
|
||||||
rows := int(cfg["rows"].(float64))
|
|
||||||
|
|
||||||
if progressCallback != nil {
|
|
||||||
progressCallback(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
generator := thumbnail.NewGenerator(utils.GetFFmpegPath())
|
|
||||||
config := thumbnail.Config{
|
|
||||||
VideoPath: inputPath,
|
|
||||||
OutputDir: outputDir,
|
|
||||||
Count: count,
|
|
||||||
Width: width,
|
|
||||||
Format: "jpg",
|
|
||||||
Quality: 85,
|
|
||||||
ContactSheet: contactSheet,
|
|
||||||
Columns: columns,
|
|
||||||
Rows: rows,
|
|
||||||
ShowTimestamp: false, // Disabled to avoid font issues
|
|
||||||
ShowMetadata: contactSheet,
|
|
||||||
}
|
|
||||||
|
|
||||||
result, err := generator.Generate(ctx, config)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("thumbnail generation failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logging.Debug(logging.CatSystem, "generated %d thumbnails", len(result.Thumbnails))
|
|
||||||
|
|
||||||
if progressCallback != nil {
|
|
||||||
progressCallback(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
@ -1,168 +0,0 @@
|
||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os/exec"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"git.leaktechnologies.dev/stu/VideoTools/internal/utils"
|
|
||||||
)
|
|
||||||
|
|
||||||
// AI Helper Functions (smaller, manageable functions)
|
|
||||||
|
|
||||||
// detectAIUpscaleBackend returns the available Real-ESRGAN backend ("ncnn", "python", or "").
|
|
||||||
func detectAIUpscaleBackend() string {
|
|
||||||
if _, err := exec.LookPath("realesrgan-ncnn-vulkan"); err == nil {
|
|
||||||
return "ncnn"
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd := exec.Command("python3", "-c", "import realesrgan")
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
if err := cmd.Run(); err == nil {
|
|
||||||
return "python"
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd = exec.Command("python", "-c", "import realesrgan")
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
if err := cmd.Run(); err == nil {
|
|
||||||
return "python"
|
|
||||||
}
|
|
||||||
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
// checkAIFaceEnhanceAvailable verifies whether face enhancement tooling is available.
|
|
||||||
func checkAIFaceEnhanceAvailable(backend string) bool {
|
|
||||||
if backend != "python" {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
cmd := exec.Command("python3", "-c", "import realesrgan, gfpgan")
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
if err := cmd.Run(); err == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
cmd = exec.Command("python", "-c", "import realesrgan, gfpgan")
|
|
||||||
utils.ApplyNoWindow(cmd)
|
|
||||||
return cmd.Run() == nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func aiUpscaleModelOptions() []string {
|
|
||||||
return []string{
|
|
||||||
"General (RealESRGAN_x4plus)",
|
|
||||||
"Anime/Illustration (RealESRGAN_x4plus_anime_6B)",
|
|
||||||
"Anime Video (realesr-animevideov3)",
|
|
||||||
"General Tiny (realesr-general-x4v3)",
|
|
||||||
"2x General (RealESRGAN_x2plus)",
|
|
||||||
"Clean Restore (realesrnet-x4plus)",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func aiUpscaleModelID(label string) string {
|
|
||||||
switch label {
|
|
||||||
case "Anime/Illustration (RealESRGAN_x4plus_anime_6B)":
|
|
||||||
return "realesrgan-x4plus-anime"
|
|
||||||
case "Anime Video (realesr-animevideov3)":
|
|
||||||
return "realesr-animevideov3"
|
|
||||||
case "General Tiny (realesr-general-x4v3)":
|
|
||||||
return "realesr-general-x4v3"
|
|
||||||
case "2x General (RealESRGAN_x2plus)":
|
|
||||||
return "realesrgan-x2plus"
|
|
||||||
case "Clean Restore (realesrnet-x4plus)":
|
|
||||||
return "realesrnet-x4plus"
|
|
||||||
default:
|
|
||||||
return "realesrgan-x4plus"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func aiUpscaleModelLabel(modelID string) string {
|
|
||||||
switch modelID {
|
|
||||||
case "realesrgan-x4plus-anime":
|
|
||||||
return "Anime/Illustration (RealESRGAN_x4plus_anime_6B)"
|
|
||||||
case "realesr-animevideov3":
|
|
||||||
return "Anime Video (realesr-animevideov3)"
|
|
||||||
case "realesr-general-x4v3":
|
|
||||||
return "General Tiny (realesr-general-x4v3)"
|
|
||||||
case "realesrgan-x2plus":
|
|
||||||
return "2x General (RealESRGAN_x2plus)"
|
|
||||||
case "realesrnet-x4plus":
|
|
||||||
return "Clean Restore (realesrnet-x4plus)"
|
|
||||||
case "realesrgan-x4plus":
|
|
||||||
return "General (RealESRGAN_x4plus)"
|
|
||||||
default:
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseResolutionPreset parses resolution preset strings and returns target dimensions and whether to preserve aspect.
|
|
||||||
// Special presets like "Match Source" and relative (2X/4X) use source dimensions to preserve AR.
|
|
||||||
func parseResolutionPreset(preset string, srcW, srcH int) (width, height int, preserveAspect bool, err error) {
|
|
||||||
// Default: preserve aspect
|
|
||||||
preserveAspect = true
|
|
||||||
|
|
||||||
// Sanitize source
|
|
||||||
if srcW < 1 || srcH < 1 {
|
|
||||||
srcW, srcH = 1920, 1080 // fallback to avoid zero division
|
|
||||||
}
|
|
||||||
|
|
||||||
switch preset {
|
|
||||||
case "", "Match Source":
|
|
||||||
return srcW, srcH, true, nil
|
|
||||||
case "2X (relative)":
|
|
||||||
return srcW * 2, srcH * 2, true, nil
|
|
||||||
case "4X (relative)":
|
|
||||||
return srcW * 4, srcH * 4, true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
presetMap := map[string][2]int{
|
|
||||||
"720p (1280x720)": {1280, 720},
|
|
||||||
"1080p (1920x1080)": {1920, 1080},
|
|
||||||
"1440p (2560x1440)": {2560, 1440},
|
|
||||||
"4K (3840x2160)": {3840, 2160},
|
|
||||||
"8K (7680x4320)": {7680, 4320},
|
|
||||||
"720p": {1280, 720},
|
|
||||||
"1080p": {1920, 1080},
|
|
||||||
"1440p": {2560, 1440},
|
|
||||||
"4K": {3840, 2160},
|
|
||||||
"8K": {7680, 4320},
|
|
||||||
}
|
|
||||||
|
|
||||||
if dims, ok := presetMap[preset]; ok {
|
|
||||||
// Keep aspect by default: use target height and let FFmpeg derive width
|
|
||||||
return dims[0], dims[1], true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0, 0, true, fmt.Errorf("unknown resolution preset: %s", preset)
|
|
||||||
}
|
|
||||||
|
|
||||||
// buildUpscaleFilter builds FFmpeg scale filter string with selected method
|
|
||||||
func buildUpscaleFilter(targetWidth, targetHeight int, method string, preserveAspect bool) string {
|
|
||||||
// Ensure even dimensions for encoders
|
|
||||||
makeEven := func(v int) int {
|
|
||||||
if v%2 != 0 {
|
|
||||||
return v + 1
|
|
||||||
}
|
|
||||||
return v
|
|
||||||
}
|
|
||||||
|
|
||||||
h := makeEven(targetHeight)
|
|
||||||
w := targetWidth
|
|
||||||
if preserveAspect || w <= 0 {
|
|
||||||
w = -2 // FFmpeg will derive width from height while preserving AR
|
|
||||||
}
|
|
||||||
return fmt.Sprintf("scale=%d:%d:flags=%s", w, h, method)
|
|
||||||
}
|
|
||||||
|
|
||||||
// sanitizeForPath creates a simple slug for filenames from user-visible labels
|
|
||||||
func sanitizeForPath(label string) string {
|
|
||||||
r := strings.NewReplacer(" ", "", "(", "", ")", "", "×", "x", "/", "-", "\\", "-", ":", "-", ",", "", ".", "", "_", "")
|
|
||||||
return strings.ToLower(r.Replace(label))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *appState) showUpscaleView() {
|
|
||||||
s.stopPreview()
|
|
||||||
s.lastModule = s.active
|
|
||||||
s.active = "upscale"
|
|
||||||
s.setContent(buildUpscaleView(s))
|
|
||||||
}
|
|
||||||
|
|
||||||
// buildUpscaleView and executeUpscaleJob will be added here incrementally...
|
|
||||||
Loading…
Reference in New Issue
Block a user