Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Modify sync-ingredients management command to support filtering by languages.

Joshua Shelley2f90c17359e8
diff --git a/wger/nutrition/management/commands/sync-ingredients.py b/wger/nutrition/management/commands/sync-ingredients.py
index 5e12aaff1..8591796dd 100644
--- a/wger/nutrition/management/commands/sync-ingredients.py
+++ b/wger/nutrition/management/commands/sync-ingredients.py
@@ -43,15 +43,25 @@ class Command(BaseCommand):
help=f'Remote URL to fetch the ingredients from (default: WGER_SETTINGS'
f'["WGER_INSTANCE"] - {settings.WGER_SETTINGS["WGER_INSTANCE"]})',
)
+ parser.add_argument(
+ '-l',
+ '--languages',
+ action='store',
+ dest='languages',
+ default=None,
+ help='Specify a comma-separated subset of languages to sync. Example: en,fr,es'
+ )
def handle(self, **options):
remote_url = options['remote_url']
+ languages = options['languages']
try:
val = URLValidator()
val(remote_url)
- self.remote_url = remote_url
+ self.remote_url = remote_url
except ValidationError:
raise CommandError('Please enter a valid URL')
+ self.languages = languages
- sync_ingredients(self.stdout.write, self.remote_url, self.style.SUCCESS)
+ sync_ingredients(self.stdout.write, self.remote_url, self.languages, self.style.SUCCESS)
diff --git a/wger/nutrition/sync.py b/wger/nutrition/sync.py
index bf73b2347..ceab97ff6 100644
--- a/wger/nutrition/sync.py
+++ b/wger/nutrition/sync.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
import os
-from typing import Optional
+from typing import List, Optional
# Django
from django.conf import settings
@@ -29,6 +29,7 @@ from openfoodfacts.images import (
)
# wger
+from wger.core.models.language import Language
from wger.nutrition.api.endpoints import (
IMAGE_ENDPOINT,
INGREDIENTS_ENDPOINT,
@@ -48,6 +49,7 @@ from wger.utils.requests import (
get_paginated,
wger_headers,
)
+from wger.utils.language import load_language
from wger.utils.url import make_uri
@@ -213,43 +215,67 @@ def download_ingredient_images(
print_fn(style_fn(' successfully saved'))
+
+
+
def sync_ingredients(
print_fn,
remote_url=settings.WGER_SETTINGS['WGER_INSTANCE'],
- style_fn=lambda x: x,
+ languages: Optional[str]=None,
+ style_fn=lambda x: x,
):
- """Synchronize the ingredients from the remote server"""
- print_fn('*** Synchronizing ingredients...')
+ """Synchronize the ingredients from the remote server"""
+
+ def _sync_ingredients(language_id: Optional[int]=None):
+ if language_id is not None:
+ url = make_uri(INGREDIENTS_ENDPOINT, server_url=remote_url, query={'limit': API_MAX_ITEMS, 'language': language_id})
+ for data in get_paginated(url, headers=wger_headers()):
+ uuid = data['uuid']
+ name = data['name']
+
+ ingredient, created = Ingredient.objects.update_or_create(
+ uuid=uuid,
+ defaults={
+ 'name': name,
+ 'code': data['code'],
+ 'language_id': data['language'],
+ 'created': data['created'],
+ 'license_id': data['license'],
+ 'license_object_url': data['license_object_url'],
+ 'license_author': data['license_author_url'],
+ 'license_author_url': data['license_author_url'],
+ 'license_title': data['license_title'],
+ 'license_derivative_source_url': data['license_derivative_source_url'],
+ 'energy': data['energy'],
+ 'carbohydrates': data['carbohydrates'],
+ 'carbohydrates_sugar': data['carbohydrates_sugar'],
+ 'fat': data['fat'],
+ 'fat_saturated': data['fat_saturated'],
+ 'protein': data['protein'],
+ 'fiber': data['fiber'],
+ 'sodium': data['sodium'],
+ },
+ )
+
+ print_fn(f"{'created' if created else 'updated'} ingredient {uuid} - {name}")
- url = make_uri(INGREDIENTS_ENDPOINT, server_url=remote_url, query={'limit': API_MAX_ITEMS})
- for data in get_paginated(url, headers=wger_headers()):
- uuid = data['uuid']
- name = data['name']
-
- ingredient, created = Ingredient.objects.update_or_create(
- uuid=uuid,
- defaults={
- 'name': name,
- 'code': data['code'],
- 'language_id': data['language'],
- 'created': data['created'],
- 'license_id': data['license'],
- 'license_object_url': data['license_object_url'],
- 'license_author': data['license_author_url'],
- 'license_author_url': data['license_author_url'],
- 'license_title': data['license_title'],
- 'license_derivative_source_url': data['license_derivative_source_url'],
- 'energy': data['energy'],
- 'carbohydrates': data['carbohydrates'],
- 'carbohydrates_sugar': data['carbohydrates_sugar'],
- 'fat': data['fat'],
- 'fat_saturated': data['fat_saturated'],
- 'protein': data['protein'],
- 'fiber': data['fiber'],
- 'sodium': data['sodium'],
- },
- )
-
- print_fn(f"{'created' if created else 'updated'} ingredient {uuid} - {name}")
-
- print_fn(style_fn('done!\n'))
+ print_fn('*** Synchronizing ingredients...')
+
+ if languages is not None:
+ language_ids: List[str] = []
+ language_codes: List[str] = languages.split(',')
+ for language_code in language_codes:
+ try:
+ lang = load_language(language_code, default_to_english=False)
+ language_ids.append(lang.id)
+ except Language.DoesNotExist as e:
+ print_fn(f'Error: The language code you provided ("{language_code}") does not exist in this database. Please try again.')
+ return 0
+
+ for language_id in language_ids:
+ _sync_ingredients(language_id)
+ else:
+ _sync_ingredients()
+
+
+ print_fn(style_fn('done!\n'))
\ No newline at end of file