update requirements y solución a mensajes de reporte

This commit is contained in:
Omar Sánchez
2021-10-13 17:46:25 +02:00
parent d546afb795
commit 025355b9d2
3 changed files with 8 additions and 24 deletions

View File

@@ -121,17 +121,17 @@ class AutoFicher():
response = self.post("check", data, self.headers)
rj = json.loads(response.text)
if response.status_code != 200:
time = datetime.strptime(self.headers["tn-d"], "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=pytz.utc).astimezone(
pytz.timezone("Europe/Madrid")).strftime("%H:%M")
self.sendReport('Has fichado correctamente a las %s' % time)
else:
if response.status_code == 200:
if rj['Repeated']:
time = datetime.strptime(rj['RepeatedTime'], "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=pytz.utc).astimezone(
pytz.timezone("Europe/Madrid")).strftime("%H:%M")
self.sendReport("Se ha realizado un marcaje antes a las %s" % time)
else:
self.sendReport("No se ha podido fichar, la web no ha devuelto 200 OK")
time = datetime.strptime(self.headers["tn-d"], "%Y-%m-%dT%H:%M:%SZ").replace(tzinfo=pytz.utc).astimezone(pytz.timezone("Europe/Madrid")).strftime("%H:%M")
self.sendReport('Has fichado correctamente a las %s' % time)
else:
self.sendReport("No se ha podido fichar, la web no ha devuelto 200 OK")
if __name__ == '__main__':

View File

@@ -1,17 +0,0 @@
#!/bin/bash
sleep $(( ( RANDOM % 300 ) + 1 ))
pin=$1
typ=$2
date=$(date +"%d/%m/%Y+%H:%M:%S")
#dateenc=$(urlencode $date)
#login
token=$(curl --header "user: 4d805364-70d7-4608-bf2f-7bf7b3d32c04" --header "pass: $pin" https://timenet.gpisoftware.com/api/v1/cp/login --silent)
token="${token//\"}"
#checks
response=$(curl -X POST -H "Content-type: application/x-www-form-urlencoded" -H "token: $token" -d "typ=$typ&date=$date&geoLatitude=41.3908992&geoLognitude=2.154496&geoError=" https://timenet.gpisoftware.com/api/v1/cp/checks --silent)
echo $response

View File

@@ -1 +1,2 @@
python-telegram
python-telegram-bot
pytz