diff --git a/freeriders/__pycache__/__init__.cpython-311.pyc b/freeriders/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000..fa4cf4e Binary files /dev/null and b/freeriders/__pycache__/__init__.cpython-311.pyc differ diff --git a/freeriders/__pycache__/functions.cpython-311.pyc b/freeriders/__pycache__/functions.cpython-311.pyc new file mode 100644 index 0000000..0c2cd2f Binary files /dev/null and b/freeriders/__pycache__/functions.cpython-311.pyc differ diff --git a/freeriders/__pycache__/models.cpython-311.pyc b/freeriders/__pycache__/models.cpython-311.pyc new file mode 100644 index 0000000..1b0b86c Binary files /dev/null and b/freeriders/__pycache__/models.cpython-311.pyc differ diff --git a/freeriders/__pycache__/routes.cpython-311.pyc b/freeriders/__pycache__/routes.cpython-311.pyc new file mode 100644 index 0000000..9e579c8 Binary files /dev/null and b/freeriders/__pycache__/routes.cpython-311.pyc differ 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.'