the Restructuring

13 files changed, 15 insertions, 74 deletions

diff --git a/discord/pylon.lua b/discord/pylon.lua
index 0200208..705f31d 100644
--- a/discord/pylon.lua
+++ b/discord/pylon.lua
@@ -5,7 +5,7 @@ local json = require 'dkjson'
 local Discord = {}
 
 function Discord.make(wilson,conf)
-	local self = {
+
 end
 
 
@@ -37,4 +37,4 @@ local function connect()
 	end
 end
 
-connect()
+-- connect()
diff --git a/irc.lua b/irc/pylon.lua
index a2fb7bf..4259f5e 100644
--- a/irc.lua
+++ b/irc/pylon.lua
@@ -1,9 +1,9 @@
 local cqueues = require'cqueues'
 local socket = require'cqueues.socket'
 local pprint = require'pprint'
-local rirc = require'rirc'
-local Queue = require'queue'
-local Channel = require'channel'
+local rirc = require'irc.rirc'
+local Queue = require'util.queue'
+local Channel = require'util.channel'
 
 local Irc = {}
 
diff --git a/rirc.lua b/irc/rirc.lua
index 0508351..0508351 100644
--- a/rirc.lua
+++ b/irc/rirc.lua
diff --git a/main.lua b/main.lua
index 1f422e6..d7b6daf 100644
--- a/main.lua
+++ b/main.lua
@@ -1,11 +1,11 @@
 local cqueues = require'cqueues'
-local config = require'config'
-local Channel = require'channel'
+local config = require'util.config'
+local Channel = require'util.channel'
 
 local pylon_classes = {
-	irc = require'irc',
-	xmpp = require'xmpp',
-	discord = require'discord',
+	irc = require'irc.pylon',
+	xmpp = require'xmpp.pylon',
+	discord = require'discord.pylon',
 }
 
 local Wilson = {}
diff --git a/test.lua b/test.lua
deleted file mode 100644
index d70f7f2..0000000
--- a/test.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-local cqueues = require'cqueues'
-local condition = require'cqueues.condition'
-
-local cv = condition.new()
-local function task1()
-	while true do
-		print('1 top')
-		cv:wait()
-		print('1 waited')
-	end
-end
-local function task2()
-	while true do
-		print('2 top')
-		cv:signal()
-		print('2 signalled')
-		cqueues.poll()
-	end
-end
-
-local cq = cqueues.new()
-cq:wrap(task1)
-cq:wrap(task2)
-print(cq:loop())
diff --git a/channel.lua b/util/channel.lua
index e908069..e908069 100644
--- a/channel.lua
+++ b/util/channel.lua
diff --git a/config.lua b/util/config.lua
index c19a087..c19a087 100644
--- a/config.lua
+++ b/util/config.lua
diff --git a/queue.lua b/util/queue.lua
index 8c9c373..8c9c373 100644
--- a/queue.lua
+++ b/util/queue.lua
diff --git a/wilson_ex.ini b/wilson_ex.ini
deleted file mode 100644
index df80e09..0000000
--- a/wilson_ex.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-# [pylon discord]
-# type=discord
-# token=abcdef123456
-
-[pylon apionet-irc]
-type=irc
-host=ubq323.website
-nick=wilson
-port=6667
-password=secretpassword
-nodename=wilson.ubq323
-
-[pylon ubq-xmpp]
-type=xmpp
-jid=wilson@ubq323.website
-server=ubq323.website
-password=zyxw9876
-default-service=conference.ubq323.website
-resource=wilson
-component=wilson.ubq323.website
-component_secret=my_secret_password
-
-
-[bus a]
-# apionet a
-# discord 12345678  # esoserver #apionet
-# discord 98765432  # apionet discord #a
-ubq-xmpp a@
-apionet-irc a
-
-[bus ja]
-# discord 3141592654  # apionet discord #ja
-apionet-irc ja
-ubq-xmpp ja@
-
diff --git a/base64.lua b/xmpp/base64.lua
index 4f9a967..4f9a967 100644
--- a/base64.lua
+++ b/xmpp/base64.lua
diff --git a/xmpp.lua b/xmpp/pylon.lua
index 5c3371b..ba9c252 100644
--- a/xmpp.lua
+++ b/xmpp/pylon.lua
@@ -1,14 +1,14 @@
 local cqueues = require'cqueues'
 local cqaux = require'cqueues.auxlib'
 local socket = require'cqueues.socket'
-local xml = require'xml'
+local xml = require'xmpp.xml'
 local X = xml.X
 local xmlify = xml.xmlify
 local pprint=require'pprint'
-local Queue = require'queue'
-local base64 = require'base64'
-local sha1 = require'sha1'
-local Channel = require'channel'
+local Queue = require'util.queue'
+local base64 = require'xmpp.base64'
+local sha1 = require'xmpp.sha1'
+local Channel = require'util.channel'
 
 local Xmpp = {}
 
diff --git a/sha1.lua b/xmpp/sha1.lua
index 7451595..7451595 100644
--- a/sha1.lua
+++ b/xmpp/sha1.lua
diff --git a/xml.lua b/xmpp/xml.lua
index 68fa741..68fa741 100644
--- a/xml.lua
+++ b/xmpp/xml.lua