scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added support for timezones with - offset

Browse Source 
introduced new regexp to better handle timestamps with a negative timezone offset like '2019-21-30T14:01:46.79231-05:00'
This commit is contained in:
gerard780 2019-12-30 14:01:59 -05:00 committed by GitHub
parent 63dc672b11
commit 2f1b35b3fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions

13
pwnagotchi/plugins/default/webgpsmap.py

@ -308,12 +308,17 @@ class PositionFile:
if date_iso_formated.endswith("Z"): if date_iso_formated.endswith("Z"):
date_iso_formated = date_iso_formated[:-1] + "+00:00" date_iso_formated = date_iso_formated[:-1] + "+00:00"
# bad microseconds fix: fill/cut microseconds to 6 numbers # bad microseconds fix: fill/cut microseconds to 6 numbers
part1, part2, part3 = re.split('\.|\+', date_iso_formated) parts = re.split('^(([0-9]+)-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])[Tt]([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60))(\.[0-9]+)?(([Zz])|([\+|\-]([01][0-9]|2[0-3]):?[0-5][0-9]))$', date_iso_formated)
part1 = parts[1]
part2 = parts[8][1:]
part3 = parts[11]
part2 = part2.ljust(6, '0')[:6] part2 = part2.ljust(6, '0')[:6]
# timezone fix: 0200 >>> 02:00 # timezone fix: 0200 >>> 02:00
if len(part3) == 4: if len(part3) == 5:
part3 = part3[1:2].rjust(2, '0') + ':' + part3[3:4].rjust(2, '0') part3 = part3[0:1] + part3[1:2].rjust(2, '0') + ':' + part3[3:4].rjust(2, '0')
date_iso_formated = part1 + "." + part2 + "+" + part3 date_iso_formated = part1 + "." + part2 + part3
dateObj = datetime.datetime.fromisoformat(date_iso_formated) dateObj = datetime.datetime.fromisoformat(date_iso_formated)
return_ts = int("%.0f" % dateObj.timestamp()) return_ts = int("%.0f" % dateObj.timestamp())
else: else: