indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

main2
Bob Mottram 2019-10-18 13:51:37 +01:00
parent 69d43b118f
commit 3de5469cf4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webinterface.py
View File

@ -52,16 +52,17 @@ def updateAvatarImageCache(session,baseDir: str,httpPrefix: str,actor: str,avata
""" """
if not avatarUrl: if not avatarUrl:
return None return None
avatarImagePath=baseDir+'/cache/avatars/'+actor.replace('/','-')
if avatarUrl.endswith('.png') or '.png?' in avatarUrl: if avatarUrl.endswith('.png') or '.png?' in avatarUrl:
sessionHeaders = {'Accept': 'image/png'} sessionHeaders = {'Accept': 'image/png'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.png' avatarImageFilename=avatarImagePath+'.png'
elif avatarUrl.endswith('.jpg') or avatarUrl.endswith('.jpeg') or \ elif avatarUrl.endswith('.jpg') or avatarUrl.endswith('.jpeg') or \
'.jpg?' in avatarUrl or '.jpeg?' in avatarUrl: '.jpg?' in avatarUrl or '.jpeg?' in avatarUrl:
sessionHeaders = {'Accept': 'image/jpeg'} sessionHeaders = {'Accept': 'image/jpeg'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.jpg' avatarImageFilename=avatarImagePath+'.jpg'
elif avatarUrl.endswith('.gif') or '.gif?' in avatarUrl: elif avatarUrl.endswith('.gif') or '.gif?' in avatarUrl:
sessionHeaders = {'Accept': 'image/gif'} sessionHeaders = {'Accept': 'image/gif'}
avatarImageFilename=baseDir+'/cache/avatars/'+actor.replace('/','-')+'.gif' avatarImageFilename=avatarImagePath+'.gif'
else: else:
return None return None
if not os.path.isfile(avatarImageFilename) or force: if not os.path.isfile(avatarImageFilename) or force:
@ -81,8 +82,9 @@ def updateAvatarImageCache(session,baseDir: str,httpPrefix: str,actor: str,avata
except Exception as e: except Exception as e:
print('Failed to download avatar image: '+str(avatarUrl)) print('Failed to download avatar image: '+str(avatarUrl))
print(e) print(e)
sessionHeaders = {'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'} if '/channel/' not in actor:
if '/channel/' in actor: sessionHeaders = {'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'}
else:
sessionHeaders = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} sessionHeaders = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
personJson = getJson(session,actor,sessionHeaders,None,__version__,httpPrefix,None) personJson = getJson(session,actor,sessionHeaders,None,__version__,httpPrefix,None)
if personJson: if personJson: