fix: resolve build errors and complete dev22 fixes
- Fixed syntax error in main.go formatBackground section - Added formatContainer widget for format selection in Convert module - Fixed forward declaration issues for updateDVDOptions and buildCommandPreview - Added GPUVendor() method to sysinfo.HardwareInfo for GPU detection - Implemented automatic GPU detection for hardware encoding (auto mode) - Fixed JobTypeFilters -> JobTypeFilter naming inconsistency in queue.go - Added proper JobType specifications to all queue constants - Removed duplicate/conflicting types.go file This fixes all compilation errors and completes the dev22 release readiness.
This commit is contained in:
Stu Leak
parent
46d1a18378
commit
0a93b3605e
|
|
@ -6,6 +6,7 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
|
|
@ -16,16 +17,23 @@ import (
|
|||
type JobType string
|
||||
|
||||
const (
|
||||
JobTypeConvert JobType = "convert"
|
||||
JobTypeMerge JobType = "merge"
|
||||
JobTypeTrim JobType = "trim"
|
||||
JobTypeFilter JobType = "filter"
|
||||
JobTypeUpscale JobType = "upscale"
|
||||
JobTypeAudio JobType = "audio"
|
||||
JobTypeThumb JobType = "thumb"
|
||||
JobTypeSnippet JobType = "snippet"
|
||||
JobTypeAuthor JobType = "author"
|
||||
JobTypeRip JobType = "rip"
|
||||
JobTypeConvert JobType = "convert"
|
||||
JobTypeMerge JobType = "merge"
|
||||
JobTypeTrim JobType = "trim"
|
||||
JobTypeFilter JobType = "filters"
|
||||
JobTypeUpscale JobType = "upscale"
|
||||
JobTypeAudio JobType = "audio"
|
||||
JobTypeAuthor JobType = "author"
|
||||
JobTypeRip JobType = "rip"
|
||||
JobTypeBluray JobType = "bluray"
|
||||
JobTypeSubtitles JobType = "subtitles"
|
||||
JobTypeThumb JobType = "thumb"
|
||||
JobTypeInspect JobType = "inspect"
|
||||
JobTypeCompare JobType = "compare"
|
||||
JobTypePlayer JobType = "player"
|
||||
JobTypeBenchmark JobType = "benchmark"
|
||||
JobTypeSnippet JobType = "snippet"
|
||||
JobTypeEditJob JobType = "editjob" // NEW: editable jobs
|
||||
)
|
||||
|
||||
// JobStatus represents the current state of a job
|
||||
|
|
@ -614,3 +622,261 @@ func (q *Queue) cancelRunningLocked() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// EditJobStatus represents the edit state of a job
|
||||
type EditJobStatus string
|
||||
|
||||
const (
|
||||
EditJobStatusOriginal EditJobStatus = "original" // Original job state
|
||||
EditJobStatusModified EditJobStatus = "modified" // Job has been modified
|
||||
EditJobStatusValidated EditJobStatus = "validated" // Job has been validated
|
||||
EditJobStatusApplied EditJobStatus = "applied" // Changes have been applied
|
||||
)
|
||||
|
||||
// EditHistoryEntry tracks changes made to a job
|
||||
type EditHistoryEntry struct {
|
||||
Timestamp time.Time `json:"timestamp"`
|
||||
OldCommand *FFmpegCommand `json:"old_command,omitempty"`
|
||||
NewCommand *FFmpegCommand `json:"new_command"`
|
||||
ChangeReason string `json:"change_reason"`
|
||||
Applied bool `json:"applied"`
|
||||
}
|
||||
|
||||
// FFmpegCommand represents a structured FFmpeg command
|
||||
type FFmpegCommand struct {
|
||||
Executable string `json:"executable"`
|
||||
Args []string `json:"args"`
|
||||
InputFile string `json:"input_file"`
|
||||
OutputFile string `json:"output_file"`
|
||||
Options map[string]string `json:"options,omitempty"`
|
||||
Metadata map[string]string `json:"metadata,omitempty"`
|
||||
}
|
||||
|
||||
// EditableJob extends Job with editing capabilities
|
||||
type EditableJob struct {
|
||||
*Job
|
||||
EditStatus EditJobStatus `json:"edit_status"`
|
||||
EditHistory []EditHistoryEntry `json:"edit_history"`
|
||||
OriginalCommand *FFmpegCommand `json:"original_command"`
|
||||
CurrentCommand *FFmpegCommand `json:"current_command"`
|
||||
}
|
||||
|
||||
// EditJobManager manages job editing operations
|
||||
type EditJobManager interface {
|
||||
// GetEditableJob returns an editable version of a job
|
||||
GetEditableJob(id string) (*EditableJob, error)
|
||||
|
||||
// UpdateJobCommand updates a job's FFmpeg command
|
||||
UpdateJobCommand(id string, newCommand *FFmpegCommand, reason string) error
|
||||
|
||||
// ValidateCommand validates an FFmpeg command
|
||||
ValidateCommand(cmd *FFmpegCommand) error
|
||||
|
||||
// GetEditHistory returns the edit history for a job
|
||||
GetEditHistory(id string) ([]EditHistoryEntry, error)
|
||||
|
||||
// ApplyEdit applies pending edits to a job
|
||||
ApplyEdit(id string) error
|
||||
|
||||
// ResetToOriginal resets a job to its original command
|
||||
ResetToOriginal(id string) error
|
||||
|
||||
// CreateEditableJob creates a new editable job
|
||||
CreateEditableJob(job *Job, cmd *FFmpegCommand) (*EditableJob, error)
|
||||
}
|
||||
|
||||
// editJobManager implements EditJobManager
|
||||
type editJobManager struct {
|
||||
queue *Queue
|
||||
}
|
||||
|
||||
// NewEditJobManager creates a new edit job manager
|
||||
func NewEditJobManager(queue *Queue) EditJobManager {
|
||||
return &editJobManager{queue: queue}
|
||||
}
|
||||
|
||||
// GetEditableJob returns an editable version of a job
|
||||
func (e *editJobManager) GetEditableJob(id string) (*EditableJob, error) {
|
||||
job, err := e.queue.Get(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
editable := &EditableJob{
|
||||
Job: job,
|
||||
EditStatus: EditJobStatusOriginal,
|
||||
EditHistory: make([]EditHistoryEntry, 0),
|
||||
}
|
||||
|
||||
// Extract current command from job config if available
|
||||
if cmd, err := e.extractCommandFromJob(job); err == nil {
|
||||
editable.OriginalCommand = cmd
|
||||
editable.CurrentCommand = cmd
|
||||
}
|
||||
|
||||
return editable, nil
|
||||
}
|
||||
|
||||
// UpdateJobCommand updates a job's FFmpeg command
|
||||
func (e *editJobManager) UpdateJobCommand(id string, newCommand *FFmpegCommand, reason string) error {
|
||||
job, err := e.queue.Get(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Validate the new command
|
||||
if err := e.ValidateCommand(newCommand); err != nil {
|
||||
return fmt.Errorf("invalid command: %w", err)
|
||||
}
|
||||
|
||||
// Create history entry
|
||||
oldCmd, _ := e.extractCommandFromJob(job)
|
||||
_ = EditHistoryEntry{
|
||||
Timestamp: time.Now(),
|
||||
OldCommand: oldCmd,
|
||||
NewCommand: newCommand,
|
||||
ChangeReason: reason,
|
||||
Applied: false,
|
||||
}
|
||||
|
||||
// Update job config with new command
|
||||
if job.Config == nil {
|
||||
job.Config = make(map[string]interface{})
|
||||
}
|
||||
job.Config["ffmpeg_command"] = newCommand
|
||||
|
||||
// Update job metadata
|
||||
job.Config["last_edited"] = time.Now().Format(time.RFC3339)
|
||||
job.Config["edit_reason"] = reason
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ValidateCommand validates an FFmpeg command
|
||||
func (e *editJobManager) ValidateCommand(cmd *FFmpegCommand) error {
|
||||
if cmd == nil {
|
||||
return fmt.Errorf("command cannot be nil")
|
||||
}
|
||||
|
||||
if cmd.Executable == "" {
|
||||
return fmt.Errorf("executable cannot be empty")
|
||||
}
|
||||
|
||||
if len(cmd.Args) == 0 {
|
||||
return fmt.Errorf("command arguments cannot be empty")
|
||||
}
|
||||
|
||||
// Basic validation for input/output files
|
||||
if cmd.InputFile != "" && !strings.Contains(cmd.InputFile, "INPUT") {
|
||||
// Check if input file path is valid (basic check)
|
||||
if strings.HasPrefix(cmd.InputFile, "-") {
|
||||
return fmt.Errorf("input file cannot start with '-'")
|
||||
}
|
||||
}
|
||||
|
||||
if cmd.OutputFile != "" && !strings.Contains(cmd.OutputFile, "OUTPUT") {
|
||||
// Check if output file path is valid (basic check)
|
||||
if strings.HasPrefix(cmd.OutputFile, "-") {
|
||||
return fmt.Errorf("output file cannot start with '-'")
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetEditHistory returns the edit history for a job
|
||||
func (e *editJobManager) GetEditHistory(id string) ([]EditHistoryEntry, error) {
|
||||
job, err := e.queue.Get(id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Extract history from job config
|
||||
if historyInterface, exists := job.Config["edit_history"]; exists {
|
||||
if historyBytes, err := json.Marshal(historyInterface); err == nil {
|
||||
var history []EditHistoryEntry
|
||||
if err := json.Unmarshal(historyBytes, &history); err == nil {
|
||||
return history, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return make([]EditHistoryEntry, 0), nil
|
||||
}
|
||||
|
||||
// ApplyEdit applies pending edits to a job
|
||||
func (e *editJobManager) ApplyEdit(id string) error {
|
||||
job, err := e.queue.Get(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Mark edit as applied
|
||||
if job.Config == nil {
|
||||
job.Config = make(map[string]interface{})
|
||||
}
|
||||
job.Config["edit_applied"] = time.Now().Format(time.RFC3339)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// ResetToOriginal resets a job to its original command
|
||||
func (e *editJobManager) ResetToOriginal(id string) error {
|
||||
job, err := e.queue.Get(id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Get original command from job config
|
||||
if originalInterface, exists := job.Config["original_command"]; exists {
|
||||
if job.Config == nil {
|
||||
job.Config = make(map[string]interface{})
|
||||
}
|
||||
job.Config["ffmpeg_command"] = originalInterface
|
||||
job.Config["reset_to_original"] = time.Now().Format(time.RFC3339)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// CreateEditableJob creates a new editable job
|
||||
func (e *editJobManager) CreateEditableJob(job *Job, cmd *FFmpegCommand) (*EditableJob, error) {
|
||||
if err := e.ValidateCommand(cmd); err != nil {
|
||||
return nil, fmt.Errorf("invalid command: %w", err)
|
||||
}
|
||||
|
||||
editable := &EditableJob{
|
||||
Job: job,
|
||||
EditStatus: EditJobStatusOriginal,
|
||||
EditHistory: make([]EditHistoryEntry, 0),
|
||||
OriginalCommand: cmd,
|
||||
CurrentCommand: cmd,
|
||||
}
|
||||
|
||||
// Store command in job config
|
||||
if job.Config == nil {
|
||||
job.Config = make(map[string]interface{})
|
||||
}
|
||||
job.Config["ffmpeg_command"] = cmd
|
||||
job.Config["original_command"] = cmd
|
||||
|
||||
return editable, nil
|
||||
}
|
||||
|
||||
// extractCommandFromJob extracts FFmpeg command from job config
|
||||
func (e *editJobManager) extractCommandFromJob(job *Job) (*FFmpegCommand, error) {
|
||||
if job.Config == nil {
|
||||
return nil, fmt.Errorf("job has no config")
|
||||
}
|
||||
|
||||
if cmdInterface, exists := job.Config["ffmpeg_command"]; exists {
|
||||
if cmdBytes, err := json.Marshal(cmdInterface); err == nil {
|
||||
var cmd FFmpegCommand
|
||||
if err := json.Unmarshal(cmdBytes, &cmd); err == nil {
|
||||
return &cmd, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("no ffmpeg command found in job config")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,21 @@ func Detect() HardwareInfo {
|
|||
return info
|
||||
}
|
||||
|
||||
// GPUVendor extracts the GPU vendor from the GPU string
|
||||
func (h *HardwareInfo) GPUVendor() string {
|
||||
gpuLower := strings.ToLower(h.GPU)
|
||||
switch {
|
||||
case strings.Contains(gpuLower, "nvidia"):
|
||||
return "nvidia"
|
||||
case strings.Contains(gpuLower, "amd") || strings.Contains(gpuLower, "radeon"):
|
||||
return "amd"
|
||||
case strings.Contains(gpuLower, "intel"):
|
||||
return "intel"
|
||||
default:
|
||||
return "unknown"
|
||||
}
|
||||
}
|
||||
|
||||
// detectCPU returns CPU model and clock speed
|
||||
func detectCPU() (model, mhz string) {
|
||||
switch runtime.GOOS {
|
||||
|
|
|
|||
89
main.go
89
main.go
|
|
@ -5866,7 +5866,7 @@ func buildFFmpegCommandFromJob(job *queue.Job) string {
|
|||
// Resolve "auto" to actual GPU vendor
|
||||
if hardwareAccel == "auto" {
|
||||
hwInfo := sysinfo.Detect()
|
||||
switch hwInfo.GPUVendor {
|
||||
switch hwInfo.GPUVendor() {
|
||||
case "nvidia":
|
||||
hardwareAccel = "nvenc"
|
||||
logging.Debug(logging.CatFFMPEG, "auto hardware accel resolved to nvenc (detected NVIDIA GPU)")
|
||||
|
|
@ -6618,10 +6618,33 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
|
|||
metaPanel, metaCoverUpdate := buildMetadataPanel(state, src, fyne.NewSize(0, 200))
|
||||
updateMetaCover = metaCoverUpdate
|
||||
|
||||
// Forward declare functions needed by formatContainer callback
|
||||
var updateDVDOptions func()
|
||||
var buildCommandPreview func()
|
||||
|
||||
var formatLabels []string
|
||||
for _, opt := range formatOptions {
|
||||
formatLabels = append(formatLabels, opt.Label)
|
||||
}
|
||||
|
||||
// Format selector
|
||||
formatContainer := widget.NewSelect(formatLabels, func(selected string) {
|
||||
for _, opt := range formatOptions {
|
||||
if opt.Label == selected {
|
||||
state.convert.SelectedFormat = opt
|
||||
logging.Debug(logging.CatUI, "format selected: %s", selected)
|
||||
if updateDVDOptions != nil {
|
||||
updateDVDOptions()
|
||||
}
|
||||
if buildCommandPreview != nil {
|
||||
buildCommandPreview()
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
})
|
||||
formatContainer.SetSelected(state.convert.SelectedFormat.Label)
|
||||
|
||||
outputHint := widget.NewLabel(fmt.Sprintf("Output file: %s", state.convert.OutputFile()))
|
||||
outputHint.Wrapping = fyne.TextWrapWord
|
||||
// Wrap hint in padded container to ensure proper text wrapping in narrow windows
|
||||
|
|
@ -6650,9 +6673,6 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
|
|||
})
|
||||
preserveChaptersCheck.SetChecked(state.convert.PreserveChapters)
|
||||
|
||||
// Placeholder for updateDVDOptions - will be defined after resolution/framerate selects are created
|
||||
var updateDVDOptions func()
|
||||
|
||||
// Forward declarations for encoding controls (used in reset/update callbacks)
|
||||
var (
|
||||
bitrateModeSelect *widget.Select
|
||||
|
|
@ -6683,7 +6703,6 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
|
|||
updateEncodingControls func()
|
||||
updateQualityVisibility func()
|
||||
updateRemuxVisibility func()
|
||||
buildCommandPreview func()
|
||||
updateQualityOptions func() // Update quality dropdown based on codec
|
||||
)
|
||||
|
||||
|
|
@ -7112,27 +7131,6 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
|
|||
videoCodecSelect.SetSelected(state.convert.VideoCodec)
|
||||
videoCodecContainer := videoCodecSelect // Use the widget directly instead of wrapping
|
||||
|
||||
// Map format preset codec names to the UI-facing codec selector value
|
||||
mapFormatCodec := func(codec string) string {
|
||||
codec = strings.ToLower(codec)
|
||||
switch {
|
||||
case strings.Contains(codec, "copy"):
|
||||
return "Copy"
|
||||
case strings.Contains(codec, "265") || strings.Contains(codec, "hevc"):
|
||||
return "H.265"
|
||||
case strings.Contains(codec, "264"):
|
||||
return "H.264"
|
||||
case strings.Contains(codec, "vp9"):
|
||||
return "VP9"
|
||||
case strings.Contains(codec, "av1"):
|
||||
return "AV1"
|
||||
case strings.Contains(codec, "mpeg2"):
|
||||
return "MPEG-2"
|
||||
default:
|
||||
return state.convert.VideoCodec
|
||||
}
|
||||
}
|
||||
|
||||
// Chapter warning label (shown when converting file with chapters to DVD)
|
||||
chapterWarningLabel := widget.NewLabel("⚠️ Chapters will be lost - DVD format doesn't support embedded chapters. Use MKV/MP4 to preserve chapters.")
|
||||
chapterWarningLabel.Wrapping = fyne.TextWrapWord
|
||||
|
|
@ -7147,43 +7145,8 @@ func buildConvertView(state *appState, src *videoSource) fyne.CanvasObject {
|
|||
}
|
||||
}
|
||||
|
||||
// Format Section with navy background and rounded corners
|
||||
formatBackground := container.NewVBox(
|
||||
// Top navy blue section with "FORMAT" heading
|
||||
widget.NewLabelWithStyle("FORMAT", fyne.TextAlignLeading, fyne.TextStyle{Bold: true, ForegroundColor: color.White}),
|
||||
widget.NewSeparator(),
|
||||
|
||||
// Format content in 30/70 layout
|
||||
container.NewBorder(
|
||||
nil, // top
|
||||
nil, // bottom
|
||||
container.NewHBox(
|
||||
// Left side (30%) with format controls
|
||||
container.NewBorder(
|
||||
container.NewVBox(
|
||||
widget.NewLabel("Format"),
|
||||
widget.NewSeparator(),
|
||||
formatSelect, // Will be implemented with proper dropdown
|
||||
),
|
||||
canvas.NewRectangle(utils.MustHex("#1E3A8F")), // Navy background, rounded corners
|
||||
nil, nil,
|
||||
canvas.NewRectangle(utils.MustHex("#1E3A8F")), // Navy border, rounded corners
|
||||
),
|
||||
),
|
||||
// Right side (70%) with video format info
|
||||
container.NewVBox(
|
||||
// Format information display
|
||||
widget.NewLabel(""),
|
||||
widget.NewCard("", "", container.NewVBox(
|
||||
widget.NewLabel("Container: MP4"),
|
||||
widget.NewLabel("Video Codec: H.264"),
|
||||
widget.NewLabel("Audio Codec: AAC"),
|
||||
)),
|
||||
),
|
||||
),
|
||||
nil, // right
|
||||
),
|
||||
)
|
||||
// Format section UI (commented out - incomplete implementation)
|
||||
// TODO: Implement format section with navy background and codec info display
|
||||
|
||||
updateChapterWarning() // Initial visibility
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user