phoenix/icarus_dm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

Uploading multi target works, but is buggy

Browse Source 
Not all of the songs are being uploaded
This commit is contained in:
kdeng00
2024-06-08 12:13:22 -04:00
parent a4f38fd917
commit 08b5fef3db
3 changed files with 50 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/syncers/upload.rs
+32 -67
View File
@@ -26,7 +26,7 @@ struct Song {
album_artist: String,
year: i32,
genre: String,
duration: f64,
duration: i32,
track: i32,
track_count: i32,
disc: i32,
@@ -49,7 +49,7 @@ impl Default for Upload {
impl Upload {
pub async fn upload_song(&self, token: &models::token::Token, song: &models::song::Song) {
let url = self.retrieve_url(&song);
let url = self.retrieve_url();
let client = reqwest::Client::new();
let access_token = token.bearer_token();
let response = client
@@ -78,7 +78,7 @@ impl Upload {
album: &models::song::Album,
) -> Result<reqwest::Response, std::io::Error> {
self.api.endpoint = String::from("song/data/upload/with/data");
let url = self.retrieve_url(&song);
let url = self.retrieve_url();
let client = reqwest::Client::new();
let new_song = self.initialize_song(&song, &album);
let access_token = token.bearer_token();
@@ -116,53 +116,12 @@ impl Upload {
}
println!("Url: {}", url);
println!("Length: {:?}", song_raw_data.len());
println!("Token: {}", access_token);
// Adding text data
// form = form.text("metadata", song_detail);
let form = self.initialize_form(song_raw_data, cover_raw_data, song_detail.clone());
// Adding a file
// let file_path = "path/to/your/file.txt";
// let file = reqwest::blocking::multipart::Part::file(file_path);
let mut headers = Vec::new();
headers.push("application/octet-stream");
headers.push("Content-type");
let mut headers = HeaderMap::new();
headers.insert(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static("application/octet-stream"),
);
let file = reqwest::multipart::Part::bytes(song_raw_data.clone()).headers(headers);
// headers.clear();
let mut headers_i = HeaderMap::new();
headers_i.insert(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static("image/jpeg"),
);
let mut image_dis = String::new();
image_dis = "form-data; name='cover'; filename='audio.wav'".to_owned();
// headers_i.insert(http::header::CONTENT_DISPOSITION, HeaderValue::from_static("form-data; name=\"cover\"; filename=\"file.jpeg\""));
let cover = reqwest::multipart::Part::bytes(cover_raw_data.clone()).headers(headers_i);
let song_filepath = "ss";
let mut p = reqwest::multipart::Part::stream(song_raw_data.clone());
// p.file_name("file");
let mut q = reqwest::multipart::Part::stream(cover_raw_data.clone());
// q.file_name("cover");
// let ee = reqwest::multipart::Part::file_name(song_filepath);
// let content_type = http::header::ContentType::from_mime_type("audio/mpeg").unwrap();
// let mut disposition = http::header::ContentDisposition::form_data_binary();
// disposition.set_filename("my_file.mp3");
let mut form = Form::new();
form = form
.part("cover", cover.file_name("cover.jpeg"))
.text("metadata", song_detail)
.part("file", file.file_name("audio.wav"));
println!("Form: {:?}", form);
let response = client
.post(url)
@@ -171,34 +130,36 @@ impl Upload {
.send()
.await;
let response_text = response.unwrap();
println!("Something was sent");
println!("{:?}", response_text);
return Ok(response_text);
}
/*
fn initialize_form(&self, song_raw_data: Vec<u8>, cover_raw_data: Vec<u8>, song_detail: String) -> Form {
let mut headers = HeaderMap::new();
headers.insert(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static("application/octet-stream"),
);
let s_file = std::fs::File::open(song.song_path());
let s_stream = tokio_util::codec::FramedRead::new(s_file, tokio_util::codec::BytesCodec::new());
let s_file_body = Body::wrap_stream(s_stream);
let s_some_file = multipart::Part::stream(s_file_body)
.file_name("track.cdda.wav");
let file = reqwest::multipart::Part::bytes(song_raw_data).headers(headers);
let mut headers_i = HeaderMap::new();
headers_i.insert(
http::header::CONTENT_TYPE,
http::HeaderValue::from_static("image/jpeg"),
);
let s_data = Part::file(song.song_path());
let c_data = multipart::Part::stream(&cover.path);
let cover = reqwest::multipart::Part::bytes(cover_raw_data).headers(headers_i);
let mut form = Form::new();
let meta = serde_json::to_string_pretty(&new_song);
form = form.text("metadata", meta.unwrap());
form = form
.part("cover", cover.file_name("cover.jpeg"))
.text("metadata", song_detail)
.part("file", file.file_name("audio.wav"));
form = form.part("file", s_some_file)
.part("cover", c_data);
let response = client.post(url).multipart(form).send();
let result = response.text;
return Ok(result);
*/
return form;
}
pub fn set_api(&mut self, host: &String) {
@@ -207,7 +168,8 @@ impl Upload {
api.version = String::from("v1");
self.api = api;
}
fn retrieve_url(&self, song: &models::song::Song) -> String {
fn retrieve_url(&self) -> String {
let api = &self.api;
let mut buffer = api.url.clone();
let count = buffer.len();
@@ -226,6 +188,9 @@ impl Upload {
}
fn initialize_song(&self, song: &models::song::Song, album: &models::song::Album) -> Song {
let dur = song.duration.clone().unwrap();
println!("Duration: {}", dur);
return Song {
title: String::from(&song.title.clone().unwrap()),
album: album.title.clone(),
@@ -233,7 +198,7 @@ impl Upload {
album_artist: album.album_artist.clone(),
year: album.year.clone(),
genre: album.genre.clone(),
duration: song.duration.clone().unwrap(),
duration: f64::round(dur) as i32,
track: (song.track.clone().unwrap()),
track_count: album.track_count.clone(),
disc: song.disc.clone().unwrap(),