mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Getting extra media types

master
Bob Mottram 2019-08-30 20:57:24 +01:00
parent 8379fada03
commit 84da665936
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.py
View File

@ -700,21 +700,33 @@ class PubServer(BaseHTTPRequestHandler):
if '/media/' in self.path: if '/media/' in self.path:
if self.path.endswith('.png') or \ if self.path.endswith('.png') or \
self.path.endswith('.jpg') or \ self.path.endswith('.jpg') or \
self.path.endswith('.gif'): self.path.endswith('.gif') or \
self.path.endswith('.mp4') or \
self.path.endswith('.ogv') or \
self.path.endswith('.mp3') or \
self.path.endswith('.ogg'):
mediaStr=self.path.split('/media/')[1] mediaStr=self.path.split('/media/')[1]
mediaFilename= \ mediaFilename= \
self.server.baseDir+'/media/'+mediaStr self.server.baseDir+'/media/'+mediaStr
if os.path.isfile(mediaFilename): if os.path.isfile(mediaFilename):
mediaFileType='png' mediaFileType='image/png'
if mediaFilename.endswith('.png'): if mediaFilename.endswith('.png'):
mediaFileType='png' mediaFileType='image/png'
elif mediaFilename.endswith('.jpg'): elif mediaFilename.endswith('.jpg'):
mediaFileType='jepg' mediaFileType='image/jpeg'
else: elif mediaFilename.endswith('.gif'):
mediaFileType='gif' mediaFileType='image/gif'
elif mediaFilename.endswith('.mp4'):
mediaFileType='video/mp4'
elif mediaFilename.endswith('.ogv'):
mediaFileType='video/ogv'
elif mediaFilename.endswith('.mp3'):
mediaFileType='audio/mpeg'
elif mediaFilename.endswith('.ogg'):
mediaFileType='audio/ogg'
with open(mediaFilename, 'rb') as avFile: with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers('image/'+mediaFileType,len(mediaBinary),cookie) self._set_headers(mediaFileType,len(mediaBinary),cookie)
self.wfile.write(mediaBinary) self.wfile.write(mediaBinary)
self.wfile.flush() self.wfile.flush()
return return