Added loading bar

Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera 2015-06-29 18:53:14 +02:00
parent 4ca825d234
commit 120b4911b1
No known key found for this signature in database
GPG Key ID: DAF1D53BBD4D4790
3 changed files with 24 additions and 7 deletions

View File

@ -46,25 +46,41 @@ do
component.invoke(gpu, "bind", screen) component.invoke(gpu, "bind", screen)
w, h = component.invoke(gpu, "getResolution") w, h = component.invoke(gpu, "getResolution")
component.invoke(gpu, "setResolution", w, h) component.invoke(gpu, "setResolution", w, h)
h = h - 3
component.invoke(gpu, "setBackground", 0x555555)
component.invoke(gpu, "fill", 1, 1, w, 3, " ")
component.invoke(gpu, "setBackground", 0xAAAAAA)
component.invoke(gpu, "fill", 4, 2, w-7, 1, "-")
component.invoke(gpu, "setBackground", 0x000000) component.invoke(gpu, "setBackground", 0x000000)
component.invoke(gpu, "setForeground", 0xFFFFFF) component.invoke(gpu, "setForeground", 0xFFFFFF)
component.invoke(gpu, "fill", 1, 1, w, h, " ") component.invoke(gpu, "fill", 1, 4, w, h, " ")
end end
local y = 1 local y = 1
function kernel._println(msg) function kernel._println(msg)
if gpu and screen then if gpu and screen then
for line in string.gmatch(tostring(msg), "([^\n]+)") do for line in string.gmatch(tostring(msg), "([^\n]+)") do
kernel._K.component.invoke(gpu, "set", 1, y, line) kernel._K.component.invoke(gpu, "set", 1, y + 3, line)
if y == h then if y == h then
kernel._K.component.invoke(gpu, "copy", 1, 2, w, h - 1, 0, -1) kernel._K.component.invoke(gpu, "copy", 1, 2+3, w, h - 1, 0, -1)
kernel._K.component.invoke(gpu, "fill", 1, h, w, 1, " ") kernel._K.component.invoke(gpu, "fill", 1, h+3, w, 1, " ")
else else
y = y + 1 y = y + 1
end end
end end
end end
end end
function kernel._status(done)
if gpu and screen then
component.invoke(gpu, "setBackground", 0xFF0000)
component.invoke(gpu, "setForeground", 0x000000)
component.invoke(gpu, "fill", 4, 2, (w-7) * done, 1, "X")
component.invoke(gpu, "setBackground", 0x000000)
component.invoke(gpu, "setForeground", 0xFFFFFF)
end
end
kernel.io.println = kernel._println kernel.io.println = kernel._println
end end
@ -151,7 +167,7 @@ for i = 1, #modules do
kernel.io.println(result[2]) kernel.io.println(result[2])
kernel.panic() kernel.panic()
end end
kernel._status((0.5 / (#modules)) * i)
else else
kernel.io.println(reason) kernel.io.println(reason)
kernel.panic() kernel.panic()
@ -169,6 +185,7 @@ for i = 1, #modules do
kernel.panic() kernel.panic()
end end
end end
kernel._status(0.5 + (0.5 / (#modules)) * i)
end end
kernel.panic() kernel.panic()

View File

@ -1 +1 @@
{database="/var/lib/mpt/base.db",frontend={mpt={api="http://mpt.magik6k.net/api/"}},cacheDir="/var/lib/mpt/cache/"} {cacheDir="/var/lib/mpt/cache/",database="/var/lib/mpt/base.db",frontend={mpt={api="http://mpt.magik6k.net/api/"}}}

View File

@ -1 +1 @@
{installed={pipes={frontend="MPT",data={files={"/boot/kernel/pipes","/lib/modules/base/05_vfs.lua","/lib/modules/base/20_threading.lua","/lib/modules/base/19_manageg.lua","/lib/modules/base/25_init.lua","/lib/modules/base/15_userspace.lua","/usr/man/pipes","/lib/modules/base/16_buffer.lua","/lib/modules/base/17_io.lua","/lib/modules/base/16_require.lua","/lib/modules/base/18_syscall.lua","/lib/modules/base/21_threadUtil.lua","/lib/modules/base/21_timer.lua","/lib/modules/base/16_component.lua","/lib/modules/base/15_keventd.lua","/lib/modules/base/10_procfs.lua","/lib/modules/base/01_util.lua","/lib/modules/base/10_devfs.lua","/lib/modules/base/18_pty.lua","/lib/modules/base/17_keyboard.lua","/lib/modules/base/06_cowfs.lua","/lib/modules/base/09_rootfs.lua"},checksum="-409e583a9ec6fcc87e70326c1ef4c85d",dependencies={"openloader-init"},repo="plan9k",name="pipes"},deps={"openloader-init"}},["plan9k-coreutil"]={frontend="MPT",data={files={"/bin/echo.lua","/bin/wc.lua","/bin/ps.lua","/bin/lua.lua","/bin/kill.lua","/bin/reboot.lua","/bin/sleep.lua","/bin/clear.lua","/bin/components.lua","/bin/hostname.lua","/bin/dmesg.lua","/bin/shutdown.lua"},checksum="6ac1f869cdc43d4f19520a64f01fe3af",dependencies={"plan9k-corelibs","plan9k-fsutil"},repo="plan9k",name="plan9k-coreutil"},deps={"plan9k-corelibs","plan9k-fsutil"}},["plan9k-fsutil"]={frontend="MPT",data={files={"/bin/cat.lua","/bin/ln.lua","/bin/ls.lua","/bin/mv.lua","/bin/rm.lua","/bin/tee.lua","/bin/df.lua","/bin/dd.lua","/bin/cp.lua","/bin/touch.lua","/bin/mount.lua","/bin/mount.cow.lua","/bin/mkdir.lua"},checksum="1cb19ef3e4dfdc41faadf0cd6df02003",dependencies={"plan9k-corelibs"},repo="plan9k",name="plan9k-fsutil"},deps={"plan9k-corelibs"}},["plan9k-core"]={frontend="MPT",data={files={"/bin/init.lua","/bin/getty.lua","/bin/readkey.lua","/lib/rc.lua","/bin/rc.lua","/etc/rc.cfg"},checksum="-3d53e6f082cfe5a61d78c78e7293660b",dependencies={"pipes","plan9k-coreutil","plan9k-shell"},repo="plan9k",name="plan9k-core"},deps={"pipes","plan9k-coreutil","plan9k-shell"}},["plan9k-edit"]={frontend="MPT",data={files={"/bin/edit.lua"},checksum="fed5f4ee1212297b07247afa1cfe3a2",dependencies={},repo="plan9k",name="plan9k-edit"},deps={}},["openloader-init"]={frontend="MPT",data={files={"/init.lua"},checksum="-45e6d7b1e41468c1d335952ee3b89e13",dependencies={},repo="disks",name="openloader-init"},deps={}},plan9k={frontend="MPT",data={files={},checksum="-c16ccdf21a1ff13be8f6258d1a17d89",dependencies={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit"},repo="plan9k",name="plan9k"},deps={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit"}},mpt={frontend="MPT",data={files={"/usr/bin/mpt.lua"},checksum="f9d7744571e5c46c658f405043c656",dependencies={},repo="mpt",name="mpt"},deps={}},["plan9k-corelibs"]={frontend="MPT",data={files={"/lib/serialization.lua","/lib/term.lua","/lib/text.lua","/lib/shell.lua","/lib/event.lua"},checksum="7d4b91ee265f364a6deafd9ca2881efa",dependencies={},repo="plan9k",name="plan9k-corelibs"},deps={}},["plan9k-installer"]={frontend="MPT",data={files={"/bin/install.lua"},checksum="52c8f82357c966ce3e19c97bf3942012",dependencies={"plan9k","mpt"},repo="plan9k",name="plan9k-installer"},deps={"plan9k","mpt"}},["plan9k-drivers"]={frontend="MPT",data={files={"/lib/modules/base/17_tape.lua","/lib/modules/base/17_eeprom.lua"},checksum="-2a9819da9410d2803c1946d76bbd4250",dependencies={},repo="plan9k",name="plan9k-drivers"},deps={}},["plan9k-shell"]={frontend="MPT",data={files={"/bin/sh.lua"},checksum="49cb5a0a3dea62e73c409ec5072112ac",dependencies={},repo="plan9k",name="plan9k-shell"},deps={}},["plan9k-network"]={frontend="MPT",data={files={"/lib/internet.lua","/bin/pastebin.lua","/bin/wget.lua","/lib/modules/base/17_network.lua","/lib/modules/base/19_libnetwork.lua","/bin/arp.lua","/bin/ifconfig.lua","/bin/ping.lua","/bin/route.lua","/lib/modules/network/loopback.lua","/lib/modules/network/modem.lua","/usr/bin/nc.lua","/lib/modules/network/tunnel.lua"},checksum="336f43272f6b38051d71a5d640716df7",dependencies={},repo="plan9k",name="plan9k-network"},deps={}}}} {installed={["plan9k-corelibs"]={data={checksum="7d4b91ee265f364a6deafd9ca2881efa",dependencies={},name="plan9k-corelibs",repo="plan9k",files={"/lib/serialization.lua","/lib/term.lua","/lib/text.lua","/lib/shell.lua","/lib/event.lua"}},frontend="MPT",deps={}},["plan9k-coreutil"]={data={checksum="6ac1f869cdc43d4f19520a64f01fe3af",dependencies={"plan9k-corelibs","plan9k-fsutil"},name="plan9k-coreutil",repo="plan9k",files={"/bin/echo.lua","/bin/wc.lua","/bin/ps.lua","/bin/lua.lua","/bin/kill.lua","/bin/reboot.lua","/bin/sleep.lua","/bin/clear.lua","/bin/components.lua","/bin/hostname.lua","/bin/dmesg.lua","/bin/shutdown.lua"}},frontend="MPT",deps={"plan9k-corelibs","plan9k-fsutil"}},["plan9k-installer"]={data={checksum="52c8f82357c966ce3e19c97bf3942012",dependencies={"plan9k","mpt"},name="plan9k-installer",repo="plan9k",files={"/bin/install.lua"}},frontend="MPT",deps={"plan9k","mpt"}},["openloader-init"]={data={checksum="-45e6d7b1e41468c1d335952ee3b89e13",dependencies={},name="openloader-init",repo="disks",files={"/init.lua"}},frontend="MPT",deps={}},mpt={data={checksum="f9d7744571e5c46c658f405043c656",dependencies={},name="mpt",repo="mpt",files={"/usr/bin/mpt.lua"}},frontend="MPT",deps={}},["plan9k-network"]={data={checksum="336f43272f6b38051d71a5d640716df7",dependencies={},name="plan9k-network",repo="plan9k",files={"/lib/internet.lua","/bin/pastebin.lua","/bin/wget.lua","/lib/modules/base/17_network.lua","/lib/modules/base/19_libnetwork.lua","/bin/arp.lua","/bin/ifconfig.lua","/bin/ping.lua","/bin/route.lua","/lib/modules/network/loopback.lua","/lib/modules/network/modem.lua","/usr/bin/nc.lua","/lib/modules/network/tunnel.lua"}},frontend="MPT",deps={}},pipes={data={checksum="-1aed07cfc9b732061797c1092fb6bb19",dependencies={"openloader-init"},name="pipes",repo="plan9k",files={"/boot/kernel/pipes","/lib/modules/base/05_vfs.lua","/lib/modules/base/20_threading.lua","/lib/modules/base/19_manageg.lua","/lib/modules/base/25_init.lua","/lib/modules/base/15_userspace.lua","/usr/man/pipes","/lib/modules/base/16_buffer.lua","/lib/modules/base/17_io.lua","/lib/modules/base/16_require.lua","/lib/modules/base/18_syscall.lua","/lib/modules/base/21_threadUtil.lua","/lib/modules/base/21_timer.lua","/lib/modules/base/16_component.lua","/lib/modules/base/15_keventd.lua","/lib/modules/base/10_procfs.lua","/lib/modules/base/01_util.lua","/lib/modules/base/10_devfs.lua","/lib/modules/base/18_pty.lua","/lib/modules/base/17_keyboard.lua","/lib/modules/base/06_cowfs.lua","/lib/modules/base/09_rootfs.lua"}},frontend="MPT",deps={"openloader-init"}},["plan9k-fsutil"]={data={checksum="1cb19ef3e4dfdc41faadf0cd6df02003",dependencies={"plan9k-corelibs"},name="plan9k-fsutil",repo="plan9k",files={"/bin/cat.lua","/bin/ln.lua","/bin/ls.lua","/bin/mv.lua","/bin/rm.lua","/bin/tee.lua","/bin/df.lua","/bin/dd.lua","/bin/cp.lua","/bin/touch.lua","/bin/mount.lua","/bin/mount.cow.lua","/bin/mkdir.lua"}},frontend="MPT",deps={"plan9k-corelibs"}},["plan9k-shell"]={data={checksum="49cb5a0a3dea62e73c409ec5072112ac",dependencies={},name="plan9k-shell",repo="plan9k",files={"/bin/sh.lua"}},frontend="MPT",deps={}},["plan9k-edit"]={data={checksum="fed5f4ee1212297b07247afa1cfe3a2",dependencies={},name="plan9k-edit",repo="plan9k",files={"/bin/edit.lua"}},frontend="MPT",deps={}},["plan9k-core"]={data={checksum="-3d53e6f082cfe5a61d78c78e7293660b",dependencies={"pipes","plan9k-coreutil","plan9k-shell"},name="plan9k-core",repo="plan9k",files={"/bin/init.lua","/bin/getty.lua","/bin/readkey.lua","/lib/rc.lua","/bin/rc.lua","/etc/rc.cfg"}},frontend="MPT",deps={"pipes","plan9k-coreutil","plan9k-shell"}},["plan9k-drivers"]={data={checksum="-2a9819da9410d2803c1946d76bbd4250",dependencies={},name="plan9k-drivers",repo="plan9k",files={"/lib/modules/base/17_tape.lua","/lib/modules/base/17_eeprom.lua"}},frontend="MPT",deps={}},plan9k={data={checksum="-c16ccdf21a1ff13be8f6258d1a17d89",dependencies={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit"},name="plan9k",repo="plan9k",files={}},frontend="MPT",deps={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit"}}}}