From ce8f3ccd6e16851269080f66b5446bf669e0110c Mon Sep 17 00:00:00 2001 From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com> Date: Sat, 30 Dec 2023 15:11:29 -0600 Subject: [PATCH] updated to match form --- server/src/construct.rs | 2 +- server/src/googleforms.rs | 5 +++-- server/src/main.rs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/construct.rs b/server/src/construct.rs index e7588b1..934737e 100644 --- a/server/src/construct.rs +++ b/server/src/construct.rs @@ -159,7 +159,7 @@ impl Task for BuildSimple { let layer = self.progress.load(Ordering::SeqCst); - if layer == self.height { + if layer > self.height { return TaskState::Complete; } diff --git a/server/src/googleforms.rs b/server/src/googleforms.rs index fc6df10..ee40a5c 100644 --- a/server/src/googleforms.rs +++ b/server/src/googleforms.rs @@ -83,7 +83,7 @@ struct GoogleOmniForm{ y2: Option, #[serde(rename(deserialize = "Z coordinate (to)"))] z2: Option, - #[serde(rename(deserialize = "Upload a .litematic file"))] + #[serde(rename(deserialize = "Upload a .schematic file"))] schematic: Option>, } @@ -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 = reqwest::get(format!("https://docs.google.com/uc?export=download&id={schematic}")).await?.bytes().await?; + // TODO: not this let input = Position::new( - Vec3::new(53,73,77), + Vec3::new(-22,91,42), Direction::West, ); diff --git a/server/src/main.rs b/server/src/main.rs index a32e419..611aeba 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -72,7 +72,7 @@ async fn main() -> Result<(), Error> { .with_target("server::googleforms", Level::TRACE) .with_target("server::fell", Level::WARN) .with_target("server::mine", Level::INFO) - .with_target("server::construct", Level::TRACE) + .with_target("server::construct", Level::INFO) .with_target("server::depot", Level::TRACE); let log = fs::OpenOptions::new().append(true).create(true).open(SAVE.get().unwrap().join("avarus.log")).await?;