cardosofelipe/eventspace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove leading slash from 'uploads/' checks in theme URLs

Browse Source 
Updated conditions to check 'uploads/' without a leading slash across preview, background, foreground, and asset image URLs. This ensures consistent handling of URLs during the relocation process and avoids potential mismatches in the path string comparison.
This commit is contained in:
Felipe Cardoso
2025-03-14 02:23:44 +01:00
parent d2e71feb69
commit 41eb631a5e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/app/api/routes/event_themes.py
View File

@@ -42,19 +42,19 @@ def create_theme(
url_updates = {} url_updates = {}
# Move preview image if it exists # Move preview image if it exists
if theme.preview_image_url and '/uploads/' in theme.preview_image_url: if theme.preview_image_url and 'uploads/' in theme.preview_image_url:
new_url = _relocate_theme_file(theme.id, theme.preview_image_url, 'preview', storage) new_url = _relocate_theme_file(theme.id, theme.preview_image_url, 'preview', storage)
if new_url: if new_url:
url_updates['preview_image_url'] = new_url url_updates['preview_image_url'] = new_url
# Move background image if it exists # Move background image if it exists
if theme.background_image_url and '/uploads/' in theme.background_image_url: if theme.background_image_url and 'uploads/' in theme.background_image_url:
new_url = _relocate_theme_file(theme.id, theme.background_image_url, 'background', storage) new_url = _relocate_theme_file(theme.id, theme.background_image_url, 'background', storage)
if new_url: if new_url:
url_updates['background_image_url'] = new_url url_updates['background_image_url'] = new_url
# Move foreground image if it exists # Move foreground image if it exists
if theme.foreground_image_url and '/uploads/' in theme.foreground_image_url: if theme.foreground_image_url and 'uploads/' in theme.foreground_image_url:
new_url = _relocate_theme_file(theme.id, theme.foreground_image_url, 'foreground', storage) new_url = _relocate_theme_file(theme.id, theme.foreground_image_url, 'foreground', storage)
if new_url: if new_url:
url_updates['foreground_image_url'] = new_url url_updates['foreground_image_url'] = new_url
@@ -63,7 +63,7 @@ def create_theme(
if theme.asset_image_urls: if theme.asset_image_urls:
new_assets = {} new_assets = {}
for key, url in theme.asset_image_urls.items(): for key, url in theme.asset_image_urls.items():
if url and '/uploads/' in url: if url and 'uploads/' in url:
new_url = _relocate_theme_file(theme.id, url, f'assets/{key}', storage) new_url = _relocate_theme_file(theme.id, url, f'assets/{key}', storage)
if new_url: if new_url:
new_assets[key] = new_url new_assets[key] = new_url
@@ -138,17 +138,17 @@ def update_theme(
update_data = theme_in.model_dump(exclude_unset=True) update_data = theme_in.model_dump(exclude_unset=True)
# Relocate any image files and update URLs # Relocate any image files and update URLs
if 'preview_image_url' in update_data and update_data['preview_image_url'] and '/uploads/' in update_data['preview_image_url']: if 'preview_image_url' in update_data and update_data['preview_image_url'] and 'uploads/' in update_data['preview_image_url']:
new_url = _relocate_theme_file(theme_id, update_data['preview_image_url'], 'preview', storage) new_url = _relocate_theme_file(theme_id, update_data['preview_image_url'], 'preview', storage)
if new_url: if new_url:
update_data['preview_image_url'] = new_url update_data['preview_image_url'] = new_url
if 'background_image_url' in update_data and update_data['background_image_url'] and '/uploads/' in update_data['background_image_url']: if 'background_image_url' in update_data and update_data['background_image_url'] and 'uploads/' in update_data['background_image_url']:
new_url = _relocate_theme_file(theme_id, update_data['background_image_url'], 'background', storage) new_url = _relocate_theme_file(theme_id, update_data['background_image_url'], 'background', storage)
if new_url: if new_url:
update_data['background_image_url'] = new_url update_data['background_image_url'] = new_url
if 'foreground_image_url' in update_data and update_data['foreground_image_url'] and '/uploads/' in update_data['foreground_image_url']: if 'foreground_image_url' in update_data and update_data['foreground_image_url'] and 'uploads/' in update_data['foreground_image_url']:
new_url = _relocate_theme_file(theme_id, update_data['foreground_image_url'], 'foreground', storage) new_url = _relocate_theme_file(theme_id, update_data['foreground_image_url'], 'foreground', storage)
if new_url: if new_url:
update_data['foreground_image_url'] = new_url update_data['foreground_image_url'] = new_url
@@ -156,7 +156,7 @@ def update_theme(
if 'asset_image_urls' in update_data and update_data['asset_image_urls']: if 'asset_image_urls' in update_data and update_data['asset_image_urls']:
new_assets = {} new_assets = {}
for key, url in update_data['asset_image_urls'].items(): for key, url in update_data['asset_image_urls'].items():
if url and '/uploads/' in url: if url and 'uploads/' in url:
new_url = _relocate_theme_file(theme_id, url, f'assets/{key}', storage) new_url = _relocate_theme_file(theme_id, url, f'assets/{key}', storage)
if new_url: if new_url:
new_assets[key] = new_url new_assets[key] = new_url