mirror of
https://github.com/pacnpal/thrillwiki_django_no_react.git
synced 2025-12-22 20:51:08 -05:00
Refactor test utilities and enhance ASGI settings
- Cleaned up and standardized assertions in ApiTestMixin for API response validation. - Updated ASGI settings to use os.environ for setting the DJANGO_SETTINGS_MODULE. - Removed unused imports and improved formatting in settings.py. - Refactored URL patterns in urls.py for better readability and organization. - Enhanced view functions in views.py for consistency and clarity. - Added .flake8 configuration for linting and style enforcement. - Introduced type stubs for django-environ to improve type checking with Pylance.
This commit is contained in:
pacnpal
@@ -1,8 +1,5 @@
|
||||
import os
|
||||
import requests
|
||||
from django.core.management.base import BaseCommand
|
||||
from django.core.files import File
|
||||
from django.core.files.temp import NamedTemporaryFile
|
||||
from media.models import Photo
|
||||
from parks.models import Park
|
||||
from rides.models import Ride
|
||||
@@ -10,105 +7,133 @@ from django.contrib.contenttypes.models import ContentType
|
||||
import json
|
||||
from django.core.files.base import ContentFile
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Download photos from seed data URLs'
|
||||
help = "Download photos from seed data URLs"
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
self.stdout.write('Downloading photos from seed data...')
|
||||
|
||||
self.stdout.write("Downloading photos from seed data...")
|
||||
|
||||
# Read seed data
|
||||
with open('parks/management/commands/seed_data.json', 'r') as f:
|
||||
with open("parks/management/commands/seed_data.json", "r") as f:
|
||||
seed_data = json.load(f)
|
||||
|
||||
|
||||
park_content_type = ContentType.objects.get_for_model(Park)
|
||||
ride_content_type = ContentType.objects.get_for_model(Ride)
|
||||
|
||||
|
||||
# Process parks and their photos
|
||||
for park_data in seed_data['parks']:
|
||||
for park_data in seed_data["parks"]:
|
||||
try:
|
||||
park = Park.objects.get(name=park_data['name'])
|
||||
|
||||
park = Park.objects.get(name=park_data["name"])
|
||||
|
||||
# Download park photos
|
||||
for idx, photo_url in enumerate(park_data['photos'], 1):
|
||||
for idx, photo_url in enumerate(park_data["photos"], 1):
|
||||
try:
|
||||
# Download image
|
||||
self.stdout.write(f'Downloading from URL: {photo_url}')
|
||||
self.stdout.write(f"Downloading from URL: {photo_url}")
|
||||
response = requests.get(photo_url, timeout=60)
|
||||
if response.status_code == 200:
|
||||
# Delete any existing photos for this park
|
||||
Photo.objects.filter(
|
||||
content_type=park_content_type,
|
||||
object_id=park.id
|
||||
object_id=park.id,
|
||||
).delete()
|
||||
|
||||
|
||||
# Create new photo record
|
||||
photo = Photo(
|
||||
content_type=park_content_type,
|
||||
object_id=park.id,
|
||||
is_primary=idx == 1
|
||||
is_primary=idx == 1,
|
||||
)
|
||||
|
||||
|
||||
# Save image content
|
||||
photo.image.save(
|
||||
f"{park.slug}_{idx}.jpg",
|
||||
ContentFile(response.content),
|
||||
save=False
|
||||
save=False,
|
||||
)
|
||||
photo.save()
|
||||
|
||||
self.stdout.write(f'Downloaded photo for {park.name}: {photo.image.name}')
|
||||
self.stdout.write(f'Database record created with ID: {photo.id}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Downloaded photo for {
|
||||
park.name}: {
|
||||
photo.image.name}"
|
||||
)
|
||||
self.stdout.write(
|
||||
f"Database record created with ID: {photo.id}"
|
||||
)
|
||||
else:
|
||||
self.stdout.write(f'Error downloading image. Status code: {response.status_code}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Error downloading image. Status code: {
|
||||
response.status_code}"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
self.stdout.write(f'Error downloading park photo: {str(e)}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Error downloading park photo: {
|
||||
str(e)}"
|
||||
)
|
||||
|
||||
# Process rides and their photos
|
||||
for ride_data in park_data['rides']:
|
||||
for ride_data in park_data["rides"]:
|
||||
try:
|
||||
ride = Ride.objects.get(name=ride_data['name'], park=park)
|
||||
|
||||
ride = Ride.objects.get(name=ride_data["name"], park=park)
|
||||
|
||||
# Download ride photos
|
||||
for idx, photo_url in enumerate(ride_data['photos'], 1):
|
||||
for idx, photo_url in enumerate(ride_data["photos"], 1):
|
||||
try:
|
||||
# Download image
|
||||
self.stdout.write(f'Downloading from URL: {photo_url}')
|
||||
self.stdout.write(f"Downloading from URL: {photo_url}")
|
||||
response = requests.get(photo_url, timeout=60)
|
||||
if response.status_code == 200:
|
||||
# Delete any existing photos for this ride
|
||||
Photo.objects.filter(
|
||||
content_type=ride_content_type,
|
||||
object_id=ride.id
|
||||
object_id=ride.id,
|
||||
).delete()
|
||||
|
||||
|
||||
# Create new photo record
|
||||
photo = Photo(
|
||||
content_type=ride_content_type,
|
||||
object_id=ride.id,
|
||||
is_primary=idx == 1
|
||||
is_primary=idx == 1,
|
||||
)
|
||||
|
||||
|
||||
# Save image content
|
||||
photo.image.save(
|
||||
f"{ride.slug}_{idx}.jpg",
|
||||
ContentFile(response.content),
|
||||
save=False
|
||||
save=False,
|
||||
)
|
||||
photo.save()
|
||||
|
||||
self.stdout.write(f'Downloaded photo for {ride.name}: {photo.image.name}')
|
||||
self.stdout.write(f'Database record created with ID: {photo.id}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Downloaded photo for {
|
||||
ride.name}: {
|
||||
photo.image.name}"
|
||||
)
|
||||
self.stdout.write(
|
||||
f"Database record created with ID: {
|
||||
photo.id}"
|
||||
)
|
||||
else:
|
||||
self.stdout.write(f'Error downloading image. Status code: {response.status_code}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Error downloading image. Status code: {
|
||||
response.status_code}"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
self.stdout.write(f'Error downloading ride photo: {str(e)}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Error downloading ride photo: {str(e)}"
|
||||
)
|
||||
|
||||
except Ride.DoesNotExist:
|
||||
self.stdout.write(f'Ride not found: {ride_data["name"]}')
|
||||
|
||||
self.stdout.write(
|
||||
f'Ride not found: {
|
||||
ride_data["name"]}'
|
||||
)
|
||||
|
||||
except Park.DoesNotExist:
|
||||
self.stdout.write(f'Park not found: {park_data["name"]}')
|
||||
|
||||
self.stdout.write('Finished downloading photos')
|
||||
|
||||
self.stdout.write("Finished downloading photos")
|
||||
|
||||
@@ -1,58 +1,77 @@
|
||||
import os
|
||||
from django.core.management.base import BaseCommand
|
||||
from media.models import Photo
|
||||
from django.conf import settings
|
||||
from django.db import transaction
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = 'Fix photo paths in database to match actual file locations'
|
||||
help = "Fix photo paths in database to match actual file locations"
|
||||
|
||||
def handle(self, *args, **kwargs):
|
||||
self.stdout.write('Fixing photo paths in database...')
|
||||
|
||||
self.stdout.write("Fixing photo paths in database...")
|
||||
|
||||
# Get all photos
|
||||
photos = Photo.objects.all()
|
||||
|
||||
|
||||
for photo in photos:
|
||||
try:
|
||||
with transaction.atomic():
|
||||
# Get current file path
|
||||
current_name = photo.image.name
|
||||
|
||||
|
||||
# Remove any 'media/' prefix if it exists
|
||||
if current_name.startswith('media/'):
|
||||
current_name = current_name[6:] # Remove 'media/' prefix
|
||||
|
||||
parts = current_name.split('/')
|
||||
|
||||
if current_name.startswith("media/"):
|
||||
# Remove 'media/' prefix
|
||||
current_name = current_name[6:]
|
||||
|
||||
parts = current_name.split("/")
|
||||
|
||||
if len(parts) >= 2:
|
||||
content_type = parts[0] # 'park' or 'ride'
|
||||
identifier = parts[1] # e.g., 'alton-towers'
|
||||
|
||||
identifier = parts[1] # e.g., 'alton-towers'
|
||||
|
||||
# Look for files in the media directory
|
||||
media_dir = os.path.join('media', content_type, identifier)
|
||||
media_dir = os.path.join("media", content_type, identifier)
|
||||
if os.path.exists(media_dir):
|
||||
files = [f for f in os.listdir(media_dir)
|
||||
if not f.startswith('.') and # Skip hidden files
|
||||
not f.startswith('tmp') and # Skip temp files
|
||||
os.path.isfile(os.path.join(media_dir, f))]
|
||||
|
||||
files = [
|
||||
f
|
||||
for f in os.listdir(media_dir)
|
||||
if not f.startswith(".") # Skip hidden files
|
||||
and not f.startswith("tmp") # Skip temp files
|
||||
and os.path.isfile(os.path.join(media_dir, f))
|
||||
]
|
||||
|
||||
if files:
|
||||
# Get the first file and update the database record
|
||||
file_path = os.path.join(content_type, identifier, files[0])
|
||||
if os.path.exists(os.path.join('media', file_path)):
|
||||
# Get the first file and update the database
|
||||
# record
|
||||
file_path = os.path.join(
|
||||
content_type, identifier, files[0]
|
||||
)
|
||||
if os.path.exists(os.path.join("media", file_path)):
|
||||
photo.image.name = file_path
|
||||
photo.save()
|
||||
self.stdout.write(f'Updated path for photo {photo.id} to {file_path}')
|
||||
self.stdout.write(
|
||||
f"Updated path for photo {
|
||||
photo.id} to {file_path}"
|
||||
)
|
||||
else:
|
||||
self.stdout.write(f'File not found for photo {photo.id}: {file_path}')
|
||||
self.stdout.write(
|
||||
f"File not found for photo {
|
||||
photo.id}: {file_path}"
|
||||
)
|
||||
else:
|
||||
self.stdout.write(f'No files found in directory for photo {photo.id}: {media_dir}')
|
||||
self.stdout.write(
|
||||
f"No files found in directory for photo {
|
||||
photo.id}: {media_dir}"
|
||||
)
|
||||
else:
|
||||
self.stdout.write(f'Directory not found for photo {photo.id}: {media_dir}')
|
||||
|
||||
self.stdout.write(
|
||||
f"Directory not found for photo {
|
||||
photo.id}: {media_dir}"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
self.stdout.write(f'Error updating photo {photo.id}: {str(e)}')
|
||||
self.stdout.write(f"Error updating photo {photo.id}: {str(e)}")
|
||||
continue
|
||||
|
||||
self.stdout.write('Finished fixing photo paths')
|
||||
|
||||
self.stdout.write("Finished fixing photo paths")
|
||||
|
||||
Reference in New Issue
Block a user