feat(daemon): drain all manual command channels

crates/arr-daemon/src/main.rs

@@ -123,7 +123,7 @@ async fn run() -> Result<(), Error> {
         None
     };
     let notifier = Notifier::new(config.ntfy_url.clone())?;
-    let (reconcile, manual_grab) =
+    let (reconcile, manual_grab, manual_tv) =
         reconcile_loop(&database, &config, &transmission, tmdb.as_ref(), &notifier)?;
 
     // Jellyseerr's Radarr shim (DESIGN.md §9.4) reads the same database and
@@ -157,10 +157,17 @@ async fn run() -> Result<(), Error> {
 
     let (shutdown_tx, shutdown_rx) = tokio::sync::watch::channel(false);
     let mut reconcile_task = tokio::spawn(reconcile.run(shutdown_rx.clone()));
-    // Issue #107: nothing else drains `AppState`'s `MovieCommand` channel, so
-    // the manual-search and manual-grab endpoints were a no-op — the command
-    // sat in the 64-slot buffer forever.
-    let mut manual_task = tokio::spawn(manual::run(state, database, manual_grab, shutdown_rx));
+    // Issue #107: nothing else drains `AppState`'s command channels, so the
+    // manual-search and manual-grab endpoints were a no-op — the command sat
+    // in the 64-slot buffer forever. Issue #132: the episode and season
+    // channels are drained by the same lane.
+    let mut manual_task = tokio::spawn(manual::run(
+        state,
+        database,
+        manual_grab,
+        manual_tv,
+        shutdown_rx,
+    ));
     let signal_tx = shutdown_tx.clone();
     let server = async move {
         axum::serve(listener, app)
@@ -198,17 +205,18 @@ async fn run() -> Result<(), Error> {
 /// Prowlarr key and grab needs TMDB as well; a lane whose upstream is not
 /// configured stays unregistered rather than failing every tick.
 ///
-/// Also returns a second, independent `GrabAction` for `manual::run` (issue
-/// #107) — the manual trigger needs the same search-and-grab path on demand
-/// rather than on the reconcile tick's schedule, and `ReconcileLoop::register`
-/// takes ownership of the one it ticks.
+/// Also returns independent action instances for `manual::run` (issues #107
+/// and #132) — the manual trigger needs the same search-and-grab paths on
+/// demand rather than on the reconcile tick's schedule, and
+/// `ReconcileLoop::register` takes ownership of the ones it ticks. The movie
+/// one needs TMDB too; TV grabbing does not (§6.2).
 fn reconcile_loop(
     database: &Db,
     config: &Config,
     transmission: &arr_dl::TransmissionClient,
     tmdb: Option<&Arc<TmdbClient>>,
     notifier: &Notifier,
-) -> Result<(ReconcileLoop, Option<GrabAction>), Error> {
+) -> Result<(ReconcileLoop, Option<GrabAction>, Option<TvGrabAction>), Error> {
     let reconcile = ReconcileLoop::new(database.clone());
     let seeding = SeedingRules::new(
         SeedingLimits {
@@ -235,7 +243,7 @@ fn reconcile_loop(
         .map(|key| arr_indexer::ProwlarrClient::new(config.prowlarr_url.clone(), key))
         .transpose()?;
 
-    let (mut reconcile, manual_grab) = register_movie_grab(
+    let (reconcile, manual_grab) = register_movie_grab(
         reconcile,
         prowlarr.as_ref(),
         transmission,
@@ -243,20 +251,8 @@ fn reconcile_loop(
         &seeding,
         tmdb,
     );
-    // TV grabbing needs no TMDB at grab time: air dates are already on the
-    // episode rows, which is the same gate the digital release date is for
-    // movies (§6.2).
-    if let Some(prowlarr) = prowlarr.as_ref() {
-        reconcile = reconcile.register(
-            Tick::Reconcile,
-            TvGrabAction::new(
-                prowlarr.clone(),
-                transmission.clone(),
-                config.download_dir.clone(),
-                seeding.clone(),
-            ),
-        );
-    }
+    let (mut reconcile, manual_tv) =
+        register_tv_grab(reconcile, prowlarr.as_ref(), transmission, config, &seeding);
     // RSS needs no TMDB: it matches what the feeds already carry against the
     // wanted list (§6.2).
     if let Some(prowlarr) = prowlarr {
@@ -322,7 +318,34 @@ fn reconcile_loop(
     }
 
     let reconcile = reconcile.register(Tick::Reaper, ReaperAction::new(transmission.clone()));
-    Ok((reconcile, manual_grab))
+    Ok((reconcile, manual_grab, manual_tv))
+}
+
+/// Register the TV grab lane on `reconcile` and hand back a second,
+/// independent instance for `manual::run` (issue #132). `None` when Prowlarr
+/// is not configured. TV grabbing needs no TMDB at grab time: air dates are
+/// already on the episode rows, which is the same gate the digital release
+/// date is for movies (§6.2).
+fn register_tv_grab(
+    mut reconcile: ReconcileLoop,
+    prowlarr: Option<&arr_indexer::ProwlarrClient>,
+    transmission: &arr_dl::TransmissionClient,
+    config: &Config,
+    seeding: &SeedingRules,
+) -> (ReconcileLoop, Option<TvGrabAction>) {
+    let Some(prowlarr) = prowlarr else {
+        return (reconcile, None);
+    };
+    let tv_grab_action = || {
+        TvGrabAction::new(
+            prowlarr.clone(),
+            transmission.clone(),
+            config.download_dir.clone(),
+            seeding.clone(),
+        )
+    };
+    reconcile = reconcile.register(Tick::Reconcile, tv_grab_action());
+    (reconcile, Some(tv_grab_action()))
 }
 
 /// Register the movie grab lane on `reconcile` and hand back a second,