Add logo for going to home. Fix origin check

tannewt · tannewt · commit 7acc5ebeb9a7 · 2022-06-27T13:39:09.000-07:00
diff --git a/ports/espressif/fatfs_port.c b/ports/espressif/fatfs_port.c
@@ -26,8 +26,26 @@
 
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared-bindings/rtc/RTC.h"
+#include "shared-bindings/time/__init__.h"
+#include "supervisor/fatfs_port.h"
 
+DWORD _time_override = 0;
 DWORD get_fattime(void) {
-    // TODO: Implement this function. For now, fake it.
-    return ((2016 - 1980) << 25) | ((12) << 21) | ((4) << 16) | ((00) << 11) | ((18) << 5) | (23 / 2);
+    if (_time_override > 0) {
+        return _time_override;
+    }
+    #if CIRCUITPY_RTC
+    timeutils_struct_time_t tm;
+    common_hal_rtc_get_time(&tm);
+    return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
+           (tm.tm_hour << 11) | (tm.tm_min << 5) | (tm.tm_sec >> 1);
+    #else
+    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
+    #endif
+}
+
+void override_fattime(DWORD time) {
+    _time_override = time;
 }
diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><html><head><title></title><meta charset="UTF-8"></head>
 <script src="/directory.js" defer=true></script>
-<body><h1></h1><template id="row"><tr><td></td><td></td><td><a></a></td><td></td><td><button class="delete">🗑️</button></td></tr></template><table><thead><tr><th>Type</th><th>Size</th><th>Path</th><th>Modified</th><th></th></tr></thead><tbody></tbody></table><hr><input type="file" id="files" multiple><button type="submit" id="upload">Upload</button><hr>+🗀&nbsp;<input type="text" id="name"><button type="submit" id="mkdir">Create Directory</button>
+<body><h1><a href="/"><img src="/favicon.ico"/></a>&nbsp;<span id="path"></span></h1><template id="row"><tr><td></td><td></td><td><a></a></td><td></td><td><button class="delete">🗑️</button></td></tr></template><table><thead><tr><th>Type</th><th>Size</th><th>Path</th><th>Modified</th><th></th></tr></thead><tbody></tbody></table><hr><input type="file" id="files" multiple><button type="submit" id="upload">Upload</button><hr>+🗀&nbsp;<input type="text" id="name"><button type="submit" id="mkdir">Create Directory</button>
 </body></html>
diff --git a/supervisor/shared/web_workflow/static/directory.js b/supervisor/shared/web_workflow/static/directory.js
@@ -3,12 +3,14 @@ let files = document.getElementById("files");
 
 var url_base = window.location;
 var current_path;
+var editable = undefined;
 
 async function refresh_list() {
     current_path = window.location.hash.substr(1);
     if (current_path == "") {
         current_path = "/";
     }
+    // Do the fetch first because the browser will prompt for credentials.
     const response = await fetch(new URL("/fs" + current_path, url_base),
         {
             headers: {
@@ -19,8 +21,24 @@ async function refresh_list() {
     );
     const data = await response.json();
     var new_children = [];
+    var title = document.querySelector("title");
+    title.textContent = current_path;
+    var path = document.querySelector("#path");
+    path.textContent = current_path;
     var template = document.querySelector('#row');
 
+    if (editable === undefined) {
+        const status = await fetch(new URL("/fs/", url_base),
+            {
+                method: "OPTIONS",
+                credentials: "include"
+            }
+        );
+        editable = status.headers.get("Access-Control-Allow-Methods").includes("DELETE");
+        new_directory_name.disabled = !editable;
+        files.disabled = !editable;
+    }
+
     if (window.location.path != "/fs/") {
         var clone = template.content.cloneNode(true);
         var td = clone.querySelectorAll("td");
@@ -66,8 +84,10 @@ async function refresh_list() {
         td[3].textContent = (new Date(f.modified_ns / 1000000)).toLocaleString();
         var delete_button = clone.querySelector("button.delete");
         delete_button.value = api_url;
+        delete_button.disabled = !editable;
         delete_button.onclick = del;
 
+
         new_children.push(clone);
     }
     var tbody = document.querySelector("tbody");
diff --git a/supervisor/shared/web_workflow/static/welcome.html b/supervisor/shared/web_workflow/static/welcome.html
@@ -6,7 +6,7 @@
 </head>
 <script src="/welcome.js" defer=true></script>
 <body>
-    <h1>Welcome!</h1>
+    <h1><a href="/"><img src="/favicon.ico"/></a>&nbsp;Welcome!</h1>
     Welcome to CircuitPython's Web API. Through your browser you can <a href="/fs/">work with files</a>. Make sure you've set <code>CIRCUITPY_WEB_API_PASSWORD</code> in <code>/.env</code> and provide it when the browser prompts for it. Leave the username blank.
     <h2>Device Info</h2>
     Board: <a id="board"></a><br>
diff --git a/supervisor/shared/web_workflow/web_workflow.c b/supervisor/shared/web_workflow/web_workflow.c
