mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +03:00
Stop tasks and show task progress (#181)
* Add job status to tasks page * Add support for stopping task * Show progress of some tasks
This commit is contained in:
@@ -31,3 +31,18 @@ func (r *queryResolver) MetadataClean(ctx context.Context) (string, error) {
|
||||
manager.GetInstance().Clean()
|
||||
return "todo", nil
|
||||
}
|
||||
|
||||
func (r *queryResolver) JobStatus(ctx context.Context) (*models.MetadataUpdateStatus, error) {
|
||||
status := manager.GetInstance().Status
|
||||
ret := models.MetadataUpdateStatus{
|
||||
Progress: status.Progress,
|
||||
Status: status.Status.String(),
|
||||
Message: "",
|
||||
}
|
||||
|
||||
return &ret, nil
|
||||
}
|
||||
|
||||
func (r *queryResolver) StopJob(ctx context.Context) (bool, error) {
|
||||
return manager.GetInstance().Status.Stop(), nil
|
||||
}
|
||||
|
||||
@@ -2,20 +2,32 @@ package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/stashapp/stash/pkg/manager"
|
||||
"time"
|
||||
|
||||
"github.com/stashapp/stash/pkg/manager"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
)
|
||||
|
||||
func (r *subscriptionResolver) MetadataUpdate(ctx context.Context) (<-chan string, error) {
|
||||
msg := make(chan string, 1)
|
||||
func (r *subscriptionResolver) MetadataUpdate(ctx context.Context) (<-chan *models.MetadataUpdateStatus, error) {
|
||||
msg := make(chan *models.MetadataUpdateStatus, 1)
|
||||
|
||||
ticker := time.NewTicker(5 * time.Second)
|
||||
|
||||
go func() {
|
||||
lastStatus := manager.TaskStatus{}
|
||||
for {
|
||||
select {
|
||||
case _ = <-ticker.C:
|
||||
manager.GetInstance().HandleMetadataUpdateSubscriptionTick(msg)
|
||||
thisStatus := manager.GetInstance().Status
|
||||
if thisStatus != lastStatus {
|
||||
ret := models.MetadataUpdateStatus{
|
||||
Progress: thisStatus.Progress,
|
||||
Status: thisStatus.Status.String(),
|
||||
Message: "",
|
||||
}
|
||||
msg <- &ret
|
||||
}
|
||||
lastStatus = thisStatus
|
||||
case <-ctx.Done():
|
||||
ticker.Stop()
|
||||
close(msg)
|
||||
|
||||
Reference in New Issue
Block a user