add donecmdThreshold

engine/config.go

@@ -40,6 +40,7 @@ type Config struct {
 	EnableSeeding        bool
 	IncomingPort         int
 	DoneCmd              string
+	DoneCmdThreshold     string
 	SeedRatio            float32
 	UploadRate           string
 	DownloadRate         string
@@ -63,6 +64,7 @@ func InitConf(specPath string) (*Config, error) {
 	viper.SetDefault("EnableUpload", true)
 	viper.SetDefault("AutoStart", true)
 	viper.SetDefault("DoneCmd", "")
+	viper.SetDefault("DoneCmdThreshold", "30s")
 	viper.SetDefault("SeedRatio", 0)
 	viper.SetDefault("ObfsPreferred", true)
 	viper.SetDefault("ObfsRequirePreferred", false)

engine/engine.go

@@ -29,14 +29,15 @@ type Server interface {
 
 //the Engine Cloud Torrent engine, backed by anacrolix/torrent
 type Engine struct {
-	sync.RWMutex // race condition on ts,client
-	cldServer    Server
-	cacheDir     string
-	client       *torrent.Client
-	closeSync    chan struct{}
-	config       Config
-	ts           map[string]*Torrent
-	bttracker    []string
+	sync.RWMutex  // race condition on ts,client
+	cldServer     Server
+	cacheDir      string
+	client        *torrent.Client
+	closeSync     chan struct{}
+	config        Config
+	ts            map[string]*Torrent
+	bttracker     []string
+	doneThreshold time.Duration
 }
 
 func New(s Server) *Engine {
@@ -63,6 +64,12 @@ func (e *Engine) Configure(c *Config) error {
 		c.TrackerListURL = defaultTrackerListURL
 	}
 
+	if th, err := time.ParseDuration(c.DoneCmdThreshold); err == nil {
+		e.doneThreshold = th
+	} else {
+		return fmt.Errorf("fail to parse DoneCmdThreshold %w", err)
+	}
+
 	e.Lock()
 	defer e.Unlock()
 	tc := torrent.NewDefaultClientConfig()
@@ -217,6 +224,20 @@ func (e *Engine) TaskRoutine() {
 			go e.StopTorrent(t.InfoHash)
 		}
 
+		// task started in `DoneCmdThreshold` (default 30s), won't call the DoneCmd below
+		if !t.IsDoneReady {
+			if t.StartedAt.IsZero() {
+				continue
+			}
+
+			if time.Since(t.StartedAt) > e.doneThreshold && !t.Done {
+				// after 30s and task is not done yet, is ready for DoneCmd
+				t.IsDoneReady = true
+			}
+
+			continue
+		}
+
 		// call DoneCmd on task completed
 		if t.Done && !t.DoneCmdCalled {
 			t.DoneCmdCalled = true

engine/torrent.go

@@ -20,6 +20,7 @@ type Torrent struct {
 	Started       bool
 	Done          bool
 	DoneCmdCalled bool
+	IsDoneReady   bool
 	Percent       float32
 	DownloadRate  float32
 	UploadRate    float32
@@ -104,7 +105,7 @@ func (torrent *Torrent) updateLoaded(t *torrent.Torrent) {
 
 	torrent.updatedAt = now
 	torrent.Percent = percent(bytes, torrent.Size)
-	torrent.Done = (bytes == torrent.Size)
+	torrent.Done = t.BytesMissing() == 0
 
 	// calculate ratio
 	bRead := torrent.Stats.BytesReadData.Int64()