blankie
/
autoytarchivers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: blankie:d7a0a6a3e596e4c80550cd79ac0b15889169b0da
Branches Tags
blankie:master
..
compare: blankie:445cac2d8fd4f7e2f535c5446ea859750dbebffd
Branches Tags
blankie:master

No commits in common. "d7a0a6a3e596e4c80550cd79ac0b15889169b0da" and "445cac2d8fd4f7e2f535c5446ea859750dbebffd" have entirely different histories.
d7a0a6a3e5 ... 445cac2d8f

2 changed files with 7 additions and 96 deletions
Show Stats Expand all files Collapse all files

8
src/main.rs
View File

@ -163,6 +163,11 @@ async fn async_main() {
match utils::get_videos(&rclient, i).await { match utils::get_videos(&rclient, i).await {
Ok(videos) => { Ok(videos) => {
for j in videos { for j in videos {
{
if tmp_handled.lock().unwrap().contains(&j) {
continue;
}
}
if nodl { if nodl {
let mut seen_videos = seen_videos.write().unwrap(); let mut seen_videos = seen_videos.write().unwrap();
if !seen_videos.contains(&j) { if !seen_videos.contains(&j) {
@ -170,9 +175,6 @@ async fn async_main() {
} }
} else { } else {
{ {
if tmp_handled.lock().unwrap().contains(&j) {
continue;
}
let seen_videos = seen_videos.read().unwrap(); let seen_videos = seen_videos.read().unwrap();
if seen_videos.contains(&j) { if seen_videos.contains(&j) {
continue; continue;

95
src/workers.rs
View File

@ -612,61 +612,14 @@ pub async fn upload_worker(
let total_size = file.seek(SeekFrom::End(0)).await.unwrap(); let total_size = file.seek(SeekFrom::End(0)).await.unwrap();
file.seek(SeekFrom::Start(0)).await.unwrap(); file.seek(SeekFrom::Start(0)).await.unwrap();
let parts = (total_size as f64 / (2000.0 * 1024.0 * 1024.0)).ceil() as usize; let parts = (total_size as f64 / (2000.0 * 1024.0 * 1024.0)).ceil() as usize;
let current_position = 0;
for i in 0..parts { for i in 0..parts {
let filename = if parts == 1 { let filename = if parts == 1 {
video_filename.clone() video_filename.clone()
} else { } else {
format!("{}.part{:02}", &video_filename, i) format!("{}.part{:02}", &video_filename, i)
}; };
let message = tclient let mut size = total_size - current_position;
.send_message(
&chat,
InputMessage::text(&format!("Uploading {}...", &video_filename)),
)
.await;
if let Err(ref err) = message {
eprintln!("Failed to send uploading message: {:?}", err);
let text = format!("{:#?}", err);
let size = text.len();
let mut stream = Cursor::new(text.into_bytes());
match tclient
.upload_stream(&mut stream, size, "failed-send-uploading.log".to_string())
.await
{
Ok(uploaded) => {
let message = InputMessage::text("Failed to send uploading message")
.mime_type("text/plain")
.file(uploaded);
if let Err(err) = tclient.send_message(&chat, message).await {
eprintln!(
"Failed to send message about failing to send uploading message: {:?}",
err
);
if let Err(err) = tclient.send_message(&chat, InputMessage::text("Failed to send message about failing to send uploading message, see logs")).await {
eprintln!("Failed to send message about failing to send message about failing to send uploading message: {:?}", err);
}
}
}
Err(err) => {
eprintln!(
"Failed to upload logs about failing to send uploading message: {:?}",
err
);
if let Err(err) = tclient
.send_message(
&chat,
InputMessage::text(
"Failed to upload logs about failing to send uploading message, see logs",
),
)
.await
{
eprintln!("Failed to send message about failing to upload logs about failing to send uploading message: {:?}", err);
}
}
};
}
let mut size = file.stream_position().await.unwrap();
if size > 2000 * 1024 * 1024 { if size > 2000 * 1024 * 1024 {
size = 2000 * 1024 * 1024; size = 2000 * 1024 * 1024;
} }
@ -711,50 +664,6 @@ pub async fn upload_worker(
} }
} }
}; };
if let Ok(mut message) = message {
if let Err(err) = message.delete().await {
eprintln!("Failed to delete uploading message: {:?}", err);
let text = format!("{:#?}", err);
let size = text.len();
let mut stream = Cursor::new(text.into_bytes());
match tclient
.upload_stream(&mut stream, size, "failed-delete-uploading.log".to_string())
.await
{
Ok(uploaded) => {
let message = InputMessage::text("Failed to delete uploading message")
.mime_type("text/plain")
.file(uploaded);
if let Err(err) = tclient.send_message(&chat, message).await {
eprintln!(
"Failed to send message about failing to delete uploading message: {:?}",
err
);
if let Err(err) = tclient.send_message(&chat, InputMessage::text("Failed to send message about failing to delete uploading message, see logs")).await {
eprintln!("Failed to send message about failing to send message about failing to delete uploading message: {:?}", err);
}
}
}
Err(err) => {
eprintln!(
"Failed to upload logs about failing to delete uploading message: {:?}",
err
);
if let Err(err) = tclient
.send_message(
&chat,
InputMessage::text(
"Failed to upload logs about failing to delete uploading message, see logs",
),
)
.await
{
eprintln!("Failed to send message about failing to upload logs about failing to delete uploading message: {:?}", err);
}
}
};
}
}
} }
if success { if success {
if let Err(err) = remove_file(&video_filename) { if let Err(err) = remove_file(&video_filename) {