Merge branch '14-do-not-notify-subscribers-for-shorts' into 'master'

Resolve "Do not notify subscribers for Shorts"

Closes #14

See merge request veretcle/tootube!29

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tootube"
 authors = ["VC <veretcle+framagit@mateu.be>"]
-version = "0.6.1"
+version = "0.10.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

README.md

@@ -1,6 +1,6 @@
 # What is it?
 
-This program takes the very last video published on a PeerTube instance and pushes it to a corresponding YouTube channel.
+This program takes the very last or a specified video published on a PeerTube instance and pushes it to a corresponding YouTube channel.
 
 # What the status of this?
 
@@ -12,7 +12,7 @@ So consider this a work in progress that will slowly get better with time.
 
 # What does it do exactly?
 
-* it retrieves the latest PeerTube video download URL from an instance
+* it retrieves the latest (or a specified) PeerTube video download URL from an instance
 * if you register the app into your PeerTube instance (optional), you can retrieve the latest video source instead of the highest quality encoded video
 * it creates a resumable upload into the target YouTube account
 * it downloads/uploads the latest PeerTube video to YouTube without using a cache (stream-to-stream)
@@ -54,10 +54,15 @@ delete_video_source_after_transfer=true # this option is only available if you h
 # everything below is given by the register command with --peertube option
 [peertube.oauth2]
 client_id="<YOUR CLIENT_ID>"
-client_secret="<YOUR CLIENT_SECRET"
+client_secret="<YOUR CLIENT_SECRET>"
-refresh_token="/var/lib/tootube/refresh_token" # refresh_token are single use only in PeerTube so we need to store it in a separate file
+refresh_token="<YOUR CLIENT TOKEN>"
 
 [youtube]
+notify_subscribers_on_shorts=false # will you notify subscribers for shorts?
+# optional
+# allows you to notify subscribers when transferring shorts, defaults to false
+
+[youtube.oauth2]
 refresh_token="" # leave empty for now
 client_id="<YOUR CLIENT_ID>"
 client_secret="<YOUR CLIENT_SECRET>"
@@ -69,7 +74,7 @@ Then run:
 tootube register --youtube --config <PATH TO YOUR TOOTUBE.TOML FILE>
 ```
 
-You’ll be then prompted with all the necessary information to register `tootube`. You’ll end with a `refresh_token` that you can now paste inside your tootube configuration.
+You’ll be then prompted with all the necessary information to register `tootube`. You’ll end with a `refresh_token` that you will be written back to the config file.
 
 If you wish to register `tootube` on PeerTube, you can do so by using:
 
@@ -77,8 +82,4 @@ If you wish to register `tootube` on PeerTube, you can do so by using:
 tootube register --peertube --config <PATH TO YOUR TOOTUBE.TOML FILE>
 ```
 
-It will require your username/password (beware that 2FA is not supported for this feature as of now) and generate a first `refresh_token` that you will put inside the aformentioned file:
+It will require your username/password (beware that 2FA is not supported for this feature as of now) and generate a first `refresh_token` that will be written back to the config file.
-
-```bash
-echo -n '<REFRESH_TOKEN>' > /var/lib/tootube/refresh_token
-```

src/config.rs

@@ -1,8 +1,11 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
-use std::fs::read_to_string;
+use std::{
+    error::Error,
+    fs::{read_to_string, write},
+};
 
 // General configuration Struct
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct Config {
     pub peertube: PeertubeConfig,
     pub youtube: YoutubeConfig,
@@ -10,7 +13,7 @@ pub struct Config {
     pub tootube: TootubeConfig,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct PeertubeConfig {
     pub base_url: String,
     #[serde(default)]
@@ -28,21 +31,28 @@ impl Default for PeertubeConfig {
     }
 }
 
-#[derive(Debug, Clone, Deserialize)]
+#[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct PeertubeConfigOauth2 {
     pub client_id: String,
     pub client_secret: String,
     pub refresh_token: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct YoutubeConfig {
+    #[serde(default)]
+    pub notify_subscribers_on_shorts: bool,
+    pub oauth2: YoutubeConfigOauth2,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct YoutubeConfigOauth2 {
     pub refresh_token: String,
     pub client_id: String,
     pub client_secret: String,
 }
 
-#[derive(Debug, Deserialize)]
+#[derive(Debug, Deserialize, Serialize)]
 pub struct TootubeConfig {
     pub progress_bar: String,
     pub progress_chars: String,
@@ -57,13 +67,52 @@ impl Default for TootubeConfig {
     }
 }
 
-/// Parses the TOML file into a Config struct
+impl Config {
-pub fn parse_toml(toml_file: &str) -> Config {
+    /// Parses the TOML file into a Config struct
-    let toml_config =
+    pub fn new(toml_file: &str) -> Self {
-        read_to_string(toml_file).unwrap_or_else(|e| panic!("Cannot open file {toml_file}: {e}"));
+        let toml_config = read_to_string(toml_file)
+            .unwrap_or_else(|e| panic!("Cannot open file {toml_file}: {e}"));
 
-    let config: Config = toml::from_str(&toml_config)
+        let config: Config = toml::from_str(&toml_config)
-        .unwrap_or_else(|e| panic!("Cannot parse TOML file {toml_file}: {e}"));
+            .unwrap_or_else(|e| panic!("Cannot parse TOML file {toml_file}: {e}"));
 
-    config
+        config
+    }
+
+    pub fn dump(&mut self, toml_file: &str) -> Result<(), Box<dyn Error>> {
+        // bring back the default for progress bar
+        self.tootube = TootubeConfig::default();
+        write(toml_file, toml::to_string_pretty(self)?)?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::fs::{remove_file, write};
+
+    #[test]
+    fn test_minimal_conf() {
+        let file_name = "/tmp/test_minimal_conf.toml";
+        let data = r#"
+[peertube]
+base_url = 'https://p.nintendojo.fr'
+
+[youtube.oauth2]
+refresh_token = 'rt_N/A'
+client_id = 'ci_N/A'
+client_secret = 'cs_N/A'
+"#;
+        write(file_name, data).unwrap();
+        let config = Config::new(file_name);
+
+        assert_eq!(config.youtube.notify_subscribers_on_shorts, false);
+        assert_eq!(config.tootube.progress_chars, "#>-");
+        assert_eq!(config.youtube.oauth2.refresh_token, "rt_N/A");
+        assert_eq!(config.youtube.oauth2.client_id, "ci_N/A");
+        assert_eq!(config.youtube.oauth2.client_secret, "cs_N/A");
+
+        remove_file(file_name).unwrap();
+    }
 }

src/lib.rs

@@ -3,31 +3,41 @@ use log::debug;
 mod error;
 
 mod config;
-pub use config::parse_toml;
+pub use config::Config;
-use config::Config;
+pub use config::PeertubeConfigOauth2;
 
 mod peertube;
 pub use peertube::register as register_peertube;
-use peertube::PeerTube;
+use peertube::{get_playlists_to_be_added_to, PeerTube};
 
 mod youtube;
 pub use youtube::register as register_youtube;
 use youtube::YouTube;
 
+/// This is where the magic happens
+/// This takes the main options from config & command line args
+/// and sends back the updated PeerTube refresh_token if any
 #[tokio::main]
-pub async fn run(config: Config, pl: Vec<String>) {
+pub async fn run(config: &Config, pl: Vec<String>, pt_video_id: Option<&str>) -> Option<String> {
     // Create PeerTube struct
     let peertube = match &config.peertube.oauth2 {
         Some(s) => PeerTube::new(&config.peertube.base_url)
-            .with_client(&s.client_id, &s.client_secret, &s.refresh_token)
+            .with_client(s)
             .await
             .unwrap_or_else(|e| panic!("Cannot instantiate PeerTube struct: {}", e)),
         None => PeerTube::new(&config.peertube.base_url),
     };
-    // Get the latest video object
+    // Get the latest video object or the targeted pt_video_id
-    let latest_vid = peertube.get_latest_video().await.unwrap_or_else(|e| {
+    let latest_vid = match pt_video_id {
-        panic!("Cannot retrieve the latest video, something must have gone terribly wrong: {e}")
+        None => peertube.get_latest_video().await.unwrap_or_else(|e| {
-    });
+            panic!("Cannot retrieve the latest video, something must have gone terribly wrong: {e}")
+        }),
+        Some(v) => peertube.get_video_detail(v).await.unwrap_or_else(|e| {
+            panic!(
+                "Cannot retrieve the specified video, something must have gone terribly wrong: {e}"
+            )
+        }),
+    };
 
     // We have a refresh_token, try to use it
     let source_url = match &config.peertube.oauth2 {
@@ -56,15 +66,24 @@ pub async fn run(config: Config, pl: Vec<String>) {
     debug!("PT download URL: {}", &dl_url);
 
     let youtube = YouTube::new(
-        &config.youtube.client_id,
+        &config.youtube.oauth2.client_id,
-        &config.youtube.client_secret,
+        &config.youtube.oauth2.client_secret,
-        &config.youtube.refresh_token,
+        &config.youtube.oauth2.refresh_token,
     )
     .await
     .unwrap_or_else(|e| panic!("Cannot instantiate YouTube struct: {}", e));
 
+    // Do not notify when notify_subscribers_on_shorts = False and latest_id is a short
+    debug!(
+        "Will user get notified? {}",
+        !(!config.youtube.notify_subscribers_on_shorts & latest_vid.is_short())
+    );
+
     let resumable_upload_url = youtube
-        .create_resumable_upload(&latest_vid)
+        .create_resumable_upload(
+            &latest_vid,
+            !(!config.youtube.notify_subscribers_on_shorts & latest_vid.is_short()),
+        )
         .await
         .unwrap_or_else(|e| panic!("Cannot retrieve the upload’s resumable id: {e}"));
     debug!("YT upload URL: {}", &resumable_upload_url);
@@ -75,6 +94,14 @@ pub async fn run(config: Config, pl: Vec<String>) {
         .unwrap_or_else(|e| panic!("Cannot resume upload!: {e}"));
     debug!("YT video ID: {}", &yt_video_id);
 
+    youtube
+        .set_thumbnail(
+            &yt_video_id,
+            &format!("{}{}", &config.peertube.base_url, latest_vid.preview_path),
+        )
+        .await
+        .unwrap_or_else(|e| panic!("Cannot upload the thumbnail: {}", e));
+
     if !pl.is_empty() {
         youtube
             .add_video_to_playlists(&yt_video_id, &pl)
@@ -91,4 +118,20 @@ pub async fn run(config: Config, pl: Vec<String>) {
 
         debug!("Original Video {} has been deleted", &latest_vid.uuid);
     }
+
+    // Updates the playlist of PeerTube if necessary
+    if config.peertube.oauth2.is_some() && !pl.is_empty() {
+        debug!("Updating playlists on PeerTube");
+
+        if let Ok(pl_to_add_to) =
+            get_playlists_to_be_added_to(&peertube, &latest_vid.uuid, &pl, latest_vid.channel.id)
+                .await
+        {
+            for p in pl_to_add_to {
+                let _ = peertube.add_video_to_playlist(&latest_vid.uuid, &p).await;
+            }
+        }
+    }
+
+    peertube.refresh_token
 }

src/main.rs

@@ -27,12 +27,21 @@ fn main() {
                 .num_args(0..)
                 .display_order(2),
         )
+        .arg(
+            Arg::new("id")
+                .short('i')
+                .long("id")
+                .value_name("ID")
+                .help("Specify the PeerTube Video ID")
+                .num_args(0..=1)
+                .display_order(3),
+        )
         .arg(
             Arg::new("vice")
                 .long("vice")
                 .aliases(["chybrare", "coquinou"])
                 .action(clap::ArgAction::SetTrue)
-                .display_order(3),
+                .display_order(4),
         )
         .subcommand(
             Command::new("register")
@@ -57,22 +66,30 @@ fn main() {
         .get_matches();
 
     if let Some(("register", sub_m)) = matches.subcommand() {
-        let config = parse_toml(sub_m.get_one::<String>("config").unwrap());
+        let mut config = Config::new(sub_m.get_one::<String>("config").unwrap());
 
         if sub_m.get_flag("youtube") {
-            register_youtube(&config.youtube)
+            let yt_refresh_token = register_youtube(&config.youtube.oauth2)
                 .unwrap_or_else(|e| panic!("Cannot register to YouTube API: {}", e));
+
+            config.youtube.oauth2.refresh_token = yt_refresh_token;
         }
 
         if sub_m.get_flag("peertube") {
-            register_peertube(&config.peertube)
+            let pt_oauth2 = register_peertube(&config.peertube)
                 .unwrap_or_else(|e| panic!("Cannot register to PeerTube API: {}", e));
+
+            config.peertube.oauth2 = Some(pt_oauth2);
         }
 
+        config
+            .dump(sub_m.get_one::<String>("config").unwrap())
+            .unwrap_or_else(|e| panic!("Cannot write back to Tootube Config file: {}", e));
+
         return;
     }
 
-    let mut config = parse_toml(matches.get_one::<String>("config").unwrap());
+    let mut config = Config::new(matches.get_one::<String>("config").unwrap());
 
     if matches.get_flag("vice") {
         config.tootube.progress_bar = "{msg}\n[{elapsed_precise}] 8{wide_bar:.magenta}ᗺ {bytes}/{total_bytes} ({bytes_per_sec}, {eta})".to_string();
@@ -85,7 +102,18 @@ fn main() {
         .map(|v| v.to_string())
         .collect();
 
+    let pt_video_id = matches.get_one::<String>("id").map(|s| s.as_str());
+
     env_logger::init();
 
-    run(config, playlists);
+    // runs the main program logic & retrieves the updated PeerTube refresh_token
+    if let Some(x) = run(&config, playlists, pt_video_id) {
+        config.peertube.oauth2 = config.peertube.oauth2.map(|y| PeertubeConfigOauth2 {
+            client_id: y.client_id,
+            client_secret: y.client_secret,
+            refresh_token: x,
+        });
+
+        let _ = config.dump(matches.get_one::<String>("config").unwrap());
+    };
 }

src/peertube.rs

@@ -1,17 +1,16 @@
-use crate::{config::PeertubeConfig, error::TootubeError};
+use crate::{config::PeertubeConfig, config::PeertubeConfigOauth2, error::TootubeError};
 use log::debug;
 use reqwest::{
     header::{HeaderMap, HeaderValue},
+    multipart::Form,
     Client,
 };
 use rpassword::prompt_password;
 use serde::{Deserialize, Serialize};
 use std::{boxed::Box, cmp::Ordering, error::Error, io::stdin};
-use tokio::fs::{read_to_string, write};
 
 #[derive(Debug, Deserialize)]
 pub struct PeerTubeVideos {
-    pub total: u64,
     pub data: Vec<PeerTubeVideo>,
 }
 
@@ -20,9 +19,29 @@ pub struct PeerTubeVideo {
     pub name: String,
     pub uuid: String,
     pub description: String,
+    pub duration: u64,
+    #[serde(rename = "aspectRatio")]
+    pub aspect_ratio: Option<f32>,
+    #[serde(rename = "previewPath")]
+    pub preview_path: String,
     #[serde(rename = "streamingPlaylists")]
     pub streaming_playlists: Option<Vec<PeerTubeVideoStreamingPlaylists>>,
     pub tags: Option<Vec<String>>,
+    pub channel: PeerTubeVideoChannel,
+}
+
+impl PeerTubeVideo {
+    pub fn is_short(&self) -> bool {
+        if self.duration < 60 && self.aspect_ratio.is_some_and(|x| x == 0.5625) {
+            return true;
+        }
+        false
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct PeerTubeVideoChannel {
+    pub id: u8,
 }
 
 #[derive(Debug, Deserialize)]
@@ -70,7 +89,6 @@ struct PeerTubeVideoTokenResponseFiles {
 
 #[derive(Eq, Debug, Deserialize)]
 pub struct PeerTubeVideoStreamingPlaylistsFiles {
-    pub id: u64,
     pub resolution: PeerTubeVideoStreamingPlaylistsFilesResolution,
     #[serde(rename = "fileDownloadUrl")]
     pub file_download_url: String,
@@ -99,9 +117,50 @@ pub struct PeerTubeVideoStreamingPlaylistsFilesResolution {
     pub id: u16,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct PeerTubeVideoPlaylists {
+    pub total: u16,
+    pub data: Vec<PeerTubeVideoPlaylist>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct PeerTubeVideoPlaylist {
+    pub uuid: String,
+    #[serde(rename = "displayName")]
+    pub display_name: String,
+}
+
+#[derive(Debug, Serialize)]
+struct PeerTubeVideoPlaylistsVideos {
+    #[serde(rename = "videoId")]
+    video_id: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoPlaylistResponse {
+    #[serde(rename = "videoPlaylist")]
+    video_playlist: PeerTubeVideoPlaylistResponseVideoPlaylist,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoPlaylistResponseVideoPlaylist {
+    uuid: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoPlaylistsPlaylistIdVideos {
+    total: u32,
+    data: Vec<PeerTubeVideoPlaylistsPlaylistIdVideosData>,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoPlaylistsPlaylistIdVideosData {
+    video: PeerTubeVideo,
+}
+
 /// This function makes the registration process a little bit easier
 #[tokio::main]
-pub async fn register(config: &PeertubeConfig) -> Result<(), Box<dyn Error>> {
+pub async fn register(config: &PeertubeConfig) -> Result<PeertubeConfigOauth2, Box<dyn Error>> {
     // Get client ID/secret
     let oauth2_client = reqwest::get(format!("{}/api/v1/oauth-clients/local", config.base_url))
         .await?
@@ -137,26 +196,25 @@ pub async fn register(config: &PeertubeConfig) -> Result<(), Box<dyn Error>> {
         .json::<PeerTubeUsersTokenResponse>()
         .await?;
 
-    println!("You can now paste the following lines inside the `peertube` section of your tootube.toml file:");
+    println!(
-
+        "The following lines will be written to the `peertube` section of your tootube.toml file:"
-    println!();
+    );
-
     println!("[peertube.oauth2]");
     println!("client_id=\"{}\"", oauth2_client.client_id);
     println!("client_secret=\"{}\"", oauth2_client.client_secret);
-    println!("refresh_token=<path to refresh_token>");
+    println!("refresh_token=\"{}\"", oauth2_token.refresh_token);
 
-    println!();
+    Ok(PeertubeConfigOauth2 {
-
+        client_id: oauth2_client.client_id,
-    println!("Finally, add the refresh token inside the refresh_token path:");
+        client_secret: oauth2_client.client_secret,
-    println!("{}", oauth2_token.refresh_token);
+        refresh_token: oauth2_token.refresh_token,
-
+    })
-    Ok(())
 }
 
 #[derive(Debug)]
 pub struct PeerTube {
     base_url: String,
+    pub refresh_token: Option<String>,
     client: Client,
 }
 
@@ -165,6 +223,7 @@ impl PeerTube {
     pub fn new(base_url: &str) -> Self {
         PeerTube {
             base_url: format!("{}/api/v1", base_url),
+            refresh_token: None,
             client: Client::new(),
         }
     }
@@ -173,32 +232,26 @@ impl PeerTube {
     /// the default required header
     pub async fn with_client(
         mut self,
-        client_id: &str,
+        pt_oauth2: &PeertubeConfigOauth2,
-        client_secret: &str,
-        refresh_token_path: &str,
     ) -> Result<Self, Box<dyn Error>> {
-        let refresh_token = read_to_string(refresh_token_path).await?;
-
         let params = PeerTubeUsersToken {
-            client_id: client_id.to_string(),
+            client_id: pt_oauth2.client_id.to_owned(),
-            client_secret: client_secret.to_string(),
+            client_secret: pt_oauth2.client_secret.to_owned(),
             grant_type: "refresh_token".to_string(),
-            refresh_token: Some(refresh_token),
+            refresh_token: Some(pt_oauth2.refresh_token.to_owned()),
             username: None,
             password: None,
         };
 
         let req = self
             .client
-            .post(&format!("{}/users/token", self.base_url))
+            .post(format!("{}/users/token", self.base_url))
             .form(&params)
             .send()
             .await?
             .json::<PeerTubeUsersTokenResponse>()
             .await?;
 
-        write(refresh_token_path, req.refresh_token).await?;
-
         let mut headers = HeaderMap::new();
         headers.insert(
             "Authorization",
@@ -209,6 +262,8 @@ impl PeerTube {
             .default_headers(headers)
             .build()?;
 
+        self.refresh_token = Some(req.refresh_token);
+
         Ok(self)
     }
 
@@ -231,7 +286,7 @@ impl PeerTube {
     }
 
     /// This gets all the crispy details about one particular video
-    async fn get_video_detail(&self, v: &str) -> Result<PeerTubeVideo, Box<dyn Error>> {
+    pub async fn get_video_detail(&self, v: &str) -> Result<PeerTubeVideo, Box<dyn Error>> {
         let body = self
             .client
             .get(format!("{}/videos/{}", self.base_url, v))
@@ -290,4 +345,213 @@ impl PeerTube {
 
         Ok(())
     }
+
+    /// List every playlists on PeerTube
+    pub async fn list_video_playlists(&self) -> Result<Vec<PeerTubeVideoPlaylist>, Box<dyn Error>> {
+        let mut playlists: Vec<PeerTubeVideoPlaylist> = vec![];
+
+        let mut start = 0;
+        let inc = 15;
+
+        while let Ok(mut local_pl) = self
+            .client
+            .get(format!(
+                "{}/video-playlists?count={}&playlistType=1&start={}",
+                self.base_url, inc, start
+            ))
+            .send()
+            .await?
+            .json::<PeerTubeVideoPlaylists>()
+            .await
+        {
+            start += inc;
+            playlists.append(&mut local_pl.data);
+            if start >= local_pl.total {
+                break;
+            }
+        }
+
+        Ok(playlists)
+    }
+
+    /// Add a public playlist
+    pub async fn create_video_playlist(
+        &self,
+        c_id: u8,
+        display_name: &str,
+    ) -> Result<String, Box<dyn Error>> {
+        let form = Form::new()
+            .text("displayName", display_name.to_string())
+            .text("privacy", "1")
+            .text("videoChannelId", format!("{}", c_id));
+
+        let pl_created = self
+            .client
+            .post(format!("{}/video-playlists", self.base_url))
+            .multipart(form)
+            .send()
+            .await?
+            .json::<PeerTubeVideoPlaylistResponse>()
+            .await?;
+
+        Ok(pl_created.video_playlist.uuid)
+    }
+
+    /// Add a video into a playlist
+    pub async fn add_video_to_playlist(
+        &self,
+        vid_uuid: &str,
+        pl_uuid: &str,
+    ) -> Result<(), Box<dyn Error>> {
+        let video_to_add = PeerTubeVideoPlaylistsVideos {
+            video_id: vid_uuid.to_string(),
+        };
+
+        let res = self
+            .client
+            .post(format!(
+                "{}/video-playlists/{}/videos",
+                self.base_url, pl_uuid
+            ))
+            .json(&video_to_add)
+            .send()
+            .await?;
+
+        if !res.status().is_success() {
+            return Err(TootubeError::new(&format!(
+                "Cannot add video {} to playlist {}: {}",
+                vid_uuid,
+                pl_uuid,
+                res.text().await?
+            ))
+            .into());
+        };
+
+        Ok(())
+    }
+
+    /// List all videos of a playlist
+    pub async fn list_videos_playlist(&self, uuid: &str) -> Result<Vec<String>, Box<dyn Error>> {
+        let mut videos: Vec<PeerTubeVideo> = vec![];
+
+        let mut start = 0;
+        let inc = 15;
+
+        while let Ok(l_vid) = self
+            .client
+            .get(format!(
+                "{}/video-playlists/{}/videos?start={}&count={}",
+                &self.base_url, &uuid, start, inc
+            ))
+            .send()
+            .await?
+            .json::<PeerTubeVideoPlaylistsPlaylistIdVideos>()
+            .await
+        {
+            start += inc;
+            videos.append(&mut l_vid.data.into_iter().map(|x| x.video).collect());
+            if start >= l_vid.total {
+                break;
+            }
+        }
+
+        Ok(videos.into_iter().map(|x| x.uuid).collect())
+    }
+}
+
+/// Given a PeerTube instance, video UUID, list of named playlists and channel ID, this function:
+/// * adds playlists if they do not exists
+/// * adds the video to said playlists if they’re not in it already
+pub async fn get_playlists_to_be_added_to(
+    peertube: &PeerTube,
+    vid_uuid: &str,
+    pl: &[String],
+    c_id: u8,
+) -> Result<Vec<String>, Box<dyn Error>> {
+    let mut playlist_to_be_added_to: Vec<String> = vec![];
+
+    if let Ok(local_pl) = peertube.list_video_playlists().await {
+        // list the displayNames of each playlist
+        let current_playlist: Vec<String> =
+            local_pl.iter().map(|s| s.display_name.clone()).collect();
+        // get the playlist whose displayName does not exist yet
+        let pl_to_create: Vec<_> = pl
+            .iter()
+            .filter(|x| !current_playlist.contains(x))
+            .collect();
+
+        debug!("Playlists to be added: {:?}", &pl_to_create);
+
+        playlist_to_be_added_to = local_pl
+            .into_iter()
+            .filter(|x| pl.contains(&x.display_name))
+            .map(|x| x.uuid.clone())
+            .collect();
+
+        // create the missing playlists
+        for p in pl_to_create {
+            if let Ok(s) = peertube.create_video_playlist(c_id, p).await {
+                playlist_to_be_added_to.push(s);
+            }
+        }
+
+        for p in playlist_to_be_added_to.clone().iter() {
+            if let Ok(s) = peertube.list_videos_playlist(p).await {
+                // if a video already exists inside a playlist, drop it
+                if s.contains(&vid_uuid.to_string()) {
+                    playlist_to_be_added_to.retain(|i| *i != *p)
+                }
+            }
+        }
+
+        debug!("Playlists to be added to: {:?}", &playlist_to_be_added_to);
+    };
+
+    Ok(playlist_to_be_added_to)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_get_latest_video() {
+        let peertube = PeerTube::new("https://peertube.cpy.re");
+
+        let vid = peertube.get_latest_video().await.unwrap();
+
+        assert_eq!(vid.uuid.len(), 36);
+    }
+
+    #[tokio::test]
+    #[should_panic]
+    async fn test_get_original_video_source() {
+        let peertube = PeerTube::new("https://peertube.cpy.re");
+
+        let _vid = peertube
+            .get_original_video_source("t")
+            .await
+            .expect("Should panic!");
+    }
+
+    #[tokio::test]
+    async fn test_list_video_playlists() {
+        let peertube = PeerTube::new("https://peertube.cpy.re");
+
+        let pl = peertube.list_video_playlists().await.unwrap();
+
+        assert!(!pl.is_empty());
+    }
+
+    #[tokio::test]
+    async fn test_list_videos_playlist() {
+        let peertube = PeerTube::new("https://peertube.cpy.re");
+
+        let pl_videos = peertube
+            .list_videos_playlist("73a5c1fa-64c5-462d-81e5-b120781c2d72")
+            .await
+            .unwrap();
+
+        assert!(!pl_videos.is_empty());
+    }
 }

src/youtube.rs

@@ -1,5 +1,5 @@
 use crate::{
-    config::{TootubeConfig, YoutubeConfig},
+    config::{TootubeConfig, YoutubeConfigOauth2},
     error::TootubeError,
     peertube::PeerTubeVideo,
 };
@@ -160,8 +160,9 @@ struct YoutubePlaylistListResponseItemSnippet {
 }
 
 /// This function makes the registration process a little bit easier
+/// It returns the expected refresh_token so that it can be written back to the file
 #[tokio::main]
-pub async fn register(config: &YoutubeConfig) -> Result<(), Box<dyn Error>> {
+pub async fn register(config: &YoutubeConfigOauth2) -> Result<String, Box<dyn Error>> {
     println!("Click on the link below to authorize {} to upload to YouTube and deal with your playlists:", env!("CARGO_PKG_NAME"));
     println!("https://accounts.google.com/o/oauth2/v2/auth?client_id={}&redirect_uri=urn:ietf:wg:oauth:2.0:oob&scope=https://www.googleapis.com/auth/youtube%20https://www.googleapis.com/auth/youtube.upload&response_type=code", config.client_id);
     println!("Paste the returned authorization code:");
@@ -187,11 +188,12 @@ pub async fn register(config: &YoutubeConfig) -> Result<(), Box<dyn Error>> {
 
     let refresh_token: RegistrationAccessTokenResponse = res.json().await?;
 
-    println!("You can now paste the following line inside the `youtube` section of your tootube.toml file:");
+    println!(
-
+        "The following line will be written to the `youtube` section of your tootube.toml file:"
+    );
     println!("refresh_token=\"{}\"", refresh_token.refresh_token);
 
-    Ok(())
+    Ok(refresh_token.refresh_token)
 }
 
 pub struct YouTube {
@@ -236,13 +238,39 @@ impl YouTube {
 
         Ok(youtube)
     }
+
+    /// This function uploads the thumbnail from PeerTube
+    pub async fn set_thumbnail(
+        &self,
+        video_id: &str,
+        preview_url: &str,
+    ) -> Result<(), Box<dyn Error>> {
+        let res = reqwest::get(preview_url).await?;
+        let stream = res.bytes_stream();
+
+        let res = self
+            .client
+            .post(format!(
+                "https://www.googleapis.com/upload/youtube/v3/thumbnails/set?videoId={}&uploadType=media",
+                video_id
+            ))
+            .header("Content-Type", "application/octet-stream")
+            .body(Body::wrap_stream(stream))
+            .send()
+            .await?;
+
+        res.status().is_success().then_some(()).ok_or(
+            TootubeError::new(&format!("Thumbnail not uploaded: {}", res.text().await?)).into(),
+        )
+    }
+
     /// This function takes a list of playlists keyword and returns a list of playlist ID
     async fn get_playlist_ids(&self, pl: &[String]) -> Result<Vec<String>, Box<dyn Error>> {
         let mut page_token = String::new();
         let mut playlists: Vec<String> = vec![];
 
         while let Ok(local_pl) = self.client
-            .get(&format!(
+            .get(format!(
                 "https://www.googleapis.com/youtube/v3/playlists?part=snippet&mine=true&pageToken={}",
                 page_token
             ))
@@ -312,6 +340,7 @@ impl YouTube {
     pub async fn create_resumable_upload(
         &self,
         vid: &PeerTubeVideo,
+        notify: bool,
     ) -> Result<String, Box<dyn Error>> {
         if vid.name.chars().count() > 100 {
             warn!(
@@ -337,21 +366,24 @@ impl YouTube {
         };
         debug!("YT upload params: {:?}", &upload_params);
 
-        let res = self.client.post("https://www.googleapis.com/upload/youtube/v3/videos?uploadType=resumable&part=snippet%2Cstatus")
+        let notify_subscriber = notify.then_some(()).map_or("False", |_| "True");
+
+        let res = self.client.post(format!("https://www.googleapis.com/upload/youtube/v3/videos?uploadType=resumable&part=snippet%2Cstatus&notifySubscribers={}", notify_subscriber))
             .json(&upload_params)
             .send().await?;
 
-        if res.status().is_success() {
+        res.status()
-            Ok(res
+            .is_success()
-                .headers()
+            .then_some(
-                .get("location")
+                res.headers()
-                .ok_or("Cannot find suitable header")?
+                    .get("location")
-                .to_str()?
+                    .ok_or("Cannot find suitable header")?
-                .to_string())
+                    .to_str()?
-        } else {
+                    .to_string(),
-            Err(TootubeError::new("Cannot create resumable upload!").into())
+            )
-        }
+            .ok_or(TootubeError::new("Cannot create resumable upload!").into())
     }
+
     /// This takes the PT stream for download, connects it to YT stream for upload
     pub async fn now_kiss(
         &self,