Add qalc command and improve README
Signed-off-by: trivernis <trivernis@protonmail.com>pull/2/head
parent
2d980111bc
commit
9d4ed2dfb5
GPG Key ID:
DFFFCC2C7A02DB45
@ -0,0 +1,18 @@
|
|||||||
|
use crate::providers::qalc;
|
||||||
|
use serenity::client::Context;
|
||||||
|
use serenity::framework::standard::macros::command;
|
||||||
|
use serenity::framework::standard::{Args, CommandResult};
|
||||||
|
use serenity::model::channel::Message;
|
||||||
|
|
||||||
|
#[command]
|
||||||
|
#[description("Calculates an expression")]
|
||||||
|
#[min_args(1)]
|
||||||
|
#[usage("<expression>")]
|
||||||
|
#[example("1 * 1 + 1 / sqrt(2)")]
|
||||||
|
async fn qalc(ctx: &Context, msg: &Message, args: Args) -> CommandResult {
|
||||||
|
let expression = args.message();
|
||||||
|
let result = qalc::qalc(expression).await?;
|
||||||
|
msg.reply(ctx, format!("`{}`", result)).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@ -1,2 +1,3 @@
|
|||||||
pub(crate) mod music;
|
pub(crate) mod music;
|
||||||
|
pub(crate) mod qalc;
|
||||||
pub(crate) mod settings;
|
pub(crate) mod settings;
|
||||||
|
|||||||
@ -1,107 +1,5 @@
|
|||||||
use crate::providers::music::queue::Song;
|
|
||||||
use crate::providers::music::responses::{PlaylistEntry, VideoInformation};
|
|
||||||
use crate::utils::error::BotResult;
|
|
||||||
use futures::future::BoxFuture;
|
|
||||||
use futures::FutureExt;
|
|
||||||
use std::process::Stdio;
|
|
||||||
use std::sync::atomic::{AtomicU8, Ordering};
|
|
||||||
use std::sync::Arc;
|
|
||||||
use std::time::Duration;
|
|
||||||
use tokio::io::AsyncReadExt;
|
|
||||||
use tokio::process::Command;
|
|
||||||
|
|
||||||
pub(crate) mod lyrics;
|
pub(crate) mod lyrics;
|
||||||
pub(crate) mod queue;
|
pub(crate) mod queue;
|
||||||
pub(crate) mod responses;
|
pub(crate) mod responses;
|
||||||
pub(crate) mod spotify;
|
pub(crate) mod spotify;
|
||||||
|
pub(crate) mod youtube_dl;
|
||||||
static THREAD_LIMIT: u8 = 64;
|
|
||||||
|
|
||||||
/// Returns a list of youtube videos for a given url
|
|
||||||
pub(crate) async fn get_videos_for_playlist(url: &str) -> BotResult<Vec<PlaylistEntry>> {
|
|
||||||
log::debug!("Getting playlist information for {}", url);
|
|
||||||
let output =
|
|
||||||
youtube_dl(&["--no-warnings", "--flat-playlist", "--dump-json", "-i", url]).await?;
|
|
||||||
|
|
||||||
let videos = output
|
|
||||||
.lines()
|
|
||||||
.filter_map(|l| serde_json::from_str::<PlaylistEntry>(l).ok())
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
Ok(videos)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns information for a single video by using youtube-dl
|
|
||||||
pub(crate) async fn get_video_information(url: &str) -> BotResult<VideoInformation> {
|
|
||||||
log::debug!("Fetching information for '{}'", url);
|
|
||||||
let output = youtube_dl(&["--no-warnings", "--dump-json", "-i", url]).await?;
|
|
||||||
|
|
||||||
let information = serde_json::from_str(&*output)?;
|
|
||||||
|
|
||||||
Ok(information)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Searches for a video
|
|
||||||
pub(crate) async fn search_video_information(query: String) -> BotResult<Option<VideoInformation>> {
|
|
||||||
log::debug!("Searching for video '{}'", query);
|
|
||||||
let output = youtube_dl(&[
|
|
||||||
"--no-warnings",
|
|
||||||
"--dump-json",
|
|
||||||
"-i",
|
|
||||||
format!("ytsearch:\"{}\"", query).as_str(),
|
|
||||||
])
|
|
||||||
.await?;
|
|
||||||
let information = serde_json::from_str(&*output)?;
|
|
||||||
|
|
||||||
Ok(information)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Searches songs on youtube in parallel
|
|
||||||
#[allow(dead_code)]
|
|
||||||
async fn parallel_search_youtube(song_names: Vec<String>) -> Vec<Song> {
|
|
||||||
let search_futures: Vec<BoxFuture<BotResult<Option<VideoInformation>>>> = song_names
|
|
||||||
.into_iter()
|
|
||||||
.map(|s| search_video_information(s).boxed())
|
|
||||||
.collect();
|
|
||||||
let information: Vec<BotResult<Option<VideoInformation>>> =
|
|
||||||
futures::future::join_all(search_futures).await;
|
|
||||||
information
|
|
||||||
.into_iter()
|
|
||||||
.filter_map(|i| i.ok().and_then(|s| s).map(Song::from))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Executes youtube-dl asynchronously
|
|
||||||
/// An atomic U8 is used to control the number of parallel processes
|
|
||||||
/// to avoid using too much memory
|
|
||||||
async fn youtube_dl(args: &[&str]) -> BotResult<String> {
|
|
||||||
lazy_static::lazy_static! { static ref THREAD_LOCK: Arc<AtomicU8> = Arc::new(AtomicU8::new(0)); }
|
|
||||||
log::trace!("Running youtube-dl with args {:?}", args);
|
|
||||||
|
|
||||||
while THREAD_LOCK.load(Ordering::SeqCst) >= THREAD_LIMIT {
|
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
||||||
}
|
|
||||||
THREAD_LOCK.fetch_add(1, Ordering::Relaxed);
|
|
||||||
|
|
||||||
let ytdl = Command::new("youtube-dl")
|
|
||||||
.args(args)
|
|
||||||
.stdout(Stdio::piped())
|
|
||||||
.spawn()
|
|
||||||
.map_err(|e| {
|
|
||||||
THREAD_LOCK.fetch_sub(1, Ordering::Relaxed);
|
|
||||||
e
|
|
||||||
})?;
|
|
||||||
let mut output = String::new();
|
|
||||||
ytdl.stdout
|
|
||||||
.unwrap()
|
|
||||||
.read_to_string(&mut output)
|
|
||||||
.await
|
|
||||||
.map_err(|e| {
|
|
||||||
THREAD_LOCK.fetch_sub(1, Ordering::Relaxed);
|
|
||||||
e
|
|
||||||
})?;
|
|
||||||
log::trace!("youtube-dl response is {}", output);
|
|
||||||
THREAD_LOCK.fetch_sub(1, Ordering::Relaxed);
|
|
||||||
|
|
||||||
Ok(output)
|
|
||||||
}
|
|
||||||
|
|||||||
@ -0,0 +1,87 @@
|
|||||||
|
use crate::providers::music::queue::Song;
|
||||||
|
use crate::providers::music::responses::{PlaylistEntry, VideoInformation};
|
||||||
|
use crate::utils::error::BotResult;
|
||||||
|
use crate::utils::run_command_async;
|
||||||
|
use futures::future::BoxFuture;
|
||||||
|
use futures::FutureExt;
|
||||||
|
use std::sync::atomic::{AtomicU8, Ordering};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
static THREAD_LIMIT: u8 = 64;
|
||||||
|
|
||||||
|
/// Returns a list of youtube videos for a given url
|
||||||
|
pub(crate) async fn get_videos_for_playlist(url: &str) -> BotResult<Vec<PlaylistEntry>> {
|
||||||
|
log::debug!("Getting playlist information for {}", url);
|
||||||
|
let output =
|
||||||
|
youtube_dl(&["--no-warnings", "--flat-playlist", "--dump-json", "-i", url]).await?;
|
||||||
|
|
||||||
|
let videos = output
|
||||||
|
.lines()
|
||||||
|
.filter_map(|l| serde_json::from_str::<PlaylistEntry>(l).ok())
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(videos)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns information for a single video by using youtube-dl
|
||||||
|
pub(crate) async fn get_video_information(url: &str) -> BotResult<VideoInformation> {
|
||||||
|
log::debug!("Fetching information for '{}'", url);
|
||||||
|
let output = youtube_dl(&["--no-warnings", "--dump-json", "-i", url]).await?;
|
||||||
|
|
||||||
|
let information = serde_json::from_str(&*output)?;
|
||||||
|
|
||||||
|
Ok(information)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Searches for a video
|
||||||
|
pub(crate) async fn search_video_information(query: String) -> BotResult<Option<VideoInformation>> {
|
||||||
|
log::debug!("Searching for video '{}'", query);
|
||||||
|
let output = youtube_dl(&[
|
||||||
|
"--no-warnings",
|
||||||
|
"--dump-json",
|
||||||
|
"-i",
|
||||||
|
format!("ytsearch:\"{}\"", query).as_str(),
|
||||||
|
])
|
||||||
|
.await?;
|
||||||
|
let information = serde_json::from_str(&*output)?;
|
||||||
|
|
||||||
|
Ok(information)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Searches songs on youtube in parallel
|
||||||
|
#[allow(dead_code)]
|
||||||
|
async fn parallel_search_youtube(song_names: Vec<String>) -> Vec<Song> {
|
||||||
|
let search_futures: Vec<BoxFuture<BotResult<Option<VideoInformation>>>> = song_names
|
||||||
|
.into_iter()
|
||||||
|
.map(|s| search_video_information(s).boxed())
|
||||||
|
.collect();
|
||||||
|
let information: Vec<BotResult<Option<VideoInformation>>> =
|
||||||
|
futures::future::join_all(search_futures).await;
|
||||||
|
information
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|i| i.ok().and_then(|s| s).map(Song::from))
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Executes youtube-dl asynchronously
|
||||||
|
/// An atomic U8 is used to control the number of parallel processes
|
||||||
|
/// to avoid using too much memory
|
||||||
|
async fn youtube_dl(args: &[&str]) -> BotResult<String> {
|
||||||
|
lazy_static::lazy_static! { static ref THREAD_LOCK: Arc<AtomicU8> = Arc::new(AtomicU8::new(0)); }
|
||||||
|
log::trace!("Running youtube-dl with args {:?}", args);
|
||||||
|
|
||||||
|
while THREAD_LOCK.load(Ordering::SeqCst) >= THREAD_LIMIT {
|
||||||
|
tokio::time::sleep(Duration::from_millis(100)).await;
|
||||||
|
}
|
||||||
|
THREAD_LOCK.fetch_add(1, Ordering::Relaxed);
|
||||||
|
|
||||||
|
let output = run_command_async("youtube-dl", args).await.map_err(|e| {
|
||||||
|
THREAD_LOCK.fetch_sub(1, Ordering::Relaxed);
|
||||||
|
e
|
||||||
|
})?;
|
||||||
|
log::trace!("youtube-dl response is {}", output);
|
||||||
|
THREAD_LOCK.fetch_sub(1, Ordering::Relaxed);
|
||||||
|
|
||||||
|
Ok(output)
|
||||||
|
}
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
use crate::utils::error::BotResult;
|
||||||
|
use crate::utils::run_command_async;
|
||||||
|
|
||||||
|
/// Runs the qalc command with the given expression
|
||||||
|
pub async fn qalc(expression: &str) -> BotResult<String> {
|
||||||
|
let result = run_command_async("qalc", &[expression]).await?;
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue