Merge pull request #22 from houssemko/dialog-ux

Lookup gating, audio-aware wording, Media naming

Author: Linuxuser67

po/grab.pot

@@ -190,14 +190,6 @@ msgstr ""
 msgid "Incomplete piece"
 msgstr ""
 
-#: src/download.rs:1942
-msgid "That link is not a supported video page"
-msgstr ""
-
-#: src/download.rs:1961 src/download.rs:2015
-msgid "Waiting to resolve video…"
-msgstr ""
-
 #: src/download.rs:2063 src/download.rs:2365
 msgid "Finished • {size}"
 msgstr ""
@@ -234,12 +226,6 @@ msgstr ""
 msgid "Starting torrent…"
 msgstr ""
 
-#. Resolve (with retries): the extractor cache already drops expired
-#. format URLs, so a cached hit is safe to download from.
-#: src/download.rs:2678 src/video.rs:1214
-msgid "Resolving video…"
-msgstr ""
-
 #: src/download.rs:2690
 msgid "Download finished"
 msgstr ""
@@ -468,10 +454,6 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: src/preferences.rs:392
-msgid "Video"
-msgstr ""
-
 #: src/preferences.rs:396
 msgid "Quality"
 msgstr ""
@@ -480,18 +462,10 @@ msgstr ""
 msgid "Preferred quality"
 msgstr ""
 
-#: src/preferences.rs:402
-msgid "Used for new video downloads"
-msgstr ""
-
 #: src/preferences.rs:429 src/window.rs:1378
 msgid "Audio only"
 msgstr ""
 
-#: src/preferences.rs:430
-msgid "New video downloads skip the video track"
-msgstr ""
-
 #: src/preferences.rs:447
 msgid "Authentication"
 msgstr ""
@@ -512,14 +486,6 @@ msgstr ""
 msgid "Support tools"
 msgstr ""
 
-#: src/preferences.rs:584
-msgid "yt-dlp and ffmpeg resolve video pages"
-msgstr ""
-
-#: src/preferences.rs:587
-msgid "Video support tools"
-msgstr ""
-
 #: src/preferences.rs:605
 msgid "Checking…"
 msgstr ""
@@ -588,26 +554,14 @@ msgstr ""
 msgid "480p"
 msgstr ""
 
-#: src/video.rs:293
-msgid "Video downloads need the yt-dlp support tools"
-msgstr ""
-
 #: src/video.rs:297
 msgid "Couldn't read the video page: {detail}"
 msgstr ""
 
-#: src/video.rs:302
-msgid "Couldn't install the video support tools: {detail}"
-msgstr ""
-
 #: src/video.rs:308
 msgid "Couldn't prepare video staging: {detail}"
 msgstr ""
 
-#: src/video.rs:315
-msgid "No suitable formats found for this video"
-msgstr ""
-
 #: src/video.rs:319
 msgid "Media download failed: {detail}"
 msgstr ""
@@ -812,18 +766,10 @@ msgstr ""
 msgid "File name (optional)"
 msgstr ""
 
-#: src/window.rs:1342
-msgid "Looking up video…"
-msgstr ""
-
 #: src/window.rs:1356 src/window.rs:1360
 msgid "Revert to Title"
 msgstr ""
 
-#: src/window.rs:1371
-msgid "Video format"
-msgstr ""
-
 #: src/window.rs:1372
 msgid "Best match follows your preferred quality"
 msgstr ""
@@ -844,10 +790,6 @@ msgstr ""
 msgid "Download the yt-dlp support tools"
 msgstr ""
 
-#: src/window.rs:1397
-msgid "Couldn't load the video preview"
-msgstr ""
-
 #: src/window.rs:1434
 msgid "Choose a .torrent file"
 msgstr ""
@@ -876,14 +818,6 @@ msgstr ""
 msgid "_Add Download"
 msgstr ""
 
-#: src/window.rs:1952
-msgid "Video Details"
-msgstr ""
-
-#: src/window.rs:2072
-msgid "Still looking up the video — wait for the preview, then add."
-msgstr ""
-
 #: src/window.rs:2125
 msgid "_Continue"
 msgstr ""
@@ -955,3 +889,75 @@ msgstr ""
 #: src/install_help.rs:133
 msgid "Open"
 msgstr ""
+
+#: src/window.rs:1343
+msgid "Looking up media…"
+msgstr ""
+
+#: src/window.rs:1372
+msgid "Media format"
+msgstr ""
+
+#: src/window.rs:1398
+msgid "Couldn't load the media preview"
+msgstr ""
+
+#: src/window.rs:1917
+msgid "Media Details"
+msgstr ""
+
+#: src/window.rs:2041
+msgid "Still looking up the media — wait for the preview, then add."
+msgstr ""
+
+#: src/preferences.rs:392
+msgid "Media"
+msgstr ""
+
+#: src/preferences.rs:402
+msgid "Used for new media downloads"
+msgstr ""
+
+#: src/preferences.rs:430
+msgid "New media downloads skip the video track"
+msgstr ""
+
+#: src/preferences.rs:482
+msgid "yt-dlp and ffmpeg resolve media pages"
+msgstr ""
+
+#: src/preferences.rs:485
+msgid "Media support tools"
+msgstr ""
+
+#: src/download.rs:1976
+msgid "That link is not a supported media page"
+msgstr ""
+
+#: src/download.rs:1996 src/download.rs:2061
+msgid "Waiting to resolve audio…"
+msgstr ""
+
+#: src/download.rs:1998 src/download.rs:2063
+msgid "Waiting to resolve media…"
+msgstr ""
+
+#: src/download.rs:2715 src/video.rs:1423
+msgid "Resolving audio…"
+msgstr ""
+
+#: src/download.rs:2717 src/video.rs:1425
+msgid "Resolving media…"
+msgstr ""
+
+#: src/download_tests.rs:654 src/video.rs:271
+msgid "Media downloads need the yt-dlp support tools"
+msgstr ""
+
+#: src/video.rs:280
+msgid "Couldn't install the media support tools: {detail}"
+msgstr ""
+
+#: src/video.rs:293
+msgid "No suitable formats found for this media"
+msgstr ""

src/download.rs

@@ -1973,7 +1973,7 @@ impl DownloadManager {
     ) -> Result<DownloadItem, String> {
         let url = normalize_url(page_url)?;
         if !crate::video::is_video_page(&url) {
-            return Err(gettext("That link is not a supported video page"));
+            return Err(gettext("That link is not a supported media page"));
         }
         let dir = self.resolve_dir(dest_dir);
         let name = filename
@@ -1992,7 +1992,11 @@ impl DownloadManager {
                     })
         });
         let item = DownloadItem::new(self.alloc_id(), &url, &name, &dir);
-        item.set_detail(gettext("Waiting to resolve video…"));
+        item.set_detail(if audio_only {
+            gettext("Waiting to resolve audio…")
+        } else {
+            gettext("Waiting to resolve media…")
+        });
         self.video_sources.borrow_mut().insert(
             item.id(),
             crate::video::VideoSource::Page {
@@ -2046,7 +2050,18 @@ impl DownloadManager {
         if let Some(src) = video_source {
             let matches = matches!(&src, crate::video::VideoSource::Page { page_url, .. } if *page_url == url);
             if matches {
-                item.set_detail(gettext("Waiting to resolve video…"));
+                let audio_only = matches!(
+                    &src,
+                    crate::video::VideoSource::Page {
+                        audio_only: true,
+                        ..
+                    }
+                );
+                item.set_detail(if audio_only {
+                    gettext("Waiting to resolve audio…")
+                } else {
+                    gettext("Waiting to resolve media…")
+                });
                 self.video_sources.borrow_mut().insert(item.id(), src);
             } else {
                 tracing::warn!("dropping video source with mismatched page URL");
@@ -2696,7 +2711,11 @@ impl DownloadManager {
         });
         self.running.borrow_mut().insert(id, handle);
         item.set_status(DownloadStatus::Downloading);
-        item.set_detail(gettext("Resolving video…"));
+        item.set_detail(if audio_only {
+            gettext("Resolving audio…")
+        } else {
+            gettext("Resolving media…")
+        });
         self.changed();
         self.pump(item, id, generation, rx);
     }

src/download_tests.rs

@@ -651,7 +651,7 @@ fn enqueue_video_spawns_and_fails_without_tools() {
     assert_eq!(item.status(), DownloadStatus::Failed);
     assert_eq!(
         item.detail(),
-        "Video downloads need the yt-dlp support tools"
+        "Media downloads need the yt-dlp support tools"
     );
     // The Page marker survives the failure, so Retry replays the pipeline.
     assert!(matches!(

src/preferences.rs

@@ -389,7 +389,7 @@ pub fn show(
         }
     }
     let video_page = adw::PreferencesPage::builder()
-        .title(gettext("Video"))
+        .title(gettext("Media"))
         .icon_name("video-x-generic-symbolic")
         .build();
     let video_quality_group = adw::PreferencesGroup::builder()
@@ -399,7 +399,7 @@ pub fn show(
     let video_refs: Vec<&str> = video_labels.iter().map(String::as_str).collect();
     let video_quality = adw::ComboRow::builder()
         .title(gettext("Preferred quality"))
-        .subtitle(gettext("Used for new video downloads"))
+        .subtitle(gettext("Used for new media downloads"))
         .model(&gtk4::StringList::new(&video_refs))
         .build();
     video_quality.set_selected(crate::video::quality_index(&settings.video_quality()) as u32);
@@ -427,7 +427,7 @@ pub fn show(
     });
     let video_audio = adw::SwitchRow::builder()
         .title(gettext("Audio only"))
-        .subtitle(gettext("New video downloads skip the video track"))
+        .subtitle(gettext("New media downloads skip the video track"))
         .build();
     settings
         .bind(
@@ -479,10 +479,10 @@ pub fn show(
     });
     let video_tools_group = adw::PreferencesGroup::builder()
         .title(gettext("Support tools"))
-        .description(gettext("yt-dlp and ffmpeg resolve video pages"))
+        .description(gettext("yt-dlp and ffmpeg resolve media pages"))
         .build();
     let video_tools_row = adw::ActionRow::builder()
-        .title(gettext("Video support tools"))
+        .title(gettext("Media support tools"))
         .build();
     let video_tools_btn = gtk4::Button::builder().valign(gtk4::Align::Center).build();
     video_tools_row.set_activatable_widget(Some(&video_tools_btn));

src/video.rs

@@ -268,7 +268,7 @@ pub enum VideoError {
 
 impl VideoError {
     fn missing_tools() -> Self {
-        Self::MissingLibraries(gettext("Video downloads need the yt-dlp support tools"))
+        Self::MissingLibraries(gettext("Media downloads need the yt-dlp support tools"))
     }
     fn fetch(e: impl std::fmt::Display) -> Self {
         Self::Fetch(
@@ -277,7 +277,7 @@ impl VideoError {
     }
     fn install(e: impl std::fmt::Display) -> Self {
         Self::Message(
-            gettext("Couldn't install the video support tools: {detail}")
+            gettext("Couldn't install the media support tools: {detail}")
                 .replace("{detail}", &e.to_string()),
         )
     }
@@ -290,7 +290,7 @@ impl VideoError {
         Self::Runtime(e.to_string())
     }
     fn unavailable() -> Self {
-        Self::Message(gettext("No suitable formats found for this video"))
+        Self::Message(gettext("No suitable formats found for this media"))
     }
     fn part_failed(e: impl std::fmt::Display) -> Self {
         Self::Message(
@@ -1419,7 +1419,11 @@ pub async fn run_video_download(
 
     // Resolve (with retries, always fresh: without a cache backend every
     // attempt re-extracts, so expired format URLs never survive a retry).
-    phase(gettext("Resolving video…"));
+    phase(if job.audio_only {
+        gettext("Resolving audio…")
+    } else {
+        gettext("Resolving media…")
+    });
     let mut video: Option<Video> = None;
     for attempt in 0..job.tries.max(1) {
         match fetch_video_page(
@@ -1677,7 +1681,11 @@ pub async fn run_video_download(
             )
             .await?;
         }
-        phase(gettext("Merging…"));
+        // Only merged video shows a merge phase: audio-only rows adopt
+        // the part directly, so announcing a merge would be wrong.
+        if vpart.is_some() {
+            phase(gettext("Merging…"));
+        }
         finish_merge(
             &downloader,
             &staging,