From de45296dc1d1813966955c23d42f2ca24e067f16 Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Tue, 5 Nov 2024 10:55:06 -0500 Subject: [PATCH] Refactor media and static file paths; update countries JSON download URL to use COUNTRY_REGION_JSON_VERSION --- backend/server/main/settings.py | 4 ++-- .../worldtravel/management/commands/download-countries.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/server/main/settings.py b/backend/server/main/settings.py index 47349ee..44aa5d4 100644 --- a/backend/server/main/settings.py +++ b/backend/server/main/settings.py @@ -136,8 +136,8 @@ STATIC_ROOT = BASE_DIR / "staticfiles" STATIC_URL = '/static/' MEDIA_URL = '/media/' -MEDIA_ROOT = os.path.join(BASE_DIR, 'media') -STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')] +MEDIA_ROOT = BASE_DIR / 'media' +STATICFILES_DIRS = [BASE_DIR / 'static'] # TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'templates')] diff --git a/backend/server/worldtravel/management/commands/download-countries.py b/backend/server/worldtravel/management/commands/download-countries.py index c5477d4..c9dff83 100644 --- a/backend/server/worldtravel/management/commands/download-countries.py +++ b/backend/server/worldtravel/management/commands/download-countries.py @@ -7,7 +7,6 @@ import json from django.conf import settings -COUNTRY_REGION_JSON_URL = settings.COUNTRY_REGION_JSON_URL COUNTRY_REGION_JSON_VERSION = settings.COUNTRY_REGION_JSON_VERSION media_root = settings.MEDIA_ROOT @@ -39,9 +38,9 @@ class Command(BaseCommand): help = 'Imports the world travel data' def handle(self, *args, **options): - countries_json_path = os.path.join(settings.MEDIA_ROOT, f'countries+regions-{COUNTRY_REGION_JSON_URL}.json') + countries_json_path = os.path.join(settings.MEDIA_ROOT, f'countries+regions-{COUNTRY_REGION_JSON_VERSION}.json') if not os.path.exists(countries_json_path): - res = requests.get(f'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/{COUNTRY_REGION_JSON_URL}/countries%2Bstates.json') + res = requests.get(f'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/{COUNTRY_REGION_JSON_VERSION}/countries%2Bstates.json') if res.status_code == 200: with open(countries_json_path, 'w') as f: f.write(res.text)