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

More attachment types

master
Bob Mottram 2019-08-30 15:37:24 +01:00
parent 864741a8dd
commit 80e4779d44
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.py
View File

@ -1823,21 +1823,21 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
# directly search the binary array for the beginning # directly search the binary array for the beginning
# of an image # of an image
searchStr=b'Content-Type: image/png' mediaExtension={
imageLocation=postBytes.find(searchStr) 'image': ['png','jpeg','gif'],
filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload' 'video': ['mp4','webm','ogv'],
if imageLocation>-1: 'audio': ['mp3','ogg']
filename=filenameBase+'.png' }
else: for mType,extensionList in mediaTypes.items():
searchStr=b'Content-Type: image/jpeg' for extension in extensionList:
imageLocation=postBytes.find(searchStr) searchStr=b'Content-Type: '+mType+'/'+extension
if imageLocation>-1:
filename=filenameBase+'.jpg'
else:
searchStr=b'Content-Type: image/gif'
imageLocation=postBytes.find(searchStr) imageLocation=postBytes.find(searchStr)
filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload'
if imageLocation>-1: if imageLocation>-1:
filename=filenameBase+'.gif' if extension=='jpeg':
extension='jpg'
filename=filenameBase+'.'+extension
break
if filename and imageLocation>-1: if filename and imageLocation>-1:
# locate the beginning of the image, after any # locate the beginning of the image, after any
# carriage returns # carriage returns

2
webinterface.py
View File

@ -807,7 +807,7 @@ def htmlNewPost(baseDir: str,path: str,inReplyTo: str,mentions: [],reportUrl: st
' <div class="container">' \ ' <div class="container">' \
' <input type="text" placeholder="Image description" name="imageDescription">' \ ' <input type="text" placeholder="Image description" name="imageDescription">' \
' <input type="file" id="attachpic" name="attachpic"' \ ' <input type="file" id="attachpic" name="attachpic"' \
' accept=".png, .jpg, .jpeg, .gif">' \ ' accept=".png, .jpg, .jpeg, .gif, .mp4, .webm, .ogv, .mp3, .ogg">' \
' </div>' \ ' </div>' \
' </div>' \ ' </div>' \
'</form>' '</form>'