From 7175f2a7764bac9b6895a8de5ce3067e7895ec86 Mon Sep 17 00:00:00 2001 From: deadvey Date: Fri, 8 May 2026 23:13:33 +0100 Subject: [PATCH] worked on the api abit, nearly finished with choice implementation --- src/.api.rs.swp | Bin 12288 -> 12288 bytes src/.parsing.rs.swp | Bin 20480 -> 20480 bytes src/api.rs | 4 +++- src/parsing.rs | 11 ++++++++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/.api.rs.swp b/src/.api.rs.swp index 4314426cea6ec35b8af7828f06b4ccd6e32290c1..e6b20c3ace4f883f9631e6262d9dbcc8cc2ad9c6 100644 GIT binary patch delta 155 zcmZojXh@JsG6?hZRj|}EVqjok5MW^V6Z0?Aw=0C9L1?4YH-5&D&4L1-`FXQg85l0H zK~#in7F5t@RO@ADU?^Z`U`S$TU`SwRU@&55V31{JVBlb9V7SM|z;J~Pq-8TBOAhPg ze`-RLmDKaO^zw@|k~8u%lT#;8P#2p#M?+RHC$&VOD77G`Qo&Y1DKR-)Y4bw$cn$y` CF(#P+ delta 127 zcmZojXh@JsG6?hZRj|}EVqjok5MW>^7yg^++ZDo4B)C!P8$V;vWz!1&Oz~IKtz#zlUz#zm9Qo5OuWdZBtOKL)sFR3*O aSTk@kaB|ja>Luk@q^4+SZeFM!&jA49JsVm8 diff --git a/src/.parsing.rs.swp b/src/.parsing.rs.swp index 3b978e8779fac73858522043e14d7bc1d29d2d76..b0a39233624dc4b169e99dd365df905aca54ebe1 100644 GIT binary patch delta 1363 zcmZozz}T>WQ7XwG%+puFQqPEifq_AQf#Fr?zsz5qAq)*d8>PPSGrCU}6p+`n14%M4 zFnB;|Mkvh;rRAY?>*h#-)%?7?91IMOoDlQeCkrZM*E{nuFgWrtFsSh{F!1s*FtGD6 zFtG43Fzn%FU|7P-z_5Uqfnf?S1H%Mf28Ie=28Lu_28Iw`1_mKs1_nW128M?`3=Btk z7#I%nFfcUmFfiEhFfjb&W?-1i&A`yd&A^by&A{Nv&A{Ny&A?#J&A?#H&A=ec&A{-M zi-F-K7ehV6T`mTO8(a(wTe%n*W^*wxOyy!=XyamFXyjsG(B)!aQ0HP`c*DuSaEz0I zVLvAWLm4N;3znP=3_6?)4C;9y|T<6vOm=3rpB&(6TGmYsni zi=BZ%hMj@oB^v|7B{l|zEo=-76WJIT%-9$h*w`2tnAsQ@HnB1=)Uh%!q_HwExU(`a zD6=v!9A{x*IKslfu!@C&p@xNlA%KN}!GMKjVhNeQbLV03Qo}z}5 zYf({tkwS55UP@+OI@IK11+kKRh2)&f)VvZUO>2c(Yp_YR)|209>IZ6M<|P-U=BDPA z=wy}V7Q`3iXXce?YAV>;DPWh<0qd>?lOP{z#3N}e)>PR1+FO)mbCljH#`@XZ3=H}_ zkTeZT?(g^+7}oMLFm&)UFtqYBFgWltFzE6#FevgfFv#*VFg)aAU})lFV5sF|Ubc=#C@zVk6KoZ@3(Sjfk~FrSZsp@xrvA%Ks8L5`1s;WjS=LoY8w zJwp^P1A{X!1A{6r0|OH;1H*D228MDT28I$I1_osw28Q?C3=G$~85nkOGcZiyW?-=3 zW?(SoW?+zpX4HdR3=9jo7#Qlg7#QNY7#OU$7#J+L7#PgC7#MiD7#O~AGBAANWMFvA z$-r=qlYwC?Cj&zfCj)~kCj)~vrw9XsCMN>}8z%$9VGc+rq;qU$WC>-TJm19woOa{U z(r!{|x}t_swUvFXLNy2}A;&%}G3zK~=B1=oXhKpNn5|%|fJk4((U3$RYs~-vR;~MM delta 1319 zcmZozz}T>WQ7XwG%+puFQqPEifq_AQfuThBZ|1Mg5QZYbjZ)wE86_tR3dn2bgCrRk z7^I;zBa~)_(&A9Mb91D?YJT2(ybKIcd=T>_CkrZM*W2?kFgWuuFlg{GF!1v+FmUoQ zFtG74Fzn-HU|7b>z_5syfngdi1H&X<28JqL28L8#28J+R1_lvc1_ohX28PEx3=GG4 z7#I%oFfcUnFfcgqFfjb)W?-1g&A>2$n}MN#n}NZbn}NZVn}NZSn}NZUn}I=;n}Ojy z7X!mwsSEs%;jQWn9jw((80yP(9FfaV8g}0V8+G3Aj-wS@Sc-_ z;Uy;n!xK&hhTEJB4A(dr7}jz!Fs$HYU|7P*z%Y%IfnhQy1H(j428Ico3=H+03=El^ z3=HX<3=9#R3=Gbk3=CqN3=F?H7#MzXFfd%>U|?9qQP03o!NI^_%E7?!oSlJT3p)eD zTy_SAdUghe7VT7#Qv`GcasqW?-1k%)l^}nSr5*nSnu{nSnu?nSp_mnStR169dCyCI*HD zObiUsObiSjObiS*ObiSbObnA{?4N92@6pf5TU?qOpP84ETA`q=V7NKfD}aTyv^cXW zb@Bnfhs?DMoRdAZH79@2WSLy5EyKrI&A`dY$q7}z*;VTYvovQ>g_VL@P-=2&W?5>H zjYd*_eoks)o(^YG#pWozRgCrXco-Ojcp+&AmaLBOGccs`GcY9ZGcZ{3GccI&GcXA8 zGcbJTV_-PS$G|X^kAb0xkAcAjn!*(M7#JS$GBDibWnj1gO`p^Ny)LF@=HQ1tSB)9#AS5U|@h{f|vXZ4A1!)7|!rB zFl^>$U|7q~z_5y+fgy>Xfx(NPfx!*xN;7^2204BP22OqkhF^RP3_JK37`F2UH;U*6Q!%iLshRHk( z4E;O|49z?Y40SvV4ADFc430bu4Awjh3_3gv4C*`#3=g;&7;bShFzn=JV3^F!z|hOh zz|g_Xz);W4z);1_z!1pIz~IBpz~I5nz+lDAz+eu|EGFCx49eUL47}V74BXrd41c)l z85o{(F)-}nVqloa#lX| { debug!("Choice: {}", index); let _ = tx_handle.send((true,index)); + let reply = "ack"; + warp::reply::json(&reply) }).boxed(); - let routes = main.or(characters); + let routes = main.or(characters).or(choice); // Start the server warp::serve(routes) .run(([127, 0, 0, 1],config::API_PORT)) diff --git a/src/parsing.rs b/src/parsing.rs index aad0b35..afc7ef1 100644 --- a/src/parsing.rs +++ b/src/parsing.rs @@ -62,11 +62,16 @@ pub async fn token_parse( }, "choice" => { - index += match choice_parse(index+1, &tokens, &data_to_send).await + let (_,jump_points) = match choice_parse(index+1, &tokens, &data_to_send).await { - Ok(increment) => increment, + Ok((increment,jump_point)) => (increment,jump_point), Err(error) => return Err(error), - } + }; + if rx.recv().is_err() { warn!("Error sending choices to client"); }; + let (_, choice) = rx.recv().unwrap(); // TODO eh + index = jump_points[choice]; + debug!("{:?} {} {}",jump_points, choice, index); + continue } _ => {