mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests 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

28
daemon.py
View File

@ -1823,21 +1823,21 @@ class PubServer(BaseHTTPRequestHandler):
else:
# directly search the binary array for the beginning
# of an image
searchStr=b'Content-Type: image/png'
imageLocation=postBytes.find(searchStr)
filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload'
if imageLocation>-1:
filename=filenameBase+'.png'
else:
searchStr=b'Content-Type: image/jpeg'
imageLocation=postBytes.find(searchStr)
if imageLocation>-1:
filename=filenameBase+'.jpg'
else:
searchStr=b'Content-Type: image/gif'
mediaExtension={
'image': ['png','jpeg','gif'],
'video': ['mp4','webm','ogv'],
'audio': ['mp3','ogg']
}
for mType,extensionList in mediaTypes.items():
for extension in extensionList:
searchStr=b'Content-Type: '+mType+'/'+extension
imageLocation=postBytes.find(searchStr)
if imageLocation>-1:
filename=filenameBase+'.gif'
filenameBase=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/upload'
if imageLocation>-1:
if extension=='jpeg':
extension='jpg'
filename=filenameBase+'.'+extension
break
if filename and imageLocation>-1:
# locate the beginning of the image, after any
# 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">' \
' <input type="text" placeholder="Image description" name="imageDescription">' \
' <input type="file" id="attachpic" name="attachpic"' \
' accept=".png, .jpg, .jpeg, .gif">' \
' accept=".png, .jpg, .jpeg, .gif, .mp4, .webm, .ogv, .mp3, .ogg">' \
' </div>' \
' </div>' \
'</form>'