Copy search banner

merge-requests/30/head
Bob Mottram 2021-08-21 13:56:46 +01:00
parent 2029fbe3cd
commit 6bf5e20de9
2 changed files with 5 additions and 10 deletions

View File

@ -20,6 +20,7 @@ import pyqrcode
# for saving images # for saving images
from hashlib import sha256 from hashlib import sha256
from hashlib import md5 from hashlib import md5
from shutil import copyfile
from session import createSession from session import createSession
from webfinger import webfingerMeta from webfinger import webfingerMeta
from webfinger import webfingerNodeInfo from webfinger import webfingerNodeInfo
@ -10413,6 +10414,10 @@ class PubServer(BaseHTTPRequestHandler):
nickname = getNicknameFromActor(path) nickname = getNicknameFromActor(path)
bannerFilename = \ bannerFilename = \
acctDir(baseDir, nickname, domain) + '/search_banner.png' acctDir(baseDir, nickname, domain) + '/search_banner.png'
if not os.path.isfile(bannerFilename):
if os.path.isfile(baseDir + '/default/search_banner.png'):
copyfile(baseDir + '/default/search_banner.png',
bannerFilename)
if os.path.isfile(bannerFilename): if os.path.isfile(bannerFilename):
if self._etag_exists(bannerFilename): if self._etag_exists(bannerFilename):
# The file has not changed # The file has not changed

View File

@ -475,16 +475,6 @@ def _getImageFile(baseDir: str, name: str, directory: str,
bannerFile = name + '_' + theme + '.' + ext bannerFile = name + '_' + theme + '.' + ext
bannerFilename = bannerFilenameTest bannerFilename = bannerFilenameTest
return bannerFile, bannerFilename return bannerFile, bannerFilename
# if not found then use the default image
theme = 'default'
directory = baseDir + '/theme/' + theme
for ext in bannerExtensions:
bannerFileTest = name + '.' + ext
bannerFilenameTest = directory + '/' + bannerFileTest
if os.path.isfile(bannerFilenameTest):
bannerFile = name + '_' + theme + '.' + ext
bannerFilename = bannerFilenameTest
break
return bannerFile, bannerFilename return bannerFile, bannerFilename