Fix duplicate encodes, worker shutdown, VLC Blu-ray preview, and rip progress stall

- WorkerReinstall: replace 0.5s sleep with pgrep wait loop (up to 5s) so the old
  worker fully exits before the new one starts; kill orphaned HandBrakeCLI after
- EncodeWorker.stop(): call handbrakeRunner.cancel() to kill in-flight HandBrakeCLI
  so it doesn't outlive the worker; treat CancellationError as pending not error
- HandBrakeRunner/HandBrakeRunning: add cancel() to protocol and implementation
- WorkerReinstall: open full app path instead of -a flag to launch installed binary
- Makefile: split --product builds (combined call silently dropped one binary);
  kill running FrostscribeUI before installing new app
- TitleSelectionView: fix VLC Blu-ray playback using --bluray-title= arg via Process
- RipFlowViewModel: detect MakeMKV "Copy complete" and clamp rip progress to 100%

Author: trevholliday

FrostscribeUI/FrostscribeUI/ViewModels/RipFlowViewModel.swift

@@ -456,7 +456,12 @@ final class RipFlowCoordinator {
             let statusFile = try? statusMgr.read()
 
             if let file = statusFile, file.status == .ripping, let currentJob = file.currentJob {
-                let pct = Int(currentJob.progress.replacing("%", with: "")) ?? 0
+                var pct = Int(currentJob.progress.replacing("%", with: "")) ?? 0
+                // MakeMKV reports "Copy complete" at ~97% before the worker moves the
+                // file — treat this as 100% so the UI doesn't appear frozen.
+                if let msg = currentJob.currentItem, msg.hasPrefix("Copy complete") {
+                    pct = 100
+                }
                 phase = .ripping(title: title, progress: pct)
                 if let msg = currentJob.currentItem, !msg.isEmpty {
                     ripMessage = msg

FrostscribeUI/FrostscribeUI/Views/Rip/TitleSelectionView.swift

@@ -17,14 +17,13 @@ struct TitleSelectionView: View {
 
     private var filteredCount: Int { scanResult.titles.count - displayedTitles.count }
 
-    /// Resolves the block device path (e.g. /dev/disk10) for the mounted disc volume.
-    private var discDevicePath: String? {
-        guard let name = scanResult.discName else { return nil }
-        let volPath = "/Volumes/\(name)"
-        var fs = statfs()
-        guard statfs(volPath, &fs) == 0 else { return nil }
-        return withUnsafeBytes(of: fs.f_mntfromname) { bytes in
-            String(cString: bytes.baseAddress!.assumingMemoryBound(to: CChar.self))
+    /// Finds the mounted disc volume by looking for a BDMV (Blu-ray) or VIDEO_TS (DVD) folder.
+    private var discVolumePath: URL? {
+        let fm = FileManager.default
+        let vols = fm.mountedVolumeURLs(includingResourceValuesForKeys: nil) ?? []
+        return vols.first { vol in
+            fm.fileExists(atPath: vol.appending(path: "BDMV").path) ||
+            fm.fileExists(atPath: vol.appending(path: "VIDEO_TS").path)
         }
     }
 
@@ -58,7 +57,7 @@ struct TitleSelectionView: View {
                     title: title,
                     isMain: title.isMainTitleCandidate,
                     isSuggested: title.number == vm.suggestedTitleNumber,
-                    discDevicePath: discDevicePath,
+                    discVolumePath: discVolumePath,
                     discType: scanResult.discType
                 )
                 .contentShape(Rectangle())
@@ -79,7 +78,7 @@ private struct TitleRow: View {
     let title: DiscTitle
     let isMain: Bool
     let isSuggested: Bool
-    let discDevicePath: String?
+    let discVolumePath: URL?
     let discType: DiscType
 
     @State private var showDetail = false
@@ -131,7 +130,7 @@ private struct TitleRow: View {
             Spacer(minLength: 0)
 
             // Play in VLC button
-            if discDevicePath != nil {
+            if discVolumePath != nil {
                 Button {
                     playInVLC()
                 } label: {
@@ -161,16 +160,28 @@ private struct TitleRow: View {
     }
 
     private func playInVLC() {
-        guard let device = discDevicePath else { return }
-        let scheme = discType == .dvd ? "dvd" : "bluray"
+        guard let volPath = discVolumePath else { return }
         // VLC uses 1-indexed titles; MakeMKV uses 0-indexed.
         let titleNum = title.number + 1
-        guard let url = URL(string: "\(scheme)://\(device)#\(titleNum)") else { return }
-        if let vlcURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "org.videolan.vlc") {
-            NSWorkspace.shared.open([url], withApplicationAt: vlcURL,
-                                    configuration: NSWorkspace.OpenConfiguration())
+        let vlcExec = "/Applications/VLC.app/Contents/MacOS/VLC"
+
+        if discType == .dvd {
+            // DVD: #N title selector works in the MRL
+            let urlString = "dvd://\(volPath.path)#\(titleNum)"
+            guard let url = URL(string: urlString) else { return }
+            if let vlcURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: "org.videolan.vlc") {
+                NSWorkspace.shared.open([url], withApplicationAt: vlcURL,
+                                        configuration: NSWorkspace.OpenConfiguration())
+            } else {
+                NSWorkspace.shared.open(url)
+            }
         } else {
-            NSWorkspace.shared.open(url)
+            // Blu-ray: title selection requires --bluray-title=N CLI argument
+            let mrl = "bluray://\(volPath.path)/"
+            let proc = Process()
+            proc.executableURL = URL(fileURLWithPath: vlcExec)
+            proc.arguments = ["--bluray-title=\(titleNum)", mrl]
+            try? proc.run()
         }
     }
 

Makefile

@@ -15,7 +15,8 @@ BREW_BIN := $(shell brew --prefix)/bin
 
 install:
 	@echo "→ Building CLI and worker..."
-	swift build -c release --product frostscribe --product frostscribe-worker
+	swift build -c release --product frostscribe
+	swift build -c release --product frostscribe-worker
 	@echo "→ Installing CLI binaries to $(BREW_BIN)..."
 	cp $(CURDIR)/.build/release/frostscribe $(BREW_BIN)/frostscribe
 	cp $(CURDIR)/.build/release/frostscribe-worker $(BREW_BIN)/frostscribe-worker
@@ -26,6 +27,8 @@ install:
 	           -derivedDataPath /tmp/frostscribe-build \
 	           build 2>&1 | grep -E "error:|warning:|BUILD"
 	@echo "→ Installing FrostscribeUI..."
+	killall FrostscribeUI 2>/dev/null || true
+	sleep 0.5
 	rm -rf /Applications/FrostscribeUI.app
 	cp -R /tmp/frostscribe-build/Build/Products/Release/FrostscribeUI.app /Applications/
 	@echo "→ Reinstalling and starting worker..."

Sources/FrostscribeCLI/Commands/WorkerCommand.swift

@@ -161,7 +161,31 @@ struct WorkerReinstall: ParsableCommand {
     func run() throws {
         Colors.info("Stopping worker...")
         _ = launchctl("bootout", "gui/\(getuid())/\(label)")
-        Thread.sleep(forTimeInterval: 0.5)
+
+        // Wait for the worker process to fully exit (up to 5 s) before proceeding.
+        // A 0.5 s sleep is not enough — the worker may still be cancelling HandBrakeCLI
+        // and resetting queue state. Starting a new worker while the old one is alive
+        // causes both to poll the queue simultaneously and spawn duplicate encodes.
+        let workerName = URL(fileURLWithPath: resolveWorkerBin()).lastPathComponent
+        for _ in 0..<50 {
+            Thread.sleep(forTimeInterval: 0.1)
+            let check = Process()
+            check.executableURL = URL(fileURLWithPath: "/usr/bin/pgrep")
+            check.arguments = ["-x", workerName]
+            check.standardOutput = FileHandle.nullDevice
+            check.standardError  = FileHandle.nullDevice
+            guard (try? check.run()) != nil else { break }
+            check.waitUntilExit()
+            if check.terminationStatus != 0 { break }  // no matching process — worker is gone
+        }
+
+        // Kill any orphaned HandBrakeCLI processes left behind by the old worker.
+        let killHB = Process()
+        killHB.executableURL = URL(fileURLWithPath: "/usr/bin/killall")
+        killHB.arguments = ["-9", "HandBrakeCLI"]
+        killHB.standardOutput = FileHandle.nullDevice
+        killHB.standardError  = FileHandle.nullDevice
+        if (try? killHB.run()) != nil { killHB.waitUntilExit() }
 
         let binPath = resolveWorkerBin()
         let logPath = ConfigManager.appSupportURL.appending(path: "worker.log").path
@@ -192,7 +216,7 @@ struct WorkerReinstall: ParsableCommand {
         Colors.info("Opening FrostscribeUI...")
         let open = Process()
         open.executableURL = URL(fileURLWithPath: "/usr/bin/open")
-        open.arguments = ["-a", "FrostscribeUI"]
+        open.arguments = ["/Applications/FrostscribeUI.app"]
         try? open.run()
 
         Colors.success("Reinstall complete.")

Sources/FrostscribeCore/Encoding/HandBrakeRunner.swift

@@ -89,6 +89,10 @@ public final class HandBrakeRunner: HandBrakeRunning, @unchecked Sendable {
         }
     }
 
+    public func cancel() {
+        activeProcess?.terminate()
+    }
+
     private func resolvedBinPath() -> String {
         if binPath.isEmpty { return "HandBrakeCLI" }
         return binPath

Sources/FrostscribeCore/Protocols/HandBrakeRunning.swift

@@ -10,4 +10,5 @@ public protocol HandBrakeRunning: Sendable {
         encoderType: EncoderType,
         onProgress: @escaping @Sendable (Double) -> Void
     ) async throws
+    func cancel()
 }

Sources/FrostscribeWorker/EncodeWorker.swift

@@ -49,6 +49,8 @@ actor EncodeWorker {
     func stop() {
         log("Frostscribe worker shutting down…")
         running = false
+        // Kill any in-flight HandBrakeCLI process so it doesn't outlive the worker.
+        handbrakeRunner.cancel()
         // Reset any in-flight job back to pending so the next worker start picks it up.
         if let jobs = try? queueManager.read() {
             for job in jobs where job.status == .encoding {
@@ -119,6 +121,11 @@ actor EncodeWorker {
             try? FileManager.default.removeItem(at: rawMKV.deletingLastPathComponent())
 
             hookRunner.fire(event: "encode_complete", title: "Encode Complete", body: job.label)
+        } catch is CancellationError {
+            // HandBrakeCLI was killed by a signal (e.g. worker restart) — reset to pending
+            // so the next worker start picks it up instead of leaving it in error state.
+            log("Encode cancelled (process killed), resetting to pending: \(job.label)")
+            try? queueManager.updateStatus(id: job.id, status: .pending)
         } catch {
             let nsErr = error as NSError
             if nsErr.domain == NSCocoaErrorDomain && nsErr.code == 513 {