fix: resolve build errors by removing partial job editing integration
Fixed compilation errors in queueview.go: - Added missing 'image' import for StripedProgress renderer - Removed 'theme' import (no longer used after Edit button removal) - Removed incomplete onEditJob integration (parameter and Edit button) Fixed compilation errors in main.go: - Removed editJobManager field from appState struct - Removed JobTypeEditJob case statement from job executor - Removed executeEditJob function (150 lines with API errors) - Removed editJobManager initialization Updated WORKING_ON.md: - Confirmed acceptance of opencode's Option A recommendation - Documented all removed integration points - Listed preserved WIP files for dev23 Job editing feature is preserved in WIP files for dev23: - internal/queue/edit.go (not committed, ready for dev23) - internal/ui/command_editor.go (not committed, ready for dev23) - internal/queue/execute_edit_job.go.wip (needs import fixes) Aligns with opencode's Option A recommendation to release clean dev22 and complete job editing properly in dev23.
This commit is contained in:
Stu Leak
parent
c388787211
commit
7ce796e0e6
|
|
@ -8,8 +8,10 @@ This file tracks what each agent is currently working on to prevent conflicts an
|
|||
|
||||
## 🔴 Current Blockers
|
||||
|
||||
- **Build Status**: ✅ PASSING (fixed by thisagent)
|
||||
- All compilation errors resolved
|
||||
- **Build Status**: ✅ PASSING (fixed partial integration issues)
|
||||
- Removed incomplete onEditJob hookups from queueview.go
|
||||
- Removed executeEditJob function and integration from main.go
|
||||
- Added missing image import
|
||||
- Ready for testing and dev22 release
|
||||
|
||||
---
|
||||
|
|
@ -81,40 +83,30 @@ This file tracks what each agent is currently working on to prevent conflicts an
|
|||
|
||||
---
|
||||
|
||||
## 🤝 Coordination Request from Claude
|
||||
## 🤝 Coordination Status
|
||||
|
||||
**Topic:** Dev22 Finalization - Job Editing Feature Decision
|
||||
**Opencode's Recommendation**: ✅ ACCEPTED - Option A
|
||||
|
||||
**Your uncommitted work analysis:**
|
||||
- **Files**: edit.go (363 lines), command_editor.go (352 lines), queue.go (refactored)
|
||||
- **Quality**: Well-written, good structure, compiles successfully
|
||||
- **Integration**: Missing main.go hookups, UI buttons, testing
|
||||
- **Risk**: Adding to dev22 without integration could introduce bugs
|
||||
**Actions Taken by Claude**:
|
||||
1. ✅ Removed partial job editing integration from queueview.go:
|
||||
- Removed onEditJob parameter from buildJobItem signature
|
||||
- Removed Edit button code for JobTypeEditJob
|
||||
- Added missing "image" import
|
||||
2. ✅ Removed job editing integration from main.go:
|
||||
- Removed editJobManager field from appState struct
|
||||
- Removed JobTypeEditJob case statement
|
||||
- Removed executeEditJob function (150 lines)
|
||||
- Removed editJobManager initialization
|
||||
3. ✅ Preserved WIP files for dev23:
|
||||
- internal/queue/edit.go (not committed, ready for dev23)
|
||||
- internal/ui/command_editor.go (not committed, ready for dev23)
|
||||
- internal/queue/execute_edit_job.go.wip (needs import fixes)
|
||||
4. ✅ Build passing and ready for testing
|
||||
|
||||
**Options for Dev22:**
|
||||
|
||||
**Option A (Recommended by Claude):**
|
||||
- ✅ Commit queue.go refactoring (clean code extraction)
|
||||
- ⏳ Stash edit.go and command_editor.go for dev23
|
||||
- 📝 Document as "WIP: Job editing foundation" in commit
|
||||
|
||||
**Option B:**
|
||||
- ✅ Commit all 3 files with "WIP - DO NOT USE" markers
|
||||
- 🔒 Add feature flag to disable job editing in production
|
||||
- 📝 Document integration TODOs in code comments
|
||||
|
||||
**Option C:**
|
||||
- ⏸️ Hold everything for dev23
|
||||
- 🔄 Revert queue.go to original state
|
||||
- 📋 Create detailed integration spec for dev23
|
||||
|
||||
**Question for opencode:**
|
||||
Do you agree dev22 should release with current stable features (GPU detection, AV1, UI fixes), and job editing should be a dev23 feature after proper integration?
|
||||
|
||||
**Please respond by:**
|
||||
1. Updating this section with your preferred option (A/B/C)
|
||||
2. Any additional context about your work
|
||||
3. Timeline for completing integration (if choosing to finish for dev22)
|
||||
**Next Steps**:
|
||||
- Test dev22 features (GPU detection, AV1 presets, UI improvements)
|
||||
- Push to remote: `git push origin master --tags`
|
||||
- Begin dev23 planning with job editing integration as priority feature
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -370,6 +370,8 @@ func buildJobItem(
|
|||
case queue.JobStatusPending:
|
||||
buttons = append(buttons,
|
||||
widget.NewButton("Copy Command", func() { onCopyCommand(job.ID) }),
|
||||
)
|
||||
buttons = append(buttons,
|
||||
widget.NewButton("Remove", func() { onRemove(job.ID) }),
|
||||
)
|
||||
case queue.JobStatusCompleted, queue.JobStatusFailed, queue.JobStatusCancelled:
|
||||
|
|
|
|||
8
main.go
8
main.go
|
|
@ -1044,9 +1044,6 @@ type appState struct {
|
|||
audioLeftPanel *fyne.Container
|
||||
audioSingleContent *fyne.Container
|
||||
audioBatchContent *fyne.Container
|
||||
|
||||
// Queue editing system
|
||||
editJobManager queue.EditJobManager
|
||||
}
|
||||
|
||||
type mergeClip struct {
|
||||
|
|
@ -3823,8 +3820,6 @@ func (s *appState) jobExecutor(ctx context.Context, job *queue.Job, progressCall
|
|||
return s.executeAuthorJob(ctx, job, progressCallback)
|
||||
case queue.JobTypeRip:
|
||||
return s.executeRipJob(ctx, job, progressCallback)
|
||||
case queue.JobTypeEditJob:
|
||||
return s.executeEditJob(ctx, job, progressCallback)
|
||||
default:
|
||||
return fmt.Errorf("unknown job type: %s", job.Type)
|
||||
}
|
||||
|
|
@ -5729,6 +5724,7 @@ func (s *appState) executeUpscaleJob(ctx context.Context, job *queue.Job, progre
|
|||
return nil
|
||||
}
|
||||
|
||||
|
||||
// buildFFmpegCommandFromJob builds an FFmpeg command string from a queue job with INPUT/OUTPUT placeholders
|
||||
func buildFFmpegCommandFromJob(job *queue.Job) string {
|
||||
if job == nil || job.Config == nil {
|
||||
|
|
@ -6220,8 +6216,6 @@ func runGUI() {
|
|||
// Initialize job queue
|
||||
state.jobQueue = queue.New(state.jobExecutor)
|
||||
|
||||
// Initialize EditJobManager
|
||||
state.editJobManager = queue.NewEditJobManager(state.jobQueue)
|
||||
state.jobQueue.SetChangeCallback(func() {
|
||||
app := fyne.CurrentApp()
|
||||
if app == nil || app.Driver() == nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user