improvements
This commit is contained in:
Daniel Løvbrøtte Olsen
parent
2fedf3ff85
commit
b5ce47f182
@ -18,4 +18,4 @@ uuid = { version = "0.7", features = ["serde", "v4"] }
|
||||
[dependencies.rocket_contrib]
|
||||
version = "0.4.4"
|
||||
default-features = false
|
||||
features = ["json", "uuid"]
|
||||
features = ["json", "uuid", "serve"]
|
||||
|
||||
161
src/main.rs
161
src/main.rs
@ -9,6 +9,7 @@ use serde_json::Value;
|
||||
use serde_json::json;
|
||||
use serde::{Serialize, Deserialize};
|
||||
use rocket_contrib::uuid::Uuid;
|
||||
use rocket_contrib::serve::StaticFiles;
|
||||
|
||||
use std::sync::Mutex;
|
||||
use std::collections::HashMap;
|
||||
@ -26,140 +27,10 @@ struct SharedState {
|
||||
}
|
||||
|
||||
#[get("/")]
|
||||
fn index() -> &'static str {
|
||||
r#"#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash curl jq libaom ffmpeg-full
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
|
||||
base_url="$1"
|
||||
version="0.2.0"
|
||||
|
||||
while true; do
|
||||
sleep 30
|
||||
set +e
|
||||
upsteam_version=`curl -s "$base_url"/version`
|
||||
retval=$?
|
||||
set -e
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Is the Job Server Down?"
|
||||
continue
|
||||
fi
|
||||
if [[ $version != $upsteam_version ]]; then
|
||||
echo "Wrong version: client version is $version, while job server requires $upstream_version"
|
||||
break
|
||||
fi
|
||||
|
||||
set +e
|
||||
job=`curl -s "$base_url"/request_job | jq`
|
||||
retval=$?
|
||||
set -e
|
||||
if [[ $job = "null" ]] || [ $retval -ne 0 ]; then
|
||||
echo "No Jobs Available ¯\_(ツ)_/¯"
|
||||
continue
|
||||
fi
|
||||
|
||||
echo "Got new job!"
|
||||
echo "$job" | jq
|
||||
|
||||
job_id=`echo "$job" | jq -r .id`
|
||||
|
||||
echo "Reserving Job"
|
||||
set +e
|
||||
curl -s "$base_url"/edit_status/"$job_id"/reserved
|
||||
retval=$?
|
||||
set -e
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Is the Job Server Down?"
|
||||
continue
|
||||
fi
|
||||
echo "Reserved!"
|
||||
|
||||
source=`echo $job | jq -r .description.file_url`
|
||||
sourceext=${source##*.}
|
||||
echo "Downloading source file: $source"
|
||||
|
||||
source=`echo $job | jq -r .description.file_url`
|
||||
|
||||
name=`echo $job | jq -r .description.file_name`
|
||||
input="$name.$job_id.$sourceext"
|
||||
|
||||
set +e
|
||||
curl "$source" -o "$input"
|
||||
retval=$?
|
||||
set -e
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Could not Download file!"
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/error || true
|
||||
continue
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
echo "Starting Encode"
|
||||
|
||||
height=`echo $job | jq -r .description.resolution[0]`
|
||||
width=`echo $job | jq -r .description.resolution[1]`
|
||||
|
||||
echo $job | jq
|
||||
|
||||
aomenco=`echo $job | jq -r .description.options.aomenc`
|
||||
aomenco=${aomenco//[^a-zA-Z0-9_\- =]/}
|
||||
ffmpego=`echo $job | jq -r .description.options.ffmpeg`
|
||||
ffmpego=${ffmpego//[^a-zA-Z0-9_\- =:]/}
|
||||
|
||||
two_pass=`echo $job | jq -r .description.options.two_pass`
|
||||
|
||||
if [[ $two_pass = true ]]; then
|
||||
set +e
|
||||
eval 'ffmpeg -nostats -hide_banner -loglevel warning \
|
||||
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt yuv422p -f yuv4mpegpipe - | aomenc - --i422 '$aomenco' \
|
||||
--pass=1 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
|
||||
|
||||
retval=$?
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Error running encode pass 1"
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/error || true
|
||||
echo ""
|
||||
continue
|
||||
fi
|
||||
|
||||
eval 'ffmpeg -nostats -hide_banner -loglevel warning \
|
||||
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt yuv422p -f yuv4mpegpipe - | aomenc - --i422 '$aomenco' \
|
||||
--pass=2 --passes=2 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
|
||||
|
||||
retval=$?
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Error running encode pass 2"
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/error || true
|
||||
echo ""
|
||||
continue
|
||||
fi
|
||||
set -e
|
||||
|
||||
else
|
||||
set +e
|
||||
eval 'ffmpeg -nostats -hide_banner -loglevel warning \
|
||||
-i "'$input'" '$ffmpego' -vf scale='$height':'$width' -pix_fmt yuv422p -f yuv4mpegpipe - | aomenc - --i422 '$aomenco' \
|
||||
--passes=1 --fpf="'$input'.fpf" --webm -o "'$input'.out.webm"'
|
||||
|
||||
retval=$?
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Error running encode"
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/error || true
|
||||
echo ""
|
||||
continue
|
||||
fi
|
||||
set -e
|
||||
fi
|
||||
|
||||
set +e
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/completed
|
||||
set -e
|
||||
|
||||
done
|
||||
"#
|
||||
fn index() -> String {
|
||||
format!("Wecome to the AV1Master Server version {version}\n
|
||||
This currently requires a working <a href=\"https://nixos.org/nix/\">nix</a> installion\n
|
||||
curl -L {baseurl}/client.sh > client.sh && chmod +x ./client.sh && ./client.sh {baseurl}", version=VERSION, baseurl="https://av1.dodsorf.as")
|
||||
}
|
||||
|
||||
#[get("/version")]
|
||||
@ -202,15 +73,28 @@ fn get_job(id: Uuid, shared: State<SharedState>) -> Result<Json<Value>, NotFound
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub struct RealIP(std::net::IpAddr);
|
||||
|
||||
impl<'a, 'r> rocket::request::FromRequest<'a, 'r> for RealIP {
|
||||
type Error = ();
|
||||
fn from_request(request: &'a rocket::Request<'r>) -> rocket::request::Outcome<Self, Self::Error> {
|
||||
match request.client_ip() {
|
||||
Some(ip) => rocket::Outcome::Success(RealIP(ip)),
|
||||
None => rocket::Outcome::Failure((rocket::http::Status::from_code(401).unwrap(), ()))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[get("/edit_status/<id>/<status>")]
|
||||
fn edit_status(id: Uuid, status: String, shared: State<SharedState>, remote_addr: SocketAddr) -> Result<String, Box<std::error::Error>> {
|
||||
fn edit_status(id: Uuid, status: String, shared: State<SharedState>, remote_addr: RealIP) -> Result<String, Box<std::error::Error>> {
|
||||
let mut list = shared.jobs.lock().unwrap();
|
||||
let job = list.get_mut(&id).ok_or("what")?;
|
||||
let status = match status.as_str() {
|
||||
"queued" => Ok(EStatus::Queued),
|
||||
"reserved" => Ok(EStatus::Reserved(remote_addr.to_string())),
|
||||
"completed" => Ok(EStatus::Completed(remote_addr.to_string())),
|
||||
"error" => Ok(EStatus::Error(remote_addr.to_string())),
|
||||
"reserved" => Ok(EStatus::Reserved(remote_addr.0.to_string())),
|
||||
"completed" => Ok(EStatus::Completed(remote_addr.0.to_string())),
|
||||
"error" => Ok(EStatus::Error(remote_addr.0.to_string())),
|
||||
_ => Err("Not a valid status, valid statuses are queued, reserved, completed, and error")
|
||||
}?;
|
||||
|
||||
@ -232,6 +116,7 @@ fn add_job(message: Json<workunit::WDesc>, shared: State<SharedState>) {
|
||||
fn main() {
|
||||
rocket::ignite()
|
||||
.manage(SharedState::default())
|
||||
.mount("/", StaticFiles::from("src/static")) // switch to templates or something cause this is dumb
|
||||
.mount("/", routes![index, version, get_jobs, get_job, request_job, edit_status, add_job])
|
||||
.launch();
|
||||
}
|
||||
@ -10,14 +10,14 @@ version="0.2.0"
|
||||
while true; do
|
||||
sleep 30
|
||||
set +e
|
||||
upsteam_version=`curl -s "$base_url"/version`
|
||||
upstream_version=`curl -s "$base_url"/version`
|
||||
retval=$?
|
||||
set -e
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Is the Job Server Down?"
|
||||
continue
|
||||
fi
|
||||
if [[ $version != $upsteam_version ]]; then
|
||||
if [[ $version != $upstream_version ]]; then
|
||||
echo "Wrong version: client version is $version, while job server requires $upstream_version"
|
||||
break
|
||||
fi
|
||||
@ -32,9 +32,9 @@ while true; do
|
||||
fi
|
||||
|
||||
echo "Got new job!"
|
||||
echo "$job" | jq
|
||||
printf "%s\n" "$job" | jq
|
||||
|
||||
job_id=`echo "$job" | jq -r .id`
|
||||
job_id=`printf "%s\n" "$job" | jq -r .id`
|
||||
|
||||
echo "Reserving Job"
|
||||
set +e
|
||||
@ -47,13 +47,13 @@ while true; do
|
||||
fi
|
||||
echo "Reserved!"
|
||||
|
||||
source=`echo $job | jq -r .description.file_url`
|
||||
source=`printf "%s\n" "$job" | jq -r .description.file_url`
|
||||
sourceext=${source##*.}
|
||||
echo "Downloading source file: $source"
|
||||
|
||||
source=`echo $job | jq -r .description.file_url`
|
||||
source=`printf "%s\n" "$job" | jq -r .description.file_url`
|
||||
|
||||
name=`echo $job | jq -r .description.file_name`
|
||||
name=`printf "%s\n" "$job" | jq -r .description.file_name`
|
||||
input="$name.$job_id.$sourceext"
|
||||
|
||||
set +e
|
||||
@ -63,6 +63,7 @@ while true; do
|
||||
if [ $retval -ne 0 ]; then
|
||||
echo "Could not Download file!"
|
||||
curl -s -L "$base_url"/edit_status/"$job_id"/error || true
|
||||
echo ""
|
||||
continue
|
||||
fi
|
||||
|
||||
@ -70,17 +71,17 @@ while true; do
|
||||
|
||||
echo "Starting Encode"
|
||||
|
||||
height=`echo $job | jq -r .description.resolution[0]`
|
||||
width=`echo $job | jq -r .description.resolution[1]`
|
||||
height=`printf "%s\n" $job | jq -r .description.resolution[0]`
|
||||
width=`printf "%s\n" $job | jq -r .description.resolution[1]`
|
||||
|
||||
echo $job | jq
|
||||
printf "%s\n" "$job" | jq
|
||||
|
||||
aomenco=`echo $job | jq -r .description.options.aomenc`
|
||||
aomenco=`printf "%s\n" "$job" | jq -r .description.options.aomenc`
|
||||
aomenco=${aomenco//[^a-zA-Z0-9_\- =]/}
|
||||
ffmpego=`echo $job | jq -r .description.options.ffmpeg`
|
||||
ffmpego=`printf "%s\n" "$job" | jq -r .description.options.ffmpeg`
|
||||
ffmpego=${ffmpego//[^a-zA-Z0-9_\- =:]/}
|
||||
|
||||
two_pass=`echo $job | jq -r .description.options.two_pass`
|
||||
two_pass=`printf "%s\n" "$job" | jq -r .description.options.two_pass`
|
||||
|
||||
if [[ $two_pass = true ]]; then
|
||||
set +e
|
||||
@ -2,6 +2,8 @@ use serde::{Serialize, Deserialize};
|
||||
use serde_repr::*;
|
||||
use uuid::Uuid;
|
||||
|
||||
use std::net::IpAddr;
|
||||
|
||||
#[derive(Default, Debug, Serialize, Deserialize, Clone)]
|
||||
pub struct WUnit {
|
||||
pub id: Uuid,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user