nouffer/rogaining_srv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix MyAlbum code step6

Browse Source
This commit is contained in:
Akira Miyata
2024-11-11 16:02:02 +09:00
parent cdae8dc7ec
commit 19f12652b9
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rog/views.py
View File

@ -2749,12 +2749,16 @@ def _get_photo_list(zekken, event_code):
for checkin in checkins: for checkin in checkins:
print(f"Processing checkin - CP number: {checkin.cp_number}") print(f"Processing checkin - CP number: {checkin.cp_number}")
if checkin.image_address: if checkin.image_address:
# URLオブジェクトかどうかを判定して適切なURLを生成 # URLオブジェクトかどうかを判定
if hasattr(checkin.image_address, 'url'): if hasattr(checkin.image_address, 'url'):
photo_url = checkin.image_address.url photo_url = checkin.image_address.url
else: else:
# 文字列の場合は先頭にベースURLを追加 # 文字列の場合、httpで始まるかどうかを確認
photo_url = f"http://rogaining.sumasen.net/media/{checkin.image_address}" image_address_str = str(checkin.image_address)
if image_address_str.lower().startswith('http'):
photo_url = image_address_str
else:
photo_url = f"http://rogaining.sumasen.net/media/{image_address_str}"
print(f"Found image for CP {checkin.cp_number}: {photo_url}") print(f"Found image for CP {checkin.cp_number}: {photo_url}")
photos.append({ photos.append({
@ -2764,18 +2768,6 @@ def _get_photo_list(zekken, event_code):
else: else:
print(f"No image found for CP {checkin.cp_number}") print(f"No image found for CP {checkin.cp_number}")
if checkin.image_address:
print(f"Found image for CP {checkin.cp_number}: {checkin.image_address.url}")
photos.append({
"cp_number": checkin.cp_number,
"photo_url": checkin.image_address.url
})
else:
print(f"No image found for CP {checkin.cp_number}")
print(f"Total photos found: {len(photos)}") print(f"Total photos found: {len(photos)}")
except Exception as e: except Exception as e: