From 50f5995702aee3c4b55f01b217f3eeb494bb9868 Mon Sep 17 00:00:00 2001
From: rexim <reximkut@gmail.com>
Date: Thu, 21 Dec 2023 07:14:55 +0700
Subject: [PATCH] Always reread the entire MARKUT file every second in watch
 mode

---
 markut.go | 49 +++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 38 deletions(-)

diff --git a/markut.go b/markut.go
index 7475034..67d82a7 100644
--- a/markut.go
+++ b/markut.go
@@ -899,65 +899,38 @@ func watchSubcommand(args []string) bool {
 	}
 
 	for {
-		initialStat, err := os.Stat(*markutPtr)
-		if err != nil {
-			fmt.Printf("ERROR: could not stat %s: %s", *markutPtr, err)
-			return false
-		}
+		// NOTE: always use rsync(1) for updating the MARKUT file remotely.
+		// This kind of crappy modification checking needs at least some sort of atomicity.
+		// rsync(1) is as atomic as rename(2). So it's alright for majority of the cases.
 
 		context, ok := evalMarkutFile(*markutPtr)
 		if !ok {
 			return false
 		}
 
-		for _, chunk := range(context.chunks) {
-			if !chunk.Unfinished {
-				if _, err := os.Stat(chunk.Name()); errors.Is(err, os.ErrNotExist) {
-					err = ffmpegCutChunk(context, chunk, *yPtr)
-					if err != nil {
-						fmt.Printf("ERROR: Could not cut the chunk %s: %s\n", chunk.Name(), err)
-						return false
-					}
-					break
-				}
-			}
-		}
-
-		// TODO: properly check if everything is finished
 		done := true
 		for _, chunk := range(context.chunks) {
 			if chunk.Unfinished {
 				done = false
-				break
+				continue
 			}
 
 			if _, err := os.Stat(chunk.Name()); errors.Is(err, os.ErrNotExist) {
+				err = ffmpegCutChunk(context, chunk, *yPtr)
+				if err != nil {
+					fmt.Printf("ERROR: Could not cut the chunk %s: %s\n", chunk.Name(), err)
+					return false
+				}
 				done = false
 				break
 			}
 		}
 
 		if done {
-			break;
+			break
 		}
 
-		// NOTE: always use rsync(1) for updating the MARKUT file remotely.
-		// This kind of crappy modification checking needs at least some sort of atomicity.
-		// rsync(1) is as atomic as rename(2). So it's alright for majority of the cases.
-		fmt.Printf("INFO: %s is not done. Waiting for modifications...\n", *markutPtr);
-		for {
-			time.Sleep(1 * time.Second)
-
-			stat, err := os.Stat(*markutPtr)
-			if err != nil {
-				fmt.Printf("ERROR: could not stat %s: %s\n", *markutPtr, err)
-				continue
-			}
-
-			if stat.Size() != initialStat.Size() || stat.ModTime() != initialStat.ModTime() {
-				break
-			}
-		}
+		time.Sleep(1 * time.Second)
 	}
 
 	context, ok := evalMarkutFile(*markutPtr)