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

Separate variable for image position

main2
Bob Mottram 2019-11-09 21:19:06 +00:00
parent dd5fdfa192
commit a1d9d43a1f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon.py
View File

@ -2687,6 +2687,9 @@ class PubServer(BaseHTTPRequestHandler):
postValue+=postLines[line] postValue+=postLines[line]
fields[postKey]=postValue fields[postKey]=postValue
if imageLocation>-1: if imageLocation>-1:
imageLocation2=-1
filename=None
searchStr=''
# directly search the binary array for the beginning # directly search the binary array for the beginning
# of an image # of an image
extensionList=['png','jpeg','gif','mp4','webm','ogv','mp3','ogg'] extensionList=['png','jpeg','gif','mp4','webm','ogv','mp3','ogg']
@ -2704,12 +2707,11 @@ class PubServer(BaseHTTPRequestHandler):
searchStr=b'Content-Type: audio/mpeg' searchStr=b'Content-Type: audio/mpeg'
elif extension=='ogg': elif extension=='ogg':
searchStr=b'Content-Type: audio/ogg' searchStr=b'Content-Type: audio/ogg'
imageLocation=postBytes.find(searchStr) imageLocation2=postBytes.find(searchStr)
filenameBase= \ filenameBase= \
self.server.baseDir+'/accounts/'+ \ self.server.baseDir+'/accounts/'+ \
nickname+'@'+self.server.domain+'/upload' nickname+'@'+self.server.domain+'/upload'
if imageLocation>-1: if imageLocation2>-1:
imageFound=True
if extension=='jpeg': if extension=='jpeg':
extension='jpg' extension='jpg'
elif extension=='mpeg': elif extension=='mpeg':
@ -2718,10 +2720,10 @@ class PubServer(BaseHTTPRequestHandler):
attachmentMediaType= \ attachmentMediaType= \
searchStr.decode().split('/')[0].replace('Content-Type: ','') searchStr.decode().split('/')[0].replace('Content-Type: ','')
break break
if filename and imageLocation>-1: if filename and imageLocation2>-1:
# locate the beginning of the image, after any # locate the beginning of the image, after any
# carriage returns # carriage returns
startPos=imageLocation+len(searchStr) startPos=imageLocation2+len(searchStr)
for offset in range(1,8): for offset in range(1,8):
if postBytes[startPos+offset]!=10: if postBytes[startPos+offset]!=10:
if postBytes[startPos+offset]!=13: if postBytes[startPos+offset]!=13:
@ -3130,7 +3132,8 @@ class PubServer(BaseHTTPRequestHandler):
postBytes=self.rfile.read(length) postBytes=self.rfile.read(length)
msg = email.parser.BytesParser().parsebytes(postBytes) msg = email.parser.BytesParser().parsebytes(postBytes)
messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary) #messageFields=msg.get_payload(decode=True).decode('utf-8').split(boundary)
messageFields=msg.get_payload(decode=False).split(boundary)
fields={} fields={}
filename=None filename=None
lastImageLocation=0 lastImageLocation=0