diff --git a/.gitignore b/.gitignore index ae176591e95853f4c78a512c806ecbcd692e081a..382f7c07cfc68672dbbb1df883e6f50a52466d56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ node_modules/ yarn.lock -dummyKaras\.json +dist + *.log +*.tgz diff --git a/common/logger.js b/common/logger.js index 29a747676f1022f00291c433e5eb94401d206772..bb1a6abcbdd8407dbcfb243ca8c5d61d9fd61841 100644 --- a/common/logger.js +++ b/common/logger.js @@ -30,11 +30,14 @@ const __loggerCustomLevels = { }, }; +const __logFile = `${require('os').tmpdir()}/amadeus.log`; +fs.open(__logFile, 'w', function (err, file) { if (err) throw err; }); + var __logger = winston.createLogger({ transports: [ new winston.transports.File({ eol: '\n', - filename: './lektor-app.log', + filename: __logFile, maxsize: '10M', tailable: true, }), @@ -55,7 +58,7 @@ var __logger = winston.createLogger({ }); var logger = { - logfile: './lektor-app.log', + logfile: __logFile, debug: (cat, lg) => { __logger.debug(`${cat.padEnd(10)} | ${lg}`); }, diff --git a/main.js b/main.js index 9efbce30c4dbb2049edbc9ef14f295304f8e223f..1a02677ca5b94a512d273144a6b0485a03da3d95 100644 --- a/main.js +++ b/main.js @@ -5,11 +5,13 @@ const logger = require.main.require('./common/logger.js'), fs = require('fs'), db = require.main.require('./common/db.js'), lkt = require.main.require('./common/lkt.js'); + var tail = require('tail').Tail; var client; /* Sub process for the express server */ var lektor; /* Sub process, the lektord player */ var lektor_closed = false; /* Is lektord closed? */ +/* TODO: Use the config */ var myDb = new db('/home/kara/kara.db'); var win = null; /* The main window */ @@ -89,6 +91,7 @@ app.on('ready', () => { createInstanceWindow(); client = fork('client/main.js'); lektor = spawn('lektord', ['-F']); + globalShortcut.register('CommandOrControl+D', () => { var win = BrowserWindow.getFocusedWindow(); if (win === null) { @@ -258,6 +261,6 @@ ipcMain.on('get-song-time-data', (event,arg) => { event.reply('send-song-time-data',{elapsed:songTimeData.elapsed+(counterTime/20.0), total:songTimeData.total, song:songTimeData.song, state:songTimeData.state}); } else { - event.reply('send-song-time-data',{elapsed:songTimeData.elapsed+(counterTime/20.0), total:songTimeData.total, song:songTimeData.song, state:songTimeData.state}) + event.reply('send-song-time-data',{elapsed:songTimeData.elapsed+(counterTime/20.0), total:songTimeData.total, song:songTimeData.song, state:songTimeData.state}) } -}); \ No newline at end of file +}); diff --git a/package.json b/package.json index fd8775bf55e447c863ce7ba325dcab8f495b01c3..c6ca0df95c9b0da15e73d606d3be4c6c80597bcd 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,9 @@ "dependencies": { "ejs": "^3.1.5", "electron": "^10.1.1", - "node":"<14.0.0 ", - "express": "^4.17.1", + "express": "^4.17.1", + "ini": "^2.0.0", + "node": "<14.0.0 ", "sqlite3": "5.0.0", "tail": "^2.0.4", "winston": "^3.3.3"