Add resumable downloads, download paths, queue controls and history

internal/jobs/job.go

@@ -2,9 +2,12 @@ package jobs
 
 import (
 	"context"
+	"slices"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"ddc/internal/fetch"
 )
 
 type Status string
@@ -12,6 +15,7 @@ type Status string
 const (
 	StatusQueued      Status = "queued"
 	StatusDownloading Status = "downloading"
+	StatusPaused      Status = "paused"
 	StatusExtracting  Status = "extracting"
 	StatusReady       Status = "ready"
 	StatusMoving      Status = "moving"
@@ -21,56 +25,46 @@ const (
 )
 
 type Snapshot struct {
-	ID         string    `json:"id"`
-	SourceURL  string    `json:"sourceUrl"`
-	FileName   string    `json:"fileName"`
-	Status     Status    `json:"status"`
-	Message    string    `json:"message"`
-	BytesDone  int64     `json:"bytesDone"`
-	BytesTotal int64     `json:"bytesTotal"`
-	CreatedAt  time.Time `json:"createdAt"`
+	ID            string    `json:"id"`
+	SourceURL     string    `json:"sourceUrl"`
+	FileName      string    `json:"fileName"`
+	Status        Status    `json:"status"`
+	Message       string    `json:"message"`
+	BytesDone     int64     `json:"bytesDone"`
+	BytesTotal    int64     `json:"bytesTotal"`
+	CreatedAt     time.Time `json:"createdAt"`
+	MoveTarget    string    `json:"moveTarget,omitempty"`
+	QueuePosition int       `json:"queuePosition,omitempty"`
 }
 
 type Job struct {
-	id          string
-	sourceURL   string
-	displayURL  string
-	directory   string
-	autoExtract bool
-	createdAt   time.Time
-	jobContext  context.Context
-	cancel      context.CancelFunc
-	workers     sync.WaitGroup
+	id            string
+	sourceURL     string
+	displayURL    string
+	directory     string
+	requestedName string
+	autoExtract   bool
+	target        *moveTarget
+	createdAt     time.Time
+	jobContext    context.Context
+	cancel        context.CancelFunc
+	workers       sync.WaitGroup
 
-	mutex    sync.Mutex
-	status   Status
-	message  string
-	fileName string
-	deleted  bool
+	mutex         sync.Mutex
+	status        Status
+	message       string
+	fileName      string
+	deleted       bool
+	downloaded    bool
+	downloadState *fetch.State
+	cancelRun     context.CancelCauseFunc
+
+	recordMutex sync.Mutex
 
 	bytesDone  atomic.Int64
 	bytesTotal atomic.Int64
 }
 
-func (job *Job) SetTotal(total int64) {
-	job.bytesTotal.Store(total)
-}
-
-func (job *Job) Add(delta int64) {
-	job.bytesDone.Add(delta)
-}
-
-func (job *Job) SetFileName(name string) {
-	job.mutex.Lock()
-	defer job.mutex.Unlock()
-	job.fileName = name
-}
-
-func (job *Job) resetProgress() {
-	job.bytesDone.Store(0)
-	job.bytesTotal.Store(0)
-}
-
 func (job *Job) setStatus(status Status, message string) {
 	job.mutex.Lock()
 	defer job.mutex.Unlock()
@@ -87,10 +81,10 @@ func (job *Job) currentStatus() Status {
 	return job.status
 }
 
-func (job *Job) begin(from, to Status) bool {
+func (job *Job) begin(to Status, allowedFrom ...Status) bool {
 	job.mutex.Lock()
 	defer job.mutex.Unlock()
-	if job.deleted || job.status != from {
+	if job.deleted || !slices.Contains(allowedFrom, job.status) {
 		return false
 	}
 	job.status = to
@@ -113,6 +107,10 @@ func (job *Job) markDeleted() bool {
 func (job *Job) snapshot() Snapshot {
 	job.mutex.Lock()
 	defer job.mutex.Unlock()
+	moveTargetPath := ""
+	if job.target != nil {
+		moveTargetPath = job.target.displayPath()
+	}
 	return Snapshot{
 		ID:         job.id,
 		SourceURL:  job.displayURL,
@@ -122,5 +120,6 @@ func (job *Job) snapshot() Snapshot {
 		BytesDone:  job.bytesDone.Load(),
 		BytesTotal: job.bytesTotal.Load(),
 		CreatedAt:  job.createdAt,
+		MoveTarget: moveTargetPath,
 	}
 }