From 042ba0918a1f9bb847169cb8ad9e7fc33523eaac Mon Sep 17 00:00:00 2001 From: Kiritow <1362050620@qq.com> Date: Sat, 24 Nov 2018 21:33:02 +0800 Subject: [PATCH] Move files --- grab.lua | 15 ++++-- checkarg.lua => libs/checkarg.lua | 0 libKGui.lua => libs/libKGui.lua | 0 libbundle.lua => libs/libbundle.lua | 0 libevent.lua => libs/libevent.lua | 0 libgpu.lua => libs/libgpu.lua | 0 libgui.lua => libs/libgui.lua | 0 libnetbox.lua => libs/libnetbox.lua | 0 libnetwork.lua => libs/libnetwork.lua | 0 libworld.lua => libs/libworld.lua | 0 .../simple_data_structure/class.lua | 0 .../simple_data_structure/queue.lua | 0 .../simple_data_structure/vector.lua | 0 util.lua => libs/util.lua | 0 programs.info | 50 ++++++++++++++++--- .../drone/drone_bios.lua | 0 .../drone/drone_console.lua | 0 .../smartstorage/SmartStorage.lua | 0 .../smartstorage/SmartStorageRobot.lua | 0 .../station/station_2_3.lua | 0 .../station/station_2_4.lua | 0 .../station/station_2_4_2.lua | 0 .../station/station_2_6.lua | 0 23 files changed, 54 insertions(+), 11 deletions(-) rename checkarg.lua => libs/checkarg.lua (100%) rename libKGui.lua => libs/libKGui.lua (100%) rename libbundle.lua => libs/libbundle.lua (100%) rename libevent.lua => libs/libevent.lua (100%) rename libgpu.lua => libs/libgpu.lua (100%) rename libgui.lua => libs/libgui.lua (100%) rename libnetbox.lua => libs/libnetbox.lua (100%) rename libnetwork.lua => libs/libnetwork.lua (100%) rename libworld.lua => libs/libworld.lua (100%) rename class.lua => libs/simple_data_structure/class.lua (100%) rename queue.lua => libs/simple_data_structure/queue.lua (100%) rename vector.lua => libs/simple_data_structure/vector.lua (100%) rename util.lua => libs/util.lua (100%) rename drone_bios.lua => programs/drone/drone_bios.lua (100%) rename drone_console.lua => programs/drone/drone_console.lua (100%) rename SmartStorage.lua => programs/smartstorage/SmartStorage.lua (100%) rename SmartStorageRobot.lua => programs/smartstorage/SmartStorageRobot.lua (100%) rename station_2_3.lua => programs/station/station_2_3.lua (100%) rename station_2_4.lua => programs/station/station_2_4.lua (100%) rename station_2_4_2.lua => programs/station/station_2_4_2.lua (100%) rename station_2_6.lua => programs/station/station_2_6.lua (100%) diff --git a/grab.lua b/grab.lua index 2026503..eab6939 100644 --- a/grab.lua +++ b/grab.lua @@ -387,12 +387,21 @@ if(args[1]=="show") then if(db[args[2]]) then local this_info=db[args[2]] print("Name: " .. args[2]) - print("Title: " .. db[args[2]].title) - print("Info:\n\t" .. db[args[2]].info) + if(this_info.deprecated) then + print("Title: [Deprecated] " .. this_info.title) + else + print("Title: " .. this_info.title) + end + print("Info: " .. this_info.info) + if(this_info.author) then print("Author: " .. this_info.author) end + if(this_info.contact) then print("Contact: " .. this_info.contact) end local nFiles=0 - for k,v in pairs(db[args[2]].files) do nFiles=nFiles+1 end + for k,v in pairs(this_info.files) do nFiles=nFiles+1 end print("Files: " .. nFiles) + + if(this_info.precheck) then print("Precheck: Yes") end + if(this_info.installer) then print("Installer: Yes") end else print("Library " .. args[2] .. " not found.") end diff --git a/checkarg.lua b/libs/checkarg.lua similarity index 100% rename from checkarg.lua rename to libs/checkarg.lua diff --git a/libKGui.lua b/libs/libKGui.lua similarity index 100% rename from libKGui.lua rename to libs/libKGui.lua diff --git a/libbundle.lua b/libs/libbundle.lua similarity index 100% rename from libbundle.lua rename to libs/libbundle.lua diff --git a/libevent.lua b/libs/libevent.lua similarity index 100% rename from libevent.lua rename to libs/libevent.lua diff --git a/libgpu.lua b/libs/libgpu.lua similarity index 100% rename from libgpu.lua rename to libs/libgpu.lua diff --git a/libgui.lua b/libs/libgui.lua similarity index 100% rename from libgui.lua rename to libs/libgui.lua diff --git a/libnetbox.lua b/libs/libnetbox.lua similarity index 100% rename from libnetbox.lua rename to libs/libnetbox.lua diff --git a/libnetwork.lua b/libs/libnetwork.lua similarity index 100% rename from libnetwork.lua rename to libs/libnetwork.lua diff --git a/libworld.lua b/libs/libworld.lua similarity index 100% rename from libworld.lua rename to libs/libworld.lua diff --git a/class.lua b/libs/simple_data_structure/class.lua similarity index 100% rename from class.lua rename to libs/simple_data_structure/class.lua diff --git a/queue.lua b/libs/simple_data_structure/queue.lua similarity index 100% rename from queue.lua rename to libs/simple_data_structure/queue.lua diff --git a/vector.lua b/libs/simple_data_structure/vector.lua similarity index 100% rename from vector.lua rename to libs/simple_data_structure/vector.lua diff --git a/util.lua b/libs/util.lua similarity index 100% rename from util.lua rename to libs/util.lua diff --git a/programs.info b/programs.info index cea339e..476f8f4 100644 --- a/programs.info +++ b/programs.info @@ -12,14 +12,21 @@ title="Arugment Checker", info="For easier argument checking", files={ - "checkarg.lua" + ["libs/checkarg.lua"]="checkarg.lua" + } + }, + ["util"]={ + title="Utility", + info="Misc programming helper.", + files={ + ["libs/util.lua"]="util.lua" } }, ["libevent"]={ title="LibEvent", info="For easier event processing", files={ - "libevent.lua" + ["libs/libevent.lua"]="libevent.lua" }, requires={ "checkarg" @@ -29,14 +36,16 @@ title="LibGPU", info="For easier gpu programming", files={ - "libgpu.lua" + ["libs/libgpu.lua"]="libgpu.lua" } }, ["simple_data_structure"]={ title="Simple Lua Data Structure", info="Provides class(...),queue and vector", files={ - "class.lua", "queue.lua", "vector.lua" + ["libs/simple_data_structure/class.lua"]="class.lua", + ["libs/simple_data_structure/queue.lua"]="queue.lua", + ["libs/simple_data_structure/vector.lua"]="vector.lua" } }, ["minesweeper"]={ @@ -55,8 +64,8 @@ author="Kiritow", contact="1362050620@qq.com", files={ - "drone_bios.lua", - "drone_console.lua" + ["programs/drone/drone_bios.lua"]="drone_bios.lua", + ["programs/drone/drone_console.lua"]="drone_console.lua" }, requires={ "libevent" @@ -64,13 +73,38 @@ }, ["smartstorage"]={ title="Smart Storage", - info="Smart Storage", + info="Smarter chests, auto-crafting...", author="Kiritow", files={ - "SmartStorage.lua" + ["programs/smartstorage/SmartStorage.lua"]="SmartStorage.lua" }, requires={ "libevent" } + }, + ["smartstoragerobot"]={ + title="Smart Storage Robot Client", + info="This is the client program of Smart Storage System.", + author="Kiritow", + files={ + ["programs/smartstorage/SmartStorageRobot.lua"]="SmartStorageRobot.lua" + }, + requires={ + "libevent" + } + }, + ["station"]={ + title="Station", + info="Collection of railway station control programs.", + deprecated=true, + files={ + ["programs/station/station_2_3.lua"]="station_2_3.lua", + ["programs/station/station_2_4.lua"]="station_2_4.lua", + ["programs/station/station_2_4_2.lua"]="station_2_4_2.lua", + ["programs/station/station_2_6.lua"]="station_2_6.lua" + }, + requires={ + "libevent","checkarg","util","simple_data_structure" + } } } \ No newline at end of file diff --git a/drone_bios.lua b/programs/drone/drone_bios.lua similarity index 100% rename from drone_bios.lua rename to programs/drone/drone_bios.lua diff --git a/drone_console.lua b/programs/drone/drone_console.lua similarity index 100% rename from drone_console.lua rename to programs/drone/drone_console.lua diff --git a/SmartStorage.lua b/programs/smartstorage/SmartStorage.lua similarity index 100% rename from SmartStorage.lua rename to programs/smartstorage/SmartStorage.lua diff --git a/SmartStorageRobot.lua b/programs/smartstorage/SmartStorageRobot.lua similarity index 100% rename from SmartStorageRobot.lua rename to programs/smartstorage/SmartStorageRobot.lua diff --git a/station_2_3.lua b/programs/station/station_2_3.lua similarity index 100% rename from station_2_3.lua rename to programs/station/station_2_3.lua diff --git a/station_2_4.lua b/programs/station/station_2_4.lua similarity index 100% rename from station_2_4.lua rename to programs/station/station_2_4.lua diff --git a/station_2_4_2.lua b/programs/station/station_2_4_2.lua similarity index 100% rename from station_2_4_2.lua rename to programs/station/station_2_4_2.lua diff --git a/station_2_6.lua b/programs/station/station_2_6.lua similarity index 100% rename from station_2_6.lua rename to programs/station/station_2_6.lua