finished vfs for a while

Src/Hyperion-firmware-cct/boot/cct/initdisks

@@ -1,18 +1,17 @@
---:Minify:--
+-- :Minify:--
 local apis = ({...})[1]
-local BOOT_DRIVE_PATH=apis.BOOT_DRIVE_PATH or "/$"
+local BOOT_DRIVE_PATH = apis.BOOT_DRIVE_PATH or "/$"
 local fs = apis.fs
 local native = apis.peripheral
 local peripheral = {}
 local sides = {"top", "bottom", "left", "right", "front", "back"}
 
 function peripheral.getType(name)
-    if native.isPresent(name) then
-        return native.getType(name)
-    end
+    if native.isPresent(name) then return native.getType(name) end
     for n = 1, #sides do
         local side = sides[n]
-        if native.hasType(side, "peripheral_hub") and native.call(side, "isPresentRemote", name) then
+        if native.hasType(side, "peripheral_hub") and
+            native.call(side, "isPresentRemote", name) then
             return native.call(side, "getTypeRemote", name)
         end
     end
@@ -23,9 +22,7 @@ function peripheral.getNames()
     local names = {}
     for n = 1, #sides do
         local side = sides[n]
-        if native.isPresent(side) then
-            table.insert(names, side)
-        end
+        if native.isPresent(side) then table.insert(names, side) end
         if native.hasType(side, "peripheral_hub") then
             local hubSides = native.call(side, "getConnectedSides")
             for _, hubSide in ipairs(hubSides) do
@@ -36,37 +33,30 @@ function peripheral.getNames()
     return names
 end
 
----------------------------------------------------------
--- STORAGE
----------------------------------------------------------
-local disks = {}      -- real disks
-local internal = {}   -- "$" disk
+local disks = {}
+local internal = {}
 
----------------------------------------------------------
--- HELPERS
----------------------------------------------------------
 local function norm(path)
     if not path or path == "" then return "/" end
     return fs.combine("/", path)
 end
 
---- Creates a disk object given a base path
 local function createDisk(id, basePath, readonly, periph)
     basePath = norm(basePath)
 
-    local disk = {address=id,isReadOnly=function() return readonly end}
+    local disk = {address = id, isReadOnly = function() return readonly end}
 
     function disk:spaceUsed()
         return fs.getCapacity(basePath) - fs.getFreeSpace(basePath)
     end
 
-    function disk:spaceTotal()
-        return fs.getCapacity(basePath)
-    end
+    function disk:spaceTotal() return fs.getCapacity(basePath) end
 
     function disk:list(path)
         local p = fs.combine(basePath, path)
-        if not fs.exists(p) or not fs.isDir(p) then return nil, "not directory" end
+        if not fs.exists(p) or not fs.isDir(p) then
+            return nil, "not directory"
+        end
         return fs.list(p)
     end
 
@@ -103,13 +93,9 @@ local function createDisk(id, basePath, readonly, periph)
         return true
     end
 
-    function disk:setLabel(label)
-        periph.setLabel(label)
-    end
+    function disk:setLabel(label) periph.setLabel(label) end
 
-    function disk:getLabel(label)
-        return periph.getLabel()
-    end
+    function disk:getLabel(label) return periph.getLabel() end
 
     function disk:attributes(path)
         local p = fs.combine(basePath, path)
@@ -120,39 +106,30 @@ local function createDisk(id, basePath, readonly, periph)
         local p = fs.combine(basePath, path)
         return fs.open(p, mode)
     end
-    
+
     return disk
 end
 
----------------------------------------------------------
--- INTERNAL DISK "$" (mapped to "/")
----------------------------------------------------------
 internal["$"] = createDisk("$", BOOT_DRIVE_PATH, false, {
-    setLabel=function(label)
+    setLabel = function(label)
         local h = fs.open("/.label", "w")
         h.write(label)
         h.close()
     end,
-    getLabel=function()
+    getLabel = function()
         local h = fs.open("/.label", "r")
+        if not h then return "$" end
         local label = h.readAll()
         h.close()
         return label
     end
 })
 
----------------------------------------------------------
--- SCAN REAL DISK PERIPHERALS
----------------------------------------------------------
 local function refresh()
-    -- remove disks that no longer exist
     for id, _ in pairs(disks) do
-        if not peripheral.getType(id) then
-            disks[id] = nil
-        end
+        if not peripheral.getType(id) then disks[id] = nil end
     end
 
-    -- detect new disks
     for _, name in ipairs(peripheral.getNames()) do
         if peripheral.getType(name) == "disk" then
             if not disks[name] then
@@ -165,28 +142,14 @@ local function refresh()
     end
 end
 
----------------------------------------------------------
--- ITERATOR
----------------------------------------------------------
 local function iter()
     refresh()
-    -- first internal
     local combined = {}
 
-    for id, obj in pairs(internal) do
-        combined[id] = obj
-    end
-    for id, obj in pairs(disks) do
-        combined[id] = obj
-    end
+    for id, obj in pairs(internal) do combined[id] = obj end
+    for id, obj in pairs(disks) do combined[id] = obj end
 
     return pairs(combined)
 end
 
----------------------------------------------------------
--- MODULE RETURN
----------------------------------------------------------
-return {
-    refresh = refresh,
-    list = iter
-}
+return {refresh = refresh, list = iter}