7 Commits

Author SHA1 Message Date
VC
d70fbdac98 Merge branch '4-use-original-source-file-when-possible' into 'master'
: add peertube source video file

Closes #4

See merge request veretcle/tootube!19
2024-05-14 08:42:25 +00:00
VC
982dc8b954 : add peertube source video file 2024-05-14 10:38:37 +02:00
VC
bf622d6989 Merge branch 'rust_1_77' into 'master'
🔖: bump version and dependencies

See merge request veretcle/tootube!18
2024-04-12 07:22:09 +00:00
VC
a687f008df 🔖: bump version and dependencies 2024-04-12 09:09:45 +02:00
VC
e2ab93c04e Merge branch 'fix_title_length' into 'master'
fix: truncate YT vid title to 100 chars

See merge request veretcle/tootube!17
2023-12-28 09:40:26 +00:00
VC
9e1c27be29 fix: truncate YT vid title to 100 chars 2023-12-28 10:37:23 +01:00
VC
ab9ea1a8ee Merge branch 'tamerelol' into 'master'
feat: add --vice option

See merge request veretcle/tootube!16
2023-10-26 09:06:47 +00:00
8 changed files with 651 additions and 345 deletions

657
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,12 +1,13 @@
[package]
name = "tootube"
authors = ["VC <veretcle+framagit@mateu.be>"]
version = "0.5.3"
version = "0.6.0"
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"

View File

@@ -13,6 +13,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
* 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)
@@ -46,6 +47,15 @@ Create your `tootube.toml` config file:
```toml
[peertube]
base_url="https://p.nintendojo.fr"
# optional
# allows you to delete the original video source file once its 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
@@ -56,7 +66,19 @@ client_secret="<YOUR CLIENT_SECRET>"
Then run:
```bash
tootube register --config <PATH TO YOUR TOOTUBE.TOML FILE>
tootube register --youtube --config <PATH TO YOUR TOOTUBE.TOML FILE>
```
Youll be then prompted with all the necessary information to register `tootube`. Youll end with a `refresh_token` that you can now paste inside your tootube configuration.
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
```

View File

@@ -13,6 +13,26 @@ pub struct Config {
#[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)]

View File

@@ -7,10 +7,11 @@ pub use config::parse_toml;
use config::Config;
mod peertube;
use peertube::get_latest_video;
pub use peertube::register as register_peertube;
use peertube::{delete_original_video_source, get_latest_video, get_original_video_source};
mod youtube;
pub use youtube::register;
pub use youtube::register as register_youtube;
use youtube::{add_video_to_playlists, create_resumable_upload, now_kiss};
#[tokio::main]
@@ -22,13 +23,29 @@ pub async fn run(config: Config, pl: Vec<String>) {
panic!("Cannot retrieve the latest video, something must have gone terribly wrong: {e}")
});
let dl_url = latest_vid.streaming_playlists.as_ref().unwrap()[0]
// We have a refresh_token, try to use it
let source_url = match &config.peertube.oauth2 {
Some(_) => get_original_video_source(&latest_vid.uuid, &config.peertube)
.await
.ok(),
None => None,
};
// 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();
// 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 resumable_upload_url = create_resumable_upload(&config.youtube, &latest_vid)
@@ -51,4 +68,13 @@ pub async fn run(config: Config, pl: Vec<String>) {
.await
.unwrap_or_else(|e| panic!("Cannot add video to playlist(s): {e}"));
}
// delete the source video if requested (it wont be used anymore)
if config.peertube.delete_video_source_after_transfer {
delete_original_video_source(&latest_vid.uuid, &config.peertube)
.await
.unwrap_or_else(|e| panic!("Cannot delete source video: {e}"));
debug!("Original Video {} has been deleted", &latest_vid.uuid);
}
}

View File

@@ -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")
@@ -29,32 +30,45 @@ fn main() {
.arg(
Arg::new("vice")
.long("vice")
.alias("chybrare")
.alias("coquinou")
.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;
}

View File

@@ -1,5 +1,10 @@
use serde::Deserialize;
use std::{boxed::Box, cmp::Ordering, error::Error};
use crate::{config::PeertubeConfig, error::TootubeError};
use log::debug;
use reqwest::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 {
@@ -22,6 +27,44 @@ pub struct PeerTubeVideoStreamingPlaylists {
pub files: Vec<PeerTubeVideoStreamingPlaylistsFiles>,
}
#[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,
@@ -74,3 +117,163 @@ async fn get_video_detail(u: &str, v: &str) -> Result<PeerTubeVideo, Box<dyn Err
Ok(body)
}
/// 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::<PeerTubeOauthClientsLocalResponse>()
.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!");
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(())
}
async fn get_refresh_token(config: &PeertubeConfig) -> Result<String, Box<dyn Error>> {
// unwrap is safe here, this function is only called when oauth2 is present
let oauth2_config = config.oauth2.as_ref().unwrap().clone();
// retrieve the refresh_token from the file
let refresh_token = read_to_string(&oauth2_config.refresh_token).await?;
debug!(
"Opened file {} to retrieve Token",
&oauth2_config.refresh_token
);
let params = PeerTubeUsersToken {
client_id: oauth2_config.client_id.clone(),
client_secret: oauth2_config.client_secret.clone(),
grant_type: "refresh_token".to_string(),
refresh_token: Some(refresh_token),
username: None,
password: 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?;
debug!("Retrieved access_token: {}", &oauth2_token.access_token);
// write the new refresh token to the file
write(&oauth2_config.refresh_token, oauth2_token.refresh_token).await?;
debug!(
"Written refresh_token to file {}",
&oauth2_config.refresh_token
);
Ok(oauth2_token.access_token)
}
pub async fn get_original_video_source(
uuid: &str,
config: &PeertubeConfig,
) -> Result<String, Box<dyn Error>> {
let access_token = get_refresh_token(config).await?;
let client = Client::new();
let source_vid = client
.get(format!("{}/api/v1/videos/{}/source", config.base_url, uuid))
.header("Authorization", format!("Bearer {}", &access_token))
.send()
.await?
.json::<PeerTubeVideoSourceResponse>()
.await?;
debug!("Got the Source Vid URL: {}", &source_vid.file_download_url);
let video_file_token = client
.post(format!("{}/api/v1/videos/{}/token", config.base_url, uuid))
.header("Authorization", format!("Bearer {}", &access_token))
.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
))
}
pub async fn delete_original_video_source(
uuid: &str,
config: &PeertubeConfig,
) -> Result<(), Box<dyn Error>> {
let access_token = get_refresh_token(config).await?;
let client = Client::new();
let res = client
.delete(format!(
"{}/api/v1/videos/{}/source/file",
config.base_url, uuid
))
.header("Authorization", format!("Bearer {}", &access_token))
.send()
.await?;
if !res.status().is_success() {
return Err(TootubeError::new(&format!(
"Cannot delete source video file {}: {}",
uuid,
res.text().await?
))
.into());
}
Ok(())
}

View File

@@ -6,7 +6,7 @@ use crate::{
use async_stream::stream;
use futures_util::StreamExt;
use indicatif::{ProgressBar, ProgressStyle};
use log::debug;
use log::{debug, warn};
use reqwest::{multipart::Form, Body, Client};
use serde::{Deserialize, Serialize};
use std::{cmp::min, error::Error, io::stdin};
@@ -253,7 +253,7 @@ async fn get_playlist_ids(
// if nextPageToken is present, continue the loop
match local_pl.next_page_token {
None => break,
Some(a) => page_token = a.clone(),
Some(a) => page_token.clone_from(&a),
}
}
@@ -309,10 +309,17 @@ pub async fn create_resumable_upload(
) -> Result<String, Box<dyn Error>> {
let access_token = refresh_token(config).await?;
if vid.name.chars().count() > 100 {
warn!(
"PT Video Title ({}) is too long, it will be truncated",
&vid.name
);
}
let upload_params = YoutubeUploadParams {
snippet: {
YoutubeUploadParamsSnippet {
title: vid.name.clone(),
title: vid.name.chars().take(100).collect::<String>(),
description: vid.description.clone(),
tags: vid.tags.clone(),
..Default::default()