summaryrefslogtreecommitdiff
path: root/src/playlog.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/playlog.lua')
-rw-r--r--src/playlog.lua6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/playlog.lua b/src/playlog.lua
index 33095c4..e692154 100644
--- a/src/playlog.lua
+++ b/src/playlog.lua
@@ -28,11 +28,9 @@ luasql = require "luasql.mysql"
-- CREATE TABLE IF NOT EXISTS now (timestamp BIGINT UNSIGNED PRIMARY KEY NOT NULL, cart INT NOT NULL, len INT, showtitle VARCHAR(255), title VARCHAR(255), artist VARCHAR(255), album VARCHAR(255), ismusic BOOLEAN);
-- ALTER TABLE now CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-conf = require "conf"
-
local playlog = {}
-function playlog:init()
+function playlog:init(cnf)
local err
self.env, err = luasql.mysql()
@@ -40,7 +38,7 @@ function playlog:init()
return nil, err
end
- self.con, err = self.env:connect(conf.playlog_db, conf.playlog_user, conf.playlog_pwd, conf.playlog_host, conf.playlog_port)
+ self.con, err = self.env:connect(cnf.playlog_db, cnf.playlog_user, cnf.playlog_pwd, cnf.playlog_host, cnf.playlog_port)
if self.con == nil then
return nil, err
end