3 Tests passing, root index still failing

Author: dancornutt

http_server.py

@@ -1,8 +1,11 @@
 import socket
 import sys
 import traceback
+import mimetypes
+import os
 
-def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"):
+
+def response_ok(body=b"Welcome to my web server", mimetype=b"text/plain"):
     """
     returns a basic HTTP response
     Ex:
@@ -19,21 +22,33 @@ def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"):
         '''
     """
 
-    # TODO: Implement response_ok
-    return b""
+    return b"\r\n".join([
+        b"HTTP/1.1 200 OK",
+        b"Content-Type: " + mimetype,
+        b"",
+        body,
+    ])
+
 
 def response_method_not_allowed():
     """Returns a 405 Method Not Allowed response"""
 
-    # TODO: Implement response_method_not_allowed
-    return b""
+    return b"\r\n".join([
+        b"HTTP/1.1 405 Method Not Allowed",
+        b"",
+        b"You can't do that on this server!"
+    ])
 
 
 def response_not_found():
     """Returns a 404 Not Found response"""
 
     # TODO: Implement response_not_found
-    return b""
+    return b"\r\n".join([
+        b"HTTP/1.1 404 Page Not Found",
+        b"",
+        b"Sorry page not found!"
+    ])
 
 
 def parse_request(request):
@@ -44,8 +59,12 @@ def parse_request(request):
     NotImplementedError if the method of the request is not GET.
     """
 
-    # TODO: implement parse_request
-    return ""
+    method, path, version = request.split("\r\n")[0].split(" ")
+
+    if method != "GET":
+        raise NotImplementedError
+    return path
+
 
 def response_path(path):
     """
@@ -74,20 +93,41 @@ def response_path(path):
         response_path('/a_page_that_doesnt_exist.html') -> Raises a NameError
 
     """
+    home_dir = "/home/dan/cert/scripts/py230/03_Lesson/assignment/socket-http-server/webroot"
+    abs_path = home_dir + path
+
+    try:
+        # TODO: Fill in the appropriate content and mime_type give the path.
+        # See the assignment guidelines for help on "mapping mime-types", though
+        # you might need to create a special case for handling make_time.py
+        if os.path.isdir(abs_path):
+            # directory
+            mime_type = b"text/plain"
+            lst = os.listdir(abs_path)
+            content = ""
+            for item in lst:
+                content += " {},".format(item)
+        elif os.path.isfile(abs_path):
+            # file
+            mime_type = mimetypes.guess_type(path)[0]
+            content = b""
+            with open(abs_path, "rb") as f:
+                byte = f.read(1)
+                while byte:
+                    content += byte
+                    byte = f.read(1)
 
     # TODO: Raise a NameError if the requested content is not present
     # under webroot.
+    except NameError:
+        response_not_found()
 
-    # TODO: Fill in the appropriate content and mime_type give the path.
-    # See the assignment guidelines for help on "mapping mime-types", though
-    # you might need to create a special case for handling make_time.py
-    #
     # If the path is "make_time.py", then you may OPTIONALLY return the
     # result of executing `make_time.py`. But you need only return the
     # CONTENTS of `make_time.py`.
-    
-    content = b"not implemented"
-    mime_type = b"not implemented"
+
+        content = b"not implemented"
+        mime_type = b"not implemented"
 
     return content, mime_type
 
@@ -114,30 +154,33 @@ def server(log_buffer=sys.stderr):
 
                     if '\r\n\r\n' in request:
                         break
-		
 
                 print("Request received:\n{}\n\n".format(request))
 
-                # TODO: Use parse_request to retrieve the path from the request.
-
-                # TODO: Use response_path to retrieve the content and the mimetype,
-                # based on the request path.
-
-                # TODO; If parse_request raised a NotImplementedError, then let
-                # response be a method_not_allowed response. If response_path raised
-                # a NameError, then let response be a not_found response. Else,
-                # use the content and mimetype from response_path to build a 
-                # response_ok.
-                response = response_ok(
-                    body=b"Welcome to my web server",
-                    mimetype=b"text/plain"
-                )
+                try:
+                    path = parse_request(request)
+                    # TODO: Use response_path to retrieve the content and the mimetype,
+                    # based on the request path.
+                    content, mtype = response_path(path)
+                    print(content, mtype)
+
+                    # TODO; If parse_request raised a NotImplementedError, then let
+                    # response be a method_not_allowed response. If response_path raised
+                    # a NameError, then let response be a not_found response. Else,
+                    # use the content and mimetype from response_path to build a
+                    # response_ok.
+                    response = response_ok(
+                        body=content,
+                        mimetype=mtype
+                    )
+                except NotImplementedError:
+                    response = response_method_not_allowed()
 
                 conn.sendall(response)
             except:
                 traceback.print_exc()
             finally:
-                conn.close() 
+                conn.close()
 
     except KeyboardInterrupt:
         sock.close()
@@ -149,5 +192,3 @@ def server(log_buffer=sys.stderr):
 if __name__ == '__main__':
     server()
     sys.exit(0)
-
-

tests.py

@@ -49,7 +49,6 @@ def test_post_yields_method_not_allowed(self):
 
         self.assertEqual(response.getcode(), 405)
 
-
     def test_get_sample_text_content(self):
         """
         A call to /sample.txt returns the correct body
@@ -187,10 +186,11 @@ def test_root_index(self):
 
         for path in os.listdir(local_path):
             self.assertIn(path, body, error_comment)
+            print(path, body, error_comment)
 
     def test_ok_response_at_root_index(self):
         """
-        A call to / at least yields a 200 OK response 
+        A call to / at least yields a 200 OK response
         """
 
         directory = ''