Avatar image doesn't necessarily end with extension

main2
Bob Mottram 2019-09-14 19:40:03 +01:00
parent 4815caeddc
commit f20cd62c2d
1 changed files with 4 additions and 3 deletions

View File

@ -48,13 +48,14 @@ def updateAvatarImageCache(session,baseDir: str,httpPrefix: str,actor: str,avata
""" """
if not avatarUrl: if not avatarUrl:
return None return None
if avatarUrl.endswith('.png'): if avatarUrl.endswith('.png') or '.png?' in avatarUrl:
sessionHeaders = {'Accept': 'image/png'} sessionHeaders = {'Accept': 'image/png'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.png' avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.png'
elif avatarUrl.endswith('.jpg') or avatarUrl.endswith('.jpeg'): elif avatarUrl.endswith('.jpg') or avatarUrl.endswith('.jpeg') or \
or '.jpg?' in avatarUrl or '.jpeg?' in avatarUrl:
sessionHeaders = {'Accept': 'image/jpeg'} sessionHeaders = {'Accept': 'image/jpeg'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.jpg' avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.jpg'
elif avatarUrl.endswith('.gif'): elif avatarUrl.endswith('.gif') or '.gif?' in avatarUrl:
sessionHeaders = {'Accept': 'image/gif'} sessionHeaders = {'Accept': 'image/gif'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.gif' avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.gif'
else: else: