correct relative path problems.

codemee · codemee · commit 40c9a92de679 · 2020-09-01T23:07:40.000+08:00
diff --git a/ESP8266WebServer.py b/ESP8266WebServer.py
@@ -85,11 +85,11 @@ def ok(socket, code, *args):
         raise TypeError("ok() takes 3 or 4 positional arguments but "+ str(len(args)+2) +" were given")
     socket.write("HTTP/1.1 " + code + " OK\r\n")
     socket.write("Content-Type: " + content_type + "\r\n\r\n")
-    if __fileExist(msg):
-        filePath = msg
-        __sendPage(socket, filePath)
-    else:
-        socket.write(msg)
+#     if __fileExist(msg):
+#         filePath = msg
+#         __sendPage(socket, filePath)
+#     else:
+    socket.write(msg)
 
 def __fileExist(path):
     """Check for file existence
@@ -157,10 +157,17 @@ def handle(socket):
                     else:
                         err(socket, "404", "Not Found")
                     return
+            socket.write("HTTP/1.1 302 Found\r\n")
+            socket.write("Location: " + filePath + "\r\n\r\n")
+            return
             
         # Responds the header first
         socket.write("HTTP/1.1 200 OK\r\n")
         socket.write("Content-Type: text/html\r\n\r\n")
+#         if filePath.endswith(".css"):
+#             socket.write("Content-Type: text/css\r\n\r\n")
+#         else:
+#             socket.write("Content-Type: text/html\r\n\r\n")
         # Responds the file content
         if filePath.endswith(".p.html"):
             print("template file.")
diff --git a/Simple_led.py b/Simple_led.py
@@ -5,8 +5,8 @@
 GPIO_NUM = 2 # Builtin led (D4)
 
 # Wi-Fi configuration
-STA_SSID = "FlagTest"
-STA_PSK = "0233110330"
+STA_SSID = "MEE_MI"
+STA_PSK = "PinkFloyd1969"
 
 # Disable AP interface
 ap_if = network.WLAN(network.AP_IF)
diff --git a/TestWebServer.py b/TestWebServer.py
@@ -5,8 +5,8 @@
 GPIO_NUM = 2 # Builtin led (D4)
 
 # Wi-Fi configuration
-STA_SSID = "SSID"
-STA_PSK = "PASSWORD"
+STA_SSID = "MEE_MI"
+STA_PSK = "PinkFloyd1969"
 
 # Disable AP interface
 ap_if = network.WLAN(network.AP_IF)
diff --git a/www2/index.html b/www2/index.html
@@ -1,4 +1,7 @@
 <html>
+    <head>
+        <link rel="stylesheet" href="test.css">
+    </head>
     <body>
         <h1>This is index.html</h1>
     </body>
diff --git a/www2/test.css b/www2/test.css
@@ -0,0 +1,3 @@
+h1 {
+    color: blue;
+}

-Original file line number
+Diff line change
@@ @@ -1,4 +1,7 @@ @@
 <html>
 +    <head>
 +        <link rel="stylesheet" href="test.css">
 +    </head>
     <body>
         <h1>This is index.html</h1>
     </body>