ank/avarus
1
Fork 0
Code Issues Activity

updated to match form

Browse source
This commit is contained in:
Andy Killorin 2023-12-30 15:11:29 -06:00
parent 5eaee49b7d
commit ce8f3ccd6e
Signed by: ank
GPG key ID: B6241CA3B552BCA4
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/src/construct.rs
View file

@ -159,7 +159,7 @@ impl Task for BuildSimple {
let layer = self.progress.load(Ordering::SeqCst); let layer = self.progress.load(Ordering::SeqCst);
if layer == self.height { if layer > self.height {
return TaskState::Complete; return TaskState::Complete;
} }

5
server/src/googleforms.rs
View file

@ -83,7 +83,7 @@ struct GoogleOmniForm{
y2: Option<String>, y2: Option<String>,
#[serde(rename(deserialize = "Z coordinate (to)"))] #[serde(rename(deserialize = "Z coordinate (to)"))]
z2: Option<String>, z2: Option<String>,
#[serde(rename(deserialize = "Upload a .litematic file"))] #[serde(rename(deserialize = "Upload a .schematic file"))]
schematic: Option<Vec<String>>, schematic: Option<Vec<String>>,
} }
@ -109,8 +109,9 @@ async fn omni_inner(state: SharedControl, req: GoogleOmniForm) -> anyhow::Result
let schematic = req.schematic.context("no schematic uploaded")?.get(0).context("zero schematics")?.to_owned(); let schematic = req.schematic.context("no schematic uploaded")?.get(0).context("zero schematics")?.to_owned();
let schematic = reqwest::get(format!("https://docs.google.com/uc?export=download&id={schematic}")).await?.bytes().await?; let schematic = reqwest::get(format!("https://docs.google.com/uc?export=download&id={schematic}")).await?.bytes().await?;
// TODO: not this
let input = Position::new( let input = Position::new(
Vec3::new(53,73,77), Vec3::new(-22,91,42),
Direction::West, Direction::West,
); );

2
server/src/main.rs
View file

@ -72,7 +72,7 @@ async fn main() -> Result<(), Error> {
.with_target("server::googleforms", Level::TRACE) .with_target("server::googleforms", Level::TRACE)
.with_target("server::fell", Level::WARN) .with_target("server::fell", Level::WARN)
.with_target("server::mine", Level::INFO) .with_target("server::mine", Level::INFO)
.with_target("server::construct", Level::TRACE) .with_target("server::construct", Level::INFO)
.with_target("server::depot", Level::TRACE); .with_target("server::depot", Level::TRACE);
let log = fs::OpenOptions::new().append(true).create(true).open(SAVE.get().unwrap().join("avarus.log")).await?; let log = fs::OpenOptions::new().append(true).create(true).open(SAVE.get().unwrap().join("avarus.log")).await?;