Ajout de le redefinition de l'action 404. Ajout du build_response pour construire la reponse

Author: c4software

extended_BaseHTTPServer.py

@@ -15,6 +15,13 @@ def decorator(f):
 		return f
 	return decorator
 
+handler_method = {}
+def handler(method=None):
+	def decorator(f):
+		handler_method[method] = f
+		return f
+	return decorator
+
 class extended_BaseHTTPServer(BaseHTTPServer.BaseHTTPRequestHandler):
 	def log_message(self, format, *args):
 		return ""
@@ -38,35 +45,38 @@ def do_GET(s):
 	def do_routing(s, o, arguments, action):
 		if o.path in register_route[action]:
 			retour = register_route[action][o.path](**arguments)
-
-			if type(retour) is dict:
-				s.send_response(retour.get("code",200))
-				for header in retour:
-					if header not in ["code","content"]:
-						s.send_header(header, retour[header])
-				s.end_headers()
-				s.wfile.write(retour['content'])
-
-			else:
-				s.send_response(200)
-				s.send_header("Content-type", "text/html")
-				s.end_headers()
-				s.wfile.write(retour)
+			build_response(s, retour, 200)
 		else:
 			# Fichier static ?
 			try:
 				with open(os.path.join("."+o.path)) as f:
 					fname,ext = os.path.splitext(o.path)
-					s.send_response(200)
-					s.send_header('Content-type', types_map[ext])
-					s.end_headers()
-					s.wfile.write(f.read())
+					ctype = "text/plain"
+					if ext in types_map:
+						ctype = types_map[ext]
+					build_response(s, {'Content-type':ctype,"content":f.read()}, 200)
 			except Exception as e:
-				s.send_response(404)
-				s.send_header("Content-type", "text/html")
-				s.end_headers()
 				# Url introuvale et fichier static introuvable ==> 404
-				s.wfile.write("TODO 404 STUFF")
+				if "404" not in handler_method:
+					build_response(s, "404 - Not Found", 404)
+				else:
+					retour = handler_method['404']()
+					build_response(s, retour, 404)
+
+
+def build_response(output, retour, code=200):
+	if type(retour) is dict:
+		output.send_response(retour.get("code",code))
+		for header in retour:
+			if header not in ["code","content"]:
+				output.send_header(header, retour[header])
+		output.end_headers()
+		output.wfile.write(retour['content'])
+	else:
+		output.send_response(code)
+		output.send_header("Content-type", "text/html")
+		output.end_headers()
+		output.wfile.write(retour)
 
 
 def redirect(location=""):

sample_test.py

@@ -1,4 +1,4 @@
-from extended_BaseHTTPServer import serve,route,redirect
+from extended_BaseHTTPServer import serve,route,redirect, handler
 
 # TODO URL AVEC PARTIES DYNAMIQUE	
 # TODO POST METHOD
@@ -12,9 +12,12 @@ def main(**kwargs):
 
 @route("/form",["GET","POST"])
 def main(**kwargs):
-	return "<form method='post'><input type='submit' /><input type='text' name='test' /></form>"
+	return "<form method='post'><input type='submit' /><input type='text' name='name' /></form>"
 
 
+@handler("404")
+def handler_404():
+	return "Contenu introuvable."
 
 # @route("/:name",["GET"])
 # def hello(**kwargs):