diff --git a/common/db.js b/common/db.js index c45da3e80e2b4779ec3b7b61ae58eac92efb7518..d6f0b3ad90978e8706be5407b78b6b27a304e1c7 100644 --- a/common/db.js +++ b/common/db.js @@ -47,7 +47,7 @@ class KaraDatabase { constructor() { this.m_karaPath = config.content.database.path; this.m_db = new sqlite3.Database(this.m_karaPath); - this.m_db.configure("busyTimeout", 50000) + this.m_db.configure('busyTimeout', 50000); logger.info('db', 'Create database from file ' + config.content.database.path); } diff --git a/common/lkt.js b/common/lkt.js index 283a4683a90edbd9e26cca3d70f0fec6bcc9c019..7f9dd4137e744e4201e12ba62e6eab377dda461b 100644 --- a/common/lkt.js +++ b/common/lkt.js @@ -170,14 +170,14 @@ class LktClient { if (String(data).includes('playlist')) { LktClient.setQueueUpdated(true); } - if(String(data).includes(' stored_playlist')) { + if (String(data).includes(' stored_playlist')) { LktClient.setPlaylistsUpdated(true); } if (String(data).includes('player')) { LktClient.reloadState(); } - if(String(data).includes('database')) { - LktClient.setDBUpdated(true) + if (String(data).includes('database')) { + LktClient.setDBUpdated(true); } client.m_socket.write(`idle\n`); return null; @@ -247,15 +247,15 @@ class LktClient { return null; } else { dataObj = __mpdToObject(data); - if(dataObj.name) { - Array.prototype.push.apply(result,dataObj.name.split(" ")); + if (dataObj.name) { + Array.prototype.push.apply(result, dataObj.name.split(' ')); } - if(dataObj.continue) { - if(prevcont==dataObj.continue){ + if (dataObj.continue) { + if (prevcont == dataObj.continue) { client.close(); resolv(result); } - prevcont = dataObj.continue + prevcont = dataObj.continue; client.m_socket.write(`${dataObj.continue} listplaylists\n`); } } @@ -272,7 +272,7 @@ class LktClient { var matches; var dataObj; var karaList; - var prevcont=0; + var prevcont = 0; const regex = /([0-9]+) (vo|va|amv|cdg|vocaloid|autres|vtuber) - (jp|fr|en|ru|sp|it|ch|latin|heb|por|pol|kor|fin|ara|swe|de|multi|undefined) \/ (.+) - (OP|ED|IS|AMV|PV|MV|LIVE)([0-9]*) - (.+) \[(.+)\]( \(U\))?/; var reg = new RegExp(regex); function __getResult(client) { @@ -285,35 +285,33 @@ class LktClient { return null; } else { dataObj = __mpdToObject(data); - karaList = data.split("\n"); - if(dataObj.continue){ + karaList = data.split('\n'); + if (dataObj.continue) { karaList.splice(-3); - } - else{ + } else { karaList.splice(-1); } - if(karaList[0]=="OK"){ - client.close(); - return null; + if (karaList[0] == 'OK') { + client.close(); + return null; } karaList.forEach(kara => { matches = reg.exec(kara); - result.push( { - id:matches[1], + result.push({ + id: matches[1], cat: matches[2], - language:matches[3], - source:matches[4], - type:matches[5]+matches[6], - title:matches[7], - author:matches[8] + language: matches[3], + source: matches[4], + type: matches[5] + matches[6], + title: matches[7], + author: matches[8], }); //logger.info("kara",matches[1]); }); - if(dataObj.continue && prevcont!= dataObj.continue) { + if (dataObj.continue && prevcont != dataObj.continue) { client.m_socket.write(`${dataObj.continue} listplaylist ${playlist}\n`); prevcont = dataObj.continue; - } - else if(dataObj.continue){ + } else if (dataObj.continue) { client.close(); resolv(result); } @@ -399,12 +397,12 @@ class LktClient { return LktClient.__execSimple(`playlistdelete ${playlist}`); } static commandUpdateDatabase() { - return LktClient.__execSimple(`password hashire\nupdate`) + return LktClient.__execSimple(`password hashire\nupdate`); } - static commandDryUpdateDatabase(){ - return LktClient.__execSimple('password hashire\n__dry_update') + static commandDryUpdateDatabase() { + return LktClient.__execSimple('password hashire\n__dry_update'); } - static commandDownloadId(id){ + static commandDownloadId(id) { logger.info(`password hashire\nupdate id://${id}`); return LktClient.__execSimple(`password hashire\nupdate id://${id}`); } @@ -460,7 +458,6 @@ class LktClient { return this.__current; } - static getStatus() { LktClient.status_updated = false; return this.__status; @@ -478,12 +475,12 @@ class LktClient { static getSongTimeData() { return this.timeData; } - static DBUpdated = false - static setDBUpdated(state){ - this.DBUpdated = state + static DBUpdated = false; + static setDBUpdated(state) { + this.DBUpdated = state; } - static isDBUpdated(){ - return this.DBUpdated + static isDBUpdated() { + return this.DBUpdated; } static ping() { @@ -538,11 +535,10 @@ function __mpdToObject(string) { string.split('\n').forEach(line => { if (line.length <= 1) return; var couple = line.split(/: (.+)/).slice(0, 2); - if(!ret[couple[0]]) { + if (!ret[couple[0]]) { ret[couple[0]] = couple[1]; - } - else { - ret[couple[0]] += " " + couple[1]; + } else { + ret[couple[0]] += ' ' + couple[1]; } }); return ret; diff --git a/instance/index.js b/instance/index.js index c1cb8e856f535a7122c579818ea64cd62f769f61..460b4a4bfa70f1c654ed5b6acca496af826db687 100644 --- a/instance/index.js +++ b/instance/index.js @@ -9,13 +9,13 @@ const { ipcRenderer } = require('electron'), var countKaraInQueue = 0; var currentSong = -1; var currentSongElement; -var currentSongPos=0; +var currentSongPos = 0; var dragCounter = 0; var leavedElement; var isDnDFromDB = false; var isPlaying = false; -var currentPlaylist = ""; -var isQueueView = true +var currentPlaylist = ''; +var isQueueView = true; var clearMenuQueue; var clearMenuPlaylist; @@ -100,23 +100,21 @@ window.onload = () => { addIpcToButton('selectDatabase', ['select-database', 'reload-db-request']); addIpcToButton('selectPlaylist', ['select-playlist']); addIpcToButton('updateDB', ['update-database']); - addIpcToButton('dryUpdate',['dry-update-database']); + addIpcToButton('dryUpdate', ['dry-update-database']); addIpcToButton('open-kurisu-view', ['toggle-kurisu']); addIpcToButton('open-user-view', ['toggle-client-view']); addIpcToButton('open-log-view', ['toggle-log-view']); - addIpcToButton('newPlaylist',['new-playlist']); - + addIpcToButton('newPlaylist', ['new-playlist']); var switchQP = document.getElementById('switchQueuePlaylist'); - switchQP.innerText = "View playlist"; - switchQP.onclick = ()=>switchQueuePlaylist(); + switchQP.innerText = 'View playlist'; + switchQP.onclick = () => switchQueuePlaylist(); - document.getElementById('addResearchToQueue').onclick = ()=>{ - ipcRenderer.send('add-kara-queue-search-result',`${$('#filterInput').val()}`); + document.getElementById('addResearchToQueue').onclick = () => { + ipcRenderer.send('add-kara-queue-search-result', `${$('#filterInput').val()}`); }; - $('#openMdtView').click(() => $('#mdt-view').toggle()); ipcRenderer.send('verify-lektord'); @@ -170,23 +168,22 @@ window.onload = () => { .on('contextmenu', e => { var top = e.pageY - 10; var left = e.pageX - 90; - if(isQueueView){ + if (isQueueView) { $('#context-menu-right') - .css({ - display: 'block', - top: top, - left: left, - }) - .addClass('show'); - } - else { + .css({ + display: 'block', + top: top, + left: left, + }) + .addClass('show'); + } else { $('#context-menu-right-playlists') - .css({ - display: 'block', - top: top, - left: left, - }) - .addClass('show'); + .css({ + display: 'block', + top: top, + left: left, + }) + .addClass('show'); } return false; /* blocks default Webbrowser right click menu */ }) @@ -209,7 +206,7 @@ window.onload = () => { }); $('#queue-recenter').click(() => { clearMenuQueue(); - if(currentSongElement){ + if (currentSongElement) { currentSongElement.scrollIntoView(true); } logger.debug('instance', 'Queue recenter'); @@ -244,12 +241,12 @@ window.onload = () => { ipcRenderer.send('delete-playlist'); }); - var playlistSelect = document.getElementById("playlist-selector"); + var playlistSelect = document.getElementById('playlist-selector'); playlistSelect.onchange = () => { currentPlaylist = playlistSelect.value; - ipcRenderer.send('get-playlist-data',playlistSelect.value); - } + ipcRenderer.send('get-playlist-data', playlistSelect.value); + }; }; /* Create the left panel */ @@ -257,13 +254,12 @@ ipcRenderer.on('reload-db-responce', (event, arg) => { logger.debug('instance', `Web page got reload-db`); document.getElementById('panelLeft').innerHTML = ''; arg.forEach(kara => { - if(kara.available==1){ + if (kara.available == 1) { ejs.renderFile(__dirname + '/views/karaDBListItem.ejs', { kara: kara }, (err, data) => { if (err) logger.error('instance', err); $('#panelLeft').append(data); }); - } - else{ + } else { ejs.renderFile(__dirname + '/views/karaDBUnavailableListItem.ejs', { kara: kara }, (err, data) => { if (err) logger.error('instance', err); $('#panelLeft').append(data); @@ -271,9 +267,9 @@ ipcRenderer.on('reload-db-responce', (event, arg) => { } }); [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), addDBKaraEventHandlers); - if(!isQueueView) { - [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), (element)=>{ - if(element.getElementsByClassName('unavailable').length==0){ + if (!isQueueView) { + [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), element => { + if (element.getElementsByClassName('unavailable').length == 0) { element.getElementsByClassName('karaAddBtn')[0].hidden = true; element.getElementsByClassName('karaInsertBtn')[0].hidden = true; element.getElementsByClassName('karaAddPlaylistBtn')[0].hidden = false; @@ -286,42 +282,40 @@ ipcRenderer.on('reload-db-responce', (event, arg) => { ipcRenderer.on('reload-queue-responce', (event, arg) => { logger.debug('instance', `Web page got reload-queue`); countKaraInQueue = 0; - if(isQueueView){ + if (isQueueView) { document.getElementById('panelRight').innerHTML = ''; - arg.forEach(kara => { - countKaraInQueue++; - ejs.renderFile(__dirname + '/views/karaQueueListItem.ejs', { kara: kara }, (err, data) => { - if (err) logger.error('instance', err); - $('#panelRight').append(data); + arg.forEach(kara => { + countKaraInQueue++; + ejs.renderFile(__dirname + '/views/karaQueueListItem.ejs', { kara: kara }, (err, data) => { + if (err) logger.error('instance', err); + $('#panelRight').append(data); + }); }); - }); - [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addQueueKaraEventHandlers); - } - else { + [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addQueueKaraEventHandlers); + } else { document.getElementById('panelBuffer').innerHTML = ''; - arg.forEach(kara => { - countKaraInQueue++; - ejs.renderFile(__dirname + '/views/karaQueueListItem.ejs', { kara: kara }, (err, data) => { - if (err) logger.error('instance', err); - $('#panelBuffer').append(data); + arg.forEach(kara => { + countKaraInQueue++; + ejs.renderFile(__dirname + '/views/karaQueueListItem.ejs', { kara: kara }, (err, data) => { + if (err) logger.error('instance', err); + $('#panelBuffer').append(data); + }); }); - }); } }); -ipcRenderer.on('playlist-data-responce', (event,karas) => { +ipcRenderer.on('playlist-data-responce', (event, karas) => { var playListPanel = document.getElementById('panelRight'); - if(!isQueueView) { + if (!isQueueView) { document.getElementById('panelRight').innerHTML = ''; - karas.forEach(kara => { - ejs.renderFile(__dirname + '/views/karaPlaylistListItem.ejs', { kara: kara }, (err, data) => { - if (err) logger.error('instance', err); - $('#panelRight').append(data); + karas.forEach(kara => { + ejs.renderFile(__dirname + '/views/karaPlaylistListItem.ejs', { kara: kara }, (err, data) => { + if (err) logger.error('instance', err); + $('#panelRight').append(data); + }); }); - }); - [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addPlayListKaraEventHandlers); - } - else { + [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addPlayListKaraEventHandlers); + } else { document.getElementById('panelBuffer').innerHTML = ''; karas.forEach(kara => { ejs.renderFile(__dirname + '/views/karaPlaylistListItem.ejs', { kara: kara }, (err, data) => { @@ -330,7 +324,6 @@ ipcRenderer.on('playlist-data-responce', (event,karas) => { }); }); } - }); ipcRenderer.on('send-lektord-is-attached', (event, arg) => { logger.debug('instance', `Lektord is in attached mode? ${arg}`); @@ -357,22 +350,22 @@ ipcRenderer.on('send-song-time-data', (event, timeData) => { }px`; if (timeData.state == 'play' || timeData.state == 'pause') { if (currentSong != timeData.song) { - if(currentSongElement){ - currentSongElement.style.background = '#4e5d6c' + if (currentSongElement) { + currentSongElement.style.background = '#4e5d6c'; } tmp = document.getElementById(`pos-${currentSongPos.toString()}`); - if(tmp) tmp.parentElement.style.background = '#4e5d6c'; - currentSongPos = parseInt(timeData.song)+1; + if (tmp) tmp.parentElement.style.background = '#4e5d6c'; + currentSongPos = parseInt(timeData.song) + 1; currentSongElement = document.getElementById(`pos-${currentSongPos.toString()}`).parentElement; currentSong = timeData.song; currentSongElement.style.background = '#6b7d8e'; - currentSongElement.scrollIntoView(true) - + currentSongElement.scrollIntoView(true); } document.getElementById(`pos-${currentSongPos.toString()}`).parentElement.style.background = '#6b7d8e'; } else { if (currentSongElement) currentSongElement.style.background = '#4e5d6c'; - document.getElementById(`pos-${currentSongPos.toString()}`).parentElement.style.background = '#4e5d6c' + currentSong = document.getElementById(`pos-${currentSongPos.toString()}`); + if (currentSong) currentSongs.parentElement.style.background = '#4e5d6c'; } }); @@ -385,8 +378,8 @@ ipcRenderer.on('send-lektord-is-attached', (event, arg) => { logger.debug('instance', `Lektord is in attached mode? ${arg}`); }); -ipcRenderer.on('check-db-updated',(event,arg) => { - ipcRenderer.send('reload-db-request') +ipcRenderer.on('check-db-updated', (event, arg) => { + ipcRenderer.send('reload-db-request'); }); /* @@ -394,7 +387,7 @@ ipcRenderer.on('check-db-updated',(event,arg) => { */ function addDBKaraEventHandlers(element) { - if(element.getElementsByClassName('karaDownloadBtn').length==0){ + if (element.getElementsByClassName('karaDownloadBtn').length == 0) { element.addEventListener('dragstart', onDragStartDB, false); element.addEventListener('dragend', onDragEnd, false); element.getElementsByClassName('karaAddBtn')[0].addEventListener('click', () => @@ -407,13 +400,12 @@ function addDBKaraEventHandlers(element) { id: element.getElementsByClassName('karaID')[0].innerText, }) ); - element.getElementsByClassName('karaAddPlaylistBtn')[0].addEventListener('click', () => + element.getElementsByClassName('karaAddPlaylistBtn')[0].addEventListener('click', () => ipcRenderer.send('add-kara-playlist-id', { id: element.getElementsByClassName('karaID')[0].innerText, }) ); - } - else{ + } else { element.getElementsByClassName('karaDownloadBtn')[0].addEventListener('click', () => ipcRenderer.send('download-kara-id', { id: element.getElementsByClassName('karaID')[0].innerText, @@ -444,19 +436,19 @@ function addQueueKaraEventHandlers(element) { function addPlayListKaraEventHandlers(element) { element.getElementsByClassName('karaDeleteBtn')[0].addEventListener('click', () => { ipcRenderer.send('del-kara-playlist-id', { - id:element.getElementsByClassName('karaID')[0].innerText + id: element.getElementsByClassName('karaID')[0].innerText, }); }); element.getElementsByClassName('karaAddBtn')[0].addEventListener('click', () => - ipcRenderer.send('add-kara-queue-id', { - id: element.getElementsByClassName('karaID')[0].innerText, - }) - ); - element.getElementsByClassName('karaInsertBtn')[0].addEventListener('click', () => - ipcRenderer.send('insert-kara-queue-id', { - id: element.getElementsByClassName('karaID')[0].innerText, - }) - ); + ipcRenderer.send('add-kara-queue-id', { + id: element.getElementsByClassName('karaID')[0].innerText, + }) + ); + element.getElementsByClassName('karaInsertBtn')[0].addEventListener('click', () => + ipcRenderer.send('insert-kara-queue-id', { + id: element.getElementsByClassName('karaID')[0].innerText, + }) + ); } function onDragStartDB(event) { @@ -520,17 +512,16 @@ function onDragEnd(event) { dragCounter = 0; } - function switchQueuePlaylist() { isQueueView = !isQueueView; var switchQP = document.getElementById('switchQueuePlaylist'); - var tempHTML = document.getElementById("panelRight").innerHTML; - document.getElementById("panelRight").innerHTML = document.getElementById("panelBuffer").innerHTML; - document.getElementById("panelBuffer").innerHTML = tempHTML; - if(isQueueView){ - switchQP.innerText = "View playlist"; - [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), (element)=>{ - if(element.getElementsByClassName('unavailable').length==0){ + var tempHTML = document.getElementById('panelRight').innerHTML; + document.getElementById('panelRight').innerHTML = document.getElementById('panelBuffer').innerHTML; + document.getElementById('panelBuffer').innerHTML = tempHTML; + if (isQueueView) { + switchQP.innerText = 'View playlist'; + [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), element => { + if (element.getElementsByClassName('unavailable').length == 0) { element.getElementsByClassName('karaAddBtn')[0].hidden = false; element.getElementsByClassName('karaInsertBtn')[0].hidden = false; element.getElementsByClassName('karaAddPlaylistBtn')[0].hidden = true; @@ -538,11 +529,10 @@ function switchQueuePlaylist() { }); [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addQueueKaraEventHandlers); clearMenuPlaylist(); - } - else { - switchQP.innerText = "View queue"; - [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), (element)=>{ - if(element.getElementsByClassName('unavailable').length==0){ + } else { + switchQP.innerText = 'View queue'; + [].forEach.call(document.querySelectorAll('#panelLeft .karaCard'), element => { + if (element.getElementsByClassName('unavailable').length == 0) { element.getElementsByClassName('karaAddBtn')[0].hidden = true; element.getElementsByClassName('karaInsertBtn')[0].hidden = true; element.getElementsByClassName('karaAddPlaylistBtn')[0].hidden = false; @@ -554,27 +544,25 @@ function switchQueuePlaylist() { } ipcRenderer.on('playlists-updated', (event, playlists) => { - if(!playlists) { + if (!playlists) { return; } - var selector = document.getElementById("playlist-selector") + var selector = document.getElementById('playlist-selector'); var currentChoice = selector.value; - if(!currentChoice || !playlists.includes(currentChoice)) { - selector.innerHTML = '<option selected disabled> Select a playlist</option>' - } - else { + if (!currentChoice || !playlists.includes(currentChoice)) { + selector.innerHTML = '<option selected disabled> Select a playlist</option>'; + } else { selector.innerHTML = '<option disabled> Select a playlist</option>'; } playlists.forEach(playlist => { - if(playlist == currentChoice) { + if (playlist == currentChoice) { optionHtml = `<option selected value="${playlist}">${playlist}</option>`; - } - else { + } else { optionHtml = `<option value="${playlist}">${playlist}</option>`; } selector.innerHTML = ` ${selector.innerHTML} ${optionHtml} - ` + `; }); }); diff --git a/main.js b/main.js index 1db7c68ccbd1bf916bbab0b8f71e1fa83689cbba..45c7018cd331419d8512ebf0a5eaaa7d310fb2ba 100644 --- a/main.js +++ b/main.js @@ -17,7 +17,6 @@ var config = require('./common/config.js'); var db = require.main.require('./common/db.js'); var Tail = require('tail').Tail; - var client; /* Sub process for the express server */ /* Timers functions, needs to be clear on app quit */ @@ -104,7 +103,7 @@ function defaultWindowOptions(title) { function createInstanceWindow() { /* Main window */ - const data = fs.readFileSync("./config.json"); + const data = fs.readFileSync('./config.json'); const json = data.toString('utf8'); settings = JSON.parse(json); const opt = defaultWindowOptions('Amadeus'); @@ -113,10 +112,9 @@ function createInstanceWindow() { opt.minWidth = 1000; opt.minHeight = 360; opt.menuBarVisible = false; - if(!settings.isWindows){ + if (!settings.isWindows) { opt.frame = false; - } - else{ + } else { opt.frame = true; opt.autoHideMenuBar = true; } @@ -235,8 +233,8 @@ ipcMain.on('cmd-unpause', () => lkt.commandUnpause().then(arg => logger.debug('m ipcMain.on('cmd-shuffle', () => lkt.commandShuffle().then(arg => logger.debug('main', 'Returned from cmd-shuffle'))); ipcMain.on('cmd-stop', () => lkt.commandStop().then(arg => logger.debug('main', 'Returned from cmd-stop'))); ipcMain.on('cmd-clear', () => lkt.commandClear().then(arg => logger.debug('main', 'Cleared queue with cmd-clear'))); -ipcMain.on('update-database',()=>lkt.commandUpdateDatabase()); -ipcMain.on('dry-update-database',()=>lkt.commandDryUpdateDatabase()); +ipcMain.on('update-database', () => lkt.commandUpdateDatabase()); +ipcMain.on('dry-update-database', () => lkt.commandDryUpdateDatabase()); /* Fill the pannel with the content of the DB. * The `arg` is the HTML object of the pannel */ @@ -262,36 +260,37 @@ ipcMain.on('queue-moved-kara', (event, movement) => { } }); -var currentPlaylist = ""; +var currentPlaylist = ''; ipcMain.on('play-kara-queue-pos', (event, arg) => lkt.commandPlayPos(arg.position)); ipcMain.on('add-kara-queue-id', (event, arg) => lkt.commandQueueAddId(arg.id)); ipcMain.on('insert-kara-queue-id', (event, arg) => lkt.commandQueueInsertId(arg.id)); -ipcMain.on('download-kara-id',(event, arg)=>{ - logger.info("download","download"); - lkt.commandDownloadId(arg.id)}); +ipcMain.on('download-kara-id', (event, arg) => { + logger.info('download', 'download'); + lkt.commandDownloadId(arg.id); +}); ipcMain.on('delete-kara-queue-pos', (event, arg) => lkt.commandQueueDelPos(arg.position)); -ipcMain.on('add-kara-playlist-id', (event,arg) => { - if(currentPlaylist != "") { - lkt.commandPlaylistAddId(currentPlaylist,arg.id); +ipcMain.on('add-kara-playlist-id', (event, arg) => { + if (currentPlaylist != '') { + lkt.commandPlaylistAddId(currentPlaylist, arg.id); } }); -ipcMain.on('del-kara-playlist-id', (event,arg) => lkt.commandPlaylistRemoveId(currentPlaylist,arg.id)); +ipcMain.on('del-kara-playlist-id', (event, arg) => lkt.commandPlaylistRemoveId(currentPlaylist, arg.id)); -ipcMain.on('clear-playlist', (event,arg) => { - if(currentPlaylist != "") { +ipcMain.on('clear-playlist', (event, arg) => { + if (currentPlaylist != '') { lkt.commandPlaylistClear(currentPlaylist); } -}); +}); -ipcMain.on('delete-playlist', (event,arg) => { - if(currentPlaylist != "") { +ipcMain.on('delete-playlist', (event, arg) => { + if (currentPlaylist != '') { lkt.commandPlaylistDelete(currentPlaylist); } -}); +}); -ipcMain.on('add-current-playlist-queue', (event,arg) => { - if(currentPlaylist != "") { +ipcMain.on('add-current-playlist-queue', (event, arg) => { + if (currentPlaylist != '') { lkt.commandAddPlaylistToQueue(currentPlaylist); } }); @@ -301,10 +300,10 @@ ipcMain.on('add-kara-queue-pos', (event, addparams) => { }); ipcMain.on('get-playlist-data', (event, playlist) => { - if(playlist) { + if (playlist) { currentPlaylist = playlist; - lkt.commandPlaylistListKaras(currentPlaylist).then((karas) => { - win.webContents.send('playlist-data-responce',karas); + lkt.commandPlaylistListKaras(currentPlaylist).then(karas => { + win.webContents.send('playlist-data-responce', karas); }); } }); @@ -313,24 +312,20 @@ ipcMain.on('add-kara-queue-search-result', (event, search) => { lkt.commandQueueAddSearch(search); }); - - -ipcMain.on('new-playlist', (event,arg) => { +ipcMain.on('new-playlist', (event, arg) => { prompt({ title: 'New playlist', label: 'Enter playlist name', type: 'input', - customStylesheet:"style/bootstrap-4.5.2-dist/css/bootstrap.min.css" - }) - .then((playlist) => { - if(playlist != null) { - logger.debug("test",playlist); - lkt.commandPlaylistCreate(playlist); + customStylesheet: 'style/bootstrap-4.5.2-dist/css/bootstrap.min.css', + }).then(playlist => { + if (playlist != null) { + logger.debug('test', playlist); + lkt.commandPlaylistCreate(playlist); } - }) + }); }); - ipcMain.on('verify-lektord', (event, arg) => { lkt.ping().then(sta => { logger.debug('main', `Status from ping is ${sta}`); @@ -424,27 +419,27 @@ ipcMain.on('verify-lektord', (event, arg) => { }, 50), ]); setInterval(() => { - if(lkt.isPlaylistsUpdated()) { + if (lkt.isPlaylistsUpdated()) { lkt.setPlaylistsUpdated(false); - lkt.commandPlaylistsList().then((playlists) => { + lkt.commandPlaylistsList().then(playlists => { win.webContents.send('playlists-updated', playlists); }); - if(currentPlaylist != "") { - lkt.commandPlaylistListKaras(currentPlaylist).then((karas) => { - win.webContents.send('playlist-data-responce',karas); + if (currentPlaylist != '') { + lkt.commandPlaylistListKaras(currentPlaylist).then(karas => { + win.webContents.send('playlist-data-responce', karas); }); } } - if(lkt.isDBUpdated()) { + if (lkt.isDBUpdated()) { lkt.setDBUpdated(false); win.webContents.send('check-db-updated'); } }, 50); setInterval(() => { - if(currentPlaylist != "" && lkt.isPlaylistsUpdated()) { + if (currentPlaylist != '' && lkt.isPlaylistsUpdated()) { lkt.setPlaylistsUpdated(false); - lkt.commandPlaylistListKaras(currentPlaylist).then((karas) => { + lkt.commandPlaylistListKaras(currentPlaylist).then(karas => { win.webContents.send('playlist-data-responce', karas); }); }