From 06af95ce57cb9925d745b9e842fc6328d08f5d92 Mon Sep 17 00:00:00 2001
From: fram3d <fram3d@dmz.rs>
Date: Wed, 4 Oct 2023 00:11:21 +0200
Subject: [PATCH] fix prediction

---
 freeriders/__pycache__/__init__.cpython-311.pyc  | Bin 0 -> 602 bytes
 freeriders/__pycache__/functions.cpython-311.pyc | Bin 0 -> 817 bytes
 freeriders/__pycache__/models.cpython-311.pyc    | Bin 0 -> 736 bytes
 freeriders/__pycache__/routes.cpython-311.pyc    | Bin 0 -> 3978 bytes
 freeriders/functions.py                          |   2 +-
 freeriders/routes.py                             |  12 ++++++++----
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 freeriders/__pycache__/__init__.cpython-311.pyc
 create mode 100644 freeriders/__pycache__/functions.cpython-311.pyc
 create mode 100644 freeriders/__pycache__/models.cpython-311.pyc
 create mode 100644 freeriders/__pycache__/routes.cpython-311.pyc

diff --git a/freeriders/__pycache__/__init__.cpython-311.pyc b/freeriders/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fa4cf4eaf2ca8558ae25a0aef4d65cbb1975abe0
GIT binary patch
literal 602
zcmZutJxc>Y5S_ivoykQ}u}Gs<iUh^8u@Mo@XfXJNCKg_^oVksj-bdVvg;pm9v9$9a
zC}QDXiCx%Au(Au-S-G1iCgSYu@Md;r-eVpH26PbCe=tg)5x|>Fehhzuk81($zySw&
z;3Eqmi4{-rv4z_hdkHI{07X>27gL_Z?U<!G3923U{p60iD4?VD)cRyibYrUh=}ros
zq?ht_OBX!22-(!T9F;{}&3krqB7k1p*)YBG5%tfvE;7-n=ho<gVHg!gDRUjlqFLvF
zXXLMq+}i5qK3OqK=CWB_C40MtJRk3RDeaoMb+Wm=Qpgu_W~s2fRTK;w3(sma%BHzm
zk)%v6h7Ywd5rlS!oh4*h2_v2)B(Qx-2*-A{%C&MBRNO<Z2p#&bEGD<|2p=NC=bUjA
z`qZ$4Ffbxk?o!_k32_6rM#yaS{4=@eht8Qtm)M9HAU7UeiO|9bp(bP+z21bWMz1#^
z6}Qi;mX7Jo+GSV|W8BgpyNqI7*Bj}H7np46FgM>xr(a;EsSd{0Exsgm5-YDT*7(oa
Hu+Z@Z%6p(u

literal 0
HcmV?d00001

diff --git a/freeriders/__pycache__/functions.cpython-311.pyc b/freeriders/__pycache__/functions.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0c2cd2f6d044468f18500e0dc6a171c914a9e427
GIT binary patch
literal 817
zcmb_aF>ljA6n<x4-G(Cx6>Sh|5mCZGD@2kGAXSJ;kzmZytqV$h7hzG`;m(mD*ir`u
ziv>11b^<C^27X43Dq(p-V(Jzt3+lu>CyhX5<XQgw-Fxr8d+(h;7K@hvt@dtJY!iT=
zdU0;Xl#HuL-UA0t_FxCN@fvmrHxUg^5lv3EVQubIr*~{rnVE@9zvDXys6Y<!d(lGp
zfV)1=cA}cm8CtJ4n;SejBAM0mrP~cO^9Js&kV>ak&svSAzAGAC&-WTi+KrwRLOLAd
zf6;+w2afNlyZx70aU#{1qUXHWkOkDy1*#>4eMs5Ww_9(v4(=tacEW1Mv^GXR{J);&
zv8Ps(N0Oqfv=An($OWWX>CfU?O?erec}@k1u5Rf&TlvOT4jw10e!}X<v@Z4a{ky)~
z7|}D22sa{wn~@ok5JF>!TS9X<2Qb8ph=vsBO*_t)`)zR6pa0^gx|k!p(X0?Su24bO
z?PqMatHhJQv7d<`D@_;YL8=1L&#XyQp)yppO}d)LVROe0<TCp8z|}eewo|zgv-EmB
zE~VuwG5xW)dRX|>NvfM)d2+LzEVg4SEicE#yu~$|QC&=aWBFimIax-jJRv{pY~g|H
u^TD2YD6e5a|0U`X!pJ0qq`>y`XG969k6;ECA-D8$3YJAGBe)3pF~0$h-?0<`

literal 0
HcmV?d00001

diff --git a/freeriders/__pycache__/models.cpython-311.pyc b/freeriders/__pycache__/models.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1b0b86c2e65de873569b42cae2cb5ea1f091e490
GIT binary patch
literal 736
zcmb7Azi-n(6n=MhemG#sL@H7wCblp%QA7|zhym214($LH5?)SD?x1dMC!FmeOc@w5
zWXKSy9Xhu`?cahDDMNHC6I)Q2I&o*m<)@H%=X>|Pd!O}v_s&hT1TuQ<JM5D@KdT~(
z+#0MNN^lGmDDuEZHbQ{mIZ*rosK(GC&VD%4050TC!`7(&5~{f`s;nY`X{)_%C5OH)
zRwoi10|OgTurUUv9cDd+GaFL=5}!%2i)%qU{|~lyssF|<{1>}ObJBiZ6!zWr5sSio
z`Gy-^?)nbzkt5dImUS_RJ<n-*Y_DpFA|Zj}GeSg(5WhoXPvM({yo((#?Qk_6k$=|l
zVm}atogiXw85h{4A|E9(!iZd-g^}ZTKf+3l=xVce(D7N#2|7V7<n7uU&KP$o<KfRx
z3NkO;?Dn`CSdx@j_)4b!^;#I^L3vmiHO7x7_oqgEX4L0Kz5jG!-X6Rdz8>-M`^nbS
zY|PBY+-&r>7glA2$HvLs(|eP6YBgt8b8a>JJ8JP;nb2NU7o{Jz(pTnom7~;+rI-o5
wEYVf*aXOwSd_$H<?r>M8rG^k%KxO*tx70QCU<rSwL2G#MRo#F4OEZ!C4qV2oQ2+n{

literal 0
HcmV?d00001

diff --git a/freeriders/__pycache__/routes.cpython-311.pyc b/freeriders/__pycache__/routes.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9e579c8d088c1f4ad628f7a598120cdff2e15c68
GIT binary patch
literal 3978
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
BY)=3H

literal 0
HcmV?d00001

diff --git a/freeriders/functions.py b/freeriders/functions.py
index a7af5fc..2a7e083 100644
--- a/freeriders/functions.py
+++ b/freeriders/functions.py
@@ -11,6 +11,6 @@ def predict(timestamp):
         base_timestamp = 1694003498
         step = 8
 
-        ticket = base_ticket + (int(time.time()) - base_timestamp) * step
+        ticket = base_ticket + (timestamp - base_timestamp) * step
         return ticket
 
diff --git a/freeriders/routes.py b/freeriders/routes.py
index adb4ac9..c3d3a3b 100644
--- a/freeriders/routes.py
+++ b/freeriders/routes.py
@@ -5,12 +5,11 @@ from freeriders.models import Tickets
 from datetime import datetime
 import time
 
-PREDICTTIMERANGE = 60 * 80
 
 @app.route('/sms', methods=['GET'])
 def sms():
     if request.method == 'GET':
-        timenow = time.time()
+        timenow = int(time.time())
 
         try:
             lastticket = Tickets.query.order_by(Tickets.timestamp.desc()).first()
@@ -21,7 +20,7 @@ def sms():
                 lastticket = formatprefix10(lastticket.ticket)
             date = datetime.now()
             datenow = f'{formatprefix2(date.day)}.{formatprefix2(date.month)}.{date.year}'
-            timenow = f'{formatprefix2(date.hour)}:{formatprefix2(date.minute)}:formatprefix2{date.second}'
+            timenow = f'{formatprefix2(date.hour)}:{formatprefix2(date.minute)}:{formatprefix2(date.second)}'
             return render_template('sms.html', ticket = lastticket, date = datenow, time = timenow)
         except:
             return 'Error retriving last ticket'
@@ -30,6 +29,7 @@ def sms():
 
 @app.route('/submit', methods=['POST', 'GET'])
 def submit():
+    PREDICTTIMERANGE = 60 * 80
     if request.method == 'GET':
         return render_template('submit.html')
     elif request.method == 'POST':
@@ -37,9 +37,13 @@ def submit():
         ticket_input = request.form['ticket']
 
         if ticket_input.isdigit() and len(ticket_input) == 10 :
-            if ticket_input < predict(timenow + PREDICTTIMERANGE ) and ticket_input > predict(timenow - PREDICTTIMERANGE ) :
+            if int(ticket_input) < predict(timenow + PREDICTTIMERANGE ) and int(ticket_input) > predict(timenow - PREDICTTIMERANGE ) :
                 ticket = Tickets(ticket = int(ticket_input), timestamp = timenow)
             else:
+                print(int(ticket_input))
+                print(predict(timenow - PREDICTTIMERANGE))
+                print(predict(timenow + PREDICTTIMERANGE))
+                print(predict(timenow))
                 return 'Ticket number is in unexpected range.'
         else:
             return 'Ticket format is wrong. Only 10 digits allowed.'