From b3c3ce482163ccb57c03d547c9492bca1cca2a8d Mon Sep 17 00:00:00 2001
From: Jordan Goulder <jordan@jordangoulder.com>
Date: Mon, 20 Jan 2025 12:51:58 -0500
Subject: [PATCH] Simplify file listing

---
 src/components/DiskInfo.vue | 15 ---------------
 src/floppy/disk.ts          | 31 ++++++++++++++++---------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/components/DiskInfo.vue b/src/components/DiskInfo.vue
index 2180809..f1aa175 100644
--- a/src/components/DiskInfo.vue
+++ b/src/components/DiskInfo.vue
@@ -37,19 +37,4 @@ pre {
   color: #c0c0c0;
   border: 1px solid rgba(255, 255, 255, 0.3);
 }
-
-:deep(ul) {
-  padding: 0;
-}
-
-:deep(ul ul) {
-  padding: 0 0 0 1.5em;
-}
-
-:deep(li) {
-  list-style: none;
-  line-height: 1.5rem;
-  margin: 0;
-  padding: 0;
-}
 </style>
diff --git a/src/floppy/disk.ts b/src/floppy/disk.ts
index 9d23ab5..244b1f9 100644
--- a/src/floppy/disk.ts
+++ b/src/floppy/disk.ts
@@ -192,34 +192,35 @@ export class FloppyDisk {
     return chain
   }
 
-  addDirectory(listing: string, entries: TDirEntry[]) {
-    listing += '\n<ul>'
-
+  addDirectory(listing: string, path: string[], entries: TDirEntry[]) {
     for (let i = 0; i < entries.length; i++) {
       const entry = entries[i]
-      if (entry.type !== 'standard-entry') {
+      if (
+        entry.type !== 'standard-entry' ||
+        entry.attributes.volumeId ||
+        entry.name === '..' ||
+        entry.name === '.'
+      ) {
         continue
       }
 
-      if (entry.name === '.' || entry.name === '..' || entry.attributes.volumeId) {
-        // do nothing
-      } else if (entry.attributes.directory) {
-        listing += `\n<li>${entry.name}\\`
-        listing = this.addDirectory(listing, entry.subDirEntries)
-        listing += '</li>\n'
+      listing += `${path.join('\\') + '\\'}${entry.name}`
+
+      if (entry.attributes.directory) {
+        listing += '\\<br/>'
+        listing = this.addDirectory(listing, [...path, entry.name], entry.subDirEntries)
       } else {
-        listing += `\n<li>${entry.name}</li>\n`
+        listing += '<br/>'
       }
     }
 
-    listing += '\n</ul>'
     return listing
   }
 
   buildFileListing(): string {
-    let listing = '<ul>A:\\'
-    listing += this.addDirectory('', this.rootDirEntries ?? [])
-    listing += '</ul>'
+    let listing = '<p>\\<br/>'
+    listing += this.addDirectory('', [''], this.rootDirEntries ?? [])
+    listing += '</p>'
     return listing
   }
 }