aboutsummaryrefslogtreecommitdiffstats
path: root/src/select
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-07 19:43:13 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-10-07 19:43:13 +0200
commit1f0445952332d96acadecb936d9eaa7169d52082 (patch)
treee725d99a19c4b92c6a6850e35c9f9894a6e503eb /src/select
parentfeat(cli): Also add a `dowa` command (diff)
downloadyt-1f0445952332d96acadecb936d9eaa7169d52082.zip
feat(cli): Add a `add` command
This command allows adding URLs directly. Otherwise, the process would be: `yt subs add <URL>` -> `yt update` -> `yt subs remove <URL>`
Diffstat (limited to '')
-rw-r--r--src/select/cmds.rs60
-rw-r--r--src/select/selection_file/display.rs5
-rw-r--r--src/select/selection_file/help.str1
3 files changed, 62 insertions, 4 deletions
diff --git a/src/select/cmds.rs b/src/select/cmds.rs
index 3a7a800..b45cc48 100644
--- a/src/select/cmds.rs
+++ b/src/select/cmds.rs
@@ -11,14 +11,19 @@
use crate::{
app::App,
cli::{SelectCommand, SharedSelectionCommandArgs},
+ download::download_options::download_opts,
storage::video_database::{
+ self,
getters::get_video_by_hash,
- setters::{set_video_options, set_video_status},
+ setters::{add_video, set_video_options, set_video_status},
VideoOptions, VideoStatus,
},
+ update::video_entry_to_video,
};
-use anyhow::{Context, Result};
+use anyhow::{bail, Context, Result};
+use futures::future::join_all;
+use yt_dlp::wrapper::info_json::InfoType;
pub async fn handle_select_cmd(
app: &App,
@@ -35,6 +40,57 @@ pub async fn handle_select_cmd(
SelectCommand::Watched { shared } => {
handle_status_change(app, shared, line_number, VideoStatus::Watched).await?;
}
+ SelectCommand::Add { urls } => {
+ for url in urls {
+ let opts = download_opts(
+ &app,
+ video_database::YtDlpOptions {
+ subtitle_langs: "".to_owned(),
+ },
+ );
+ let entry = yt_dlp::extract_info(&opts, &url, false, true)
+ .await
+ .with_context(|| format!("Failed to fetch entry for url: '{}'", url))?;
+
+ async fn add_entry(
+ app: &App,
+ entry: yt_dlp::wrapper::info_json::InfoJson,
+ ) -> Result<()> {
+ let video = video_entry_to_video(entry, None)?;
+ println!("{}", video.to_color_display(app).await?);
+ add_video(app, video).await?;
+
+ Ok(())
+ }
+
+ match entry._type {
+ Some(InfoType::Video) => {
+ add_entry(&app, entry).await?;
+ }
+ Some(InfoType::Playlist) => {
+ if let Some(mut entries) = entry.entries {
+ if !entries.is_empty() {
+ // Pre-warm the cache
+ add_entry(app, entries.remove(0)).await?;
+
+ let futures: Vec<_> = entries
+ .into_iter()
+ .map(|entry| add_entry(&app, entry))
+ .collect();
+
+ join_all(futures).await.into_iter().collect::<Result<_>>()?;
+ }
+ } else {
+ bail!("Your playlist does not seem to have any entries!")
+ }
+ }
+ other => bail!(
+ "Your URL should point to a video or a playlist, but points to a '{:#?}'",
+ other
+ ),
+ }
+ }
+ }
SelectCommand::Watch { shared } => {
let hash = shared.hash.clone().realize(app).await?;
diff --git a/src/select/selection_file/display.rs b/src/select/selection_file/display.rs
index 8ff6a15..0714015 100644
--- a/src/select/selection_file/display.rs
+++ b/src/select/selection_file/display.rs
@@ -10,7 +10,7 @@
use std::fmt::Write;
-use anyhow::Result;
+use anyhow::{Context, Result};
use chrono::DateTime;
use log::debug;
@@ -31,7 +31,8 @@ impl Video {
let mut f = String::new();
let opts = get_video_opts(app, &self.extractor_hash)
- .await?
+ .await
+ .with_context(|| format!("Failed to get video options for video: '{}'", self.title))?
.to_cli_flags(app);
let opts_white = if !opts.is_empty() { " " } else { "" };
diff --git a/src/select/selection_file/help.str b/src/select/selection_file/help.str
index f3ad2f2..eb76ce5 100644
--- a/src/select/selection_file/help.str
+++ b/src/select/selection_file/help.str
@@ -4,6 +4,7 @@
# d, drop [-p,-s,-l] Mark the video given by the hash to be dropped
# u, url [-p,-s,-l] Open the video URL in Firefox's `timesinks.youtube` profile
# p, pick [-p,-s,-l] Reset the videos status to 'Pick'
+# a, add URL Add a video, defined by the URL
#
# See `yt select <cmd_name> --help` for more help.
#