Unified root to root_path across all files

Author: michalpokusa

adafruit_httpserver/response.py

@@ -21,7 +21,7 @@ class HTTPResponse:
     content_type: str
 
     filename: Optional[str]
-    root_directory: str
+    root_path: str
 
     body: str
 
@@ -32,7 +32,7 @@ def __init__(
         headers: Dict[str, str] = None,
         content_type: str = MIMEType.TEXT_PLAIN,
         filename: Optional[str] = None,
-        root_directory: str = "",
+        root_path: str = "",
         http_version: str = "HTTP/1.1"
     ) -> None:
         """
@@ -46,7 +46,7 @@ def __init__(
         self.headers = headers or {}
         self.content_type = content_type
         self.filename = filename
-        self.root_directory = root_directory
+        self.root_path = root_path
         self.http_version = http_version
 
     @staticmethod
@@ -82,11 +82,11 @@ def send(self, conn: Union[SocketPool.Socket, socket.socket]) -> None:
 
         if self.filename is not None:
             try:
-                file_length = os.stat(self.root_directory + self.filename)[6]
+                file_length = os.stat(self.root_path + self.filename)[6]
                 self._send_file_response(
                     conn,
                     filename = self.filename,
-                    root_directory = self.root_directory,
+                    root_path = self.root_path,
                     file_length = file_length
                 )
             except OSError:
@@ -127,7 +127,7 @@ def _send_file_response(
         self,
         conn: Union[SocketPool.Socket, socket.socket],
         filename: str,
-        root_directory: str,
+        root_path: str,
         file_length: int
     ):
         self._send_bytes(
@@ -138,7 +138,7 @@ def _send_file_response(
                 content_length = file_length
             ),
         )
-        with open(root_directory + filename, "rb") as file:
+        with open(root_path + filename, "rb") as file:
             while bytes_read := file.read(2048):
                 self._send_bytes(conn, bytes_read)
 

adafruit_httpserver/server.py

@@ -50,22 +50,22 @@ def route_decorator(func: Callable) -> Callable:
 
         return route_decorator
 
-    def serve_forever(self, host: str, port: int = 80, root: str = "") -> None:
+    def serve_forever(self, host: str, port: int = 80, root_path: str = "") -> None:
         """Wait for HTTP requests at the given host and port. Does not return.
 
         :param str host: host name or IP address
         :param int port: port
         :param str root: root directory to serve files from
         """
-        self.start(host, port, root)
+        self.start(host, port, root_path)
 
         while True:
             try:
                 self.poll()
             except OSError:
                 continue
 
-    def start(self, host: str, port: int = 80, root: str = "") -> None:
+    def start(self, host: str, port: int = 80, root_path: str = "") -> None:
         """
         Start the HTTP server at the given host and port. Requires calling
         poll() in a while loop to handle incoming requests.
@@ -74,7 +74,7 @@ def start(self, host: str, port: int = 80, root: str = "") -> None:
         :param int port: port
         :param str root: root directory to serve files from
         """
-        self.root_path = root
+        self.root_path = root_path
 
         self._sock = self._socket_source.socket(
             self._socket_source.AF_INET, self._socket_source.SOCK_STREAM
@@ -105,7 +105,7 @@ def poll(self):
 
                 # If no handler exists and request method is GET, try to serve a file.
                 elif request.method == HTTPMethod.GET:
-                    response = HTTPResponse(filename=request.path, root=self.root_path)
+                    response = HTTPResponse(filename=request.path, root_path=self.root_path)
 
                 # If no handler exists and request method is not GET, return 400 Bad Request.
                 else: