mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2025-10-24 12:17:40 +00:00
Code Issues Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
kepler155c@gmail.com
2017-10-23 19:33:53 -04:00
parent 22a432492c
commit 84b2b8ce63
6 changed files with 27 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sys/services/chat.lua
View File

@@ -1,43 +0,0 @@
local device = _G.device
local multishell = _ENV.multishell
local os = _G.os
if device.wireless_modem and false then
multishell.setTitle(multishell.getCurrent(), 'Chat')
multishell.openTab({
path = 'rom/programs/rednet/chat',
args = { 'host', 'opusChat-' .. os.getComputerID() },
title = 'Chat Daemon',
hidden = true,
})
local tab = multishell.getTab(multishell.getCurrent())
_G.requireInjector()
local Event = require('event')
local Util = require('util')
local h = Event.addRoutine(function()
while true do
Util.run(_ENV, 'rom/programs/rednet/chat',
'join', 'opusChat-' .. os.getComputerID(), 'owner')
end
end)
while true do
local e = { os.pullEventRaw() }
if e[1] == 'terminate' then
multishell.hideTab(tab.tabId)
else
if e[1] == 'rednet_message' and e[4] == 'chat' and e[3].sType == 'chat' then
if tab.hidden then
multishell.unhideTab(tab.tabId)
end
end
h:resume(table.unpack(e))
end
end
end

26
sys/services/network.lua
View File

@@ -1,17 +1,25 @@
requireInjector(getfenv(1))
_G.requireInjector()
local Util = require('util')
local device = _G.device
local fs = _G.fs
local multishell = _ENV.multishell
local os = _G.os
local printError = _G.printError
local network = { }
_G.network = network
multishell.setTitle(multishell.getCurrent(), 'Net Daemon')
_G.network = { }
local function netUp()
requireInjector(getfenv(1))
local Event = require('event')
_G.requireInjector()
local Event = require('event')
_G._e2 = _ENV
for _,file in pairs(fs.list('sys/network')) do
local fn, msg = Util.run(getfenv(1), 'sys/network/' .. file)
local fn, msg = Util.run(_ENV, 'sys/network/' .. file)
if not fn then
printError(msg)
end
@@ -40,8 +48,10 @@ print('Net daemon started')
local function startNetwork()
print('Starting network services')
_G._e1 = _ENV
local success, msg = Util.runFunction(
Util.shallowCopy(getfenv(1)), netUp)
Util.shallowCopy(_ENV), netUp)
if not success and msg then
printError(msg)
@@ -56,7 +66,7 @@ else
end
while true do
local e, deviceName = os.pullEvent('device_attach')
local _, deviceName = os.pullEvent('device_attach')
if deviceName == 'wireless_modem' then
startNetwork()
end