Merge pull request #162 from makermelissa/main

Fix file listing for CP 9
circuitpython · Feb 21, 2024 · 1780d47 · 1780d47
2 parents cc2603d + 5833721
commit 1780d47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -312,7 +312,7 @@ <h1>Select USB Host Folder</h1>
             <tbody>
                 <tr>
                     <td>Board:</td>
-                    <td><a id="board"></a></td>
+                    <td><a id="board" target="_blank"></a></td>
                 </tr>
                 <tr>
                     <td>Version:</td>

diff --git a/js/common/web-file-transfer.js b/js/common/web-file-transfer.js
@@ -131,12 +131,16 @@ class FileTransferClient {
 
         const response = await this._fetch(`/fs${path}`, {headers: {"Accept": "application/json"}});
         const results = await response.json();
-        for (let result of results) {
+        let listings = results
+        if (results.files !== undefined) {
+            listings = results.files;
+        }
+        for (let listing of listings) {
             contents.push({
-                path: result.name,
-                isDir: result.directory,
-                fileSize: result.file_size,
-                fileDate: Number(result.modified_ns / 1000000),
+                path: listing.name,
+                isDir: listing.directory,
+                fileSize: listing.file_size,
+                fileDate: Number(listing.modified_ns / 1000000),
             });
         }