* Fixes [REQUEST] Email-based auto-linking for OIDC Fixes #921 * Add ClusterMap integration for regions and cities with fit-to-bounds functionality * Update COUNTRY_REGION_JSON_VERSION to v3.0 and modify state ID generation to use ISO2 code * fix: handle email verification required case during signup Updated the signup action to return a specific message when the backend responds with a 401 status, indicating that the signup succeeded but email verification is required. This allows the frontend to display the appropriate message using an i18n key. * feat: add Advanced Configuration documentation with optional environment variables * Fixes #511 * fix: update appVersion to v0.11.0-main-121425 and enhance socialProviders handling in settings page * feat: implement social signup controls and update documentation for new environment variables * fix: update LocationCard props and enhance restore data functionality - Changed the user prop to null in LocationCard component on the dashboard page. - Added isRestoring state to manage loading state during data restoration in settings. - Updated the restore button to show a loading spinner when a restore operation is in progress. * fix: update appVersion to v0.12.0-pre-dev-121625 * feat: implement itinerary planning feature with CollectionItineraryPlanner component and related updates * feat: add overnight lodging indicator and functionality to CollectionItineraryPlanner * feat: add compact display option to LocationCard and enhance lodging filtering in CollectionItineraryPlanner * feat(itinerary): add itinerary management features and link modal - Introduced ItineraryViewSet for managing itinerary items with create and reorder functionalities. - Added itinerary linking capabilities in CollectionModal and CollectionItineraryPlanner components. - Implemented new ItineraryLinkModal for linking existing items to specific dates. - Enhanced the frontend with new modals for creating locations, lodging, transportation, notes, and checklists. - Updated the backend to handle itinerary item creation and reordering with appropriate permissions. - Improved data handling for unscheduled items and their association with the itinerary. - Added new dependencies to the frontend for enhanced functionality. * feat(itinerary): implement auto-generate functionality for itinerary items based on dated records * feat(collection): enhance collection sharing logic and improve data handling on invite acceptance * fix: update appVersion to correct pre-dev version * feat(wikipedia): implement image selection from Wikipedia with enhanced results display * Refactor code structure for improved readability and maintainability * feat: add CollectionRecommendationView component for displaying location recommendations - Implemented CollectionRecommendationView.svelte to handle location recommendations based on user input and selected categories. - Added Recommendation and RecommendationResponse types to types.ts for better type safety and structure. - Updated collections/[id]/+page.svelte to include a new view for recommendations, allowing users to switch between different views seamlessly. * fix: update appVersion and improve button accessibility in collection views * feat: add canModify prop to collection components for user permission handling * feat: add itinerary removal functionality to various cards and update UI components - Implemented `removeFromItinerary` function in `LodgingCard`, `NoteCard`, and `TransportationCard` to allow users to remove items from their itinerary. - Replaced the trash icon with a calendar remove icon in `LocationCard`, `LodgingCard`, `NoteCard`, and `TransportationCard` for better visual representation. - Updated the dropdown menus in `LodgingCard`, `NoteCard`, and `TransportationCard` to include the new remove from itinerary option. - Enhanced `CollectionItineraryPlanner` to pass itinerary items to the respective cards. - Removed `PointSelectionModal.svelte` as it is no longer needed. - Refactored `LocationMedia.svelte` to integrate `ImageManagement` component and clean up unused code related to image handling. * feat: enhance itinerary management with deduplication and initial visit date handling * feat: add FullMap component for enhanced map functionality with clustering support - Introduced FullMap.svelte to handle map rendering, clustering, and marker management. - Updated map page to utilize FullMap component, replacing direct MapLibre usage. - Implemented clustering options and marker properties handling in FullMap. - Added utility functions for resolving theme colors and managing marker states. - Enhanced user experience with hover popups and improved loading states for location details. - Updated app version to v0.12.0-pre-dev-122225. * feat: enhance map interaction for touch devices with custom popup handling * feat: add progress tracker for folder views to display visited and planned locations * feat: add map center and zoom state management with URL synchronization * feat: add status and days until start fields to collections with filtering options * Component folder structure changes * feat: add LodgingMedia and LodgingModal components for managing lodging details and media attachments feat: implement LocationSearchMap component for interactive location searching and mapping functionality * fix: update contentType in ImageManagement component to 'lodging' for correct media handling * feat: enhance lodging management with date validation and update messages * feat: implement lodging detail page with server-side loading and image modal functionality - Added a new server-side load function to fetch lodging details by ID. - Created a new Svelte component for the lodging detail page, including image carousel and map integration. - Implemented a modal for displaying images with navigation. - Enhanced URL handling in the locations page to only read parameters. * feat: add Transportation modal component and related routes - Implemented TransportationModal component for creating and editing transportation entries. - Added server-side loading for transportation details in the new route [id]/+page.server.ts. - Created a new Svelte page for displaying transportation details with image and attachment handling. - Integrated modal for editing transportation in the transportation details page. - Updated lodging routes to include a modal for editing lodging entries. - Removed unused delete action from lodging server-side logic. * feat: add start_code and end_code fields to Transportation model and update related components * feat: implement date validation for itinerary items and add day picker modal for scheduling * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Make sure reverse geocoding uses correct key for cities (#938) * Reorder town and county checks in geocoding.py Fix detection if only town exists for a location but county is no city name * Use address keys only if city is found * Refactor code structure for improved readability and maintainability * Enhance collection management with modal updates and item handling * feat: integrate CollectionMap component in collections page and update map titles in lodging and transportation pages - Replaced inline map implementation with CollectionMap component in collections/[id]/+page.svelte for better modularity. - Updated the map title in lodging/[id]/+page.svelte to reflect lodging context. - Updated the map title in transportations/[id]/+page.svelte to reflect transportation context. - Added functionality to collect and render GeoJSON data from transportation attachments in transportations/[id]/+page.svelte. * chore: update copyright year to 2026 in various files * feat: enhance backup export functionality with itinerary items and export IDs * fix: improve dropdown close behavior by handling multiple event types * fix: remove unnecessary cache decorator from globespin function * feat: add initial visit date support in ChecklistModal and NoteModal, with UI suggestions for prefilled dates * feat: add details view for checklist and note cards with edit functionality * feat: add travel duration and GPX distance calculation to Transportation model and UI * feat: add primary image support to Collection model, serializers, and UI components * Refactor calendar components and enhance event detail handling - Replaced direct calendar implementation with a reusable CalendarComponent in the calendar route. - Introduced EventDetailsModal for displaying event details, improving modularity and readability. - Added functionality to fetch event details asynchronously when an event is clicked. - Implemented ICS calendar download functionality with loading state management. - Enhanced collections page to support calendar view, integrating event handling and timezone management. - Improved lodging and transportation pages to display local time for stays and trips, including timezone badges. - Cleaned up unused code and comments for better maintainability. * feat: enhance hero image handling in collection view by prioritizing primary image * chore: update .env.example to include account email verification configuration * feat: enhance LodgingCard and TransportationCard components with expandable details and improved layout * feat: add price and currency fields to locations, lodging, and transportation components - Introduced price and price_currency fields in LocationModal, LodgingDetails, LodgingModal, TransportationDetails, and TransportationModal components. - Implemented MoneyInput and CurrencyDropdown components for handling monetary values and currency selection. - Updated data structures and types to accommodate new price and currency fields across various models. - Enhanced cost summary calculations in collections and routes to display total costs by currency. - Added user preference for default currency in settings, affecting new item forms. - Updated UI to display price information in relevant components, ensuring consistent formatting and user experience. * feat: add Development Timeline link to overview and create timeline documentation * feat: enhance map functionality with search and zoom features - Updated availableViews in collection page to include map view based on lodging and transportation locations. - Added search functionality to the map page, allowing users to filter pins by name and category. - Implemented auto-zoom feature to adjust the map view based on filtered search results. - Introduced a search bar with a clear button for better user experience. * feat: enhance ISO code extraction and region matching logic in extractIsoCode function * feat: enhance extractIsoCode function with normalization for locality matching * feat: update extractIsoCode function to include additional ISO3166 levels for improved region matching * feat: enhance extractIsoCode function to handle cases without city information and update CollectionMap to bind user data * feat: add cron job for syncing visited regions and cities, enhance Docker and supervisord configurations * feat: add CollectionItineraryDay model and related functionality for itinerary day metadata management * feat: implement cleanup of out-of-range itinerary items and notify users of potential impacts on itinerary when dates change * Refactor collection page for improved localization and code clarity - Removed unused imports and consolidated cost category labels to be reactive. - Updated cost summary function to accept localized labels. - Enhanced localization for various UI elements, including buttons, headings, and statistics. - Improved user feedback messages for better clarity and consistency. - Ensured all relevant text is translatable using the i18n library. * feat: add collaborator serialization and display in collections - Implemented `_build_profile_pic_url` and `_serialize_collaborator` functions for user profile picture URLs and serialization. - Updated `CollectionSerializer` and `UltraSlimCollectionSerializer` to include collaborators in the serialized output. - Enhanced `CollectionViewSet` to prefetch shared_with users for optimized queries. - Modified frontend components to display collaborators in collection details, including profile pictures and initials. - Added new localization strings for collaborators. - Refactored map and location components to improve usability and functionality. - Updated app version to reflect new changes. * feat: add dynamic lodging icons based on type in CollectionMap component * feat: add CollectionStats component for detailed trip statistics - Implemented CollectionStats.svelte to display various statistics related to the collection, including distances, activities, and locations visited. - Enhanced CollectionMap.svelte to filter activities based on date range using new getActivityDate function. - Updated LocationSearchMap.svelte to handle airport mode for start and end locations. - Modified types.ts to include is_global property in CollectionItineraryItem for trip-wide items. - Updated +page.svelte to integrate the new stats view and manage view state accordingly. * feat: enhance itinerary management by removing old items on date change for notes and checklists; normalize date handling in CollectionMap * feat: add functionality to change day and move items to trip-wide itinerary - Implemented changeDay function in ChecklistCard, LocationCard, LodgingCard, NoteCard, and TransportationCard components to allow users to change the scheduled day of items. - Added a button to move items to the global (trip-wide) itinerary in the aforementioned components, with appropriate dispatch events. - Enhanced CollectionItineraryPlanner to handle moving items to the global itinerary and added UI elements for unscheduled items. - Updated ItineraryDayPickModal to support the deletion of source visits when moving locations. - Added new translations for "Change Day" and "Move Trip Wide" in the English locale. * fix: specify full path for python3 in cron job and add shell and path variables * fix: update appVersion to v0.12.0-pre-dev-010726 * feat: enhance CollectionItineraryPlanner and CollectionStats with dynamic links and transport type normalization * Add Dev Container + WSL install docs and link in install guide (#944) (#951) * feat: enhance internationalization support in CollectionMap and CollectionStats components - Added translation support for various labels and messages in CollectionMap.svelte and CollectionStats.svelte using svelte-i18n. - Updated English and Chinese locale files to include new translation keys for improved user experience. - Simplified the rendering of recommendation views in the collections page. * Refactor itinerary management and UI components - Updated ItineraryViewSet to handle visit updates and creations more efficiently, preserving visit IDs when moving between days. - Enhanced ChecklistCard, LodgingCard, TransportationCard, and NoteCard to include a new "Change Day" option in the actions menu. - Improved user experience in CollectionItineraryPlanner by tracking specific itinerary items being moved and ensuring only the relevant entries are deleted. - Added new location sharing options in LodgingCard and TransportationCard for Apple Maps, Google Maps, and OpenStreetMap. - Updated translations in en.json for consistency and clarity. - Minor UI adjustments for better accessibility and usability across various components. * feat: implement action menus and close event handling in card components * feat: refactor Dockerfile and supervisord configuration to remove cron and add periodic sync script * feat: enhance LocationSearchMap and TransportationDetails components with initialization handling and airport mode logic * feat: add airport and location search mode labels to localization file * feat: enhance periodic sync logging and improve airport mode handling in LocationSearchMap * feat: enhance unscheduled items display with improved card interactions and accessibility * Add dev compose for hot reload and update WSL dev container docs (#958) * feat: enhance localization for itinerary linking and transportation components * Localization: update localization files with new keys and values * fix: improve error messages for Overpass API responses * chore: update dependencies in frontend package.json and pnpm-lock.yaml - Updated @sveltejs/adapter-node from ^5.2.12 to ^5.4.0 - Updated @sveltejs/adapter-vercel from ^5.7.0 to ^6.3.0 - Updated tailwindcss from ^3.4.17 to ^3.4.19 - Updated typescript from ^5.8.3 to ^5.9.3 - Updated vite from ^5.4.19 to ^5.4.21 * chore: update dependencies in pnpm-lock.yaml to latest versions * Refactor code structure for improved readability and maintainability * Refactor code structure for improved readability and maintainability * fix: update package dependencies to resolve compatibility issues * Add "worldtravel" translations to multiple locale files - Added "worldtravel" key with translations for Spanish, French, Hungarian, Italian, Japanese, Korean, Dutch, Norwegian, Polish, Brazilian Portuguese, Russian, Slovak, Swedish, Turkish, Ukrainian, and Chinese. - Updated the navigation section in each locale file to include the new "worldtravel" entry. * Add new screenshots and update email verification message in locale file * feat: Implement data restoration functionality with file import - Added a new action `restoreData` in `+page.server.ts` to handle file uploads for restoring collections. - Enhanced the UI in `+page.svelte` to include an import button and a modal for import progress. - Integrated file input handling to trigger form submission upon file selection. - Removed unused GSAP animations from the login, profile, and signup pages for cleaner code. * feat: Add modals for creating locations and lodging from recommendations, enhance image import functionality * fix: Adjust styles to prevent horizontal scroll and enhance floating action button visibility * feat: Enhance error handling and messaging for Google Maps and OpenStreetMap geocoding functions * fix: Enhance error messaging for Google Maps access forbidden response * feat: Add User-Agent header to Google Maps API requests and refine error messaging for access forbidden response * fix: Update User-Agent header in Google Maps API requests for improved compatibility * fix: Disable proxy settings in Google Maps API request to prevent connection issues * fix: Update Trivy security scan configuration and add .trivyignore for known false positives * fix: Refactor update method to handle is_public cascading for related items * feat: Integrate django-invitations for user invitation management and update settings * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add Tailwind CSS and DaisyUI plugin for styling * feat: Add "Invite a User" guide and update navigation links * docs: Update "Invite a User" guide to include email configuration tip * feat: Update email invitation template for improved styling and clarity * fix: Remove trailing backslash from installation note in Unraid documentation * feat: Add export/import messages and user email verification prompts in multiple languages * Squashed commit of the following: commit a993a15b93ebb7521ae2e5cc31596b98b29fcd6c Author: Alex <div@alexe.at> Date: Mon Jan 12 20:44:47 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit fdc455d9424fbb0f6b72179d9eb1340411700773 Author: Ettore Atalan <atalanttore@googlemail.com> Date: Sat Jan 10 23:24:23 2026 +0100 Translated using Weblate (German) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit 5942129c55e89dd999a13d4df9c40e6e3189355c Author: Orhun <orhunavcu@gmail.com> Date: Sun Jan 11 13:05:31 2026 +0100 Translated using Weblate (Turkish) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 8712e43d8ba4a7e7fe163fb454d6577187f9a375 Author: Henrique Fonseca Veloso <henriquefv@tutamail.com> Date: Fri Jan 9 22:53:11 2026 +0100 Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pt_BR/ commit 18ee56653470413afe8d71ecd2b5028f6e4cf118 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:57 2026 +0100 Translated using Weblate (Dutch) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nl/ commit 57783c544e583c035c8b57b5c10ca320f25f399e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:14 2026 +0100 Translated using Weblate (Arabic) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ar/ commit fb09edfd85bc85234b1c1ba7dd499f2915093fff Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:26 2026 +0100 Translated using Weblate (Spanish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/es/ commit 554a207d8e454a1f7ae826e2a40d389b94be5512 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:21 2026 +0100 Translated using Weblate (German) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/de/ commit b70b9db27fb8607beefeb288185601c8f5eae28d Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:02 2026 +0100 Translated using Weblate (Norwegian Bokmål) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/nb_NO/ commit 3b467caa9007c553e4ae7de97f53b6e462161ea3 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:07 2026 +0100 Translated using Weblate (Polish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/pl/ commit 30fbbfba3572c8f78ec7c7e1a231e363aca1ef10 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:17 2026 +0100 Translated using Weblate (Russian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ru/ commit 8cecb492cfcac0a1f93ee8919f7b41d978d331ee Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:42 2026 +0100 Translated using Weblate (Italian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/it/ commit f0d3d41029c89bfa83d5891ee7af70241f27b7be Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:38 2026 +0100 Translated using Weblate (Hungarian) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/hu/ commit 102e0f1912d010d38755a1713abb2a7f7564aafb Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:21 2026 +0100 Translated using Weblate (Slovak) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sk/ commit 428b8f18cf6195a96b55109e0221413d82415a2f Author: Максим Горпиніч <gorpinicmaksim0@gmail.com> Date: Sat Jan 10 08:55:28 2026 +0100 Translated using Weblate (Ukrainian) Currently translated at 100.0% (1048 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/uk/ commit 1a71aaf279ecab26c0c1fede05025732e6dcfa5e Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:27 2026 +0100 Translated using Weblate (Swedish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/sv/ commit 36ec3701f3a1a904e7c42ac4ffbe6a050dc6d1ed Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:53:43 2026 +0100 Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/zh_Hans/ commit 65d8b74b340c877cad2028b7142c783a1b568d49 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:48 2026 +0100 Translated using Weblate (Japanese) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ja/ commit 4d11d1d31022583657e93aee70301a8ffcde1340 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:52 2026 +0100 Translated using Weblate (Korean) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/ko/ commit bd1135bcb965ad73cf493771b15081cc97cf513a Author: Orhun <orhunavcu@gmail.com> Date: Fri Jan 9 22:53:33 2026 +0100 Translated using Weblate (Turkish) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/tr/ commit 2c3d814119f4cf2dabd20933699f5b991f20f3e6 Author: Anonymous <noreply@weblate.org> Date: Fri Jan 9 22:52:32 2026 +0100 Translated using Weblate (French) Currently translated at 99.9% (1047 of 1048 strings) Translation: AdventureLog/Web App Translate-URL: https://hosted.weblate.org/projects/adventurelog/web-app/fr/ * Refactor code structure and remove redundant code blocks for improved readability and maintainability * fix: Correct appVersion to match the latest pre-release version * fix: Add missing vulnerability reference for jaraco.context in .trivyignore --------- Co-authored-by: Lars Lehmann <33843261+larsl-net@users.noreply.github.com> Co-authored-by: Lars Lehmann <lars@lmail.eu> Co-authored-by: Nick Petrushin <n.a.petrushin@gmail.com>
517 lines
22 KiB
Python
517 lines
22 KiB
Python
import os
|
|
from django.core.management.base import BaseCommand
|
|
import requests
|
|
from worldtravel.models import Country, Region, City
|
|
from django.db import transaction
|
|
import ijson
|
|
import gc
|
|
import tempfile
|
|
import sqlite3
|
|
from contextlib import contextmanager
|
|
|
|
from django.conf import settings
|
|
|
|
COUNTRY_REGION_JSON_VERSION = settings.COUNTRY_REGION_JSON_VERSION
|
|
|
|
media_root = settings.MEDIA_ROOT
|
|
|
|
def saveCountryFlag(country_code):
|
|
# For standards, use the lowercase country_code
|
|
country_code = country_code.lower()
|
|
flags_dir = os.path.join(media_root, 'flags')
|
|
|
|
# Check if the flags directory exists, if not, create it
|
|
if not os.path.exists(flags_dir):
|
|
os.makedirs(flags_dir)
|
|
|
|
# Check if the flag already exists in the media folder
|
|
flag_path = os.path.join(flags_dir, f'{country_code}.png')
|
|
if os.path.exists(flag_path):
|
|
print(f'Flag for {country_code} already exists')
|
|
return
|
|
|
|
res = requests.get(f'https://flagcdn.com/h240/{country_code}.png'.lower())
|
|
if res.status_code == 200:
|
|
with open(flag_path, 'wb') as f:
|
|
f.write(res.content)
|
|
print(f'Flag for {country_code} downloaded')
|
|
else:
|
|
print(f'Error downloading flag for {country_code}')
|
|
|
|
class Command(BaseCommand):
|
|
help = 'Imports the world travel data with minimal memory usage'
|
|
|
|
def add_arguments(self, parser):
|
|
parser.add_argument('--force', action='store_true', help='Force download the countries+regions+states.json file')
|
|
parser.add_argument('--batch-size', type=int, default=500, help='Batch size for database operations')
|
|
|
|
@contextmanager
|
|
def _temp_db(self):
|
|
"""Create a temporary SQLite database for intermediate storage"""
|
|
with tempfile.NamedTemporaryFile(suffix='.db', delete=False) as f:
|
|
temp_db_path = f.name
|
|
|
|
try:
|
|
conn = sqlite3.connect(temp_db_path)
|
|
conn.execute('''CREATE TABLE temp_countries (
|
|
country_code TEXT PRIMARY KEY,
|
|
name TEXT,
|
|
subregion TEXT,
|
|
capital TEXT,
|
|
longitude REAL,
|
|
latitude REAL
|
|
)''')
|
|
|
|
conn.execute('''CREATE TABLE temp_regions (
|
|
id TEXT PRIMARY KEY,
|
|
name TEXT,
|
|
country_code TEXT,
|
|
longitude REAL,
|
|
latitude REAL
|
|
)''')
|
|
|
|
conn.execute('''CREATE TABLE temp_cities (
|
|
id TEXT PRIMARY KEY,
|
|
name TEXT,
|
|
region_id TEXT,
|
|
longitude REAL,
|
|
latitude REAL
|
|
)''')
|
|
|
|
conn.commit()
|
|
yield conn
|
|
finally:
|
|
conn.close()
|
|
try:
|
|
os.unlink(temp_db_path)
|
|
except OSError:
|
|
pass
|
|
|
|
def handle(self, **options):
|
|
force = options['force']
|
|
batch_size = options['batch_size']
|
|
countries_json_path = os.path.join(settings.MEDIA_ROOT, f'countries+regions+states-{COUNTRY_REGION_JSON_VERSION}.json')
|
|
|
|
# Download or validate JSON file
|
|
if not os.path.exists(countries_json_path) or force:
|
|
self.stdout.write('Downloading JSON file...')
|
|
res = requests.get(f'https://raw.githubusercontent.com/dr5hn/countries-states-cities-database/{COUNTRY_REGION_JSON_VERSION}/json/countries%2Bstates%2Bcities.json')
|
|
if res.status_code == 200:
|
|
with open(countries_json_path, 'w') as f:
|
|
f.write(res.text)
|
|
self.stdout.write(self.style.SUCCESS('JSON file downloaded successfully'))
|
|
else:
|
|
self.stdout.write(self.style.ERROR('Error downloading JSON file'))
|
|
return
|
|
elif not os.path.isfile(countries_json_path):
|
|
self.stdout.write(self.style.ERROR('JSON file is not a file'))
|
|
return
|
|
elif os.path.getsize(countries_json_path) == 0:
|
|
self.stdout.write(self.style.ERROR('JSON file is empty'))
|
|
return
|
|
elif Country.objects.count() == 0 or Region.objects.count() == 0 or City.objects.count() == 0:
|
|
self.stdout.write(self.style.WARNING('Some data is missing. Re-importing all data.'))
|
|
else:
|
|
self.stdout.write(self.style.SUCCESS('Latest data already imported.'))
|
|
return
|
|
|
|
self.stdout.write(self.style.SUCCESS('Starting ultra-memory-efficient import process...'))
|
|
|
|
# Use temporary SQLite database for intermediate storage
|
|
with self._temp_db() as temp_conn:
|
|
self.stdout.write('Step 1: Parsing JSON and storing in temporary database...')
|
|
self._parse_and_store_temp(countries_json_path, temp_conn)
|
|
|
|
self.stdout.write('Step 2: Processing countries...')
|
|
self._process_countries_from_temp(temp_conn, batch_size)
|
|
|
|
self.stdout.write('Step 3: Processing regions...')
|
|
self._process_regions_from_temp(temp_conn, batch_size)
|
|
|
|
self.stdout.write('Step 4: Processing cities...')
|
|
self._process_cities_from_temp(temp_conn, batch_size)
|
|
|
|
self.stdout.write('Step 5: Cleaning up obsolete records...')
|
|
self._cleanup_obsolete_records(temp_conn)
|
|
|
|
self.stdout.write(self.style.SUCCESS('All data imported successfully with minimal memory usage'))
|
|
|
|
def _parse_and_store_temp(self, json_path, temp_conn):
|
|
"""Parse JSON once and store in temporary SQLite database"""
|
|
country_count = 0
|
|
region_count = 0
|
|
city_count = 0
|
|
|
|
with open(json_path, 'rb') as f:
|
|
parser = ijson.items(f, 'item')
|
|
|
|
for country in parser:
|
|
country_code = country['iso2']
|
|
country_name = country['name']
|
|
country_subregion = country['subregion']
|
|
country_capital = country['capital']
|
|
longitude = round(float(country['longitude']), 6) if country['longitude'] else None
|
|
latitude = round(float(country['latitude']), 6) if country['latitude'] else None
|
|
|
|
# Store country
|
|
temp_conn.execute('''INSERT OR REPLACE INTO temp_countries
|
|
(country_code, name, subregion, capital, longitude, latitude)
|
|
VALUES (?, ?, ?, ?, ?, ?)''',
|
|
(country_code, country_name, country_subregion, country_capital, longitude, latitude))
|
|
|
|
country_count += 1
|
|
|
|
# Download flag (do this during parsing to avoid extra pass)
|
|
saveCountryFlag(country_code)
|
|
|
|
# Process regions/states
|
|
if country['states']:
|
|
for state in country['states']:
|
|
state_id = f"{country_code}-{state['iso2']}"
|
|
state_name = state['name']
|
|
state_lat = round(float(state['latitude']), 6) if state['latitude'] else None
|
|
state_lng = round(float(state['longitude']), 6) if state['longitude'] else None
|
|
|
|
temp_conn.execute('''INSERT OR REPLACE INTO temp_regions
|
|
(id, name, country_code, longitude, latitude)
|
|
VALUES (?, ?, ?, ?, ?)''',
|
|
(state_id, state_name, country_code, state_lng, state_lat))
|
|
|
|
region_count += 1
|
|
|
|
# Process cities
|
|
if 'cities' in state and state['cities']:
|
|
for city in state['cities']:
|
|
city_id = f"{state_id}-{city['id']}"
|
|
city_name = city['name']
|
|
city_lat = round(float(city['latitude']), 6) if city['latitude'] else None
|
|
city_lng = round(float(city['longitude']), 6) if city['longitude'] else None
|
|
|
|
temp_conn.execute('''INSERT OR REPLACE INTO temp_cities
|
|
(id, name, region_id, longitude, latitude)
|
|
VALUES (?, ?, ?, ?, ?)''',
|
|
(city_id, city_name, state_id, city_lng, city_lat))
|
|
|
|
city_count += 1
|
|
else:
|
|
# Country without states - create default region
|
|
state_id = f"{country_code}-00"
|
|
temp_conn.execute('''INSERT OR REPLACE INTO temp_regions
|
|
(id, name, country_code, longitude, latitude)
|
|
VALUES (?, ?, ?, ?, ?)''',
|
|
(state_id, country_name, country_code, None, None))
|
|
region_count += 1
|
|
|
|
# Commit periodically to avoid memory buildup
|
|
if country_count % 100 == 0:
|
|
temp_conn.commit()
|
|
self.stdout.write(f' Parsed {country_count} countries, {region_count} regions, {city_count} cities...')
|
|
|
|
temp_conn.commit()
|
|
self.stdout.write(f'✓ Parsing complete: {country_count} countries, {region_count} regions, {city_count} cities')
|
|
|
|
def _process_countries_from_temp(self, temp_conn, batch_size):
|
|
"""Process countries from temporary database"""
|
|
cursor = temp_conn.execute('SELECT country_code, name, subregion, capital, longitude, latitude FROM temp_countries')
|
|
|
|
countries_to_create = []
|
|
countries_to_update = []
|
|
processed = 0
|
|
|
|
while True:
|
|
rows = cursor.fetchmany(batch_size)
|
|
if not rows:
|
|
break
|
|
|
|
# Batch check for existing countries
|
|
country_codes_in_batch = [row[0] for row in rows]
|
|
existing_countries = {
|
|
c.country_code: c for c in
|
|
Country.objects.filter(country_code__in=country_codes_in_batch)
|
|
.only('country_code', 'name', 'subregion', 'capital', 'longitude', 'latitude')
|
|
}
|
|
|
|
for row in rows:
|
|
country_code, name, subregion, capital, longitude, latitude = row
|
|
|
|
if country_code in existing_countries:
|
|
# Update existing
|
|
country_obj = existing_countries[country_code]
|
|
country_obj.name = name
|
|
country_obj.subregion = subregion
|
|
country_obj.capital = capital
|
|
country_obj.longitude = longitude
|
|
country_obj.latitude = latitude
|
|
countries_to_update.append(country_obj)
|
|
else:
|
|
countries_to_create.append(Country(
|
|
country_code=country_code,
|
|
name=name,
|
|
subregion=subregion,
|
|
capital=capital,
|
|
longitude=longitude,
|
|
latitude=latitude
|
|
))
|
|
|
|
processed += 1
|
|
|
|
# Flush batches
|
|
if countries_to_create:
|
|
with transaction.atomic():
|
|
Country.objects.bulk_create(countries_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
countries_to_create.clear()
|
|
|
|
if countries_to_update:
|
|
with transaction.atomic():
|
|
Country.objects.bulk_update(
|
|
countries_to_update,
|
|
['name', 'subregion', 'capital', 'longitude', 'latitude'],
|
|
batch_size=batch_size
|
|
)
|
|
countries_to_update.clear()
|
|
|
|
if processed % 1000 == 0:
|
|
self.stdout.write(f' Processed {processed} countries...')
|
|
gc.collect()
|
|
|
|
# Final flush
|
|
if countries_to_create:
|
|
with transaction.atomic():
|
|
Country.objects.bulk_create(countries_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
if countries_to_update:
|
|
with transaction.atomic():
|
|
Country.objects.bulk_update(
|
|
countries_to_update,
|
|
['name', 'subregion', 'capital', 'longitude', 'latitude'],
|
|
batch_size=batch_size
|
|
)
|
|
|
|
self.stdout.write(f'✓ Countries complete: {processed} processed')
|
|
|
|
def _process_regions_from_temp(self, temp_conn, batch_size):
|
|
"""Process regions from temporary database"""
|
|
# Get country mapping once
|
|
country_map = {c.country_code: c for c in Country.objects.only('id', 'country_code')}
|
|
|
|
cursor = temp_conn.execute('SELECT id, name, country_code, longitude, latitude FROM temp_regions')
|
|
|
|
regions_to_create = []
|
|
regions_to_update = []
|
|
processed = 0
|
|
|
|
while True:
|
|
rows = cursor.fetchmany(batch_size)
|
|
if not rows:
|
|
break
|
|
|
|
# Batch check for existing regions
|
|
region_ids_in_batch = [row[0] for row in rows]
|
|
existing_regions = {
|
|
r.id: r for r in
|
|
Region.objects.filter(id__in=region_ids_in_batch)
|
|
.select_related('country')
|
|
.only('id', 'name', 'country', 'longitude', 'latitude')
|
|
}
|
|
|
|
for row in rows:
|
|
region_id, name, country_code, longitude, latitude = row
|
|
country_obj = country_map.get(country_code)
|
|
|
|
if not country_obj:
|
|
continue
|
|
|
|
if region_id in existing_regions:
|
|
# Update existing
|
|
region_obj = existing_regions[region_id]
|
|
region_obj.name = name
|
|
region_obj.country = country_obj
|
|
region_obj.longitude = longitude
|
|
region_obj.latitude = latitude
|
|
regions_to_update.append(region_obj)
|
|
else:
|
|
regions_to_create.append(Region(
|
|
id=region_id,
|
|
name=name,
|
|
country=country_obj,
|
|
longitude=longitude,
|
|
latitude=latitude
|
|
))
|
|
|
|
processed += 1
|
|
|
|
# Flush batches
|
|
if regions_to_create:
|
|
with transaction.atomic():
|
|
Region.objects.bulk_create(regions_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
regions_to_create.clear()
|
|
|
|
if regions_to_update:
|
|
with transaction.atomic():
|
|
Region.objects.bulk_update(
|
|
regions_to_update,
|
|
['name', 'country', 'longitude', 'latitude'],
|
|
batch_size=batch_size
|
|
)
|
|
regions_to_update.clear()
|
|
|
|
if processed % 2000 == 0:
|
|
self.stdout.write(f' Processed {processed} regions...')
|
|
gc.collect()
|
|
|
|
# Final flush
|
|
if regions_to_create:
|
|
with transaction.atomic():
|
|
Region.objects.bulk_create(regions_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
if regions_to_update:
|
|
with transaction.atomic():
|
|
Region.objects.bulk_update(
|
|
regions_to_update,
|
|
['name', 'country', 'longitude', 'latitude'],
|
|
batch_size=batch_size
|
|
)
|
|
|
|
self.stdout.write(f'✓ Regions complete: {processed} processed')
|
|
|
|
def _process_cities_from_temp(self, temp_conn, batch_size):
|
|
"""Process cities from temporary database with optimized existence checking"""
|
|
# Get region mapping once
|
|
region_map = {r.id: r for r in Region.objects.only('id')}
|
|
|
|
cursor = temp_conn.execute('SELECT id, name, region_id, longitude, latitude FROM temp_cities')
|
|
|
|
cities_to_create = []
|
|
cities_to_update = []
|
|
processed = 0
|
|
|
|
while True:
|
|
rows = cursor.fetchmany(batch_size)
|
|
if not rows:
|
|
break
|
|
|
|
# Fast existence check - only get IDs, no objects
|
|
city_ids_in_batch = [row[0] for row in rows]
|
|
existing_city_ids = set(
|
|
City.objects.filter(id__in=city_ids_in_batch)
|
|
.values_list('id', flat=True)
|
|
)
|
|
|
|
for row in rows:
|
|
city_id, name, region_id, longitude, latitude = row
|
|
region_obj = region_map.get(region_id)
|
|
|
|
if not region_obj:
|
|
continue
|
|
|
|
if city_id in existing_city_ids:
|
|
# For updates, just store the data - we'll do bulk update by raw SQL
|
|
cities_to_update.append({
|
|
'id': city_id,
|
|
'name': name,
|
|
'region_id': region_obj.id,
|
|
'longitude': longitude,
|
|
'latitude': latitude
|
|
})
|
|
else:
|
|
cities_to_create.append(City(
|
|
id=city_id,
|
|
name=name,
|
|
region=region_obj,
|
|
longitude=longitude,
|
|
latitude=latitude
|
|
))
|
|
|
|
processed += 1
|
|
|
|
# Flush create batch (this is already fast)
|
|
if cities_to_create:
|
|
with transaction.atomic():
|
|
City.objects.bulk_create(cities_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
cities_to_create.clear()
|
|
|
|
# Flush update batch with raw SQL for speed
|
|
if cities_to_update:
|
|
self._bulk_update_cities_raw(cities_to_update)
|
|
cities_to_update.clear()
|
|
|
|
if processed % 5000 == 0:
|
|
self.stdout.write(f' Processed {processed} cities...')
|
|
gc.collect()
|
|
|
|
# Final flush
|
|
if cities_to_create:
|
|
with transaction.atomic():
|
|
City.objects.bulk_create(cities_to_create, batch_size=batch_size, ignore_conflicts=True)
|
|
if cities_to_update:
|
|
self._bulk_update_cities_raw(cities_to_update)
|
|
|
|
self.stdout.write(f'✓ Cities complete: {processed} processed')
|
|
|
|
def _bulk_update_cities_raw(self, cities_data):
|
|
"""Fast bulk update using raw SQL"""
|
|
if not cities_data:
|
|
return
|
|
|
|
from django.db import connection
|
|
|
|
with connection.cursor() as cursor:
|
|
# Build the SQL for bulk update
|
|
# Using CASE statements for efficient bulk updates
|
|
when_clauses_name = []
|
|
when_clauses_region = []
|
|
when_clauses_lng = []
|
|
when_clauses_lat = []
|
|
city_ids = []
|
|
|
|
for city in cities_data:
|
|
city_id = city['id']
|
|
city_ids.append(city_id)
|
|
when_clauses_name.append(f"WHEN id = %s THEN %s")
|
|
when_clauses_region.append(f"WHEN id = %s THEN %s")
|
|
when_clauses_lng.append(f"WHEN id = %s THEN %s")
|
|
when_clauses_lat.append(f"WHEN id = %s THEN %s")
|
|
|
|
# Build parameters list
|
|
params = []
|
|
for city in cities_data:
|
|
params.extend([city['id'], city['name']]) # for name
|
|
for city in cities_data:
|
|
params.extend([city['id'], city['region_id']]) # for region_id
|
|
for city in cities_data:
|
|
params.extend([city['id'], city['longitude']]) # for longitude
|
|
for city in cities_data:
|
|
params.extend([city['id'], city['latitude']]) # for latitude
|
|
params.extend(city_ids) # for WHERE clause
|
|
|
|
# Execute the bulk update
|
|
sql = f"""
|
|
UPDATE worldtravel_city
|
|
SET
|
|
name = CASE {' '.join(when_clauses_name)} END,
|
|
region_id = CASE {' '.join(when_clauses_region)} END,
|
|
longitude = CASE {' '.join(when_clauses_lng)} END,
|
|
latitude = CASE {' '.join(when_clauses_lat)} END
|
|
WHERE id IN ({','.join(['%s'] * len(city_ids))})
|
|
"""
|
|
|
|
cursor.execute(sql, params)
|
|
|
|
def _cleanup_obsolete_records(self, temp_conn):
|
|
"""Clean up obsolete records using temporary database"""
|
|
# Get IDs from temp database to avoid loading large lists into memory
|
|
temp_country_codes = {row[0] for row in temp_conn.execute('SELECT country_code FROM temp_countries')}
|
|
temp_region_ids = {row[0] for row in temp_conn.execute('SELECT id FROM temp_regions')}
|
|
temp_city_ids = {row[0] for row in temp_conn.execute('SELECT id FROM temp_cities')}
|
|
|
|
with transaction.atomic():
|
|
countries_deleted = Country.objects.exclude(country_code__in=temp_country_codes).count()
|
|
regions_deleted = Region.objects.exclude(id__in=temp_region_ids).count()
|
|
cities_deleted = City.objects.exclude(id__in=temp_city_ids).count()
|
|
|
|
Country.objects.exclude(country_code__in=temp_country_codes).delete()
|
|
Region.objects.exclude(id__in=temp_region_ids).delete()
|
|
City.objects.exclude(id__in=temp_city_ids).delete()
|
|
|
|
if countries_deleted > 0 or regions_deleted > 0 or cities_deleted > 0:
|
|
self.stdout.write(f'✓ Deleted {countries_deleted} obsolete countries, {regions_deleted} regions, {cities_deleted} cities')
|
|
else:
|
|
self.stdout.write('✓ No obsolete records found to delete') |