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

More general search for images

merge-requests/30/head
Bob Mottram 2021-12-15 12:59:48 +00:00
parent 30498f4b39
commit cb5a5a99d1
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
daemon.py
View File

@ -12716,12 +12716,23 @@ class PubServer(BaseHTTPRequestHandler):
avatarFilename = \ avatarFilename = \
acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile
if not os.path.isfile(avatarFilename): if not os.path.isfile(avatarFilename):
if avatarFileExt == 'png': originalExt = avatarFileExt
return False originalAvatarFile = avatarFile
avatarFile = avatarFile.replace('.' + avatarFileExt, '.png') altExt = getImageExtensions()
avatarFilename = \ altFound = False
acctDir(baseDir, avatarNickname, domain) + '/' + avatarFile for alt in altExt:
if not os.path.isfile(avatarFilename): if alt == originalExt:
continue
avatarFile = \
originalAvatarFile.replace('.' + originalExt,
'.' + alt)
avatarFilename = \
acctDir(baseDir, avatarNickname, domain) + \
'/' + avatarFile
if os.path.isfile(avatarFilename):
altFound = True
break
if not altFound:
return False return False
if self._etag_exists(avatarFilename): if self._etag_exists(avatarFilename):
# The file has not changed # The file has not changed