Merge branch '6-refactor-peertube-and-youtube-to-impl-struct-instead-of-functional-style' into 'master'

♻️: refactor src/peertube.rs code to be more efficient regarding reqwest management

Closes #6

See merge request veretcle/tootube!20

Cargo.toml

@@ -1,21 +1,23 @@
 [package]
 name = "tootube"
 authors = ["VC <veretcle+framagit@mateu.be>"]
-version = "0.4.0"
+version = "0.6.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+rpassword = "^7.3"
 reqwest = { version = "^0.11", features = ["json", "stream", "multipart"] }
 tokio = { version = "^1", features = ["full"] }
 clap = "^4"
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "^1", features = ["derive"] }
 toml = "^0.5"
 log = "^0.4"
 env_logger = "^0.10"
-futures-core = "0.3.28"
-bytes = "1.5.0"
+indicatif = "^0.17"
+async-stream = "^0.3"
+futures-util = "^0.3"
 
 [profile.release]
 strip = true

README.md

@@ -6,50 +6,79 @@ This program takes the very last video published on a PeerTube instance and push
 
 This is an early prototype not really suited for production purposes for now:
 * it still relies way too much on pre-determined value to upload the video to YouTube
-* it cannot determine the playlists it needs to put them in
 * it cannot determine the recording date (believe me, I tried!)
-* there are still a lot of static values that I would rather not have static (like the cache directory…)
-* it is 100% sync, meaning it’s clearly not optimal for now and probably won’t be for the next releases
 
-So consider this a work in progress that will slowly get better with time
+So consider this a work in progress that will slowly get better with time.
 
 # What does it do exactly?
 
-* it downloads the latest PeerTube video from an instance
-* stores it in cache directory
-* uploads it to YouTube
+* it retrieves the latest 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)
 
 # What doesn’t it do exactly?
 
-* it cannot register the original key (see below)
-* it relies on a local cache despite the fact that it might well be possible to just download from PT/upload to YT at the same time (I don’t see why not in fact)
 * it doesn’t retrieve ALL the original PeerTube video properties like licences, languages, categories, etc… again: early prototype
 
-# Obtain Authorization Token from Google
+# Howtos
+## General usage
 
-That the complicated part:
-* create an OAuth2.0 application with authorization for Youtube DATA Api v3 Upload
+Once you fill your `tootube.toml` config file (see below), you can run `tootube` like this:
+
+```bash
+tootube --config tootube.toml --playlist playlist_1 "Things You Might Like"
+```
+
+You can turn on debug using env var `RUST_LOG`.
+
+## Obtain Authorization Token from Google
+
+The complicated part:
+* create an OAuth2.0 application with authorization for Youtube DATA Api v3 Upload and Youtube DATA Api v3 (generally referenced as `../auth/youtube.upload` and `../auth/youtube`)
 * create a OAuth2.0 client with Desktop client
 
 You’ll need:
 * the `client_id` from your OAuth2.0 client
 * the `client_secret` from you OAuth2.0 client
 
-Then enter in:
+Create your `tootube.toml` config file:
 
-```
-https://accounts.google.com/o/oauth2/v2/auth?client_id=XXX.apps.googleusercontent.com&redirect_uri=urn:ietf:wg:oauth:2.0:oob&scope=https://www.googleapis.com/auth/youtube.upload&response_type=code
+```toml
+[peertube]
+base_url="https://p.nintendojo.fr"
+# optional
+# allows you to delete the original video source file once it’s uploaded to YouTube
+delete_video_source_after_transfer=true # this option is only available if you have Administrator privileges
+# optional
+# everything below is given by the register command with --peertube option
+[peertube.oauth2]
+client_id="<YOUR CLIENT_ID>"
+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
+
+[youtube]
+refresh_token="" # leave empty for now
+client_id="<YOUR CLIENT_ID>"
+client_secret="<YOUR CLIENT_SECRET>"
 ```
 
-And accept that your YouTube account might be modified. You’ll get a code then; enter this `curl` post:
+Then run:
 
-```
-curl -s \
---request POST \
---data "code=[THE_CODE]&client_id=XXX.apps.googleusercontent.com&client_secret=[THE_CLIENT_SECRET]&redirect_uri=urn:ietf:wg:oauth:2.0:oob&grant_type=authorization_code" \
-https://accounts.google.com/o/oauth2/token
+```bash
+tootube register --youtube --config <PATH TO YOUR TOOTUBE.TOML FILE>
 ```
 
-You’ll get a Token. The only important part is the `refresh_token`
+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.
 
-In your `tootube.toml` config file, put the `refresh_token`.
+If you wish to register `tootube` on PeerTube, you can do so by using:
+
+```bash
+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:
+
+```bash
+echo -n '<REFRESH_TOKEN>' > /var/lib/tootube/refresh_token
+```

src/config.rs

@@ -6,11 +6,33 @@ use std::fs::read_to_string;
 pub struct Config {
     pub peertube: PeertubeConfig,
     pub youtube: YoutubeConfig,
+    #[serde(default)]
+    pub tootube: TootubeConfig,
 }
 
 #[derive(Debug, Deserialize)]
 pub struct PeertubeConfig {
     pub base_url: String,
+    #[serde(default)]
+    pub delete_video_source_after_transfer: bool,
+    pub oauth2: Option<PeertubeConfigOauth2>,
+}
+
+impl Default for PeertubeConfig {
+    fn default() -> Self {
+        PeertubeConfig {
+            base_url: "".to_string(),
+            delete_video_source_after_transfer: false,
+            oauth2: None,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct PeertubeConfigOauth2 {
+    pub client_id: String,
+    pub client_secret: String,
+    pub refresh_token: String,
 }
 
 #[derive(Debug, Deserialize)]
@@ -20,6 +42,21 @@ pub struct YoutubeConfig {
     pub client_secret: String,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct TootubeConfig {
+    pub progress_bar: String,
+    pub progress_chars: String,
+}
+
+impl Default for TootubeConfig {
+    fn default() -> Self {
+        TootubeConfig {
+            progress_bar: "{msg}\n{spinner:.green} [{elapsed_precise}] [{wide_bar:.cyan/blue}] {bytes}/{total_bytes} ({bytes_per_sec}, {eta})".to_string(),
+            progress_chars: "#>-".to_string(),
+        }
+    }
+}
+
 /// Parses the TOML file into a Config struct
 pub fn parse_toml(toml_file: &str) -> Config {
     let toml_config =

src/lib.rs

@@ -1,6 +1,4 @@
-use bytes::Bytes;
-use futures_core::stream::Stream;
-use std::error::Error;
+use log::debug;
 
 mod error;
 
@@ -9,44 +7,88 @@ pub use config::parse_toml;
 use config::Config;
 
 mod peertube;
-use peertube::{get_latest_video, get_max_resolution_dl};
+pub use peertube::register as register_peertube;
+use peertube::PeerTube;
 
 mod youtube;
-pub use youtube::register;
-use youtube::{add_video_to_playlists, create_resumable_upload, now_kiss};
-
-async fn get_dl_video_stream(
-    u: &str,
-) -> Result<impl Stream<Item = Result<Bytes, reqwest::Error>>, Box<dyn Error>> {
-    Ok(reqwest::get(u).await?.bytes_stream())
-}
+pub use youtube::register as register_youtube;
+use youtube::YouTube;
 
 #[tokio::main]
 pub async fn run(config: Config, pl: Vec<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)
+            .await
+            .unwrap_or_else(|e| panic!("Cannot instantiate PeerTube struct: {}", e)),
+        None => PeerTube::new(&config.peertube.base_url),
+    };
     // Get the latest video object
-    let latest_vid = get_latest_video(&config.peertube.base_url)
-        .await
-        .unwrap_or_else(|e| {
-            panic!("Cannot retrieve the latest video, something must have gone terribly wrong: {e}")
-        });
+    let latest_vid = peertube.get_latest_video().await.unwrap_or_else(|e| {
+        panic!("Cannot retrieve the latest video, something must have gone terribly wrong: {e}")
+    });
 
-    let dl_url = get_max_resolution_dl(latest_vid.streaming_playlists.as_ref().unwrap());
+    // We have a refresh_token, try to use it
+    let source_url = match &config.peertube.oauth2 {
+        Some(_) => peertube
+            .get_original_video_source(&latest_vid.uuid)
+            .await
+            .ok(),
+        None => None,
+    };
 
-    let pt_stream = get_dl_video_stream(&dl_url)
-        .await
-        .unwrap_or_else(|e| panic!("Cannot download video at URL {}: {}", dl_url, e));
+    // Whatever happens, collect the highest quality possible
+    let high_quality_url = latest_vid.streaming_playlists.as_ref().unwrap()[0]
+        .files
+        .iter()
+        .max()
+        .unwrap()
+        .file_download_url
+        .clone();
 
-    let resumable_upload_url = create_resumable_upload(&config.youtube, &latest_vid)
+    // dl_url corresponds to source url if available, best quality if not
+    let dl_url = match source_url {
+        Some(s) => s,
+        None => high_quality_url,
+    };
+
+    debug!("PT download URL: {}", &dl_url);
+
+    let youtube = YouTube::new(
+        &config.youtube.client_id,
+        &config.youtube.client_secret,
+        &config.youtube.refresh_token,
+    )
+    .await
+    .unwrap_or_else(|e| panic!("Cannot instantiate YouTube struct: {}", e));
+
+    let resumable_upload_url = youtube
+        .create_resumable_upload(&latest_vid)
         .await
         .unwrap_or_else(|e| panic!("Cannot retrieve the upload’s resumable id: {e}"));
+    debug!("YT upload URL: {}", &resumable_upload_url);
 
-    let yt_video_id = now_kiss(pt_stream, &resumable_upload_url, &config.youtube)
+    let yt_video_id = youtube
+        .now_kiss(&dl_url, &resumable_upload_url, &config.tootube)
         .await
         .unwrap_or_else(|e| panic!("Cannot resume upload!: {e}"));
+    debug!("YT video ID: {}", &yt_video_id);
 
     if !pl.is_empty() {
-        add_video_to_playlists(&config.youtube, &yt_video_id, &pl)
+        youtube
+            .add_video_to_playlists(&yt_video_id, &pl)
             .await
             .unwrap_or_else(|e| panic!("Cannot add video to playlist(s): {e}"));
     }
+
+    // delete the source video if requested (it won’t be used anymore)
+    if config.peertube.delete_video_source_after_transfer {
+        peertube
+            .delete_original_video_source(&latest_vid.uuid)
+            .await
+            .unwrap_or_else(|e| panic!("Cannot delete source video: {e}"));
+
+        debug!("Original Video {} has been deleted", &latest_vid.uuid);
+    }
 }

src/main.rs

@@ -10,6 +10,7 @@ fn main() {
         .arg(
             Arg::new("config")
                 .short('c')
+                .global(true)
                 .long("config")
                 .value_name("CONFIG_FILE")
                 .help("TOML config file for tootube")
@@ -26,31 +27,57 @@ fn main() {
                 .num_args(0..)
                 .display_order(2),
         )
+        .arg(
+            Arg::new("vice")
+                .long("vice")
+                .aliases(["chybrare", "coquinou"])
+                .action(clap::ArgAction::SetTrue)
+                .display_order(3),
+        )
         .subcommand(
             Command::new("register")
                 .version(env!("CARGO_PKG_VERSION"))
-                .about("Command to register to YouTube OAuth2.0")
+                .about("Command to register to YouTube or PeerTube OAuth2.0")
                 .arg(
-                    Arg::new("config")
-                        .short('c')
-                        .long("config")
-                        .value_name("CONFIG_FILE")
-                        .help("TOML config file for tootube")
-                        .num_args(1)
-                        .default_value(DEFAULT_CONFIG_PATH)
-                        .display_order(1),
+                    Arg::new("youtube")
+                        .long("youtube")
+                        .short('y')
+                        .required(true)
+                        .conflicts_with("peertube")
+                        .action(clap::ArgAction::SetTrue),
+                )
+                .arg(
+                    Arg::new("peertube")
+                        .long("peertube")
+                        .short('p')
+                        .required(true)
+                        .action(clap::ArgAction::SetTrue),
                 ),
         )
         .get_matches();
 
     if let Some(("register", sub_m)) = matches.subcommand() {
         let config = parse_toml(sub_m.get_one::<String>("config").unwrap());
-        register(&config.youtube)
-            .unwrap_or_else(|e| panic!("Cannot register to YouTube API: {}", e));
+
+        if sub_m.get_flag("youtube") {
+            register_youtube(&config.youtube)
+                .unwrap_or_else(|e| panic!("Cannot register to YouTube API: {}", e));
+        }
+
+        if sub_m.get_flag("peertube") {
+            register_peertube(&config.peertube)
+                .unwrap_or_else(|e| panic!("Cannot register to PeerTube API: {}", e));
+        }
+
         return;
     }
 
-    let config = parse_toml(matches.get_one::<String>("config").unwrap());
+    let mut config = parse_toml(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();
+        config.tootube.progress_chars = "=D ".to_string();
+    }
 
     let playlists: Vec<String> = matches
         .get_many::<String>("playlists")

src/peertube.rs

@@ -1,5 +1,13 @@
-use serde::Deserialize;
-use std::{boxed::Box, error::Error};
+use crate::{config::PeertubeConfig, error::TootubeError};
+use log::debug;
+use reqwest::{
+    header::{HeaderMap, HeaderValue},
+    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 {
@@ -23,6 +31,44 @@ pub struct PeerTubeVideoStreamingPlaylists {
 }
 
 #[derive(Debug, Deserialize)]
+struct PeerTubeOauthClientsLocalResponse {
+    client_id: String,
+    client_secret: String,
+}
+
+#[derive(Debug, Serialize)]
+struct PeerTubeUsersToken {
+    client_id: String,
+    client_secret: String,
+    grant_type: String,
+    password: Option<String>,
+    username: Option<String>,
+    refresh_token: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeUsersTokenResponse {
+    refresh_token: String,
+    access_token: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoSourceResponse {
+    #[serde(rename = "fileDownloadUrl")]
+    pub file_download_url: String,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoTokenResponse {
+    files: PeerTubeVideoTokenResponseFiles,
+}
+
+#[derive(Debug, Deserialize)]
+struct PeerTubeVideoTokenResponseFiles {
+    token: String,
+}
+
+#[derive(Eq, Debug, Deserialize)]
 pub struct PeerTubeVideoStreamingPlaylistsFiles {
     pub id: u64,
     pub resolution: PeerTubeVideoStreamingPlaylistsFilesResolution,
@@ -30,75 +76,218 @@ pub struct PeerTubeVideoStreamingPlaylistsFiles {
     pub file_download_url: String,
 }
 
-#[derive(Debug, Deserialize)]
+impl Ord for PeerTubeVideoStreamingPlaylistsFiles {
+    fn cmp(&self, other: &Self) -> Ordering {
+        self.resolution.id.cmp(&other.resolution.id)
+    }
+}
+
+impl PartialOrd for PeerTubeVideoStreamingPlaylistsFiles {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl PartialEq for PeerTubeVideoStreamingPlaylistsFiles {
+    fn eq(&self, other: &Self) -> bool {
+        self.resolution.id == other.resolution.id
+    }
+}
+
+#[derive(Eq, Debug, Deserialize, PartialEq)]
 pub struct PeerTubeVideoStreamingPlaylistsFilesResolution {
     pub id: u16,
 }
 
-/// This gets the last video uploaded to the PeerTube server
-pub async fn get_latest_video(u: &str) -> Result<PeerTubeVideo, Box<dyn Error>> {
-    let body = reqwest::get(format!("{}/api/v1/videos?count=1&sort=-publishedAt", u))
+/// This function makes the registration process a little bit easier
+#[tokio::main]
+pub async fn register(config: &PeertubeConfig) -> Result<(), Box<dyn Error>> {
+    // Get client ID/secret
+    let oauth2_client = reqwest::get(format!("{}/api/v1/oauth-clients/local", config.base_url))
         .await?
-        .json::<PeerTubeVideos>()
+        .json::<PeerTubeOauthClientsLocalResponse>()
         .await?;
 
-    let vid = get_video_detail(u, &body.data[0].uuid).await?;
+    println!(
+        "Please type your PeerTube username for instance {}:",
+        config.base_url
+    );
+    let mut username = String::new();
+    stdin()
+        .read_line(&mut username)
+        .expect("Unable to read back the username!");
 
-    Ok(vid)
+    let password = prompt_password("Your password: ").expect("Unable to read back the password!");
+
+    let params = PeerTubeUsersToken {
+        client_id: oauth2_client.client_id.clone(),
+        client_secret: oauth2_client.client_secret.clone(),
+        grant_type: "password".to_string(),
+        username: Some(username.trim().to_string()),
+        password: Some(password.clone()),
+        refresh_token: None,
+    };
+
+    let client = Client::new();
+    let oauth2_token = client
+        .post(format!("{}/api/v1/users/token", config.base_url))
+        .form(&params)
+        .send()
+        .await?
+        .json::<PeerTubeUsersTokenResponse>()
+        .await?;
+
+    println!("You can now paste the following lines inside 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!();
+
+    println!("Finally, add the refresh token inside the refresh_token path:");
+    println!("{}", oauth2_token.refresh_token);
+
+    Ok(())
 }
 
-/// This returns the direct download URL for with the maximum resolution
-pub fn get_max_resolution_dl(p: &[PeerTubeVideoStreamingPlaylists]) -> String {
-    let mut res = 0;
-    let mut dl_url = String::new();
+#[derive(Debug)]
+pub struct PeerTube {
+    base_url: String,
+    client: Client,
+}
 
-    for i in p[0].files.iter() {
-        if i.resolution.id > res {
-            res = i.resolution.id;
-            dl_url = i.file_download_url.clone();
+impl PeerTube {
+    /// Create a new PeerTube struct with a basic embedded reqwest::Client
+    pub fn new(base_url: &str) -> Self {
+        PeerTube {
+            base_url: format!("{}/api/v1", base_url),
+            client: Client::new(),
         }
     }
 
-    dl_url
-}
+    /// Retrieve the refresh_token and access_token and update the embedded reqwest::Client to have
+    /// the default required header
+    pub async fn with_client(
+        mut self,
+        client_id: &str,
+        client_secret: &str,
+        refresh_token_path: &str,
+    ) -> Result<Self, Box<dyn Error>> {
+        let refresh_token = read_to_string(refresh_token_path).await?;
 
-/// This gets all the crispy details about one particular video
-async fn get_video_detail(u: &str, v: &str) -> Result<PeerTubeVideo, Box<dyn Error>> {
-    let body = reqwest::get(format!("{}/api/v1/videos/{}", u, v))
-        .await?
-        .json::<PeerTubeVideo>()
-        .await?;
+        let params = PeerTubeUsersToken {
+            client_id: client_id.to_string(),
+            client_secret: client_secret.to_string(),
+            grant_type: "refresh_token".to_string(),
+            refresh_token: Some(refresh_token),
+            username: None,
+            password: None,
+        };
 
-    Ok(body)
-}
+        let req = self
+            .client
+            .post(&format!("{}/users/token", self.base_url))
+            .form(&params)
+            .send()
+            .await?
+            .json::<PeerTubeUsersTokenResponse>()
+            .await?;
 
-#[cfg(test)]
-mod tests {
-    use super::*;
+        write(refresh_token_path, req.refresh_token).await?;
 
-    #[test]
-    fn test_get_max_resolution_dl() {
-        let str_plist: Vec<PeerTubeVideoStreamingPlaylists> =
-            vec![PeerTubeVideoStreamingPlaylists {
-                files: vec![
-                    PeerTubeVideoStreamingPlaylistsFiles {
-                        id: 1025,
-                        resolution: PeerTubeVideoStreamingPlaylistsFilesResolution { id: 990 },
-                        file_download_url: "meh!".to_string(),
-                    },
-                    PeerTubeVideoStreamingPlaylistsFiles {
-                        id: 1027,
-                        resolution: PeerTubeVideoStreamingPlaylistsFilesResolution { id: 1720 },
-                        file_download_url: "blah".to_string(),
-                    },
-                    PeerTubeVideoStreamingPlaylistsFiles {
-                        id: 1026,
-                        resolution: PeerTubeVideoStreamingPlaylistsFilesResolution { id: 360 },
-                        file_download_url: "nope".to_string(),
-                    },
-                ],
-            }];
+        let mut headers = HeaderMap::new();
+        headers.insert(
+            "Authorization",
+            HeaderValue::from_str(&format!("Bearer {}", req.access_token))?,
+        );
 
-        assert_eq!("blah".to_string(), get_max_resolution_dl(&str_plist));
+        self.client = reqwest::Client::builder()
+            .default_headers(headers)
+            .build()?;
+
+        Ok(self)
+    }
+
+    /// This gets the last video uploaded to the PeerTube server
+    pub async fn get_latest_video(&self) -> Result<PeerTubeVideo, Box<dyn Error>> {
+        let body = self
+            .client
+            .get(format!(
+                "{}/videos?count=1&sort=-publishedAt",
+                self.base_url
+            ))
+            .send()
+            .await?
+            .json::<PeerTubeVideos>()
+            .await?;
+
+        let vid = self.get_video_detail(&body.data[0].uuid).await?;
+
+        Ok(vid)
+    }
+
+    /// This gets all the crispy details about one particular video
+    async fn get_video_detail(&self, v: &str) -> Result<PeerTubeVideo, Box<dyn Error>> {
+        let body = self
+            .client
+            .get(format!("{}/videos/{}", self.base_url, v))
+            .send()
+            .await?
+            .json::<PeerTubeVideo>()
+            .await?;
+
+        Ok(body)
+    }
+
+    /// Get the original video source
+    pub async fn get_original_video_source(&self, uuid: &str) -> Result<String, Box<dyn Error>> {
+        let source_vid = self
+            .client
+            .get(format!("{}/videos/{}/source", self.base_url, uuid))
+            .send()
+            .await?
+            .json::<PeerTubeVideoSourceResponse>()
+            .await?;
+
+        debug!("Got the Source Vid URL: {}", &source_vid.file_download_url);
+
+        let video_file_token = self
+            .client
+            .post(format!("{}/videos/{}/token", self.base_url, uuid))
+            .send()
+            .await?
+            .json::<PeerTubeVideoTokenResponse>()
+            .await?;
+
+        debug!("Got the File Token: {}", &video_file_token.files.token);
+
+        Ok(format!(
+            "{}?videoFileToken={}",
+            source_vid.file_download_url, video_file_token.files.token
+        ))
+    }
+
+    /// Delete the original video source
+    pub async fn delete_original_video_source(&self, uuid: &str) -> Result<(), Box<dyn Error>> {
+        let res = self
+            .client
+            .delete(format!("{}/videos/{}/source/file", self.base_url, uuid))
+            .send()
+            .await?;
+
+        if !res.status().is_success() {
+            return Err(TootubeError::new(&format!(
+                "Cannot delete source video file {}: {}",
+                uuid,
+                res.text().await?
+            ))
+            .into());
+        }
+
+        Ok(())
     }
 }

src/youtube.rs

@@ -1,12 +1,19 @@
-use crate::{config::YoutubeConfig, error::TootubeError, peertube::PeerTubeVideo};
-use bytes::Bytes;
-use futures_core::stream::Stream;
-use reqwest::{multipart::Form, Body, Client};
+use crate::{
+    config::{TootubeConfig, YoutubeConfig},
+    error::TootubeError,
+    peertube::PeerTubeVideo,
+};
+use async_stream::stream;
+use futures_util::StreamExt;
+use indicatif::{ProgressBar, ProgressStyle};
+use log::{debug, warn};
+use reqwest::{
+    header::{HeaderMap, HeaderValue},
+    multipart::Form,
+    Body, Client,
+};
 use serde::{Deserialize, Serialize};
-use std::{error::Error, io::stdin};
-use tokio::sync::OnceCell;
-
-static ACCESS_TOKEN: OnceCell<String> = OnceCell::const_new();
+use std::{cmp::min, error::Error, io::stdin};
 
 #[derive(Serialize, Debug)]
 struct RefreshTokenRequest {
@@ -187,180 +194,216 @@ pub async fn register(config: &YoutubeConfig) -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-/// Ensures that Token has been refreshed and that it is unique
-async fn refresh_token(config: &YoutubeConfig) -> Result<String, reqwest::Error> {
-    ACCESS_TOKEN
-        .get_or_try_init(|| async {
-            let refresh_token = RefreshTokenRequest {
-                refresh_token: config.refresh_token.clone(),
-                client_id: config.client_id.clone(),
-                client_secret: config.client_secret.clone(),
-                ..Default::default()
+pub struct YouTube {
+    client: Client,
+}
+
+impl YouTube {
+    pub async fn new(
+        client_id: &str,
+        client_secret: &str,
+        refresh_token: &str,
+    ) -> Result<Self, Box<dyn Error>> {
+        let mut youtube = YouTube {
+            client: Client::new(),
+        };
+
+        let refresh_token = RefreshTokenRequest {
+            refresh_token: refresh_token.to_string(),
+            client_id: client_id.to_string(),
+            client_secret: client_secret.to_string(),
+            ..Default::default()
+        };
+
+        let access_token = youtube
+            .client
+            .post("https://accounts.google.com/o/oauth2/token")
+            .json(&refresh_token)
+            .send()
+            .await?
+            .json::<AccessTokenResponse>()
+            .await?;
+
+        let mut headers = HeaderMap::new();
+        headers.insert(
+            "Authorization",
+            HeaderValue::from_str(&format!("Bearer {}", access_token.access_token))?,
+        );
+
+        youtube.client = reqwest::Client::builder()
+            .default_headers(headers)
+            .build()?;
+
+        Ok(youtube)
+    }
+    /// 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!(
+                "https://www.googleapis.com/youtube/v3/playlists?part=snippet&mine=true&pageToken={}",
+                page_token
+            ))
+            .send()
+            .await?
+            .json::<YoutubePlaylistListResponse>()
+            .await
+        {
+            playlists.append(
+                &mut local_pl
+                    .items
+                    .iter()
+                    .filter_map(|s| pl.contains(&s.snippet.title).then_some(s.id.clone()))
+                    .collect(),
+            );
+            // if nextPageToken is present, continue the loop
+            match local_pl.next_page_token {
+                None => break,
+                Some(a) => page_token.clone_from(&a),
+            }
+        }
+
+        debug!("Playlists IDs: {:?}", &playlists);
+        Ok(playlists)
+    }
+
+    /// This function adds the video id to the corresponding named playlist(s)
+    pub async fn add_video_to_playlists(
+        &self,
+        v: &str,
+        pl: &[String],
+    ) -> Result<(), Box<dyn Error>> {
+        let playlists_ids = self.get_playlist_ids(pl).await?;
+
+        for pl_id in playlists_ids {
+            let yt_pl_upload_params = YoutubePlaylistItemsParams {
+                snippet: YoutubePlaylistItemsParamsSnippet {
+                    playlist_id: pl_id.clone(),
+                    resource_id: YoutubePlaylistItemsParamsSnippetResourceId {
+                        video_id: v.to_string(),
+                        ..Default::default()
+                    },
+                    ..Default::default()
+                },
             };
 
-            let client = Client::new();
-            let res = client
-                .post("https://accounts.google.com/o/oauth2/token")
-                .json(&refresh_token)
+            let res = self
+                .client
+                .post("https://youtube.googleapis.com/youtube/v3/playlistItems?part=snippet")
+                .json(&yt_pl_upload_params)
                 .send()
                 .await?;
 
-            let access_token: AccessTokenResponse = res.json().await?;
-
-            Ok(access_token.access_token)
-        })
-        .await
-        .cloned()
-}
-
-/// This function takes a list of playlists keyword and returns a list of playlist ID
-async fn get_playlist_ids(
-    config: &YoutubeConfig,
-    pl: &[String],
-) -> Result<Vec<String>, Box<dyn Error>> {
-    let mut page_token = String::new();
-    let mut playlists: Vec<String> = vec![];
-
-    let access_token = refresh_token(config).await?;
-    let client = Client::new();
-
-    while let Ok(local_pl) = client
-        .get(&format!(
-            "https://www.googleapis.com/youtube/v3/playlists?part=snippet&mine=true&pageToken={}",
-            page_token
-        ))
-        .header("Authorization", format!("Bearer {}", access_token))
-        .send()
-        .await?
-        .json::<YoutubePlaylistListResponse>()
-        .await
-    {
-        playlists.append(
-            &mut local_pl
-                .items
-                .iter()
-                .filter_map(|s| pl.contains(&s.snippet.title).then_some(s.id.clone()))
-                .collect(),
-        );
-
-        // if nextPageToken is present, continue the loop
-        match local_pl.next_page_token {
-            None => break,
-            Some(a) => page_token = a.clone(),
+            if !res.status().is_success() {
+                return Err(TootubeError::new(&format!(
+                    "Something went wrong when trying to add the video to a playlist: {}",
+                    res.text().await?
+                ))
+                .into());
+            }
         }
+
+        Ok(())
     }
 
-    Ok(playlists)
-}
+    /// This function creates a resumable YT upload, putting all the parameters in
+    pub async fn create_resumable_upload(
+        &self,
+        vid: &PeerTubeVideo,
+    ) -> Result<String, Box<dyn Error>> {
+        if vid.name.chars().count() > 100 {
+            warn!(
+                "PT Video Title ({}) is too long, it will be truncated",
+                &vid.name
+            );
+        }
 
-/// This function adds the video id to the corresponding named playlist(s)
-pub async fn add_video_to_playlists(
-    config: &YoutubeConfig,
-    v: &str,
-    pl: &[String],
-) -> Result<(), Box<dyn Error>> {
-    let access_token = refresh_token(config).await?;
-    let playlists_ids = get_playlist_ids(config, pl).await?;
-
-    for pl_id in playlists_ids {
-        let yt_pl_upload_params = YoutubePlaylistItemsParams {
-            snippet: YoutubePlaylistItemsParamsSnippet {
-                playlist_id: pl_id.clone(),
-                resource_id: YoutubePlaylistItemsParamsSnippetResourceId {
-                    video_id: v.to_string(),
+        let upload_params = YoutubeUploadParams {
+            snippet: {
+                YoutubeUploadParamsSnippet {
+                    title: vid.name.chars().take(100).collect::<String>(),
+                    description: vid.description.clone(),
+                    tags: vid.tags.clone(),
                     ..Default::default()
-                },
-                ..Default::default()
+                }
+            },
+            status: {
+                YoutubeUploadParamsStatus {
+                    ..Default::default()
+                }
             },
         };
-        let client = Client::new();
+        debug!("YT upload params: {:?}", &upload_params);
 
-        let res = client
-            .post("https://youtube.googleapis.com/youtube/v3/playlistItems?part=snippet")
-            .header("Authorization", format!("Bearer {}", access_token))
-            .json(&yt_pl_upload_params)
+        let res = self.client.post("https://www.googleapis.com/upload/youtube/v3/videos?uploadType=resumable&part=snippet%2Cstatus")
+            .json(&upload_params)
+            .send().await?;
+
+        if res.status().is_success() {
+            Ok(res
+                .headers()
+                .get("location")
+                .ok_or("Cannot find suitable header")?
+                .to_str()?
+                .to_string())
+        } else {
+            Err(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,
+        dl_url: &str,
+        r_url: &str,
+        pg_conf: &TootubeConfig,
+    ) -> Result<String, Box<dyn Error>> {
+        // Get the upstream bytes stream
+        let res = reqwest::get(dl_url).await?;
+        let content_lengh = res
+            .content_length()
+            .ok_or(format!("Cannot get content length from {}", dl_url))?;
+        let mut stream = res.bytes_stream();
+
+        // Create the progress bar
+        let pb = ProgressBar::new(content_lengh);
+        pb.set_style(
+            ProgressStyle::default_bar()
+                .template(&pg_conf.progress_bar)?
+                .progress_chars(&pg_conf.progress_chars),
+        );
+        pb.set_message("Transferring…");
+        let mut transferring: u64 = 0;
+
+        // yields the stream chunk by chunk, updating the progress bar at the same time
+        let async_stream = stream! {
+            while let Some(chunk) = stream.next().await {
+                if let Ok(chunk) = &chunk {
+                    let new = min(transferring + (chunk.len() as u64), content_lengh);
+                    transferring = new;
+                    pb.set_position(new);
+                    if transferring >= content_lengh {
+                        pb.finish();
+                    }
+                }
+                yield chunk;
+            }
+        };
+
+        // Create client
+        let res = self
+            .client
+            .put(r_url)
+            .body(Body::wrap_stream(async_stream))
             .send()
             .await?;
 
-        if !res.status().is_success() {
-            return Err(TootubeError::new(&format!(
-                "Something went wrong when trying to add the video to a playlist: {}",
-                res.text().await?
-            ))
-            .into());
+        if res.status().is_success() {
+            let yt_videos: YoutubeVideos = res.json().await?;
+            Ok(yt_videos.id)
+        } else {
+            Err(TootubeError::new(&format!("Cannot upload video: {:?}", res.text().await?)).into())
         }
     }
-
-    Ok(())
-}
-
-/// This function creates a resumable YT upload, putting all the parameters in
-pub async fn create_resumable_upload(
-    config: &YoutubeConfig,
-    vid: &PeerTubeVideo,
-) -> Result<String, Box<dyn Error>> {
-    let access_token = refresh_token(config).await?;
-
-    let upload_params = YoutubeUploadParams {
-        snippet: {
-            YoutubeUploadParamsSnippet {
-                title: vid.name.clone(),
-                description: vid.description.clone(),
-                tags: vid.tags.clone(),
-                ..Default::default()
-            }
-        },
-        status: {
-            YoutubeUploadParamsStatus {
-                ..Default::default()
-            }
-        },
-    };
-
-    let client = Client::new();
-    let res = client.post("https://www.googleapis.com/upload/youtube/v3/videos?uploadType=resumable&part=snippet%2Cstatus")
-        .header("Authorization", format!("Bearer {}", access_token))
-        .json(&upload_params)
-        .send().await?;
-
-    if res.status().is_success() {
-        Ok(res
-            .headers()
-            .get("location")
-            .ok_or("Cannot find suitable header")?
-            .to_str()?
-            .to_string())
-    } else {
-        Err(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<'a>(
-    stream: impl Stream<Item = Result<Bytes, reqwest::Error>>
-        + std::marker::Send
-        + std::marker::Sync
-        + 'a + 'static,
-    r_url: &'a str,
-    config: &'a YoutubeConfig,
-) -> Result<String, Box<dyn Error>> {
-    // Get access token
-    let access_token = refresh_token(config).await?;
-
-    // Create client
-    let client = Client::new();
-
-    let res = client
-        .put(r_url)
-        .header("Authorization", format!("Bearer {}", access_token))
-        .body(Body::wrap_stream(stream))
-        .send()
-        .await?;
-
-    if res.status().is_success() {
-        let yt_videos: YoutubeVideos = res.json().await?;
-        Ok(yt_videos.id)
-    } else {
-        Err(TootubeError::new(&format!("Cannot upload video: {:?}", res.text().await?)).into())
-    }
 }