MayaTheShy/opus-apps
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

manipulator modules working after detach/reattach

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-07-15 20:10:06 -06:00
parent ae20a8ada7
commit e4b1b50117
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/etc/fstab
View File

@@ -1,2 +1,3 @@
packages/common/ascii.lua urlfs http://pastebin.com/raw/u3kcnyjd packages/common/ascii.lua urlfs http://pastebin.com/raw/u3kcnyjd
packages/common/hexedit.lua urlfs https://pastebin.com/raw/Ds9ajsp4 packages/common/hexedit.lua urlfs https://pastebin.com/raw/Ds9ajsp4
packages/common/colors.lua urlfs https://raw.githubusercontent.com/kepler155c/opus-apps/develop-1.8/ignore/colors.lua

3
ignore/colors.lua
View File

@@ -1,5 +1,4 @@
_G.requireInjector(_ENV) local Util = require('opus.util')
local Util = require('util')
local colors = _G.colors local colors = _G.colors
local term = _G.term local term = _G.term

5
milo/apis/storage.lua
View File

@@ -67,7 +67,7 @@ function Storage:init()
Event.on({ 'device_attach', 'device_detach' }, function(e, dev) Event.on({ 'device_attach', 'device_detach' }, function(e, dev)
_G._syslog('%s: %s', e, tostring(dev)) _G._syslog('%s: %s', e, tostring(dev))
self:initStorage() self:initStorage() -- this can yield - so we might miss events
end) end)
Event.onInterval(60, function() Event.onInterval(60, function()
self:showStorage() self:showStorage()
@@ -111,6 +111,9 @@ function Storage:initStorage()
if v.mtype ~= 'hidden' then if v.mtype ~= 'hidden' then
if v.adapter then if v.adapter then
v.adapter.online = not not device[k] v.adapter.online = not not device[k]
if v.adapter.online then
Util.merge(v.adapter, device[k])
end
elseif device[k] and device[k].list and device[k].size and device[k].pullItems then elseif device[k] and device[k].list and device[k].size and device[k].pullItems then
if v.adapterType then if v.adapterType then
v.adapter = require(v.adapterType)({ side = k }) v.adapter = require(v.adapterType)({ side = k })