Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #345 from SamR1/update-errors-on-gpx-files

Browse Source 
Update error messages on gpx errors
This commit is contained in:
Sam 2023-04-11 16:44:10 +02:00 committed by GitHub
commit ef65689263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 114 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee/dist/index.html vendored
View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"/><link rel="stylesheet" href="/static/css/leaflet.css"/><title>FitTrackee</title><script defer="defer" src="/static/js/chunk-vendors.01cb48d3.js"></script><script defer="defer" src="/static/js/app.a4012b5a.js"></script><link href="/static/css/app.5f8309dc.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"/><link rel="stylesheet" href="/static/css/leaflet.css"/><title>FitTrackee</title><script defer="defer" src="/static/js/chunk-vendors.01cb48d3.js"></script><script defer="defer" src="/static/js/app.3af67296.js"></script><link href="/static/css/app.5f8309dc.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
fittrackee/dist/service-worker.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/service-worker.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.3af67296.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.3af67296.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.a4012b5a.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.a4012b5a.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.5bcd14e6.js → fittrackee/dist/static/js/reset.3d1800dc.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.5bcd14e6.js.map → fittrackee/dist/static/js/reset.3d1800dc.js.map vendored
View File

File diff suppressed because one or more lines are too long

50
fittrackee/tests/fixtures/fixtures_workouts.py vendored
View File

@ -591,6 +591,56 @@ def gpx_file_invalid_xml() -> str:
'<?xml version=\'1.0\' encoding=\'UTF-8\'?>' '<?xml version=\'1.0\' encoding=\'UTF-8\'?>'
'<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">' # noqa '<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">' # noqa
' <metadata/>' ' <metadata/>'
' <trk>'
' <name>just a workout</name>'
)
@pytest.fixture()
def gpx_file_without_time() -> str:
return (
'<?xml version=\'1.0\' encoding=\'UTF-8\'?>'
'<gpx xmlns:gpxdata="http://www.cluetrust.com/XML/GPXDATA/1/0" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxext="http://www.garmin.com/xmlschemas/GpxExtensions/v3" xmlns="http://www.topografix.com/GPX/1/1">' # noqa
' <metadata/>'
' <trk>'
' <name>just a workout</name>'
' <trkseg>'
' <trkpt lat="44.68095" lon="6.07367">'
' <ele>998</ele>'
' </trkpt>'
' <trkpt lat="44.68091" lon="6.07367">'
' <ele>998</ele>'
' </trkpt>'
' <trkpt lat="44.6808" lon="6.07364">'
' <ele>994</ele>'
' </trkpt>'
' <trkpt lat="44.68075" lon="6.07364">'
' <ele>994</ele>'
' </trkpt>'
' <trkpt lat="44.68071" lon="6.07364">'
' <ele>994</ele>'
' </trkpt>'
' <trkpt lat="44.68049" lon="6.07361">'
' <ele>993</ele>'
' </trkpt>'
' <trkpt lat="44.68019" lon="6.07356">'
' <ele>992</ele>'
' </trkpt>'
' <trkpt lat="44.68014" lon="6.07355">'
' <ele>992</ele>'
' </trkpt>'
' <trkpt lat="44.67995" lon="6.07358">'
' <ele>987</ele>'
' </trkpt>'
' <trkpt lat="44.67977" lon="6.07364">'
' <ele>987</ele>'
' </trkpt>'
' <trkpt lat="44.67972" lon="6.07367">'
' <ele>987</ele>'
' </trkpt>'
' </trkseg>'
' </trk>'
'</gpx>'
) )

35
fittrackee/tests/workouts/test_workouts_api_1_post.py
View File

@ -674,7 +674,7 @@ class TestPostWorkoutWithGpx(ApiTestCaseMixin, CallArgsMixin):
), ),
) )
data = self.assert_500(response, 'error during gpx processing') data = self.assert_500(response, 'no tracks in gpx file')
assert 'data' not in data assert 'data' not in data
def test_it_returns_500_if_gpx_has_invalid_xml( def test_it_returns_500_if_gpx_has_invalid_xml(
@ -703,7 +703,36 @@ class TestPostWorkoutWithGpx(ApiTestCaseMixin, CallArgsMixin):
), ),
) )
data = self.assert_500(response, 'error during gpx file parsing') data = self.assert_500(response, 'gpx file is invalid')
assert 'data' not in data
def test_it_returns_500_if_gpx_has_no_time(
self,
app: Flask,
user_1: User,
sport_1_cycling: Sport,
gpx_file_without_time: str,
) -> None:
client, auth_token = self.get_test_client_and_auth_token(
app, user_1.email
)
response = client.post(
'/api/workouts',
data=dict(
file=(
BytesIO(str.encode(gpx_file_without_time)),
'example.gpx',
),
data='{"sport_id": 1}',
),
headers=dict(
content_type='multipart/form-data',
Authorization=f'Bearer {auth_token}',
),
)
data = self.assert_500(response, '<time> is missing in gpx file')
assert 'data' not in data assert 'data' not in data
def test_it_returns_400_if_workout_gpx_has_invalid_extension( def test_it_returns_400_if_workout_gpx_has_invalid_extension(
@ -1405,7 +1434,7 @@ class TestPostWorkoutWithZipArchive(ApiTestCaseMixin):
), ),
) )
data = self.assert_500(response, 'error during gpx processing') data = self.assert_500(response, 'no tracks in gpx file')
assert 'data' not in data assert 'data' not in data
def test_it_returns_400_when_files_in_archive_exceed_limit( def test_it_returns_400_when_files_in_archive_exceed_limit(

4
fittrackee/workouts/exceptions.py
View File

@ -1,6 +1,10 @@
from fittrackee.exceptions import GenericException from fittrackee.exceptions import GenericException
class InvalidGPXException(GenericException):
...
class WorkoutException(GenericException): class WorkoutException(GenericException):
... ...

13
fittrackee/workouts/utils/gpx.py
View File

@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
import gpxpy.gpx import gpxpy.gpx
from ..exceptions import WorkoutGPXException from ..exceptions import InvalidGPXException, WorkoutGPXException
from .weather import WeatherService from .weather import WeatherService
weather_service = WeatherService() weather_service = WeatherService()
@ -77,9 +77,12 @@ def get_gpx_info(
""" """
Parse and return gpx, map and weather data from gpx file Parse and return gpx, map and weather data from gpx file
""" """
gpx = open_gpx_file(gpx_file) try:
gpx = open_gpx_file(gpx_file)
except Exception:
raise InvalidGPXException('error', 'gpx file is invalid')
if gpx is None: if gpx is None:
raise WorkoutGPXException('not found', 'No gpx file') raise InvalidGPXException('error', 'no tracks in gpx file')
gpx_data: Dict = {'name': gpx.tracks[0].name, 'segments': []} gpx_data: Dict = {'name': gpx.tracks[0].name, 'segments': []}
max_speed = 0.0 max_speed = 0.0
@ -95,6 +98,10 @@ def get_gpx_info(
segment_start: Optional[datetime] = None segment_start: Optional[datetime] = None
segment_points_nb = len(segment.points) segment_points_nb = len(segment.points)
for point_idx, point in enumerate(segment.points): for point_idx, point in enumerate(segment.points):
if point.time is None:
raise InvalidGPXException(
'error', '<time> is missing in gpx file'
)
if point_idx == 0: if point_idx == 0:
segment_start = point.time segment_start = point.time
# first gpx point => get weather # first gpx point => get weather

5
fittrackee/workouts/utils/workouts.py
View File

@ -15,7 +15,7 @@ from fittrackee import appLog, db
from fittrackee.files import get_absolute_file_path from fittrackee.files import get_absolute_file_path
from fittrackee.users.models import User, UserSportPreference from fittrackee.users.models import User, UserSportPreference
from ..exceptions import WorkoutException from ..exceptions import InvalidGPXException, WorkoutException
from ..models import Sport, Workout, WorkoutSegment from ..models import Sport, Workout, WorkoutSegment
from .gpx import get_gpx_info from .gpx import get_gpx_info
from .maps import generate_map, get_map_hash from .maps import generate_map, get_map_hash
@ -329,6 +329,9 @@ def process_one_gpx_file(
except (gpxpy.gpx.GPXXMLSyntaxException, TypeError) as e: except (gpxpy.gpx.GPXXMLSyntaxException, TypeError) as e:
delete_files(absolute_gpx_filepath, absolute_map_filepath) delete_files(absolute_gpx_filepath, absolute_map_filepath)
raise WorkoutException('error', 'error during gpx file parsing', e) raise WorkoutException('error', 'error during gpx file parsing', e)
except InvalidGPXException as e:
delete_files(absolute_gpx_filepath, absolute_map_filepath)
raise WorkoutException('error', str(e))
except Exception as e: except Exception as e:
delete_files(absolute_gpx_filepath, absolute_map_filepath) delete_files(absolute_gpx_filepath, absolute_map_filepath)
raise WorkoutException('error', 'error during gpx processing', e) raise WorkoutException('error', 'error during gpx processing', e)

3
fittrackee_client/src/locales/en/api.json
View File

@ -1,5 +1,6 @@
{ {
"ERROR": { "ERROR": {
"<time> is missing in gpx file": "<time> element is missing in .gpx file.",
"Network Error": "Network Error.", "Network Error": "Network Error.",
"UNKNOWN": "Error. Please try again or contact the administrator.", "UNKNOWN": "Error. Please try again or contact the administrator.",
"at least one file in zip archive exceeds size limit, please check the archive": "At least one file in zip archive exceeds size limit, please check the archive.", "at least one file in zip archive exceeds size limit, please check the archive": "At least one file in zip archive exceeds size limit, please check the archive.",
@ -14,6 +15,7 @@
"error, registration is disabled": "Error, registration is disabled.", "error, registration is disabled": "Error, registration is disabled.",
"file extension not allowed": "File extension not allowed.", "file extension not allowed": "File extension not allowed.",
"file size is greater than the allowed size": "File size is greater than the allowed size.", "file size is greater than the allowed size": "File size is greater than the allowed size.",
"gpx file is invalid": "The .gpx file is invalid.",
"invalid credentials": "Invalid credentials.", "invalid credentials": "Invalid credentials.",
"invalid payload": "Provided data are invalid.", "invalid payload": "Provided data are invalid.",
"invalid token, please log in again": "Invalid token, please log in again.", "invalid token, please log in again": "Invalid token, please log in again.",
@ -21,6 +23,7 @@
"new email must be different than curent email": "The new email must be different than curent email", "new email must be different than curent email": "The new email must be different than curent email",
"no file part": "No file provided.", "no file part": "No file provided.",
"no selected file": "No selected file.", "no selected file": "No selected file.",
"no tracks in gpx file": "No track (<trk>) in .gpx file.",
"ongoing request exists": "A data export request already exists.", "ongoing request exists": "A data export request already exists.",
"password: password and password confirmation do not match": "Password: password and password confirmation don't match.", "password: password and password confirmation do not match": "Password: password and password confirmation don't match.",
"provide a valid auth token": "Provide a valid auth token.", "provide a valid auth token": "Provide a valid auth token.",

3
fittrackee_client/src/locales/fr/api.json
View File

@ -1,5 +1,6 @@
{ {
"ERROR": { "ERROR": {
"<time> is missing in gpx file": "Elément <time> manquant dans le fichier .gpx.",
"Network Error": "Erreur réseau.", "Network Error": "Erreur réseau.",
"UNKNOWN": "Erreur. Veuillez réessayer ou contacter l'administrateur.", "UNKNOWN": "Erreur. Veuillez réessayer ou contacter l'administrateur.",
"at least one file in zip archive exceeds size limit, please check the archive": "Au moins un fichier de l'archive zip dépasse la taille maximale, veuillez vérifier l'archive.", "at least one file in zip archive exceeds size limit, please check the archive": "Au moins un fichier de l'archive zip dépasse la taille maximale, veuillez vérifier l'archive.",
@ -14,6 +15,7 @@
"error, registration is disabled": "Erreur, les inscriptions sont désactivées.", "error, registration is disabled": "Erreur, les inscriptions sont désactivées.",
"file extension not allowed": "Extension de fichier non autorisée.", "file extension not allowed": "Extension de fichier non autorisée.",
"file size is greater than the allowed size": "La taille du fichier est supérieure à la limite autorisée.", "file size is greater than the allowed size": "La taille du fichier est supérieure à la limite autorisée.",
"gpx file is invalid": "Le fichier .gpx est invalide.",
"invalid credentials": "Identifiants invalides.", "invalid credentials": "Identifiants invalides.",
"invalid payload": "Données fournies incorrectes.", "invalid payload": "Données fournies incorrectes.",
"invalid token, please log in again": "Jeton de connexion invalide, merci de vous reconnecter.", "invalid token, please log in again": "Jeton de connexion invalide, merci de vous reconnecter.",
@ -21,6 +23,7 @@
"new email must be different than curent email": "La nouvelle addresse électronique doit être differente de l'adresse actuelle", "new email must be different than curent email": "La nouvelle addresse électronique doit être differente de l'adresse actuelle",
"no file part": "Pas de fichier fourni.", "no file part": "Pas de fichier fourni.",
"no selected file": "Pas de fichier sélectionné.", "no selected file": "Pas de fichier sélectionné.",
"no tracks in gpx file": "Pas de trace (<trk>) dans le fichier .gpx",
"ongoing request exists": "Une demande d'exportation de données existe déjà.", "ongoing request exists": "Une demande d'exportation de données existe déjà.",
"password: password and password confirmation do not match": "Mot de passe : les mots de passe saisis sont différents.", "password: password and password confirmation do not match": "Mot de passe : les mots de passe saisis sont différents.",
"provide a valid auth token": "Merci de fournir un jeton de connexion valide.", "provide a valid auth token": "Merci de fournir un jeton de connexion valide.",