neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Hand out the right content-type for .mjs files" 

This reverts commit 3d0e73d0e9.
This commit is contained in:
John Donaldson 2020-02-28 19:05:24 +00:00
parent 3d0e73d0e9
commit 618100d7b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devel/devel-server.py
View File

@ -7,6 +7,7 @@ import cgi
import http.server import http.server
import io import io
import json import json
import mimetypes
import moth import moth
import logging import logging
import os import os
@ -42,6 +43,7 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
except TypeError: except TypeError:
super().__init__(request, client_address, server) super().__init__(request, client_address, server)
# Backport from Python 3.7 # Backport from Python 3.7
def translate_path(self, path): def translate_path(self, path):
# I guess we just hope that some other thread doesn't call getcwd # I guess we just hope that some other thread doesn't call getcwd
@ -158,7 +160,7 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
return return
self.send_response(200) self.send_response(200)
self.send_header("Content-Type", self.guess_type(file.name)) self.send_header("Content-Type", mimetypes.guess_type(file.name))
self.end_headers() self.end_headers()
shutil.copyfileobj(file.stream, self.wfile) shutil.copyfileobj(file.stream, self.wfile)
endpoints.append(("/{seed}/content/{cat}/{points}/{filename}", handle_puzzlefile)) endpoints.append(("/{seed}/content/{cat}/{points}/{filename}", handle_puzzlefile))
@ -192,7 +194,7 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
self.send_header("Content-Type", "text/html") self.send_header("Content-Type", "text/html")
self.end_headers() self.end_headers()
self.wfile.write("Your browser was supposed to redirect you to <a href=\"%s/\">here</a>." % seed) self.wfile.write("Your browser was supposed to redirect you to <a href=\"%s/\">here</a>." % seed)
endpoints.append(("/", handle_index)) endpoints.append((r"/", handle_index))
def handle_theme_file(self): def handle_theme_file(self):
@ -233,7 +235,6 @@ class MothRequestHandler(http.server.SimpleHTTPRequestHandler):
HTTPStatus.NOT_IMPLEMENTED, HTTPStatus.NOT_IMPLEMENTED,
"Unsupported method (%r)" % self.command, "Unsupported method (%r)" % self.command,
) )
MothRequestHandler.extensions_map[".mjs"] = "application/ecmascript"
if __name__ == '__main__': if __name__ == '__main__':
@ -278,6 +279,6 @@ if __name__ == '__main__':
server.args["base_url"] = args.base server.args["base_url"] = args.base
server.args["puzzles_dir"] = pathlib.Path(args.puzzles) server.args["puzzles_dir"] = pathlib.Path(args.puzzles)
server.args["theme_dir"] = args.theme server.args["theme_dir"] = args.theme
logging.info("Listening on %s:%d", addr, port) logging.info("Listening on %s:%d", addr, port)
server.serve_forever() server.serve_forever()