Completed the testing and programming

Author: IanMayther

http_server.py

@@ -2,6 +2,7 @@
 import sys
 import traceback
 import os
+import mimetypes
 
 def response_ok(body=b"This is a minimal response", mimetype=b"text/plain"):
     """
@@ -51,11 +52,8 @@ def parse_request(request):
     This server only handles GET requests, so this method shall raise a
     NotImplementedError if the method of the request is not GET.
     """
-
-    # TODO: implement parse_request
     method, path, version = request.split("\r\n")[0].split(" ")
 
-
     if method != "GET":
         raise NotImplementedError
 
@@ -66,19 +64,25 @@ def read_file(file_name):
     Read the provided file as bytes and return content
     return byte string
     '''
-
-    with open(os.path.join(os.getcwd(), "webroot", file_name), "rb") as f:
-        content = f.read()
+    try:
+        with open(file_name, "rb") as f:
+            content = f.read()
+    except PermissionError:
+        content = 'directory'
 
     return content
 
-def contents_to_bytes(path):
+def contents_to_bytes(path, file_name):
     '''
     Converts the directory list to byte string
     '''
-    file_path = os.path.join(os.getcwd(), "webroot", path)
-    files = os.listdir(file_path)
-    contents = ''.join(files).encode()
+    try:
+        file_path = os.path.join(path, file_name)
+        files = os.listdir(file_path)
+        contents = ''.join(files).encode('utf-8')
+    except NotADirectoryError:
+        raise NotADirectoryError
+    
     return contents
 
 def response_path(path):
@@ -109,49 +113,26 @@ def response_path(path):
 
     """
 
-    # TODO: Raise a NameError if the requested content is not present
-    # under webroot.
-    '''
-    Get path
-    Determine if path is valid
-    Determine content
-    Determine mime_type
-    '''
-
     content = b"not implemented"
     mime_type = b"not implemented"
 
     path_1 = path.strip("/")
-
-    if path_1 == '':
-        content=contents_to_bytes(path_1)
-        mime_type=b"text/plain" 
-        return content, mime_type
+    path_2 = os.path.join(
+        os.getcwd(),
+        'socket-http-server',
+        'webroot'
+        )
 
     try:
-        contents_to_bytes(path_1)
+        content = contents_to_bytes(path_2, path_1)
+        mime_type = b"text/plain"
     except NotADirectoryError:
-        file_type = path_1.split(".")
+        guess_type = mimetypes.guess_type(path_1)[0]
+        content = read_file(os.path.join(path_2, path_1))
+        mime_type = guess_type.encode('utf-8')
     except FileNotFoundError:
         raise NameError
 
-    type_dict = {
-        "txt" : [read_file(path_1), b"text/plain"],
-        "html" : [read_file(path_1), b"text/html"],
-        "ico" : [read_file(path_1), b"image/ico"],
-        "jpg" : [read_file(path_1), b"image/jpg"],
-    }
-    
-    content = type_dict[file_type[-1]][0]
-    mime_type = type_dict[file_type[-1]][1]
-    # 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`.
-
     return content, mime_type
 
 
@@ -183,14 +164,9 @@ def server(log_buffer=sys.stderr):
 
                 try:
                     path = parse_request(request)
-                    # TODO: Use response_path to retrieve the content and the mimetype,
-                    # based on the request path.
+
                     content, mime_type = response_path(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=content,
                         mimetype=mime_type
@@ -217,5 +193,3 @@ def server(log_buffer=sys.stderr):
 if __name__ == '__main__':
     server()
     sys.exit(0)
-
-

tests.py

@@ -75,9 +75,6 @@ def test_get_sample_text_mime_type(self):
         web_path = '/' + file
         error_comment = "Error encountered while visiting " + web_path
 
-        print(web_path)
-        print(os.getcwd())
-
         response = self.get_response(web_path)
 
         self.assertEqual(response.getcode(), 200, error_comment)
@@ -201,7 +198,7 @@ def test_ok_response_at_root_index(self):
         response = self.get_response(web_path)
 
         self.assertEqual(response.getcode(), 200)
-
+    
 
 if __name__ == '__main__':
     unittest.main()