Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use the make_uri helper for the other sync functions
Roland Geiderdb2f9a0f0f0f
diff --git a/wger/core/api/endpoints.py b/wger/core/api/endpoints.pyindex 68f2f6818..68ce8db5f 100644--- a/wger/core/api/endpoints.py+++ b/wger/core/api/endpoints.py@@ -1 +1 @@-LANGUAGE_ENDPOINT = "{0}/api/v2/language/"+LANGUAGE_ENDPOINT = "language"diff --git a/wger/exercises/api/endpoints.py b/wger/exercises/api/endpoints.pyindex ab5e165cc..5dd966f0a 100644--- a/wger/exercises/api/endpoints.py+++ b/wger/exercises/api/endpoints.py@@ -1,7 +1,7 @@-EXERCISE_ENDPOINT = "{0}/api/v2/exercisebaseinfo/?limit=100"-DELETION_LOG_ENDPOINT = "{0}/api/v2/deletion-log/?limit=100"-CATEGORY_ENDPOINT = "{0}/api/v2/exercisecategory/"-MUSCLE_ENDPOINT = "{0}/api/v2/muscle/"-EQUIPMENT_ENDPOINT = "{0}/api/v2/equipment/"-IMAGE_ENDPOINT = "{0}/api/v2/exerciseimage/"-VIDEO_ENDPOINT = "{0}/api/v2/video/"+EXERCISE_ENDPOINT = "exercisebaseinfo"+DELETION_LOG_ENDPOINT = "deletion-log"+CATEGORY_ENDPOINT = "exercisecategory"+MUSCLE_ENDPOINT = "muscle"+EQUIPMENT_ENDPOINT = "equipment"+IMAGE_ENDPOINT = "exerciseimage"+VIDEO_ENDPOINT = "video"diff --git a/wger/exercises/sync.py b/wger/exercises/sync.pyindex 6616a433f..041744b8a 100644--- a/wger/exercises/sync.py+++ b/wger/exercises/sync.py@@ -48,6 +48,7 @@ from wger.exercises.models import (Muscle,)from wger.utils.requests import wger_headers+from wger.utils.url import make_uridef sync_exercises(@@ -56,12 +57,13 @@ def sync_exercises(style_fn=lambda x: x,):"""Synchronize the exercises from the remote server"""- headers = wger_headers()-print_fn('*** Synchronizing exercises...')+page = 1all_exercise_processed = False- result = requests.get(EXERCISE_ENDPOINT.format(remote_url), headers=headers).json()+ url = make_uri(EXERCISE_ENDPOINT, server_url=remote_url, query={'limit': 100})+ headers = wger_headers()+ result = requests.get(url, headers=headers).json()while not all_exercise_processed:for data in result['results']:@@ -128,10 +130,10 @@ def sync_languages(style_fn=lambda x: x,):"""Synchronize the languages from the remote server"""- headers = wger_headers()-print_fn('*** Synchronizing languages...')- result = requests.get(LANGUAGE_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(LANGUAGE_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()for data in result['results']:short_name = data['short_name']full_name = data['full_name']@@ -154,10 +156,10 @@ def sync_categories():"""Synchronize the categories from the remote server"""- headers = wger_headers()-print_fn('*** Synchronizing categories...')- result = requests.get(CATEGORY_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(CATEGORY_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()for data in result['results']:category_id = data['id']category_name = data['name']@@ -180,10 +182,10 @@ def sync_muscles():"""Synchronize the muscles from the remote server"""- headers = wger_headers()-print_fn('*** Synchronizing muscles...')- result = requests.get(MUSCLE_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(MUSCLE_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()for data in result['results']:muscle_id = data['id']muscle_name = data['name']@@ -215,11 +217,11 @@ def sync_equipment(style_fn=lambda x: x,):"""Synchronize the equipment from the remote server"""+ print_fn('*** Synchronizing equipment...')headers = wger_headers()-- print_fn('*** Synchronizing equipment...')- result = requests.get(EQUIPMENT_ENDPOINT.format(remote_url), headers=headers).json()+ url = make_uri(EQUIPMENT_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()for data in result['results']:equipment_id = data['id']equipment_name = data['name']@@ -241,14 +243,13 @@ def delete_entries(style_fn=lambda x: x,):"""Delete exercises that were removed on the server"""-- headers = wger_headers()-print_fn('*** Deleting exercises data that was removed on the server...')page = 1all_entries_processed = False- result = requests.get(DELETION_LOG_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(DELETION_LOG_ENDPOINT, server_url=remote_url, query={'limit': 100})+ result = requests.get(url, headers=headers).json()while not all_entries_processed:for data in result['results']:uuid = data['uuid']@@ -299,12 +300,11 @@ def download_exercise_images(remote_url=settings.WGER_SETTINGS['WGER_INSTANCE'],style_fn=lambda x: x,):- headers = wger_headers()-- # Get all imagespage = 1all_images_processed = False- result = requests.get(IMAGE_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(IMAGE_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()print_fn('*** Processing images ***')while not all_images_processed:print_fn('')@@ -365,12 +365,12 @@ def download_exercise_videos(remote_url=settings.WGER_SETTINGS['WGER_INSTANCE'],style_fn=lambda x: x,):- headers = wger_headers()-# Get all videospage = 1all_videos_processed = False- result = requests.get(VIDEO_ENDPOINT.format(remote_url), headers=headers).json()+ headers = wger_headers()+ url = make_uri(VIDEO_ENDPOINT, server_url=remote_url)+ result = requests.get(url, headers=headers).json()print_fn('*** Processing videos ***')while not all_videos_processed:print_fn('')diff --git a/wger/nutrition/tests/test_tasks.py b/wger/nutrition/tests/test_tasks.pyindex 113752647..da0068bd1 100644--- a/wger/nutrition/tests/test_tasks.py+++ b/wger/nutrition/tests/test_tasks.py@@ -1,7 +1,7 @@# This file is part of wger Workout Manager.## wger Workout Manager is free software: you can redistribute it and/or modify-# it under the terms of the GNU Affero General Public License as published by+# it under the t erms of the GNU Affero General Public License as published by# the Free Software Foundation, either version 3 of the License, or# (at your option) any later version.#