Rework sleep conditions

src/CCVTAC.Main/Orchestrator.fs

@@ -59,18 +59,8 @@ module Orchestrator =
         match Directories.warnIfAnyFiles 10 settings.WorkingDirectory with
         | Error err ->
             printer.Error err
-            Ok { NextAction = NextAction.QuitDueToErrors; UpdatedSettings = None }
+            Ok { NextAction = QuitDueToErrors; UpdatedSettings = None }
         | Ok () ->
-            if urlIndex > 1 then // Don't sleep for the first URL.
-                settings.SleepSecondsBetweenURLs
-                |> String.pluralizeS "second"
-                |> fun secondsLabel ->
-                    sleep
-                        (fun seconds -> $"Sleeping for {seconds} {secondsLabel}...")
-                        (fun seconds -> $"Slept for {seconds} {secondsLabel}.")
-                        settings.SleepSecondsBetweenURLs
-                |> fun msg -> printer.Info($"{String.newLine}{msg}", appendLines = 1uy)
-
             if batchSize > 1 then
                 printer.Info $"Processing item %d{urlIndex} of %d{batchSize}..."
 
@@ -92,10 +82,10 @@ module Orchestrator =
                 | Error errs ->
                     errs
                     |> List.map (sprintf "Media download error: %s")
-                    |> String.concat String.newLine
+                    |> String.concat String.nl
                     |> Error
                 | Ok message ->
-                    printer.Debug "Media download(s) successful!"
+                    printer.Debug "Download successful."
                     if String.hasText message then printer.Info message
                     PostProcessor.run settings mediaType printer
 
@@ -105,9 +95,7 @@ module Orchestrator =
                         else String.Empty
 
                     printer.Info $"Processed '%s{url}'%s{groupClause} in %s{jobWatch.ElapsedFriendly}."
-
-                    Ok { NextAction = NextAction.Continue
-                         UpdatedSettings = None }
+                    Ok { NextAction = Continue; UpdatedSettings = None }
 
     let summarizeToggle settingName setting =
         sprintf "%s was toggled to %s for this session." settingName (if setting then "ON" else "OFF")
@@ -220,56 +208,66 @@ module Orchestrator =
         : BatchResults =
 
         let inputTime = DateTime.Now
-        let watch = Watch()
+        let batchWatch = Watch()
         let batchResults = ResultTracker<BatchResults> printer
-        let mutable nextAction = NextAction.Continue
-        let mutable currentSettings = settings
 
-        use e = (Seq.ofList categorizedInputs).GetEnumerator()
-        let mutable inputIndex = 1
-        let mutable stop = false
-
-        while not stop && e.MoveNext() do
-            let input = e.Current
-
-            let result =
-                match input.Category with
-                | InputCategory.Command ->
-                    processCommand input.Text currentSettings history printer
-                | InputCategory.Url ->
-                    processUrl input.Text currentSettings resultTracker history inputTime
-                               categoryCounts[InputCategory.Url] inputIndex printer
-
-            batchResults.RegisterResult(input.Text, result)
-
-            match result with
-            | Error err ->
-                printer.Error err
-            | Ok result ->
-                nextAction <- result.NextAction
-                match result.UpdatedSettings with
-                    | None -> ()
-                    | Some us -> currentSettings <- us
-                if nextAction <> NextAction.Continue then
-                    stop <- true
-                inputIndex <- inputIndex + 1
-
-        if categoryCounts[InputCategory.Url] > 1 then
-            printer.Info(sprintf "%sFinished with batch of %d URLs in %s."
-                            String.newLine
-                            categoryCounts[InputCategory.Url]
-                            watch.ElapsedFriendly)
+        let printSleep (category: InputCategory) =
+            if category.IsUrl then
+                let seconds = settings.SleepSecondsBetweenURLs
+                let label = String.pluralizeS "second" seconds
+                sleep
+                    (fun s -> $"Sleeping for {s} {label}...")
+                    (fun s -> $"Slept for {s} {label}.")
+                    seconds
+                |> fun msg -> printer.Info($"{String.nl}{msg}", appendLines = 1uy)
+
+        let processInput category text index : Result<BatchResults,string> =
+            match category with
+            | Command -> processCommand text settings history printer
+            | Url -> processUrl text settings resultTracker history inputTime categoryCounts[Url] index printer
+
+        let rec loop inputs settings' nextAction' index =
+            match inputs with
+            | [] ->
+                (nextAction', settings', index)
+            | input :: remainingInputs when nextAction' = Continue ->
+                let result = processInput input.Category input.Text index
+                batchResults.RegisterResult(input.Text, result)
+
+                match result with
+                | Error err ->
+                    printer.Error err
+                    if List.isNotEmpty remainingInputs then printSleep input.Category
+                    loop remainingInputs settings' nextAction' (index + 1)
+                | Ok processResult ->
+                    if List.isNotEmpty remainingInputs then printSleep input.Category
+                    let newSettings = processResult.UpdatedSettings |> Option.defaultValue settings'
+                    let newNextAction = processResult.NextAction
+                    loop remainingInputs newSettings newNextAction (index + 1)
+            | _ ->
+                (nextAction', settings', index)
+
+        let (finalNextAction, finalSettings, processedCount) =
+            loop categorizedInputs settings Continue 1
+
+        if categoryCounts[Url] > 1 then
+            printer.Info(
+                sprintf "%sFinished with batch of %d URLs in %s."
+                    String.nl
+                    categoryCounts[Url]
+                    batchWatch.ElapsedFriendly
+                )
             batchResults.PrintBatchFailures()
 
-        if inputIndex < categorizedInputs.Length then
+        if processedCount <= categorizedInputs.Length then
             let unprocessedInputs =
-                categorizedInputs[inputIndex-1..]
+                categorizedInputs[processedCount-1..]
                 |> List.map (fun x -> $"• {x.Text}")
-                |> String.concat String.newLine
-            printer.Warning($"Some inputs were not yet processed: {String.newLine}{unprocessedInputs}")
+                |> String.concat String.nl
+            printer.Warning $"Some inputs were not yet processed: {String.nl}{unprocessedInputs}"
 
-        { NextAction = nextAction
-          UpdatedSettings = Some currentSettings }
+        { NextAction = finalNextAction
+          UpdatedSettings = Some finalSettings }
 
     /// Ensures the download environment is ready, then initiates the input and download process.
     let start (settings: UserSettings) (printer: Printer) : unit =

src/CCVTAC.Main/PostProcessing/Tagging/Tagger.fs

@@ -161,7 +161,7 @@ module Tagger =
             if settings.EmbedImages
                && settings.DoNotEmbedImageUploaders |> List.doesNotContain videoData.Uploader
             then
-                printer.Info "Embedding artwork..."
+                printer.Debug "Embedding artwork..."
                 writeImageToFile taggedFile path printer
             else
                 printer.Debug "Skipping artwork embedding."