From 6c5cc508b1884d080b5940f819a53d54333f8dd6 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Fri, 5 Jun 2020 21:38:26 -0600
Subject: [PATCH] moonscript support + cleanup

---
 sys/apps/package.lua                           |  4 ++--
 sys/modules/opus/fs/urlfs.lua                  |  3 +++
 sys/modules/opus/injector.lua                  | 12 +++++-------
 sys/modules/opus/ui/components/QuickSelect.lua |  7 +++++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/sys/apps/package.lua b/sys/apps/package.lua
index 0ede6f5..0b6d582 100644
--- a/sys/apps/package.lua
+++ b/sys/apps/package.lua
@@ -1,9 +1,9 @@
 local BulkGet  = require('opus.bulkget')
 local Config   = require('opus.config')
 local Git      = require('opus.git')
-local LZW  = require('opus.compress.lzw')
+local LZW      = require('opus.compress.lzw')
 local Packages = require('opus.packages')
-local Tar  = require('opus.compress.tar')
+local Tar      = require('opus.compress.tar')
 local Util     = require('opus.util')
 
 local fs       = _G.fs
diff --git a/sys/modules/opus/fs/urlfs.lua b/sys/modules/opus/fs/urlfs.lua
index b2c47ca..e9a4193 100644
--- a/sys/modules/opus/fs/urlfs.lua
+++ b/sys/modules/opus/fs/urlfs.lua
@@ -109,6 +109,9 @@ function urlfs.open(node, fn, fl)
 		}
 	end
 	return {
+		readAll = function()
+			return c
+		end,
 		read = function()
 			ctr = ctr + 1
 			return c:sub(ctr, ctr):byte()
diff --git a/sys/modules/opus/injector.lua b/sys/modules/opus/injector.lua
index 266d5a8..634babd 100644
--- a/sys/modules/opus/injector.lua
+++ b/sys/modules/opus/injector.lua
@@ -43,9 +43,9 @@ return function(env)
 				return env.package.preload[modname](modname, env)
 			end
 		end
-	end
+	--end
 
-	local function loadedSearcher(modname)
+	--local function loadedSearcher(modname)
 		if env.package.loaded[modname] then
 			return function()
 				return env.package.loaded[modname]
@@ -95,7 +95,7 @@ return function(env)
 		},
 		loaders = {
 			preloadSearcher,
-			loadedSearcher,
+			--loadedSearcher,
 			pathSearcher,
 		}
 	}
@@ -104,10 +104,8 @@ return function(env)
 		for _,searcher in ipairs(env.package.loaders) do
 			local fn, msg = searcher(modname)
 			if fn then
-				local module, msg2 = fn(modname, env)
-				if not module then
-					error(msg2 or (modname .. ' module returned nil'), 2)
-				end
+				local module = fn(modname, env) or true
+
 				env.package.loaded[modname] = module
 				return module
 			end
diff --git a/sys/modules/opus/ui/components/QuickSelect.lua b/sys/modules/opus/ui/components/QuickSelect.lua
index dc96979..5626f8c 100644
--- a/sys/modules/opus/ui/components/QuickSelect.lua
+++ b/sys/modules/opus/ui/components/QuickSelect.lua
@@ -64,8 +64,11 @@ function UI.QuickSelect:enable()
 		local files = fs.list(dir)
 		for _,f in ipairs(files) do
 			local fullName = fs.combine(dir, f)
-			if fs.native.isDir(fullName) then -- skip virtual dirs
-				if f ~= '.git' then recurse(fullName) end
+			if fs.isDir(fullName) then
+				-- skip virtual dirs
+				if f ~= '.git' and fs.native.isDir(fullName) then
+					recurse(fullName)
+				end
 			else
 				_insert(self.grid.values, {
 					name = f,