From 343ce7fdc2814c9de4786f68ed841b754681e46a Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Fri, 28 Jun 2019 13:50:02 -0400 Subject: [PATCH] move apis into rom/modules/main for shell compatibility --- sys/apps/Files.lua | 10 +++++----- sys/apps/Help.lua | 4 ++-- sys/apps/Lua.lua | 6 +++--- sys/apps/Network.lua | 10 +++++----- sys/apps/Overview.lua | 18 +++++++++--------- sys/apps/PackageManager.lua | 8 ++++---- sys/apps/System.lua | 4 ++-- sys/apps/Tasks.lua | 4 ++-- sys/apps/Welcome.lua | 8 ++++---- sys/apps/autorun.lua | 2 +- sys/apps/cedit.lua | 2 +- sys/apps/cshell.lua | 2 +- sys/apps/netdaemon.lua | 4 ++-- sys/apps/network/proxy.lua | 6 +++--- sys/apps/network/samba.lua | 4 ++-- sys/apps/network/snmp.lua | 8 ++++---- sys/apps/network/telnet.lua | 6 +++--- sys/apps/network/transport.lua | 2 +- sys/apps/network/trust.lua | 10 +++++----- sys/apps/network/vnc.lua | 6 +++--- sys/apps/package.lua | 8 ++++---- sys/apps/password.lua | 6 +++--- sys/apps/pastebin.lua | 2 +- sys/apps/shell.lua | 16 ++++++++-------- sys/apps/system/aliases.lua | 4 ++-- sys/apps/system/cloud.lua | 6 +++--- sys/apps/system/kiosk.lua | 2 +- sys/apps/system/label.lua | 4 ++-- sys/apps/system/launcher.lua | 4 ++-- sys/apps/system/network.lua | 6 +++--- sys/apps/system/password.lua | 6 +++--- sys/apps/system/path.lua | 6 +++--- sys/apps/system/requires.lua | 6 +++--- sys/apps/system/settings.lua | 2 +- sys/apps/system/shell.lua | 6 +++--- sys/apps/telnet.lua | 8 ++++---- sys/apps/trust.lua | 10 +++++----- sys/apps/vnc.lua | 8 ++++---- sys/autorun/clipboard.lua | 2 +- sys/autorun/hotkeys.lua | 2 +- sys/autorun/welcome.lua | 4 ++-- sys/boot/opus.boot | 10 +++++----- sys/init/1.device.lua | 6 +++--- sys/init/2.vfs.lua | 4 ++-- sys/init/3.modules.lua | 2 +- sys/init/4.user.lua | 6 +++--- sys/init/5.network.lua | 2 +- sys/init/6.packages.lua | 8 +++++--- sys/init/6.tl3.lua | 8 ++++---- sys/init/7.multishell.lua | 6 +++--- sys/kernel.lua | 4 ++-- sys/{apis => modules/opus}/ansi.lua | 0 sys/{apis => modules/opus}/array.lua | 0 sys/{apis => modules/opus}/bulkget.lua | 2 +- sys/{apis => modules/opus}/class.lua | 0 sys/{apis => modules/opus}/config.lua | 2 +- sys/{apis => modules/opus}/crypto/chacha20.lua | 4 ++-- .../opus}/crypto/ecc/elliptic.lua | 2 +- sys/{apis => modules/opus}/crypto/ecc/fp.lua | 0 sys/{apis => modules/opus}/crypto/ecc/fq.lua | 0 sys/{apis => modules/opus}/crypto/ecc/init.lua | 6 +++--- sys/{apis => modules/opus}/crypto/sha2.lua | 0 sys/{apis => modules/opus}/entry.lua | 2 +- sys/{apis => modules/opus}/event.lua | 0 sys/{apis => modules/opus}/fs/gitfs.lua | 2 +- sys/{apis => modules/opus}/fs/linkfs.lua | 0 sys/{apis => modules/opus}/fs/netfs.lua | 4 ++-- sys/{apis => modules/opus}/fs/ramfs.lua | 2 +- sys/{apis => modules/opus}/fs/urlfs.lua | 2 +- sys/{apis => modules/opus}/git.lua | 4 ++-- sys/{apis => modules/opus}/gps.lua | 0 sys/{apis => modules/opus}/history.lua | 2 +- sys/{apis => modules/opus}/http/pastebin.lua | 0 sys/{apis => modules/opus}/injector.lua | 14 ++++++++++---- sys/{apis => modules/opus}/input.lua | 4 ++-- sys/{apis => modules/opus}/json.lua | 0 .../opus}/jumper/core/bheap.lua | 0 .../opus}/jumper/core/node.lua | 0 .../opus}/jumper/core/path.lua | 0 .../opus}/jumper/core/utils.lua | 0 sys/{apis => modules/opus}/jumper/grid.lua | 0 .../opus}/jumper/pathfinder.lua | 0 .../opus}/jumper/search/astar.lua | 0 sys/{apis => modules/opus}/map.lua | 2 +- sys/{apis => modules/opus}/nft.lua | 2 +- sys/{apis => modules/opus}/packages.lua | 2 +- sys/{apis => modules/opus}/pathfind.lua | 8 ++++---- sys/{apis => modules/opus}/peripheral.lua | 4 ++-- sys/{apis => modules/opus}/point.lua | 2 +- sys/{apis => modules/opus}/security.lua | 6 +++--- sys/{apis => modules/opus}/socket.lua | 6 +++--- sys/{apis => modules/opus}/sound.lua | 0 sys/{apis => modules/opus}/sync.lua | 0 sys/{apis => modules/opus}/terminal.lua | 2 +- sys/{apis => modules/opus}/trace.lua | 0 sys/{apis => modules/opus}/ui.lua | 16 ++++++++-------- sys/{apis => modules/opus}/ui/canvas.lua | 6 +++--- .../opus}/ui/components/ActiveLayer.lua | 4 ++-- .../opus}/ui/components/Button.lua | 6 +++--- .../opus}/ui/components/Checkbox.lua | 4 ++-- .../opus}/ui/components/Chooser.lua | 6 +++--- .../opus}/ui/components/Dialog.lua | 8 ++++---- .../opus}/ui/components/DropMenu.lua | 6 +++--- .../opus}/ui/components/DropMenuItem.lua | 4 ++-- .../opus}/ui/components/Embedded.lua | 6 +++--- .../opus}/ui/components/Form.lua | 6 +++--- .../opus}/ui/components/Grid.lua | 6 +++--- .../opus}/ui/components/Image.lua | 4 ++-- .../opus}/ui/components/Menu.lua | 4 ++-- .../opus}/ui/components/MenuBar.lua | 4 ++-- .../opus}/ui/components/MenuItem.lua | 4 ++-- .../opus}/ui/components/NftImage.lua | 4 ++-- .../opus}/ui/components/Notification.lua | 10 +++++----- .../opus}/ui/components/ProgressBar.lua | 4 ++-- .../opus}/ui/components/ScrollBar.lua | 6 +++--- .../opus}/ui/components/ScrollingGrid.lua | 6 +++--- .../opus}/ui/components/SlideOut.lua | 4 ++-- .../opus}/ui/components/StatusBar.lua | 8 ++++---- .../opus}/ui/components/Tab.lua | 4 ++-- .../opus}/ui/components/TabBar.lua | 6 +++--- .../opus}/ui/components/TabBarMenuItem.lua | 4 ++-- .../opus}/ui/components/Tabs.lua | 6 +++--- .../opus}/ui/components/Text.lua | 6 +++--- .../opus}/ui/components/TextArea.lua | 4 ++-- .../opus}/ui/components/TextEntry.lua | 8 ++++---- .../opus}/ui/components/Throttle.lua | 4 ++-- .../opus}/ui/components/TitleBar.lua | 4 ++-- .../opus}/ui/components/VerticalMeter.lua | 4 ++-- .../opus}/ui/components/Viewport.lua | 4 ++-- .../opus}/ui/components/Wizard.lua | 6 +++--- .../opus}/ui/components/WizardPage.lua | 4 ++-- sys/{apis => modules/opus}/ui/region.lua | 0 sys/{apis => modules/opus}/ui/transition.lua | 2 +- sys/{apis => modules/opus}/ui/tween.lua | 0 sys/{apis => modules/opus}/util.lua | 0 135 files changed, 297 insertions(+), 289 deletions(-) rename sys/{apis => modules/opus}/ansi.lua (100%) rename sys/{apis => modules/opus}/array.lua (100%) rename sys/{apis => modules/opus}/bulkget.lua (93%) rename sys/{apis => modules/opus}/class.lua (100%) rename sys/{apis => modules/opus}/config.lua (96%) rename sys/{apis => modules/opus}/crypto/chacha20.lua (98%) rename sys/{apis => modules/opus}/crypto/ecc/elliptic.lua (99%) rename sys/{apis => modules/opus}/crypto/ecc/fp.lua (100%) rename sys/{apis => modules/opus}/crypto/ecc/fq.lua (100%) rename sys/{apis => modules/opus}/crypto/ecc/init.lua (92%) rename sys/{apis => modules/opus}/crypto/sha2.lua (100%) rename sys/{apis => modules/opus}/entry.lua (99%) rename sys/{apis => modules/opus}/event.lua (100%) rename sys/{apis => modules/opus}/fs/gitfs.lua (91%) rename sys/{apis => modules/opus}/fs/linkfs.lua (100%) rename sys/{apis => modules/opus}/fs/netfs.lua (97%) rename sys/{apis => modules/opus}/fs/ramfs.lua (98%) rename sys/{apis => modules/opus}/fs/urlfs.lua (97%) rename sys/{apis => modules/opus}/git.lua (95%) rename sys/{apis => modules/opus}/gps.lua (100%) rename sys/{apis => modules/opus}/history.lua (96%) rename sys/{apis => modules/opus}/http/pastebin.lua (100%) rename sys/{apis => modules/opus}/injector.lua (91%) rename sys/{apis => modules/opus}/input.lua (98%) rename sys/{apis => modules/opus}/json.lua (100%) rename sys/{apis => modules/opus}/jumper/core/bheap.lua (100%) rename sys/{apis => modules/opus}/jumper/core/node.lua (100%) rename sys/{apis => modules/opus}/jumper/core/path.lua (100%) rename sys/{apis => modules/opus}/jumper/core/utils.lua (100%) rename sys/{apis => modules/opus}/jumper/grid.lua (100%) rename sys/{apis => modules/opus}/jumper/pathfinder.lua (100%) rename sys/{apis => modules/opus}/jumper/search/astar.lua (100%) rename sys/{apis => modules/opus}/map.lua (96%) rename sys/{apis => modules/opus}/nft.lua (98%) rename sys/{apis => modules/opus}/packages.lua (97%) rename sys/{apis => modules/opus}/pathfind.lua (97%) rename sys/{apis => modules/opus}/peripheral.lua (97%) rename sys/{apis => modules/opus}/point.lua (99%) rename sys/{apis => modules/opus}/security.lua (88%) rename sys/{apis => modules/opus}/socket.lua (97%) rename sys/{apis => modules/opus}/sound.lua (100%) rename sys/{apis => modules/opus}/sync.lua (100%) rename sys/{apis => modules/opus}/terminal.lua (99%) rename sys/{apis => modules/opus}/trace.lua (100%) rename sys/{apis => modules/opus}/ui.lua (98%) rename sys/{apis => modules/opus}/ui/canvas.lua (98%) rename sys/{apis => modules/opus}/ui/components/ActiveLayer.lua (89%) rename sys/{apis => modules/opus}/ui/components/Button.lua (92%) rename sys/{apis => modules/opus}/ui/components/Checkbox.lua (95%) rename sys/{apis => modules/opus}/ui/components/Chooser.lua (95%) rename sys/{apis => modules/opus}/ui/components/Dialog.lua (87%) rename sys/{apis => modules/opus}/ui/components/DropMenu.lua (93%) rename sys/{apis => modules/opus}/ui/components/DropMenuItem.lua (87%) rename sys/{apis => modules/opus}/ui/components/Embedded.lua (93%) rename sys/{apis => modules/opus}/ui/components/Form.lua (96%) rename sys/{apis => modules/opus}/ui/components/Grid.lua (99%) rename sys/{apis => modules/opus}/ui/components/Image.lua (90%) rename sys/{apis => modules/opus}/ui/components/Menu.lua (94%) rename sys/{apis => modules/opus}/ui/components/MenuBar.lua (96%) rename sys/{apis => modules/opus}/ui/components/MenuItem.lua (79%) rename sys/{apis => modules/opus}/ui/components/NftImage.lua (89%) rename sys/{apis => modules/opus}/ui/components/Notification.lua (91%) rename sys/{apis => modules/opus}/ui/components/ProgressBar.lua (84%) rename sys/{apis => modules/opus}/ui/components/ScrollBar.lua (95%) rename sys/{apis => modules/opus}/ui/components/ScrollingGrid.lua (93%) rename sys/{apis => modules/opus}/ui/components/SlideOut.lua (92%) rename sys/{apis => modules/opus}/ui/components/StatusBar.lua (93%) rename sys/{apis => modules/opus}/ui/components/Tab.lua (69%) rename sys/{apis => modules/opus}/ui/components/TabBar.lua (90%) rename sys/{apis => modules/opus}/ui/components/TabBarMenuItem.lua (90%) rename sys/{apis => modules/opus}/ui/components/Tabs.lua (94%) rename sys/{apis => modules/opus}/ui/components/Text.lua (76%) rename sys/{apis => modules/opus}/ui/components/TextArea.lua (89%) rename sys/{apis => modules/opus}/ui/components/TextEntry.lua (94%) rename sys/{apis => modules/opus}/ui/components/Throttle.lua (95%) rename sys/{apis => modules/opus}/ui/components/TitleBar.lua (96%) rename sys/{apis => modules/opus}/ui/components/VerticalMeter.lua (85%) rename sys/{apis => modules/opus}/ui/components/Viewport.lua (97%) rename sys/{apis => modules/opus}/ui/components/Wizard.lua (96%) rename sys/{apis => modules/opus}/ui/components/WizardPage.lua (70%) rename sys/{apis => modules/opus}/ui/region.lua (100%) rename sys/{apis => modules/opus}/ui/transition.lua (96%) rename sys/{apis => modules/opus}/ui/tween.lua (100%) rename sys/{apis => modules/opus}/util.lua (100%) diff --git a/sys/apps/Files.lua b/sys/apps/Files.lua index ea3126d..6c6b453 100644 --- a/sys/apps/Files.lua +++ b/sys/apps/Files.lua @@ -1,8 +1,8 @@ -local Config = require('config') -local Event = require('event') -local pastebin = require('http.pastebin') -local UI = require('ui') -local Util = require('util') +local Config = require('opus.config') +local Event = require('opus.event') +local pastebin = require('opus.http.pastebin') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local fs = _G.fs diff --git a/sys/apps/Help.lua b/sys/apps/Help.lua index d00c80b..b6e862c 100644 --- a/sys/apps/Help.lua +++ b/sys/apps/Help.lua @@ -1,5 +1,5 @@ -local UI = require('ui') -local Util = require('util') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local help = _G.help diff --git a/sys/apps/Lua.lua b/sys/apps/Lua.lua index bfc080b..a7442be 100644 --- a/sys/apps/Lua.lua +++ b/sys/apps/Lua.lua @@ -1,9 +1,9 @@ -- Lua may be called from outside of shell - inject a require _G.requireInjector(_ENV) -local History = require('history') -local UI = require('ui') -local Util = require('util') +local History = require('opus.history') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local os = _G.os diff --git a/sys/apps/Network.lua b/sys/apps/Network.lua index e6341eb..f9f4cc1 100644 --- a/sys/apps/Network.lua +++ b/sys/apps/Network.lua @@ -1,8 +1,8 @@ -local Config = require('config') -local Event = require('event') -local Socket = require('socket') -local UI = require('ui') -local Util = require('util') +local Config = require('opus.config') +local Event = require('opus.event') +local Socket = require('opus.socket') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local device = _G.device diff --git a/sys/apps/Overview.lua b/sys/apps/Overview.lua index a2692be..bfcbbb3 100644 --- a/sys/apps/Overview.lua +++ b/sys/apps/Overview.lua @@ -1,12 +1,12 @@ -local class = require('class') -local Config = require('config') -local Event = require('event') -local NFT = require('nft') -local Packages = require('packages') -local SHA = require('crypto.sha2') -local Tween = require('ui.tween') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local Config = require('opus.config') +local Event = require('opus.event') +local NFT = require('opus.nft') +local Packages = require('opus.packages') +local SHA = require('opus.crypto.sha2') +local Tween = require('opus.ui.tween') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local device = _G.device diff --git a/sys/apps/PackageManager.lua b/sys/apps/PackageManager.lua index 6ed2d41..de8af57 100644 --- a/sys/apps/PackageManager.lua +++ b/sys/apps/PackageManager.lua @@ -1,7 +1,7 @@ -local Ansi = require('ansi') -local Packages = require('packages') -local UI = require('ui') -local Util = require('util') +local Ansi = require('opus.ansi') +local Packages = require('opus.packages') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local term = _G.term diff --git a/sys/apps/System.lua b/sys/apps/System.lua index 5b1595a..b97d2e9 100644 --- a/sys/apps/System.lua +++ b/sys/apps/System.lua @@ -1,5 +1,5 @@ -local UI = require('ui') -local Util = require('util') +local UI = require('opus.ui') +local Util = require('opus.util') local fs = _G.fs local shell = _ENV.shell diff --git a/sys/apps/Tasks.lua b/sys/apps/Tasks.lua index 9b35be2..73ff93b 100644 --- a/sys/apps/Tasks.lua +++ b/sys/apps/Tasks.lua @@ -1,5 +1,5 @@ -local Event = require('event') -local UI = require('ui') +local Event = require('opus.event') +local UI = require('opus.ui') local kernel = _G.kernel local multishell = _ENV.multishell diff --git a/sys/apps/Welcome.lua b/sys/apps/Welcome.lua index 399d0b2..76c4c7f 100644 --- a/sys/apps/Welcome.lua +++ b/sys/apps/Welcome.lua @@ -1,7 +1,7 @@ -local Ansi = require('ansi') -local Security = require('security') -local SHA = require('crypto.sha2') -local UI = require('ui') +local Ansi = require('opus.ansi') +local Security = require('opus.security') +local SHA = require('opus.crypto.sha2') +local UI = require('opus.ui') local colors = _G.colors local os = _G.os diff --git a/sys/apps/autorun.lua b/sys/apps/autorun.lua index 1d650da..e8b378f 100644 --- a/sys/apps/autorun.lua +++ b/sys/apps/autorun.lua @@ -1,4 +1,4 @@ -local Packages = require('packages') +local Packages = require('opus.packages') local colors = _G.colors local fs = _G.fs diff --git a/sys/apps/cedit.lua b/sys/apps/cedit.lua index 138f977..2231e73 100644 --- a/sys/apps/cedit.lua +++ b/sys/apps/cedit.lua @@ -1,4 +1,4 @@ -local Config = require('config') +local Config = require('opus.config') local multishell = _ENV.multishell local os = _G.os diff --git a/sys/apps/cshell.lua b/sys/apps/cshell.lua index 34e5c91..9a0e1af 100644 --- a/sys/apps/cshell.lua +++ b/sys/apps/cshell.lua @@ -1,4 +1,4 @@ -local Config = require('config') +local Config = require('opus.config') local read = _G.read local shell = _ENV.shell diff --git a/sys/apps/netdaemon.lua b/sys/apps/netdaemon.lua index cc14a7b..fb9e23e 100644 --- a/sys/apps/netdaemon.lua +++ b/sys/apps/netdaemon.lua @@ -1,7 +1,7 @@ _G.requireInjector(_ENV) -local Event = require('event') -local Util = require('util') +local Event = require('opus.event') +local Util = require('opus.util') local device = _G.device local fs = _G.fs diff --git a/sys/apps/network/proxy.lua b/sys/apps/network/proxy.lua index a90dcef..9e487b0 100644 --- a/sys/apps/network/proxy.lua +++ b/sys/apps/network/proxy.lua @@ -1,6 +1,6 @@ -local Event = require('event') -local Socket = require('socket') -local Util = require('util') +local Event = require('opus.event') +local Socket = require('opus.socket') +local Util = require('opus.util') local function getProxy(path) local x = Util.split(path, '(.-)/') diff --git a/sys/apps/network/samba.lua b/sys/apps/network/samba.lua index a1d5227..f679b4d 100644 --- a/sys/apps/network/samba.lua +++ b/sys/apps/network/samba.lua @@ -1,5 +1,5 @@ -local Event = require('event') -local Socket = require('socket') +local Event = require('opus.event') +local Socket = require('opus.socket') local fs = _G.fs diff --git a/sys/apps/network/snmp.lua b/sys/apps/network/snmp.lua index 11ed673..ff42b99 100644 --- a/sys/apps/network/snmp.lua +++ b/sys/apps/network/snmp.lua @@ -1,7 +1,7 @@ -local Event = require('event') -local GPS = require('gps') -local Socket = require('socket') -local Util = require('util') +local Event = require('opus.event') +local GPS = require('opus.gps') +local Socket = require('opus.socket') +local Util = require('opus.util') local device = _G.device local kernel = _G.kernel diff --git a/sys/apps/network/telnet.lua b/sys/apps/network/telnet.lua index a396570..dc2bda0 100644 --- a/sys/apps/network/telnet.lua +++ b/sys/apps/network/telnet.lua @@ -1,6 +1,6 @@ -local Event = require('event') -local Socket = require('socket') -local Util = require('util') +local Event = require('opus.event') +local Socket = require('opus.socket') +local Util = require('opus.util') local kernel = _G.kernel local term = _G.term diff --git a/sys/apps/network/transport.lua b/sys/apps/network/transport.lua index eccd9ef..fa1978c 100644 --- a/sys/apps/network/transport.lua +++ b/sys/apps/network/transport.lua @@ -5,7 +5,7 @@ * background read buffering ]]-- -local Event = require('event') +local Event = require('opus.event') local os = _G.os diff --git a/sys/apps/network/trust.lua b/sys/apps/network/trust.lua index b2e493f..b31acbc 100644 --- a/sys/apps/network/trust.lua +++ b/sys/apps/network/trust.lua @@ -1,8 +1,8 @@ -local Crypto = require('crypto.chacha20') -local Event = require('event') -local Security = require('security') -local Socket = require('socket') -local Util = require('util') +local Crypto = require('opus.crypto.chacha20') +local Event = require('opus.event') +local Security = require('opus.security') +local Socket = require('opus.socket') +local Util = require('opus.util') local function trustConnection(socket) local data = socket:read(2) diff --git a/sys/apps/network/vnc.lua b/sys/apps/network/vnc.lua index 779a75d..54ea8fc 100644 --- a/sys/apps/network/vnc.lua +++ b/sys/apps/network/vnc.lua @@ -1,6 +1,6 @@ -local Event = require('event') -local Socket = require('socket') -local Util = require('util') +local Event = require('opus.event') +local Socket = require('opus.socket') +local Util = require('opus.util') local os = _G.os local terminal = _G.device.terminal diff --git a/sys/apps/package.lua b/sys/apps/package.lua index d1e2071..864f4fd 100644 --- a/sys/apps/package.lua +++ b/sys/apps/package.lua @@ -1,7 +1,7 @@ -local BulkGet = require('bulkget') -local Git = require('git') -local Packages = require('packages') -local Util = require('util') +local BulkGet = require('opus.bulkget') +local Git = require('opus.git') +local Packages = require('opus.packages') +local Util = require('opus.util') local fs = _G.fs local term = _G.term diff --git a/sys/apps/password.lua b/sys/apps/password.lua index be64a0e..e1585b0 100644 --- a/sys/apps/password.lua +++ b/sys/apps/password.lua @@ -1,6 +1,6 @@ -local Security = require('security') -local SHA = require('crypto.sha2') -local Terminal = require('terminal') +local Security = require('opus.security') +local SHA = require('opus.crypto.sha2') +local Terminal = require('opus.terminal') local password = Terminal.readPassword('Enter new password: ') diff --git a/sys/apps/pastebin.lua b/sys/apps/pastebin.lua index 4cdc80b..aaade9a 100644 --- a/sys/apps/pastebin.lua +++ b/sys/apps/pastebin.lua @@ -11,7 +11,7 @@ if not http then return end -local pastebin = require('http.pastebin') +local pastebin = require('opus.http.pastebin') local tArgs = { ... } local sCommand = tArgs[1] diff --git a/sys/apps/shell.lua b/sys/apps/shell.lua index a32676a..5d7f067 100644 --- a/sys/apps/shell.lua +++ b/sys/apps/shell.lua @@ -13,8 +13,8 @@ sandboxEnv.shell = shell _G.requireInjector(_ENV) -local trace = require('trace') -local Util = require('util') +local trace = require('opus.trace') +local Util = require('opus.util') local DIR = (parentShell and parentShell.dir()) or "" local PATH = (parentShell and parentShell.path()) or ".:/rom/programs" @@ -358,12 +358,12 @@ if #tArgs > 0 then return run(env, ...) end -local Config = require('config') -local Entry = require('entry') -local History = require('history') -local Input = require('input') -local Sound = require('sound') -local Terminal = require('terminal') +local Config = require('opus.config') +local Entry = require('opus.entry') +local History = require('opus.history') +local Input = require('opus.input') +local Sound = require('opus.sound') +local Terminal = require('opus.terminal') local colors = _G.colors local os = _G.os diff --git a/sys/apps/system/aliases.lua b/sys/apps/system/aliases.lua index 3a98bc6..6b04c5c 100644 --- a/sys/apps/system/aliases.lua +++ b/sys/apps/system/aliases.lua @@ -1,5 +1,5 @@ -local Config = require('config') -local UI = require('ui') +local Config = require('opus.config') +local UI = require('opus.ui') local kernel = _G.kernel diff --git a/sys/apps/system/cloud.lua b/sys/apps/system/cloud.lua index 61d47f9..e40d924 100644 --- a/sys/apps/system/cloud.lua +++ b/sys/apps/system/cloud.lua @@ -1,6 +1,6 @@ -local Ansi = require('ansi') -local Config = require('config') -local UI = require('ui') +local Ansi = require('opus.ansi') +local Config = require('opus.config') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apps/system/kiosk.lua b/sys/apps/system/kiosk.lua index 1adb110..becee72 100644 --- a/sys/apps/system/kiosk.lua +++ b/sys/apps/system/kiosk.lua @@ -1,4 +1,4 @@ -local UI = require('ui') +local UI = require('opus.ui') local colors = _G.colors local peripheral = _G.peripheral diff --git a/sys/apps/system/label.lua b/sys/apps/system/label.lua index 7ed6f6f..e4a73f2 100644 --- a/sys/apps/system/label.lua +++ b/sys/apps/system/label.lua @@ -1,5 +1,5 @@ -local UI = require('ui') -local Util = require('util') +local UI = require('opus.ui') +local Util = require('opus.util') local fs = _G.fs local os = _G.os diff --git a/sys/apps/system/launcher.lua b/sys/apps/system/launcher.lua index cebd5b7..6bd290c 100644 --- a/sys/apps/system/launcher.lua +++ b/sys/apps/system/launcher.lua @@ -1,5 +1,5 @@ -local Config = require('config') -local UI = require('ui') +local Config = require('opus.config') +local UI = require('opus.ui') local colors = _G.colors local fs = _G.fs diff --git a/sys/apps/system/network.lua b/sys/apps/system/network.lua index 11f3c00..414c080 100644 --- a/sys/apps/system/network.lua +++ b/sys/apps/system/network.lua @@ -1,6 +1,6 @@ -local Ansi = require('ansi') -local Config = require('config') -local UI = require('ui') +local Ansi = require('opus.ansi') +local Config = require('opus.config') +local UI = require('opus.ui') local device = _G.device diff --git a/sys/apps/system/password.lua b/sys/apps/system/password.lua index ecb7677..4340a73 100644 --- a/sys/apps/system/password.lua +++ b/sys/apps/system/password.lua @@ -1,6 +1,6 @@ -local Security = require('security') -local SHA = require('crypto.sha2') -local UI = require('ui') +local Security = require('opus.security') +local SHA = require('opus.crypto.sha2') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apps/system/path.lua b/sys/apps/system/path.lua index 803ed51..bf30f7e 100644 --- a/sys/apps/system/path.lua +++ b/sys/apps/system/path.lua @@ -1,6 +1,6 @@ -local Config = require('config') -local UI = require('ui') -local Util = require('util') +local Config = require('opus.config') +local UI = require('opus.ui') +local Util = require('opus.util') local tab = UI.Tab { tabTitle = 'Path', diff --git a/sys/apps/system/requires.lua b/sys/apps/system/requires.lua index b98d93b..38acef9 100644 --- a/sys/apps/system/requires.lua +++ b/sys/apps/system/requires.lua @@ -1,6 +1,6 @@ -local Config = require('config') -local UI = require('ui') -local Util = require('util') +local Config = require('opus.config') +local UI = require('opus.ui') +local Util = require('opus.util') local tab = UI.Tab { tabTitle = 'Requires', diff --git a/sys/apps/system/settings.lua b/sys/apps/system/settings.lua index f5d35db..8e071ac 100644 --- a/sys/apps/system/settings.lua +++ b/sys/apps/system/settings.lua @@ -1,4 +1,4 @@ -local UI = require('ui') +local UI = require('opus.ui') local settings = _G.settings diff --git a/sys/apps/system/shell.lua b/sys/apps/system/shell.lua index 238a8d9..13dfda6 100644 --- a/sys/apps/system/shell.lua +++ b/sys/apps/system/shell.lua @@ -1,6 +1,6 @@ -local Config = require('config') -local UI = require('ui') -local Util = require('util') +local Config = require('opus.config') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local os = _G.os diff --git a/sys/apps/telnet.lua b/sys/apps/telnet.lua index 40a1134..91b163e 100644 --- a/sys/apps/telnet.lua +++ b/sys/apps/telnet.lua @@ -1,7 +1,7 @@ -local Event = require('event') -local Socket = require('socket') -local Terminal = require('terminal') -local Util = require('util') +local Event = require('opus.event') +local Socket = require('opus.socket') +local Terminal = require('opus.terminal') +local Util = require('opus.util') local multishell = _ENV.multishell local os = _G.os diff --git a/sys/apps/trust.lua b/sys/apps/trust.lua index dbe0b33..b1283f8 100644 --- a/sys/apps/trust.lua +++ b/sys/apps/trust.lua @@ -1,8 +1,8 @@ -local Crypto = require('crypto.chacha20') -local Security = require('security') -local SHA = require('crypto.sha2') -local Socket = require('socket') -local Terminal = require('terminal') +local Crypto = require('opus.crypto.chacha20') +local Security = require('opus.security') +local SHA = require('opus.crypto.sha2') +local Socket = require('opus.socket') +local Terminal = require('opus.terminal') local os = _G.os diff --git a/sys/apps/vnc.lua b/sys/apps/vnc.lua index b57df3b..cb2d945 100644 --- a/sys/apps/vnc.lua +++ b/sys/apps/vnc.lua @@ -1,7 +1,7 @@ -local Event = require('event') -local Socket = require('socket') -local Terminal = require('terminal') -local Util = require('util') +local Event = require('opus.event') +local Socket = require('opus.socket') +local Terminal = require('opus.terminal') +local Util = require('opus.util') local colors = _G.colors local multishell = _ENV.multishell diff --git a/sys/autorun/clipboard.lua b/sys/autorun/clipboard.lua index ad3286f..72c9434 100644 --- a/sys/autorun/clipboard.lua +++ b/sys/autorun/clipboard.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local kernel = _G.kernel local keyboard = _G.device.keyboard diff --git a/sys/autorun/hotkeys.lua b/sys/autorun/hotkeys.lua index cf50efb..5c6b539 100644 --- a/sys/autorun/hotkeys.lua +++ b/sys/autorun/hotkeys.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local kernel = _G.kernel local keyboard = _G.device.keyboard diff --git a/sys/autorun/welcome.lua b/sys/autorun/welcome.lua index 0ee57d0..b8d113b 100644 --- a/sys/autorun/welcome.lua +++ b/sys/autorun/welcome.lua @@ -1,5 +1,5 @@ -local Config = require('config') -local Util = require('util') +local Config = require('opus.config') +local Util = require('opus.util') local fs = _G.fs local os = _G.os diff --git a/sys/boot/opus.boot b/sys/boot/opus.boot index d139e37..f3b5ffb 100644 --- a/sys/boot/opus.boot +++ b/sys/boot/opus.boot @@ -44,19 +44,19 @@ local function runUrl(file, ...) end -- Install require shim -if fs.exists('sys/apis/injector.lua') then - _G.requireInjector = run('sys/apis/injector.lua') +if fs.exists('sys/modules/opus/injector.lua') then + _G.requireInjector = run('sys/modules/opus/injector.lua') else -- not local, run the file system directly from git if package and package.path then - package.path = package.path .. ';' .. BASE .. '/sys/apis' + package.path = package.path .. ';' .. BASE .. '/sys/modules/opus' else sandboxEnv.package = { - path = BASE .. '/sys/apis' + path = BASE .. '/sys/modules/opus' } end - _G.requireInjector = runUrl('sys/apis/injector.lua') + _G.requireInjector = runUrl('sys/modules/opus/injector.lua') runUrl('sys/init/2.vfs.lua') diff --git a/sys/init/1.device.lua b/sys/init/1.device.lua index 803898d..65b1e76 100644 --- a/sys/init/1.device.lua +++ b/sys/init/1.device.lua @@ -1,6 +1,6 @@ _G.requireInjector(_ENV) -local Peripheral = require('peripheral') +local Peripheral = require('opus.peripheral') _G.device = Peripheral.getList() @@ -24,8 +24,8 @@ _G.device.mouse = { state = { }, } -local Input = require('input') -local Util = require('util') +local Input = require('opus.input') +local Util = require('opus.util') local device = _G.device local kernel = _G.kernel diff --git a/sys/init/2.vfs.lua b/sys/init/2.vfs.lua index b32f6b4..0ddc672 100644 --- a/sys/init/2.vfs.lua +++ b/sys/init/2.vfs.lua @@ -3,7 +3,7 @@ if fs.native then end _G.requireInjector(_ENV) -local Util = require('util') +local Util = require('opus.util') -- TODO: support getDrive for virtual nodes @@ -256,7 +256,7 @@ end local function getfstype(fstype) local vfs = fstypes[fstype] if not vfs then - vfs = require('fs.' .. fstype) + vfs = require('opus.fs.' .. fstype) fs.registerType(fstype, vfs) end return vfs diff --git a/sys/init/3.modules.lua b/sys/init/3.modules.lua index 91a7159..8dd5fcb 100644 --- a/sys/init/3.modules.lua +++ b/sys/init/3.modules.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local device = _G.device local kernel = _G.kernel diff --git a/sys/init/4.user.lua b/sys/init/4.user.lua index e795997..0349808 100644 --- a/sys/init/4.user.lua +++ b/sys/init/4.user.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local fs = _G.fs local shell = _ENV.shell @@ -43,7 +43,7 @@ end shell.setPath(table.concat(path, ':')) -_G.LUA_PATH = config.lua_path -_G.settings.set('mbs.shell.require_path', config.lua_path) +--_G.LUA_PATH = config.lua_path +--_G.settings.set('mbs.shell.require_path', config.lua_path) fs.loadTab('usr/config/fstab') diff --git a/sys/init/5.network.lua b/sys/init/5.network.lua index bd97122..6526c5f 100644 --- a/sys/init/5.network.lua +++ b/sys/init/5.network.lua @@ -1,6 +1,6 @@ _G.requireInjector(_ENV) -local Config = require('config') +local Config = require('opus.config') local device = _G.device local kernel = _G.kernel diff --git a/sys/init/6.packages.lua b/sys/init/6.packages.lua index ba52af1..ad667cd 100644 --- a/sys/init/6.packages.lua +++ b/sys/init/6.packages.lua @@ -1,5 +1,5 @@ -local Packages = require('packages') -local Util = require('util') +local Packages = require('opus.packages') +local Util = require('opus.util') local fs = _G.fs local help = _G.help @@ -22,7 +22,7 @@ for name in pairs(Packages:installed()) do table.insert(appPaths, 1, packageDir) local apiPath = fs.combine(packageDir, 'apis') if fs.exists(apiPath) then - fs.mount(fs.combine('sys/apis', name), 'linkfs', apiPath) + fs.mount(fs.combine('rom/modules/main', name), 'linkfs', apiPath) end local helpPath = '/' .. fs.combine(packageDir, 'help') @@ -33,3 +33,5 @@ end help.setPath(table.concat(helpPaths, ':')) shell.setPath(table.concat(appPaths, ':')) + +fs.mount('rom/modules/main/opus', 'linkfs', 'sys/modules/opus') diff --git a/sys/init/6.tl3.lua b/sys/init/6.tl3.lua index 4e797e2..ee3f3aa 100644 --- a/sys/init/6.tl3.lua +++ b/sys/init/6.tl3.lua @@ -2,10 +2,10 @@ if not _G.turtle then return end -local Pathing = require('pathfind') -local Point = require('point') -local synchronized = require('sync').sync -local Util = require('util') +local Pathing = require('opus.pathfind') +local Point = require('opus.point') +local synchronized = require('opus.sync').sync +local Util = require('opus.util') local os = _G.os local peripheral = _G.peripheral diff --git a/sys/init/7.multishell.lua b/sys/init/7.multishell.lua index d9a2536..b6ada5d 100644 --- a/sys/init/7.multishell.lua +++ b/sys/init/7.multishell.lua @@ -1,8 +1,8 @@ _G.requireInjector(_ENV) -local Config = require('config') -local trace = require('trace') -local Util = require('util') +local Config = require('opus.config') +local trace = require('opus.trace') +local Util = require('opus.util') local colors = _G.colors local fs = _G.fs diff --git a/sys/kernel.lua b/sys/kernel.lua index 799164e..62ab6bc 100644 --- a/sys/kernel.lua +++ b/sys/kernel.lua @@ -1,7 +1,7 @@ _G.requireInjector(_ENV) -local Terminal = require('terminal') -local Util = require('util') +local Terminal = require('opus.terminal') +local Util = require('opus.util') _G.kernel = { UID = 0, diff --git a/sys/apis/ansi.lua b/sys/modules/opus/ansi.lua similarity index 100% rename from sys/apis/ansi.lua rename to sys/modules/opus/ansi.lua diff --git a/sys/apis/array.lua b/sys/modules/opus/array.lua similarity index 100% rename from sys/apis/array.lua rename to sys/modules/opus/array.lua diff --git a/sys/apis/bulkget.lua b/sys/modules/opus/bulkget.lua similarity index 93% rename from sys/apis/bulkget.lua rename to sys/modules/opus/bulkget.lua index a9679ef..29eadcf 100644 --- a/sys/apis/bulkget.lua +++ b/sys/modules/opus/bulkget.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local parallel = _G.parallel diff --git a/sys/apis/class.lua b/sys/modules/opus/class.lua similarity index 100% rename from sys/apis/class.lua rename to sys/modules/opus/class.lua diff --git a/sys/apis/config.lua b/sys/modules/opus/config.lua similarity index 96% rename from sys/apis/config.lua rename to sys/modules/opus/config.lua index 35f7310..3518ba2 100644 --- a/sys/apis/config.lua +++ b/sys/modules/opus/config.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local fs = _G.fs local shell = _ENV.shell diff --git a/sys/apis/crypto/chacha20.lua b/sys/modules/opus/crypto/chacha20.lua similarity index 98% rename from sys/apis/crypto/chacha20.lua rename to sys/modules/opus/crypto/chacha20.lua index 03386a4..8302d1b 100644 --- a/sys/apis/crypto/chacha20.lua +++ b/sys/modules/opus/crypto/chacha20.lua @@ -1,8 +1,8 @@ -- Chacha20 cipher in ComputerCraft -- By Anavrins -local sha2 = require('crypto.sha2') -local util = require('util') +local sha2 = require('opus.crypto.sha2') +local util = require('opus.util') local ROUNDS = 20 -- Adjust this for speed tradeoff diff --git a/sys/apis/crypto/ecc/elliptic.lua b/sys/modules/opus/crypto/ecc/elliptic.lua similarity index 99% rename from sys/apis/crypto/ecc/elliptic.lua rename to sys/modules/opus/crypto/ecc/elliptic.lua index ca2b5b5..4177258 100644 --- a/sys/apis/crypto/ecc/elliptic.lua +++ b/sys/modules/opus/crypto/ecc/elliptic.lua @@ -21,7 +21,7 @@ -- Completeness? Yes: The curve is an Edwards Curve with non-square d and square a, so the curve is complete. -- Indistinguishability? No: The curve does not support indistinguishability maps. -local fp = require('crypto.ecc.fp') +local fp = require('opus.crypto.ecc.fp') local eq = fp.eq local mul = fp.mul local sqr = fp.sqr diff --git a/sys/apis/crypto/ecc/fp.lua b/sys/modules/opus/crypto/ecc/fp.lua similarity index 100% rename from sys/apis/crypto/ecc/fp.lua rename to sys/modules/opus/crypto/ecc/fp.lua diff --git a/sys/apis/crypto/ecc/fq.lua b/sys/modules/opus/crypto/ecc/fq.lua similarity index 100% rename from sys/apis/crypto/ecc/fq.lua rename to sys/modules/opus/crypto/ecc/fq.lua diff --git a/sys/apis/crypto/ecc/init.lua b/sys/modules/opus/crypto/ecc/init.lua similarity index 92% rename from sys/apis/crypto/ecc/init.lua rename to sys/modules/opus/crypto/ecc/init.lua index f765542..e1c1284 100644 --- a/sys/apis/crypto/ecc/init.lua +++ b/sys/modules/opus/crypto/ecc/init.lua @@ -1,6 +1,6 @@ -local fq = require('crypto.ecc.fq') -local elliptic = require('crypto.ecc.elliptic') -local sha256 = require('crypto.sha2') +local fq = require('opus.crypto.ecc.fq') +local elliptic = require('opus.crypto.ecc.elliptic') +local sha256 = require('opus.crypto.sha2') local os = _G.os diff --git a/sys/apis/crypto/sha2.lua b/sys/modules/opus/crypto/sha2.lua similarity index 100% rename from sys/apis/crypto/sha2.lua rename to sys/modules/opus/crypto/sha2.lua diff --git a/sys/apis/entry.lua b/sys/modules/opus/entry.lua similarity index 99% rename from sys/apis/entry.lua rename to sys/modules/opus/entry.lua index 5956762..0029ded 100644 --- a/sys/apis/entry.lua +++ b/sys/modules/opus/entry.lua @@ -1,4 +1,4 @@ -local class = require('class') +local class = require('opus.class') local os = _G.os diff --git a/sys/apis/event.lua b/sys/modules/opus/event.lua similarity index 100% rename from sys/apis/event.lua rename to sys/modules/opus/event.lua diff --git a/sys/apis/fs/gitfs.lua b/sys/modules/opus/fs/gitfs.lua similarity index 91% rename from sys/apis/fs/gitfs.lua rename to sys/modules/opus/fs/gitfs.lua index 026d9e8..21fe1d9 100644 --- a/sys/apis/fs/gitfs.lua +++ b/sys/modules/opus/fs/gitfs.lua @@ -1,4 +1,4 @@ -local git = require('git') +local git = require('opus.git') local fs = _G.fs diff --git a/sys/apis/fs/linkfs.lua b/sys/modules/opus/fs/linkfs.lua similarity index 100% rename from sys/apis/fs/linkfs.lua rename to sys/modules/opus/fs/linkfs.lua diff --git a/sys/apis/fs/netfs.lua b/sys/modules/opus/fs/netfs.lua similarity index 97% rename from sys/apis/fs/netfs.lua rename to sys/modules/opus/fs/netfs.lua index 77ec3b0..e36a1cc 100644 --- a/sys/apis/fs/netfs.lua +++ b/sys/modules/opus/fs/netfs.lua @@ -1,5 +1,5 @@ -local Socket = require('socket') -local synchronized = require('sync').sync +local Socket = require('opus.socket') +local synchronized = require('opus.sync').sync local fs = _G.fs diff --git a/sys/apis/fs/ramfs.lua b/sys/modules/opus/fs/ramfs.lua similarity index 98% rename from sys/apis/fs/ramfs.lua rename to sys/modules/opus/fs/ramfs.lua index 5dc7470..0d943a8 100644 --- a/sys/apis/fs/ramfs.lua +++ b/sys/modules/opus/fs/ramfs.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local fs = _G.fs diff --git a/sys/apis/fs/urlfs.lua b/sys/modules/opus/fs/urlfs.lua similarity index 97% rename from sys/apis/fs/urlfs.lua rename to sys/modules/opus/fs/urlfs.lua index fc3b655..960806e 100644 --- a/sys/apis/fs/urlfs.lua +++ b/sys/modules/opus/fs/urlfs.lua @@ -1,5 +1,5 @@ --local rttp = require('rttp') -local Util = require('util') +local Util = require('opus.util') local fs = _G.fs diff --git a/sys/apis/git.lua b/sys/modules/opus/git.lua similarity index 95% rename from sys/apis/git.lua rename to sys/modules/opus/git.lua index 058f202..49c42e4 100644 --- a/sys/apis/git.lua +++ b/sys/modules/opus/git.lua @@ -1,5 +1,5 @@ -local json = require('json') -local Util = require('util') +local json = require('opus.json') +local Util = require('opus.util') local TREE_URL = 'https://api.github.com/repos/%s/%s/git/trees/%s?recursive=1' local FILE_URL = 'https://raw.githubusercontent.com/%s/%s/%s/%s' diff --git a/sys/apis/gps.lua b/sys/modules/opus/gps.lua similarity index 100% rename from sys/apis/gps.lua rename to sys/modules/opus/gps.lua diff --git a/sys/apis/history.lua b/sys/modules/opus/history.lua similarity index 96% rename from sys/apis/history.lua rename to sys/modules/opus/history.lua index 7162a48..99cc060 100644 --- a/sys/apis/history.lua +++ b/sys/modules/opus/history.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local History = { } local History_mt = { __index = History } diff --git a/sys/apis/http/pastebin.lua b/sys/modules/opus/http/pastebin.lua similarity index 100% rename from sys/apis/http/pastebin.lua rename to sys/modules/opus/http/pastebin.lua diff --git a/sys/apis/injector.lua b/sys/modules/opus/injector.lua similarity index 91% rename from sys/apis/injector.lua rename to sys/modules/opus/injector.lua index 799cf0b..0835c6b 100644 --- a/sys/apis/injector.lua +++ b/sys/modules/opus/injector.lua @@ -8,21 +8,27 @@ local function split(str, pattern) return t end +local hasMain local luaPaths = package and package.path and split(package.path, '(.-);') or { } for i = 1, #luaPaths do if luaPaths[i] == '?' or luaPaths[i] == '?.lua' then luaPaths[i] = nil + elseif string.find(luaPaths[i], '/rom/modules/main') then + hasMain = true end end table.insert(luaPaths, 1, '?.lua') table.insert(luaPaths, 2, '?/init.lua') -table.insert(luaPaths, 3, '/usr/apis/?.lua') -table.insert(luaPaths, 4, '/usr/apis/?/init.lua') -table.insert(luaPaths, 5, '/sys/apis/?.lua') -table.insert(luaPaths, 6, '/sys/apis/?/init.lua') +table.insert(luaPaths, 3, '/usr/modules/?.lua') +table.insert(luaPaths, 4, '/usr/modules/?/init.lua') +table.insert(luaPaths, 5, '/sys/modules/?.lua') +table.insert(luaPaths, 6, '/sys/modules/?/init.lua') local DEFAULT_PATH = table.concat(luaPaths, ';') +if not hasMain then + DEFAULT_PATH = DEFAULT_PATH .. ';/rom/modules/main/?;/rom/modules/main/?.lua;/rom/modules/main/?/init.lua' +end local fs = _G.fs local http = _G.http diff --git a/sys/apis/input.lua b/sys/modules/opus/input.lua similarity index 98% rename from sys/apis/input.lua rename to sys/modules/opus/input.lua index ee003a0..b7894d1 100644 --- a/sys/apis/input.lua +++ b/sys/modules/opus/input.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local keyboard = _G.device and _G.device.keyboard local keys = _G.keys @@ -203,4 +203,4 @@ function input:test() end end -return input \ No newline at end of file +return input diff --git a/sys/apis/json.lua b/sys/modules/opus/json.lua similarity index 100% rename from sys/apis/json.lua rename to sys/modules/opus/json.lua diff --git a/sys/apis/jumper/core/bheap.lua b/sys/modules/opus/jumper/core/bheap.lua similarity index 100% rename from sys/apis/jumper/core/bheap.lua rename to sys/modules/opus/jumper/core/bheap.lua diff --git a/sys/apis/jumper/core/node.lua b/sys/modules/opus/jumper/core/node.lua similarity index 100% rename from sys/apis/jumper/core/node.lua rename to sys/modules/opus/jumper/core/node.lua diff --git a/sys/apis/jumper/core/path.lua b/sys/modules/opus/jumper/core/path.lua similarity index 100% rename from sys/apis/jumper/core/path.lua rename to sys/modules/opus/jumper/core/path.lua diff --git a/sys/apis/jumper/core/utils.lua b/sys/modules/opus/jumper/core/utils.lua similarity index 100% rename from sys/apis/jumper/core/utils.lua rename to sys/modules/opus/jumper/core/utils.lua diff --git a/sys/apis/jumper/grid.lua b/sys/modules/opus/jumper/grid.lua similarity index 100% rename from sys/apis/jumper/grid.lua rename to sys/modules/opus/jumper/grid.lua diff --git a/sys/apis/jumper/pathfinder.lua b/sys/modules/opus/jumper/pathfinder.lua similarity index 100% rename from sys/apis/jumper/pathfinder.lua rename to sys/modules/opus/jumper/pathfinder.lua diff --git a/sys/apis/jumper/search/astar.lua b/sys/modules/opus/jumper/search/astar.lua similarity index 100% rename from sys/apis/jumper/search/astar.lua rename to sys/modules/opus/jumper/search/astar.lua diff --git a/sys/apis/map.lua b/sys/modules/opus/map.lua similarity index 96% rename from sys/apis/map.lua rename to sys/modules/opus/map.lua index 8380f38..bd576d3 100644 --- a/sys/apis/map.lua +++ b/sys/modules/opus/map.lua @@ -1,5 +1,5 @@ -- convience functions for tables with key/value pairs -local Util = require('util') +local Util = require('opus.util') local Map = { } diff --git a/sys/apis/nft.lua b/sys/modules/opus/nft.lua similarity index 98% rename from sys/apis/nft.lua rename to sys/modules/opus/nft.lua index 056961b..f6d5468 100644 --- a/sys/apis/nft.lua +++ b/sys/modules/opus/nft.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local NFT = { } diff --git a/sys/apis/packages.lua b/sys/modules/opus/packages.lua similarity index 97% rename from sys/apis/packages.lua rename to sys/modules/opus/packages.lua index 6148e28..c54bb65 100644 --- a/sys/apis/packages.lua +++ b/sys/modules/opus/packages.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local fs = _G.fs local textutils = _G.textutils diff --git a/sys/apis/pathfind.lua b/sys/modules/opus/pathfind.lua similarity index 97% rename from sys/apis/pathfind.lua rename to sys/modules/opus/pathfind.lua index f34c6ac..06c12f1 100644 --- a/sys/apis/pathfind.lua +++ b/sys/modules/opus/pathfind.lua @@ -1,7 +1,7 @@ -local Grid = require('jumper.grid') -local Pathfinder = require('jumper.pathfinder') -local Point = require('point') -local Util = require('util') +local Grid = require('opus.jumper.grid') +local Pathfinder = require('opus.jumper.pathfinder') +local Point = require('opus.point') +local Util = require('opus.util') local turtle = _G.turtle diff --git a/sys/apis/peripheral.lua b/sys/modules/opus/peripheral.lua similarity index 97% rename from sys/apis/peripheral.lua rename to sys/modules/opus/peripheral.lua index 1d84c8a..86d63fc 100644 --- a/sys/apis/peripheral.lua +++ b/sys/modules/opus/peripheral.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local Peripheral = Util.shallowCopy(_G.peripheral) @@ -123,4 +123,4 @@ function Peripheral.get(args) end end -return Peripheral \ No newline at end of file +return Peripheral diff --git a/sys/apis/point.lua b/sys/modules/opus/point.lua similarity index 99% rename from sys/apis/point.lua rename to sys/modules/opus/point.lua index da1d15b..a118df3 100644 --- a/sys/apis/point.lua +++ b/sys/modules/opus/point.lua @@ -1,4 +1,4 @@ -local Util = require('util') +local Util = require('opus.util') local Point = { } diff --git a/sys/apis/security.lua b/sys/modules/opus/security.lua similarity index 88% rename from sys/apis/security.lua rename to sys/modules/opus/security.lua index 691df97..725d864 100644 --- a/sys/apis/security.lua +++ b/sys/modules/opus/security.lua @@ -1,6 +1,6 @@ -local Config = require('config') -local Util = require('util') -local ECC = require('crypto.ecc') +local Config = require('opus.config') +local Util = require('opus.util') +local ECC = require('opus.crypto.ecc') local Security = { } diff --git a/sys/apis/socket.lua b/sys/modules/opus/socket.lua similarity index 97% rename from sys/apis/socket.lua rename to sys/modules/opus/socket.lua index ae1bc60..5e83424 100644 --- a/sys/apis/socket.lua +++ b/sys/modules/opus/socket.lua @@ -1,6 +1,6 @@ -local Crypto = require('crypto.chacha20') -local Security = require('security') -local Util = require('util') +local Crypto = require('opus.crypto.chacha20') +local Security = require('opus.security') +local Util = require('opus.util') local device = _G.device local os = _G.os diff --git a/sys/apis/sound.lua b/sys/modules/opus/sound.lua similarity index 100% rename from sys/apis/sound.lua rename to sys/modules/opus/sound.lua diff --git a/sys/apis/sync.lua b/sys/modules/opus/sync.lua similarity index 100% rename from sys/apis/sync.lua rename to sys/modules/opus/sync.lua diff --git a/sys/apis/terminal.lua b/sys/modules/opus/terminal.lua similarity index 99% rename from sys/apis/terminal.lua rename to sys/modules/opus/terminal.lua index e73d822..cb7df22 100644 --- a/sys/apis/terminal.lua +++ b/sys/modules/opus/terminal.lua @@ -1,4 +1,4 @@ -local Canvas = require('ui.canvas') +local Canvas = require('opus.ui.canvas') local colors = _G.colors local term = _G.term diff --git a/sys/apis/trace.lua b/sys/modules/opus/trace.lua similarity index 100% rename from sys/apis/trace.lua rename to sys/modules/opus/trace.lua diff --git a/sys/apis/ui.lua b/sys/modules/opus/ui.lua similarity index 98% rename from sys/apis/ui.lua rename to sys/modules/opus/ui.lua index 3b0c26b..87a6a67 100644 --- a/sys/apis/ui.lua +++ b/sys/modules/opus/ui.lua @@ -1,9 +1,9 @@ -local Canvas = require('ui.canvas') -local class = require('class') -local Event = require('event') -local Input = require('input') -local Transition = require('ui.transition') -local Util = require('util') +local Canvas = require('opus.ui.canvas') +local class = require('opus.class') +local Event = require('opus.event') +local Input = require('opus.input') +local Transition = require('opus.ui.transition') +local Util = require('opus.util') local _rep = string.rep local _sub = string.sub @@ -1168,7 +1168,7 @@ end local function loadComponents() local function load(name) - local s, m = Util.run(_ENV, 'sys/apis/ui/components/' .. name .. '.lua') + local s, m = Util.run(_ENV, 'sys/modules/opus/ui/components/' .. name .. '.lua') if not s then error(m) end @@ -1181,7 +1181,7 @@ local function loadComponents() return UI[name] end - local components = fs.list('sys/apis/ui/components') + local components = fs.list('sys/modules/opus/ui/components') for _, f in pairs(components) do local name = f:match('(.+)%.') diff --git a/sys/apis/ui/canvas.lua b/sys/modules/opus/ui/canvas.lua similarity index 98% rename from sys/apis/ui/canvas.lua rename to sys/modules/opus/ui/canvas.lua index b7969b0..260ad89 100644 --- a/sys/apis/ui/canvas.lua +++ b/sys/modules/opus/ui/canvas.lua @@ -1,6 +1,6 @@ -local class = require('class') -local Region = require('ui.region') -local Util = require('util') +local class = require('opus.class') +local Region = require('opus.ui.region') +local Util = require('opus.util') local _rep = string.rep local _sub = string.sub diff --git a/sys/apis/ui/components/ActiveLayer.lua b/sys/modules/opus/ui/components/ActiveLayer.lua similarity index 89% rename from sys/apis/ui/components/ActiveLayer.lua rename to sys/modules/opus/ui/components/ActiveLayer.lua index 94354fe..dcbb499 100644 --- a/sys/apis/ui/components/ActiveLayer.lua +++ b/sys/modules/opus/ui/components/ActiveLayer.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') UI.ActiveLayer = class(UI.Window) UI.ActiveLayer.defaults = { diff --git a/sys/apis/ui/components/Button.lua b/sys/modules/opus/ui/components/Button.lua similarity index 92% rename from sys/apis/ui/components/Button.lua rename to sys/modules/opus/ui/components/Button.lua index be31cad..c6ea3bf 100644 --- a/sys/apis/ui/components/Button.lua +++ b/sys/modules/opus/ui/components/Button.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/Checkbox.lua b/sys/modules/opus/ui/components/Checkbox.lua similarity index 95% rename from sys/apis/ui/components/Checkbox.lua rename to sys/modules/opus/ui/components/Checkbox.lua index 6356ebf..a90e911 100644 --- a/sys/apis/ui/components/Checkbox.lua +++ b/sys/modules/opus/ui/components/Checkbox.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Chooser.lua b/sys/modules/opus/ui/components/Chooser.lua similarity index 95% rename from sys/apis/ui/components/Chooser.lua rename to sys/modules/opus/ui/components/Chooser.lua index 0284fbf..e4d41fa 100644 --- a/sys/apis/ui/components/Chooser.lua +++ b/sys/modules/opus/ui/components/Chooser.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/Dialog.lua b/sys/modules/opus/ui/components/Dialog.lua similarity index 87% rename from sys/apis/ui/components/Dialog.lua rename to sys/modules/opus/ui/components/Dialog.lua index a293052..dd9de1a 100644 --- a/sys/apis/ui/components/Dialog.lua +++ b/sys/modules/opus/ui/components/Dialog.lua @@ -1,6 +1,6 @@ -local Canvas = require('ui.canvas') -local class = require('class') -local UI = require('ui') +local Canvas = require('opus.ui.canvas') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors @@ -36,4 +36,4 @@ function UI.Dialog:eventHandler(event) self:hide() end return UI.SlideOut.eventHandler(self, event) -end \ No newline at end of file +end diff --git a/sys/apis/ui/components/DropMenu.lua b/sys/modules/opus/ui/components/DropMenu.lua similarity index 93% rename from sys/apis/ui/components/DropMenu.lua rename to sys/modules/opus/ui/components/DropMenu.lua index 10ad096..5cce43a 100644 --- a/sys/apis/ui/components/DropMenu.lua +++ b/sys/modules/opus/ui/components/DropMenu.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/DropMenuItem.lua b/sys/modules/opus/ui/components/DropMenuItem.lua similarity index 87% rename from sys/apis/ui/components/DropMenuItem.lua rename to sys/modules/opus/ui/components/DropMenuItem.lua index a08f505..09263da 100644 --- a/sys/apis/ui/components/DropMenuItem.lua +++ b/sys/modules/opus/ui/components/DropMenuItem.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Embedded.lua b/sys/modules/opus/ui/components/Embedded.lua similarity index 93% rename from sys/apis/ui/components/Embedded.lua rename to sys/modules/opus/ui/components/Embedded.lua index ad4db59..fcdee82 100644 --- a/sys/apis/ui/components/Embedded.lua +++ b/sys/modules/opus/ui/components/Embedded.lua @@ -1,6 +1,6 @@ -local class = require('class') -local Terminal = require('terminal') -local UI = require('ui') +local class = require('opus.class') +local Terminal = require('opus.terminal') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Form.lua b/sys/modules/opus/ui/components/Form.lua similarity index 96% rename from sys/apis/ui/components/Form.lua rename to sys/modules/opus/ui/components/Form.lua index 8ba925e..f1eb6f3 100644 --- a/sys/apis/ui/components/Form.lua +++ b/sys/modules/opus/ui/components/Form.lua @@ -1,6 +1,6 @@ -local class = require('class') -local Sound = require('sound') -local UI = require('ui') +local class = require('opus.class') +local Sound = require('opus.sound') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Grid.lua b/sys/modules/opus/ui/components/Grid.lua similarity index 99% rename from sys/apis/ui/components/Grid.lua rename to sys/modules/opus/ui/components/Grid.lua index 21069ee..a1dc638 100644 --- a/sys/apis/ui/components/Grid.lua +++ b/sys/modules/opus/ui/components/Grid.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local os = _G.os diff --git a/sys/apis/ui/components/Image.lua b/sys/modules/opus/ui/components/Image.lua similarity index 90% rename from sys/apis/ui/components/Image.lua rename to sys/modules/opus/ui/components/Image.lua index 630cf3c..787d813 100644 --- a/sys/apis/ui/components/Image.lua +++ b/sys/modules/opus/ui/components/Image.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') UI.Image = class(UI.Window) UI.Image.defaults = { diff --git a/sys/apis/ui/components/Menu.lua b/sys/modules/opus/ui/components/Menu.lua similarity index 94% rename from sys/apis/ui/components/Menu.lua rename to sys/modules/opus/ui/components/Menu.lua index 3377a0e..f581874 100644 --- a/sys/apis/ui/components/Menu.lua +++ b/sys/modules/opus/ui/components/Menu.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') --[[-- Menu --]]-- UI.Menu = class(UI.Grid) diff --git a/sys/apis/ui/components/MenuBar.lua b/sys/modules/opus/ui/components/MenuBar.lua similarity index 96% rename from sys/apis/ui/components/MenuBar.lua rename to sys/modules/opus/ui/components/MenuBar.lua index 4c239c0..bccb9be 100644 --- a/sys/apis/ui/components/MenuBar.lua +++ b/sys/modules/opus/ui/components/MenuBar.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/MenuItem.lua b/sys/modules/opus/ui/components/MenuItem.lua similarity index 79% rename from sys/apis/ui/components/MenuItem.lua rename to sys/modules/opus/ui/components/MenuItem.lua index c4dbc7a..2f0efe8 100644 --- a/sys/apis/ui/components/MenuItem.lua +++ b/sys/modules/opus/ui/components/MenuItem.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/NftImage.lua b/sys/modules/opus/ui/components/NftImage.lua similarity index 89% rename from sys/apis/ui/components/NftImage.lua rename to sys/modules/opus/ui/components/NftImage.lua index 37740c5..b932dfb 100644 --- a/sys/apis/ui/components/NftImage.lua +++ b/sys/modules/opus/ui/components/NftImage.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') UI.NftImage = class(UI.Window) UI.NftImage.defaults = { diff --git a/sys/apis/ui/components/Notification.lua b/sys/modules/opus/ui/components/Notification.lua similarity index 91% rename from sys/apis/ui/components/Notification.lua rename to sys/modules/opus/ui/components/Notification.lua index 33a5745..f1b38f6 100644 --- a/sys/apis/ui/components/Notification.lua +++ b/sys/modules/opus/ui/components/Notification.lua @@ -1,8 +1,8 @@ -local class = require('class') -local Event = require('event') -local Sound = require('sound') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local Event = require('opus.event') +local Sound = require('opus.sound') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/ProgressBar.lua b/sys/modules/opus/ui/components/ProgressBar.lua similarity index 84% rename from sys/apis/ui/components/ProgressBar.lua rename to sys/modules/opus/ui/components/ProgressBar.lua index 2a78c5f..56d6156 100644 --- a/sys/apis/ui/components/ProgressBar.lua +++ b/sys/modules/opus/ui/components/ProgressBar.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/ScrollBar.lua b/sys/modules/opus/ui/components/ScrollBar.lua similarity index 95% rename from sys/apis/ui/components/ScrollBar.lua rename to sys/modules/opus/ui/components/ScrollBar.lua index 2299502..d4bef52 100644 --- a/sys/apis/ui/components/ScrollBar.lua +++ b/sys/modules/opus/ui/components/ScrollBar.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/ScrollingGrid.lua b/sys/modules/opus/ui/components/ScrollingGrid.lua similarity index 93% rename from sys/apis/ui/components/ScrollingGrid.lua rename to sys/modules/opus/ui/components/ScrollingGrid.lua index c29fe74..93a35e6 100644 --- a/sys/apis/ui/components/ScrollingGrid.lua +++ b/sys/modules/opus/ui/components/ScrollingGrid.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') --[[-- ScrollingGrid --]]-- UI.ScrollingGrid = class(UI.Grid) diff --git a/sys/apis/ui/components/SlideOut.lua b/sys/modules/opus/ui/components/SlideOut.lua similarity index 92% rename from sys/apis/ui/components/SlideOut.lua rename to sys/modules/opus/ui/components/SlideOut.lua index 9e85251..37f5e37 100644 --- a/sys/apis/ui/components/SlideOut.lua +++ b/sys/modules/opus/ui/components/SlideOut.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') --[[-- SlideOut --]]-- UI.SlideOut = class(UI.Window) diff --git a/sys/apis/ui/components/StatusBar.lua b/sys/modules/opus/ui/components/StatusBar.lua similarity index 93% rename from sys/apis/ui/components/StatusBar.lua rename to sys/modules/opus/ui/components/StatusBar.lua index af1d2c4..a92c0c2 100644 --- a/sys/apis/ui/components/StatusBar.lua +++ b/sys/modules/opus/ui/components/StatusBar.lua @@ -1,7 +1,7 @@ -local class = require('class') -local Event = require('event') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local Event = require('opus.event') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/Tab.lua b/sys/modules/opus/ui/components/Tab.lua similarity index 69% rename from sys/apis/ui/components/Tab.lua rename to sys/modules/opus/ui/components/Tab.lua index d564c86..2f86b2f 100644 --- a/sys/apis/ui/components/Tab.lua +++ b/sys/modules/opus/ui/components/Tab.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/TabBar.lua b/sys/modules/opus/ui/components/TabBar.lua similarity index 90% rename from sys/apis/ui/components/TabBar.lua rename to sys/modules/opus/ui/components/TabBar.lua index 1431314..72e07f6 100644 --- a/sys/apis/ui/components/TabBar.lua +++ b/sys/modules/opus/ui/components/TabBar.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors diff --git a/sys/apis/ui/components/TabBarMenuItem.lua b/sys/modules/opus/ui/components/TabBarMenuItem.lua similarity index 90% rename from sys/apis/ui/components/TabBarMenuItem.lua rename to sys/modules/opus/ui/components/TabBarMenuItem.lua index 28e585b..0a7799c 100644 --- a/sys/apis/ui/components/TabBarMenuItem.lua +++ b/sys/modules/opus/ui/components/TabBarMenuItem.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Tabs.lua b/sys/modules/opus/ui/components/Tabs.lua similarity index 94% rename from sys/apis/ui/components/Tabs.lua rename to sys/modules/opus/ui/components/Tabs.lua index 7c2d967..46f87d1 100644 --- a/sys/apis/ui/components/Tabs.lua +++ b/sys/modules/opus/ui/components/Tabs.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') UI.Tabs = class(UI.Window) UI.Tabs.defaults = { diff --git a/sys/apis/ui/components/Text.lua b/sys/modules/opus/ui/components/Text.lua similarity index 76% rename from sys/apis/ui/components/Text.lua rename to sys/modules/opus/ui/components/Text.lua index 68926d2..0250a48 100644 --- a/sys/apis/ui/components/Text.lua +++ b/sys/modules/opus/ui/components/Text.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') UI.Text = class(UI.Window) UI.Text.defaults = { diff --git a/sys/apis/ui/components/TextArea.lua b/sys/modules/opus/ui/components/TextArea.lua similarity index 89% rename from sys/apis/ui/components/TextArea.lua rename to sys/modules/opus/ui/components/TextArea.lua index 8602866..51b8972 100644 --- a/sys/apis/ui/components/TextArea.lua +++ b/sys/modules/opus/ui/components/TextArea.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') --[[-- TextArea --]]-- UI.TextArea = class(UI.Viewport) diff --git a/sys/apis/ui/components/TextEntry.lua b/sys/modules/opus/ui/components/TextEntry.lua similarity index 94% rename from sys/apis/ui/components/TextEntry.lua rename to sys/modules/opus/ui/components/TextEntry.lua index 69566c6..512f668 100644 --- a/sys/apis/ui/components/TextEntry.lua +++ b/sys/modules/opus/ui/components/TextEntry.lua @@ -1,7 +1,7 @@ -local class = require('class') -local entry = require('entry') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local entry = require('opus.entry') +local UI = require('opus.ui') +local Util = require('opus.util') local colors = _G.colors local _rep = string.rep diff --git a/sys/apis/ui/components/Throttle.lua b/sys/modules/opus/ui/components/Throttle.lua similarity index 95% rename from sys/apis/ui/components/Throttle.lua rename to sys/modules/opus/ui/components/Throttle.lua index 1e2dc02..0466486 100644 --- a/sys/apis/ui/components/Throttle.lua +++ b/sys/modules/opus/ui/components/Throttle.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors local os = _G.os diff --git a/sys/apis/ui/components/TitleBar.lua b/sys/modules/opus/ui/components/TitleBar.lua similarity index 96% rename from sys/apis/ui/components/TitleBar.lua rename to sys/modules/opus/ui/components/TitleBar.lua index 872d78b..ce7fdd4 100644 --- a/sys/apis/ui/components/TitleBar.lua +++ b/sys/modules/opus/ui/components/TitleBar.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors local _rep = string.rep diff --git a/sys/apis/ui/components/VerticalMeter.lua b/sys/modules/opus/ui/components/VerticalMeter.lua similarity index 85% rename from sys/apis/ui/components/VerticalMeter.lua rename to sys/modules/opus/ui/components/VerticalMeter.lua index e4f1e7b..012d0e5 100644 --- a/sys/apis/ui/components/VerticalMeter.lua +++ b/sys/modules/opus/ui/components/VerticalMeter.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Viewport.lua b/sys/modules/opus/ui/components/Viewport.lua similarity index 97% rename from sys/apis/ui/components/Viewport.lua rename to sys/modules/opus/ui/components/Viewport.lua index b0e2a30..acb84cd 100644 --- a/sys/apis/ui/components/Viewport.lua +++ b/sys/modules/opus/ui/components/Viewport.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/components/Wizard.lua b/sys/modules/opus/ui/components/Wizard.lua similarity index 96% rename from sys/apis/ui/components/Wizard.lua rename to sys/modules/opus/ui/components/Wizard.lua index 67dcc2b..e6bce7e 100644 --- a/sys/apis/ui/components/Wizard.lua +++ b/sys/modules/opus/ui/components/Wizard.lua @@ -1,6 +1,6 @@ -local class = require('class') -local UI = require('ui') -local Util = require('util') +local class = require('opus.class') +local UI = require('opus.ui') +local Util = require('opus.util') UI.Wizard = class(UI.Window) UI.Wizard.defaults = { diff --git a/sys/apis/ui/components/WizardPage.lua b/sys/modules/opus/ui/components/WizardPage.lua similarity index 70% rename from sys/apis/ui/components/WizardPage.lua rename to sys/modules/opus/ui/components/WizardPage.lua index dae4e9a..cb2c2de 100644 --- a/sys/apis/ui/components/WizardPage.lua +++ b/sys/modules/opus/ui/components/WizardPage.lua @@ -1,5 +1,5 @@ -local class = require('class') -local UI = require('ui') +local class = require('opus.class') +local UI = require('opus.ui') local colors = _G.colors diff --git a/sys/apis/ui/region.lua b/sys/modules/opus/ui/region.lua similarity index 100% rename from sys/apis/ui/region.lua rename to sys/modules/opus/ui/region.lua diff --git a/sys/apis/ui/transition.lua b/sys/modules/opus/ui/transition.lua similarity index 96% rename from sys/apis/ui/transition.lua rename to sys/modules/opus/ui/transition.lua index 90db9ee..4448760 100644 --- a/sys/apis/ui/transition.lua +++ b/sys/modules/opus/ui/transition.lua @@ -1,4 +1,4 @@ -local Tween = require('ui.tween') +local Tween = require('opus.ui.tween') local Transition = { } diff --git a/sys/apis/ui/tween.lua b/sys/modules/opus/ui/tween.lua similarity index 100% rename from sys/apis/ui/tween.lua rename to sys/modules/opus/ui/tween.lua diff --git a/sys/apis/util.lua b/sys/modules/opus/util.lua similarity index 100% rename from sys/apis/util.lua rename to sys/modules/opus/util.lua