xomf/keypadOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

:3333333 extra config stuff

Browse Source
This commit is contained in:
Gvidas Juknevičius 2024-08-18 14:37:59 +03:00
parent 2eb20cb6c5
commit 348e764adf
Signed by: MCorange
GPG Key ID: 12B1346D720B7FBB
6 changed files with 80 additions and 3092 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3033
basalt.lua
View File

File diff suppressed because one or more lines are too long

73
keypadOS.lua
View File

@ -7,26 +7,22 @@ local require = function(path)
return __DEFAULT_IMPORT(path)
end
end
rawset(__BUNDLER_FILES, "updater.lua", function ()
local utils = require("utils.lua")
local config = require("config.lua")
local LAST_USED = os.time()
local mod = {}
local function checkForUpdate()
local current_time = os.time()
local difference = math.abs(current_time - LAST_USED)
print("Checking for update... difference: " .. tostring(difference))
--its been considerable time since the keypad was interacted with
--therefore it's time to force an update down the users throat (microsoft moment)
if difference > .5 then
local update_code_request = http.get("https://git.mcorangehq.xyz/xomf/keypadOS/raw/branch/main/keypadOS.lua")
print("INFO: Updating! (diff: " .. tostring(difference) .. ")")
local update_code_request = http.get(config.release_url)
if update_code_request then
local update_code_text = update_code_request.readAll()
if update_code_text then
if string.find(update_code_text, "^local __BUNDLER_FILES = {}") then
--make backup
fs.copy("startup.lua","backup.lua")
--install update
local file = fs.open("startup.lua", "w")
file.write(update_code_text)
file.close()
@ -50,7 +46,7 @@ rawset(__BUNDLER_FILES, "updater.lua", function ()
utils.MonPrint("Basalt found!")
else
utils.MonPrint("Downloading basalt...")
local basalt_code = http.get("https://raw.githubusercontent.com/Pyroxenium/Basalt/master/docs/versions/latest.lua").readAll()
local basalt_code = http.get(config.release_url).readAll()
utils.MonPrint("Installing basalt...")
local file = fs.open("basalt.lua", "w")
if not file then
@ -65,35 +61,36 @@ rawset(__BUNDLER_FILES, "updater.lua", function ()
end
end
return mod
end) -- FILE END: updater.lua --
end)
rawset(__BUNDLER_FILES, "config.lua", function ()
return {
correctPin = "42169"
local config = {
correctPin = "42169",
release_url = "https://git.mcorangehq.xyz/xomf/keypadOS/raw/branch/main/keypadOS.lua",
basalt_url = "https://raw.githubusercontent.com/Pyroxenium/Basalt/master/docs/versions/latest.lua",
config_path = "keypadOS.config.lua"
}
end) -- FILE END: config.lua --
local DEFAULT_CONFIG = "return {\n" ..
" group=\"default\",\n" ..
"}\n"
function config.ReadConfig()
if not fs.exists(config.config_path) then
local f = fs.open(config.config_path, "w")
f.write(DEFAULT_CONFIG)
f.close();
end
local cfg = require(config.config_path)
return cfg
end
return config
end)
rawset(__BUNDLER_FILES, "ui.lua", function ()
local utils = require("utils.lua")
local basalt = require("basalt")
local config = require("config.lua")
local updater = require("updater.lua")
--- @type Monitor
local monitor = utils.Cast(peripheral.find("monitor"))
--- @type drive
local drive = utils.Cast(peripheral.find("drive"))
local mod = {}
--- @class Ui
--- @field pin string
--- @field main any
--- @field pinLabel any
--- @field enterButton any
--- @field resetEverything function
--- @field unlockDoor function
--- @field addToPin function
--- @param ui Ui
local function resetEverything(ui)
sleep(2)
ui.pin = ""
@ -101,7 +98,6 @@ rawset(__BUNDLER_FILES, "ui.lua", function ()
redstone.setOutput("front", false)
ui.enterButton:setBackground(colors.blue)
end
--- @param ui Ui
local function unlockDoor(ui)
if drive.isDiskPresent() then
if drive.getDiskLabel() == config.correctPin then
@ -129,7 +125,6 @@ rawset(__BUNDLER_FILES, "ui.lua", function ()
resetEverything(ui)
end)
end
--- @param ui Ui
local function addToPin(ui, i)
if #ui.pin >= 5 then
return
@ -180,23 +175,15 @@ rawset(__BUNDLER_FILES, "ui.lua", function ()
fs.delete("startup.lua")
fs.copy("backup.lua", "startup.lua")
os.exit()
-- os.reboot()
end
end
return mod
end) -- FILE END: ui.lua --
end)
rawset(__BUNDLER_FILES, "utils.lua", function ()
local utils = {}
-- Type coersion for lsp
---@generic T
---@param object any
---@return T
function utils.Cast(object)
return object
end
--- @type Monitor
local MONITOR = utils.Cast(peripheral.find("monitor"))
local MONITOR_Y = 1
function utils.MonPrint(text)
@ -209,12 +196,8 @@ rawset(__BUNDLER_FILES, "utils.lua", function ()
MONITOR.setTextScale(scale)
end
return utils;
end) -- FILE END: utils.lua --
end)
rawset(__BUNDLER_FILES, "main.lua", function ()
-- keycardOS "bootloader", has no access to basalt
-- intended for checking for updates, and automatically updating basalt if it is missing
local utils = require("utils.lua")
local updater = require("updater.lua")
local main = {}
@ -227,7 +210,5 @@ rawset(__BUNDLER_FILES, "main.lua", function ()
require("ui.lua").InitUi()
end
return main
end) -- FILE END: main.lua --
end)
require("main.lua").Main()

28
src/config.lua
View File

@ -1,3 +1,27 @@
return {
correctPin = "42169"
local config = {
correctPin = "42169",
release_url = "https://git.mcorangehq.xyz/xomf/keypadOS/raw/branch/main/keypadOS.lua",
basalt_url = "https://raw.githubusercontent.com/Pyroxenium/Basalt/master/docs/versions/latest.lua",
config_path = "keypadOS.config.lua"
}
local DEFAULT_CONFIG = "return {\n" ..
" group=\"default\",\n" ..
"}\n"
--- @class Config
--- @field group string
--- Read current configs, create if doesnt exist
---@return Config
function config.ReadConfig()
if not fs.exists(config.config_path) then
local f = fs.open(config.config_path, "w")
f.write(DEFAULT_CONFIG)
f.close();
end
local cfg = require(config.config_path)
return cfg
end
return config

2
src/main.lua
View File

@ -2,8 +2,6 @@
-- intended for checking for updates, and automatically updating basalt if it is missing
local utils = require("utils.lua")
local updater = require("updater.lua")
local main = {}

9
src/updater.lua
View File

@ -1,5 +1,5 @@
local utils = require("utils.lua")
local config = require("config.lua")
local LAST_USED = os.time()
local mod = {}
@ -7,11 +7,12 @@ local mod = {}
local function checkForUpdate()
local current_time = os.time()
local difference = math.abs(current_time - LAST_USED)
print("Checking for update... difference: " .. tostring(difference))
-- print("INFO: Checking for update... difference: " .. tostring(difference))
--its been considerable time since the keypad was interacted with
--therefore it's time to force an update down the users throat (microsoft moment)
if difference > .5 then
local update_code_request = http.get("https://git.mcorangehq.xyz/xomf/keypadOS/raw/branch/main/keypadOS.lua")
print("INFO: Updating! (diff: " .. tostring(difference) .. ")")
local update_code_request = http.get(config.release_url)
if update_code_request then
local update_code_text = update_code_request.readAll()
if update_code_text then
@ -45,7 +46,7 @@ function mod.GetBasalt()
utils.MonPrint("Basalt found!")
else
utils.MonPrint("Downloading basalt...")
local basalt_code = http.get("https://raw.githubusercontent.com/Pyroxenium/Basalt/master/docs/versions/latest.lua").readAll()
local basalt_code = http.get(config.release_url).readAll()
utils.MonPrint("Installing basalt...")
local file = fs.open("basalt.lua", "w")

27
x.py
View File

@ -9,16 +9,30 @@ FILES= [
"main.lua",
]
MINIMISE=True
def read_file(p: str) -> str:
buf = "";
with open("src/"+p, "r", encoding="utf-8") as f:
buf += f"\nrawset(__BUNDLER_FILES, \"{p}\", function ()\n";
buf += f"rawset(__BUNDLER_FILES, \"{p}\", function ()\n";
for line in f.readlines():
if str.strip(line) != "":
buf += " " + line;
buf += f"\nend) -- FILE END: {p} --\n";
buf += " " + line;
buf += "\nend)";
if not MINIMISE:
buf += f"-- FILE END: {p} --\n";
else:
buf += "\n";
return buf;
def minimise(buf: str) -> str:
newbuf = "";
for line in buf.splitlines():
if line.strip().startswith("--"):
continue;
if line.strip() == "":
continue
newbuf += line + "\n";
return newbuf;
def main():
buf = ""
@ -36,7 +50,10 @@ def main():
print(f"=== FILE: {file}");
buf += read_file(file);
buf += "\nrequire(\"main.lua\").Main()\n";
buf += "require(\"main.lua\").Main()\n";
if MINIMISE:
buf = minimise(buf);
with open(OUTPUT, "w", encoding="utf-8") as f:
f.write(buf);