miniOS 0.5.9.7

Added file management commands. Will not work between drives.

Signed-off-by: Skye M. <[email protected]>

Author: skyem123

miniOS/command.lua

@@ -8,13 +8,19 @@ local tArgs={...}
 local continue
 if tArgs[1] == "-c" then continue = true table.remove(tArgs, 1) end
 
-local function intro() print(_OSVERSION .. " [".. math.floor(computer.totalMemory()/1024).."k RAM, at least "..math.floor(miniOS.freeMem/1024).."k Free]" .."\nCommand Interpreter By Skye M.\n") end 
+local function intro() print(_OSVERSION .. " [".. math.floor(computer.totalMemory()/1024).."k RAM, around "..math.floor(miniOS.freeMem/1024).."k Free]" .."\nCommand Interpreter By Skye M.\n") end 
 if not continue then intro() end
 
 local history = {}
 if miniOS.cmdHistory then history = miniOS.cmdHistory end
 if miniOS.cmdDrive then fs.drive.setcurrent(miniOS.cmdDrive) end
 
+local function fixPath(path)
+	checkArg(1, path, "string")
+	if path:sub(1,1) == '"' and path:sub(-1,-1) == '"' then path = path:sub(2, -2) end
+	return path
+end
+
 local function runprog(file, parts)
 	miniOS.cmdHistory = history
 	miniOS.cmdDrive = fs.drive.getcurrent()
@@ -34,7 +40,7 @@ end
 
 local function lables()
 	for letter, address in fs.drive.list() do
-		print(letter, component.invoke(address, "getLabel"))
+		print(letter, component.invoke(address, "getLabel") or "")
 	end
 end
 
@@ -85,6 +91,57 @@ local function dir(folder)
 	printPaged(output)
 end
 
+local function moveFile(from, to, force)
+	checkArg(1, from, "string")
+	checkArg(2, to, "string")
+	if fs.isDirectory(to) then
+		to = to .. "/" .. fs.name(from)
+	end
+	if fs.exists(to) then
+		if not force then
+			printErr("target file exists")
+			return
+		end
+		fs.remove(to)
+	end
+	local result, reason = fs.rename(from, to)
+	if not result then
+		error(reason or "unknown error", 0)
+	end
+end
+
+local function copyFile(from, to, force)
+	checkArg(1, from, "string")
+	checkArg(2, to, "string")
+	if fs.isDirectory(to) then
+		to = to .. "/" .. fs.name(from)
+	end
+	if fs.exists(to) then
+		if not force then
+			printErr("target file exists")
+			return
+		end
+		fs.remove(to)
+	end
+	local result, reason = fs.copy(from, to)
+	if not result then
+		error(reason or "unknown error", 0)
+	end
+end
+
+local function twoFileCommandHelper(run, parts)
+	if #parts >= 3 then
+		if parts[2] == "-f" then
+			table.remove(parts, 2)
+			run(fixPath(parts[2]), fixPath(parts[3]), true)
+			return true
+		else
+			run(fixPath(parts[2]), fixPath(parts[3]))
+			return true
+		end
+	else printErr("Bad Parameters!") return true end
+end
+
 local function runline(line)
 	line = text.trim(line)
 	if line == "" then return true end
@@ -121,16 +178,23 @@ local function runline(line)
 	if command == "cls" then term.clear() return true end
 	if command == "ver" then print(_OSVERSION) return true end
 	if command == "mem" then print(math.floor(computer.totalMemory()/1024).."k RAM, "..math.floor(computer.freeMemory()/1024).."k Free") return true end
-	if command == "dir" then dir() return true end
+	if command == "dir" then if parts[2] then dir(fixPath(parts[2])) else dir() end return true end
 	if command == "intro" then intro() return true end
 	if command == "disks" then listdrives() return true end
 	if command == "discs" then listdrives() return true end
 	if command == "drives" then listdrives() return true end
 	if command == "labels" then lables() return true end
-	if command == "label" then if parts[2] then label(parts) return true else print("Invalid Parameters") return false end end
-	if command == "type" then outputFile(parts[2]) return true end
-	if command == "more" then outputFile(parts[2], true) return true end
+	if command == "label" then if parts[2] then label(parts) return true else printErr("Invalid Parameters") return false end end
+	if command == "type" then outputFile(fixPath(parts[2])) return true end
+	if command == "more" then outputFile(fixPath(parts[2]), true) return true end
 	if command == "echo" then print(table.concat(parts, " ", 2)) return true end
+	if command == "print" then print(table.concat(parts, "\t", 2)) return true end
+	if command == "touch" then filesystem.close(filesystem.open(fixPath(parts[2]), 'w')) return true end
+	if command == "del" then filesystem.remove(fixPath(parts[2])) return true end
+	if command == "copy" then return twoFileCommandHelper(copyFile, parts) end
+	if command == "rename" then return twoFileCommandHelper(moveFile, parts) end
+	if command == "ren" then return twoFileCommandHelper(moveFile, parts) end
+	if command == "move" then return twoFileCommandHelper(moveFile, parts) end
 	if command == "cmds" then printPaged([[
 Internal Commands:
 exit --- Exit the command interpreter, Usually restarts it.
@@ -146,8 +210,11 @@ label -- Sets the label of a drive.
 echo --- Outputs its arguments.
 type --- Like echo, but outputs a file.
 more --- Like type, but the output is paged.
+touch -- Creates a file.
+del ---- Deletes a file.
 copy --- Copies a file.
-move --- Moves a file.]]) print() return true end
+move --- Moves a file.
+ren ---- Renames a file.]]) print() return true end
 	print("'" .. parts[1] .. "' is not an internal or external command, program or batch file.")
 	return false
 end

miniOS/minios.lua

@@ -1,5 +1,5 @@
-_G._OSNAME = "MiniOS"
-_G._OSVER = "0.5.9.5"
+_G._OSNAME = "miniOS"
+_G._OSVER = "0.5.9.7"
 _G._OSVERSION = _OSNAME .. " " .. _OSVER
 
 --component code
@@ -228,6 +228,10 @@ function text_code()
 
   -------------------------------------------------------------------------------
 
+  function text.endswith(s, send)
+    return #s >= #send and s:find(send, #s-#send+1, true) and true or false
+  end
+  
   return text
 end
 --event code
@@ -419,24 +423,44 @@ function event_code()
 
   return event
 end
---Simple filesystem code
+--filesystem code
 function fs_code()
   local fs = {}
   fs.drive = {}
-  fs.drive._map = { ["A"]=computer.getBootAddress(), ["X"]=computer.tmpAddress() } --Z: will be the unix style root
+  --drive mapping table, initilized later
+  fs.drive._map = {}
+  --converts a drive letter into a proxy
+  function fs.drive.letterToProxy(letter)
+	return fs.drive._map[letter]
+  end
+  --finds the proxy associated with the letter
+  function fs.drive.proxyToLetter(proxy)
+    for l,p in pairs(fs.drive._map) do
+	  if p == proxy then return l end
+	end
+	return nil
+  end
+  --maps a proxy to a letter
+  function fs.drive.mapProxy(letter, proxy)
+    fs.drive._map[letter] = proxy
+  end
+  --finds the address of a drive letter.
   function fs.drive.toAddress(letter)
-    return fs.drive._map[letter]
+    return fs.drive._map[letter].address
   end
+  --finds the drive letter mapped to an address
   function fs.drive.toLetter(address)
-	for l,a in pairs(fs.drive._map) do
-	  if a == address then return l end
+	for l,p in pairs(fs.drive._map) do
+	  if p.address == address then return l end
 	end
 	return nil
   end
   function fs.drive.mapAddress(letter, address)
-    fs.drive._map[letter] = address
+	--print("mapAddress")
+    fs.drive._map[letter] = fs.proxy(address)
   end
   function fs.drive.autoMap(address) --returns the letter if mapped OR already mapped, false if not.
+	--print("autoMap")
 	--we get the address and see if it already is mapped...
 	local l = fs.drive.toLetter(address)
 	if l then return l end
@@ -450,28 +474,38 @@ function fs_code()
 		if l == "_" then return false end
 	end
   end
-  function fs.drive.list()
+  function fs.drive.listProxy()
     local t = fs.drive._map
-    local a = {}
-	for n in pairs(t) do table.insert(a, n) end
-    table.sort(a, f)
+    local p = {}
+	for n in pairs(t) do table.insert(p, n) end
+    table.sort(p, f)
     local i = 0      -- iterator variable
     local iter = function ()   -- iterator function
       i = i + 1
-      if a[i] == nil then return nil
-      else return a[i], t[a[i]]
+      if p[i] == nil then return nil
+      else return p[i], t[p[i]]
       end
     end
     return iter
   end
+  function fs.drive.list()
+    local i = 0      -- iterator variable
+	local proxyIter = fs.drive.listProxy()
+    local iter = function ()   -- iterator function
+	  l, p = proxyIter()
+	  if not l then return nil end
+      return l, p.address
+    end
+	return iter
+  end
   fs.drive._current = "A" --as the boot drive is A:
   function fs.drive.setcurrent(letter)
 	letter = letter:upper()
     if not fs.drive._map[letter] then error("Invalid Drive", 2) end
     fs.drive._current = letter
 	end
   function fs.drive.getcurrent() return fs.drive._current end
-  function fs.invoke(method, ...) return component.invoke(fs.drive.toAddress(fs.drive._current), method, ...) end
+  function fs.invoke(method, ...) return fs.drive._map[fs.drive._current][method](...) end
   function fs.proxy(filter)
     checkArg(1, filter, "string")
     local address
@@ -499,6 +533,39 @@ function fs_code()
   function fs.close(handle) return fs.invoke("close", handle) end
   function fs.isDirectory(path) return fs.invoke("isDirectory", path) end
   function fs.exists(path) return fs.invoke("exists", path) end
+  function fs.remove(path) return fs.invoke("remove", path) end
+  function fs.copy(fromPath, toPath)
+    if fs.isDirectory(fromPath) then
+      return nil, "cannot copy folders"
+    end
+    local input, reason = fs.open(fromPath, "rb")
+    if not input then
+      return nil, reason
+    end
+    local output, reason = fs.open(toPath, "wb")
+    if not output then
+      fs.close(input)
+    return nil, reason
+    end
+    repeat
+      local buffer, reason = filesystem.read(input)
+      if not buffer and reason then
+        return nil, reason
+      elseif buffer then
+        local result, reason = filesystem.write(output, buffer)
+        if not result then
+          filesystem.close(input)
+          filesystem.close(output)
+          return nil, reason
+          end
+        end
+    until not buffer
+    filesystem.close(input)
+    filesystem.close(output)
+    return true
+  end
+  function fs.rename(path1, path2) return fs.invoke("rename", path1, path2) end
+  function fs.makeDirectory(path) return fs.invoke("makeDirectory", path) end
   function fs.list(path)
     local i = 0
     local t = fs.invoke("list", path)
@@ -517,12 +584,18 @@ function fs_code()
     end
   end
   local function onComponentRemoved(_, address, componentType)
-  if componentType == "filesystem" then
-    fs.drive.mapAddress(fs.drive.toLetter(address), nil)
+    if componentType == "filesystem" then
+      fs.drive.mapAddress(fs.drive.toLetter(address), nil)
+    end
   end
-end
   event.listen("component_added", onComponentAdded)
   event.listen("component_removed", onComponentRemoved)
+  local function driveInit()
+    local boot = fs.proxy(computer.getBootAddress())
+    local temp = fs.proxy(computer.tmpAddress())
+    fs.drive._map = { ["A"]=boot, ["X"]=temp } 
+  end
+  driveInit()
   --return the API
   return fs
 end
@@ -1043,15 +1116,14 @@ end
 
 print("Starting " .. _OSNAME .. "...\n")
 
+--clean up libs
+event_code, component_code, text_code, fs_code, terminal_code = nil, nil, nil, nil, nil
+
 --map the drives
 for address, componentType in component.list() do 
   if componentType == "filesystem" then filesystem.drive.autoMap(address) end
 end
 
-function text.endswith(s, send)
-return #s >= #send and s:find(send, #s-#send+1, true) and true or false
-end
-
 miniOS = {}
 local function interrupt(data)
   if data[2] == "RUN" then miniOS.runfile(data[3], table.unpack(data[4])) end

miniOS/power.lua

@@ -2,6 +2,7 @@ local targs = {...}
 local computer = require("computer")
 print(...)
 if not targs[1] then computer.shutdown()
-elseif targs[1] == "s" then computer.shutdown()
-elseif targs[1] == "r" then computer.shutdown(true) end
-error("Could not shutdown!")
+elseif targs[1]:sub(1,1) == "s" then computer.shutdown()
+elseif targs[1]:sub(1,1) == "r" then computer.shutdown(true)
+elseif targs[1] then print("Bad Argument: " .. targs[1] .. "\nTry 'r' or 's' or no argument") return end
+error("Could not Shutdown!")

miniOS/sked.lua

@@ -0,0 +1,16 @@
+local b={}
+local l=1
+local function ctr() s=term.read() s=s:sub(1,s:len()-1) return s end
+local function p(d) term.write(d,true) end
+while true do
+local c=ctr()
+if c=="l" then for k,v in pairs(b) do p(v.."\n") end
+elseif c=="lc" then p(tostring(b[l]).."\n")
+elseif c=="s" then p">" l=tonumber(ctr())
+elseif c=="so" then p(l)
+elseif c=="a" then p":" table.insert(b,l,ctr()) l=l+1
+elseif c=="r" then p":" b[l]=ctr()
+elseif c=="d" then p(table.remove(b,l))
+elseif c=="o" then p">" local rF=ctr() local f=filesystem.open(rF) local a=filesystem.read(f) filesystem.close(f) for L in a:gmatch("[^\r\n]+") do table.insert(b,l,L) l=l+1 end
+elseif c=="w" then p">" local wT=ctr() local f=filesystem.open(wT,"w") for k,v in pairs(b) do filesystem.write(f,v.."\n") end filesystem.close(f)
+elseif c=="e" then break else p"?" end end

miniOS/todo.txt

@@ -1,16 +1,12 @@
-use startswith() in shutdown
-use fs proxies in fs
+pastebin port
 basic directory support
-improve dir command
-file management commands
-resolution command
-handle bad programs in the kernel
+resolution+other screen control command
 fix readkey echo
+advanced directory&path support. (paths like MS-DOS. with "/" and "\") (with unix option!)
 disk cloner + images (miniOS + openOS)
-move program starting function to kernel. Improve with command / args to run when done.
+move program starting function to kernel. Program Stack? (With arguments)
 os libary
 tape drive?
-directory support. (paths like MS-DOS. with "/" and "\") (with unix option!)
 io implementation
 batch files
 check for bad drives in command
@@ -19,5 +15,4 @@ very basic require. (libaryies already stored)
 automatic clean up of unused drives
 run miniOS programs on openOS
 use coroutienes for interrupts
-make things look nicer
-swap internal / external commands?
+make things look nicer

miniOS/version.txt

@@ -1,3 +1,3 @@
 miniOS
-0.5.9.5
+0.5.9.7
 Alpha