mykola/mk-dl-bot_legacy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

use result for better error handling dx

Browse source
This commit is contained in:
mykola2312 2024-02-21 19:25:15 +02:00
parent 02265981d8
commit 69193d9f94
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dl.rs
View file

@ -10,7 +10,7 @@ pub mod yt_dlp;
pub enum DownloadError { pub enum DownloadError {
Message(String), Message(String),
NoFormatFound, NoFormatFound,
MakePathError MakePathError,
} }
impl From<SpawnError> for DownloadError { impl From<SpawnError> for DownloadError {
@ -25,12 +25,12 @@ impl From<YtDlpError> for DownloadError {
} }
} }
fn make_download_path(info: &YtDlpInfo, format: &YtDlpFormat) -> Option<String> { fn make_download_path(info: &YtDlpInfo, format: &YtDlpFormat) -> Result<String, DownloadError> {
std::env::temp_dir() std::env::temp_dir()
.join(format!("{}.{}", info.id, format.ext)) .join(format!("{}.{}", info.id, format.ext))
.into_os_string() .into_os_string()
.into_string() .into_string()
.ok() .map_err(|e| DownloadError::MakePathError)
} }
pub async fn download(url: &str) -> Result<String, DownloadError> { pub async fn download(url: &str) -> Result<String, DownloadError> {
@ -39,10 +39,7 @@ pub async fn download(url: &str) -> Result<String, DownloadError> {
Some(av) => av, Some(av) => av,
None => return Err(DownloadError::NoFormatFound), None => return Err(DownloadError::NoFormatFound),
}; };
let output_path = match make_download_path(&info, &av) { let output_path = make_download_path(&info, &av)?;
Some(path) => path,
None => return Err(DownloadError::MakePathError)
};
todo!() todo!()
} }