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

Check etag

main
Bob Mottram 2019-12-04 12:47:16 +00:00
parent 99883818cd
commit 13826ca5cb
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
daemon.py
View File

@ -1411,6 +1411,29 @@ class PubServer(BaseHTTPRequestHandler):
mediaFileType='audio/mpeg' mediaFileType='audio/mpeg'
elif mediaFilename.endswith('.ogg'): elif mediaFilename.endswith('.ogg'):
mediaFileType='audio/ogg' mediaFileType='audio/ogg'
# does an etag header exist?
etagHeader='If-None-Match'
if not self.headers.get(etagHeader):
etagHeader='if-none-match'
if not self.headers.get(etagHeader):
etagHeader='If-none-match'
if self.headers.get(etagHeader):
oldEtag=self.headers['If-None-Match']
if os.path.isfile(mediaFilename+'.etag'):
# load the etag from file
currEtag=''
try:
with open(mediaFilename, 'r') as etagFile:
currEtag = etagFile.read()
except:
pass
if oldEtag==currEtag:
# if the etags are the same then only return the header
# not the media
self._set_headers(mediaFileType,mediaBinary,cookie)
return
with open(mediaFilename, 'rb') as avFile: with open(mediaFilename, 'rb') as avFile:
mediaBinary = avFile.read() mediaBinary = avFile.read()
self._set_headers_etag(mediaFilename,mediaFileType,mediaBinary,cookie) self._set_headers_etag(mediaFilename,mediaFileType,mediaBinary,cookie)