Apps/ImageApi
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Improve test coverage and logging #7

Merged
cameron merged 5 commits from feature/improve-test-coverage into master 2021-03-01 13:18:24 +00:00
Conversation 0 Commits 5 Files Changed 6 +8 -7
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1c7e54d355 - Show all commits

1
Cargo.lock generated
View File

@@ -1206,7 +1206,6 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
"tokio 1.2.0",
"walkdir", "walkdir",
] ]

1
Cargo.toml
View File

@@ -26,7 +26,6 @@ image = "0.23.7"
walkdir = "2" walkdir = "2"
rayon = "1.3" rayon = "1.3"
notify = "4.0" notify = "4.0"
tokio = "1"
path-absolutize = "3.0.6" path-absolutize = "3.0.6"
log="0.4" log="0.4"
env_logger="0.8" env_logger="0.8"

7
src/main.rs
View File

@@ -14,8 +14,11 @@ use std::sync::Arc;
use actix::{Actor, Addr}; use actix::{Actor, Addr};
use actix_files::NamedFile; use actix_files::NamedFile;
use actix_multipart as mp; use actix_multipart as mp;
use actix_web::web::{HttpRequest, HttpResponse, Json};
use actix_web::{get, post, web, App, HttpServer, Responder}; use actix_web::{get, post, web, App, HttpServer, Responder};
use actix_web::{
middleware,
web::{HttpRequest, HttpResponse, Json},
};
use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher}; use notify::{watcher, DebouncedEvent, RecursiveMode, Watcher};
use rayon::prelude::*; use rayon::prelude::*;
use serde::Serialize; use serde::Serialize;
@@ -157,7 +160,7 @@ async fn generate_video(
let filename = name.to_str().expect("Filename should convert to string"); let filename = name.to_str().expect("Filename should convert to string");
let playlist = format!("tmp/{}.m3u8", filename); let playlist = format!("tmp/{}.m3u8", filename);
if let Some(path) = is_valid_path(&body.path) { if let Some(path) = is_valid_path(&body.path) {
if let Ok(child) = create_playlist(&path.to_str().unwrap(), &playlist) { if let Ok(child) = create_playlist(&path.to_str().unwrap(), &playlist).await {
data.stream_manager data.stream_manager
.do_send(ProcessMessage(playlist.clone(), child)); .do_send(ProcessMessage(playlist.clone(), child));
} }

6
src/video.rs
View File

@@ -39,7 +39,7 @@ impl Handler<ProcessMessage> for StreamActor {
} }
} }
pub fn create_playlist(video_path: &str, playlist_file: &str) -> Result<Child> { pub async fn create_playlist(video_path: &str, playlist_file: &str) -> Result<Child> {
if Path::new(playlist_file).exists() { if Path::new(playlist_file).exists() {
debug!("Playlist already exists: {}", playlist_file); debug!("Playlist already exists: {}", playlist_file);
return Err(std::io::Error::from(std::io::ErrorKind::AlreadyExists)); return Err(std::io::Error::from(std::io::ErrorKind::AlreadyExists));
@@ -51,7 +51,7 @@ pub fn create_playlist(video_path: &str, playlist_file: &str) -> Result<Child> {
.arg("-c:v") .arg("-c:v")
.arg("h264") .arg("h264")
.arg("-crf") .arg("-crf")
.arg("23") .arg("21")
.arg("-preset") .arg("-preset")
.arg("veryfast") .arg("veryfast")
.arg("-hls_time") .arg("-hls_time")
@@ -67,7 +67,7 @@ pub fn create_playlist(video_path: &str, playlist_file: &str) -> Result<Child> {
let start_time = std::time::Instant::now(); let start_time = std::time::Instant::now();
loop { loop {
std::thread::sleep(std::time::Duration::from_secs(1)); actix::clock::delay_for(std::time::Duration::from_secs(1)).await;
if Path::new(playlist_file).exists() if Path::new(playlist_file).exists()
|| std::time::Instant::now() - start_time > std::time::Duration::from_secs(5) || std::time::Instant::now() - start_time > std::time::Duration::from_secs(5)