Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Rename get_paginated_generator to just get_paginated

Roland Geiderb3494cbb87e5
diff --git a/wger/exercises/sync.py b/wger/exercises/sync.py
index 6544f0d20..acdb9e3fc 100644
--- a/wger/exercises/sync.py
+++ b/wger/exercises/sync.py
@@ -58,6 +58,7 @@ from wger.manager.models import (
WorkoutLog,
)
from wger.utils.requests import (
+ get_all_paginated,
get_paginated,
wger_headers,
)
@@ -165,7 +166,7 @@ def sync_languages(
headers = wger_headers()
url = make_uri(LANGUAGE_ENDPOINT, server_url=remote_url)
- for data in get_paginated(url, headers=headers):
+ for data in get_all_paginated(url, headers=headers):
short_name = data['short_name']
full_name = data['full_name']
@@ -189,7 +190,7 @@ def sync_licenses(
print_fn('*** Synchronizing licenses...')
url = make_uri(LICENSE_ENDPOINT, server_url=remote_url)
- for data in get_paginated(url, headers=wger_headers()):
+ for data in get_all_paginated(url, headers=wger_headers()):
short_name = data['short_name']
full_name = data['full_name']
license_url = data['url']
@@ -218,7 +219,7 @@ def sync_categories(
print_fn('*** Synchronizing categories...')
url = make_uri(CATEGORY_ENDPOINT, server_url=remote_url)
- for data in get_paginated(url, headers=wger_headers()):
+ for data in get_all_paginated(url, headers=wger_headers()):
category_id = data['id']
category_name = data['name']
@@ -243,7 +244,7 @@ def sync_muscles(
print_fn('*** Synchronizing muscles...')
url = make_uri(MUSCLE_ENDPOINT, server_url=remote_url)
- for data in get_paginated(url, headers=wger_headers()):
+ for data in get_all_paginated(url, headers=wger_headers()):
muscle_id = data['id']
muscle_name = data['name']
muscle_is_front = data['is_front']
@@ -278,7 +279,7 @@ def sync_equipment(
url = make_uri(EQUIPMENT_ENDPOINT, server_url=remote_url)
- for data in get_paginated(url, headers=wger_headers()):
+ for data in get_all_paginated(url, headers=wger_headers()):
equipment_id = data['id']
equipment_name = data['name']
diff --git a/wger/nutrition/sync.py b/wger/nutrition/sync.py
index 4b8fbe94e..6b675e160 100644
--- a/wger/nutrition/sync.py
+++ b/wger/nutrition/sync.py
@@ -41,11 +41,12 @@ from wger.utils.constants import (
DOWNLOAD_INGREDIENT_WGER,
)
from wger.utils.requests import (
- get_paginated_generator,
+ get_paginated,
wger_headers,
)
from wger.utils.url import make_uri
+
logger = logging.getLogger(__name__)
@@ -166,7 +167,7 @@ def download_ingredient_images(
url = make_uri(IMAGE_ENDPOINT, server_url=remote_url, query={'limit': 100})
print_fn('*** Processing ingredient images ***')
- for image_data in get_paginated_generator(url, headers=headers):
+ for image_data in get_paginated(url, headers=headers):
image_uuid = image_data['uuid']
print_fn(f'Processing image {image_uuid}')
@@ -200,7 +201,7 @@ def sync_ingredients(
print_fn('*** Synchronizing ingredients...')
url = make_uri(INGREDIENTS_ENDPOINT, server_url=remote_url, query={'limit': API_MAX_ITEMS})
- for data in get_paginated_generator(url, headers=wger_headers()):
+ for data in get_paginated(url, headers=wger_headers()):
uuid = data['uuid']
name = data['name']
diff --git a/wger/utils/requests.py b/wger/utils/requests.py
index 2a41d18f9..d59020e63 100644
--- a/wger/utils/requests.py
+++ b/wger/utils/requests.py
@@ -27,7 +27,7 @@ def wger_headers():
return {'User-agent': wger_user_agent()}
-def get_paginated(url: str, headers=None):
+def get_all_paginated(url: str, headers=None):
"""
Fetch all results from a paginated endpoint.
@@ -49,7 +49,7 @@ def get_paginated(url: str, headers=None):
return results
-def get_paginated_generator(url: str, headers=None):
+def get_paginated(url: str, headers=None):
"""
Generator that iterates over a paginated endpoint