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

Set theme after removing custom font

main
Bob Mottram 2020-05-27 14:01:13 +01:00
parent fac462f44b
commit 54224094a9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon.py
View File

@ -170,6 +170,7 @@ from cache import getPersonFromCache
from httpsig import verifyPostHeaders from httpsig import verifyPostHeaders
from theme import setTheme from theme import setTheme
from theme import getTheme from theme import getTheme
from theme import setCustomFont
from schedule import runPostSchedule from schedule import runPostSchedule
from schedule import runPostScheduleWatchdog from schedule import runPostScheduleWatchdog
from schedule import removeScheduledPosts from schedule import removeScheduledPosts
@ -5473,8 +5474,7 @@ class PubServer(BaseHTTPRequestHandler):
postImageFilename = filename.replace('.temp', '') postImageFilename = filename.replace('.temp', '')
if mType == 'customFont': if mType == 'customFont':
os.rename(filename, postImageFilename) os.rename(filename, postImageFilename)
setTheme(self.server.baseDir, setCustomFont(self.server.baseDir)
getTheme(self.server.baseDir))
print('profile POST ' + mType + print('profile POST ' + mType +
' image or font filename ' + postImageFilename) ' image or font filename ' + postImageFilename)
else: else:
@ -5801,14 +5801,14 @@ class PubServer(BaseHTTPRequestHandler):
'/fonts/custom.' + ext): '/fonts/custom.' + ext):
os.remove(self.server.baseDir + os.remove(self.server.baseDir +
'/fonts/custom.' + ext) '/fonts/custom.' + ext)
setTheme(self.server.baseDir,
getTheme(self.server.baseDir))
if os.path.isfile(self.server.baseDir + if os.path.isfile(self.server.baseDir +
'/fonts/custom.' + ext + '/fonts/custom.' + ext +
'.etag'): '.etag'):
os.remove(self.server.baseDir + os.remove(self.server.baseDir +
'/fonts/custom.' + ext + '/fonts/custom.' + ext +
'.etag') '.etag')
setTheme(self.server.baseDir,
getTheme(self.server.baseDir))
if fields.get('mediaInstance'): if fields.get('mediaInstance'):
self.server.mediaInstance = False self.server.mediaInstance = False