@@ -53,4 +59,4 @@ for any legal concerns contact me at
-
@@ -53,4 +59,4 @@ for any legal concerns contact me at
-
(Authed: ${lfmAuthKey})
`; - element.onclick = app.LastFMDeauthorize; - }); + ipcRenderer.on( + 'LastfmAuthenticated', + function (_event, lfmAuthKey) { + app.cfg.lastfm.auth_token = lfmAuthKey; + app.cfg.lastfm.enabled = true; + element.innerHTML = `Disconnect\n(Authed: ${lfmAuthKey})
`; + element.onclick = app.LastFMDeauthorize; + } + ); }, parseSCTagToRG: function (tag) { - let soundcheck = tag.split(" ") - let numbers = [] + let soundcheck = tag.split(' '); + let numbers = []; for (item of soundcheck) { - numbers.push(parseInt(item, 16)) - + numbers.push(parseInt(item, 16)); } - numbers.shift() - let gain = Math.log10((Math.max(numbers[0], numbers[1]) ?? 1000) / 1000.0) * -10 - let peak = Math.max(numbers[6], numbers[7]) / 32768.0 + numbers.shift(); + let gain = + Math.log10( + (Math.max(numbers[0], numbers[1]) ?? 1000) / 1000.0 + ) * -10; + let peak = Math.max(numbers[6], numbers[7]) / 32768.0; return { gain: gain, peak: peak - } + }; } - } -}) +}); Vue.component('sidebar-library-item', { template: '#sidebar-library-item', @@ -2996,12 +3892,12 @@ Vue.component('sidebar-library-item', { data: function () { return { app: app, - svgIconData: "" - } + svgIconData: '' + }; }, async mounted() { if (this.svgIcon) { - this.svgIconData = await this.app.getSvgIcon(this.svgIcon) + this.svgIconData = await this.app.getSvgIcon(this.svgIcon); } }, methods: {} @@ -3010,86 +3906,88 @@ Vue.component('sidebar-library-item', { // Key binds document.addEventListener('keydown', function (e) { if (e.keyCode === 70 && e.ctrlKey) { - app.$refs.searchInput.focus() - app.$refs.searchInput.select() + app.$refs.searchInput.focus(); + app.$refs.searchInput.select(); } }); // Hang Timer app.hangtimer = setTimeout(() => { - if (confirm("Cider is not responding. Reload the app?")) { - window.location.reload() + if (confirm('Cider is not responding. Reload the app?')) { + window.location.reload(); } -}, 10000) +}, 10000); // add event listener for when window.location.hash changes -window.addEventListener("hashchange", function () { - app.appRoute(window.location.hash) +window.addEventListener('hashchange', function () { + app.appRoute(window.location.hash); }); document.addEventListener('musickitloaded', function () { // MusicKit global is now defined function initMusicKit() { - let parsedJson = JSON.parse(this.responseText) + let parsedJson = JSON.parse(this.responseText); MusicKit.configure({ developerToken: parsedJson.Key, app: { name: 'Apple Music', build: '1978.4.1', - version: "1.0" + version: '1.0' }, sourceType: 24, suppressErrorDialog: true }); setTimeout(() => { - app.init() - }, 1000) + app.init(); + }, 1000); } function fallbackinitMusicKit() { const request = new XMLHttpRequest(); function loadAlternateKey() { - let parsedJson = JSON.parse(this.responseText) + let parsedJson = JSON.parse(this.responseText); MusicKit.configure({ developerToken: parsedJson.developerToken, app: { name: 'Apple Music', build: '1978.4.1', - version: "1.0" + version: '1.0' }, sourceType: 24, suppressErrorDialog: true }); setTimeout(() => { - app.init() - }, 1000) + app.init(); + }, 1000); } - request.addEventListener("load", loadAlternateKey); - request.open("GET", "https://raw.githubusercontent.com/lujjjh/LitoMusic/main/token.json"); + request.addEventListener('load', loadAlternateKey); + request.open( + 'GET', + 'https://raw.githubusercontent.com/lujjjh/LitoMusic/main/token.json' + ); request.send(); } const request = new XMLHttpRequest(); request.timeout = 5000; - request.addEventListener("load", initMusicKit); + request.addEventListener('load', initMusicKit); request.onreadystatechange = function (aEvt) { if (request.readyState == 4) { - if (request.status != 200) - fallbackinitMusicKit() + if (request.status != 200) fallbackinitMusicKit(); } }; - request.open("GET", "https://api.cider.sh/"); + request.open('GET', 'https://api.cider.sh/'); request.send(); }); if ('serviceWorker' in navigator) { // Use the window load event to keep the page load performant window.addEventListener('load', () => { - navigator.serviceWorker.register('sw.js?v=1'); + navigator.serviceWorker.register('sw.js?v=1'); }); - } +} const getBase64FromUrl = async (url) => { const data = await fetch(url); @@ -3100,44 +3998,48 @@ const getBase64FromUrl = async (url) => { reader.onloadend = () => { const base64data = reader.result; resolve(base64data); - } + }; }); -} +}; function uuidv4() { - return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => - (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16) + return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (c) => + ( + c ^ + (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4))) + ).toString(16) ); } function refreshFocus() { if (document.hasFocus() == false) { - app.windowFocus(false) + app.windowFocus(false); } else { - app.windowFocus(true) + app.windowFocus(true); } setTimeout(refreshFocus, 200); } -app.getHTMLStyle() +app.getHTMLStyle(); refreshFocus(); function xmlToJson(xml) { - // Create the return object let obj = {}; - if (xml.nodeType == 1) { // element + if (xml.nodeType == 1) { + // element // do attributes if (xml.attributes.length > 0) { - obj["@attributes"] = {}; + obj['@attributes'] = {}; for (var j = 0; j < xml.attributes.length; j++) { let attribute = xml.attributes.item(j); - obj["@attributes"][attribute.nodeName] = attribute.nodeValue; + obj['@attributes'][attribute.nodeName] = attribute.nodeValue; } } - } else if (xml.nodeType == 3) { // text + } else if (xml.nodeType == 3) { + // text obj = xml.nodeValue; } @@ -3146,10 +4048,10 @@ function xmlToJson(xml) { for (var i = 0; i < xml.childNodes.length; i++) { var item = xml.childNodes.item(i); var nodeName = item.nodeName; - if (typeof (obj[nodeName]) == "undefined") { + if (typeof obj[nodeName] == 'undefined') { obj[nodeName] = xmlToJson(item); } else { - if (typeof (obj[nodeName].push) == "undefined") { + if (typeof obj[nodeName].push == 'undefined') { var old = obj[nodeName]; obj[nodeName] = []; obj[nodeName].push(old); @@ -3160,33 +4062,37 @@ function xmlToJson(xml) { } console.log(obj); return obj; -}; +} var checkIfScrollIsStatic = setInterval(() => { try { - if (position === document.getElementsByClassName('lyric-body')[0].scrollTop) { - clearInterval(checkIfScrollIsStatic) + if ( + position === + document.getElementsByClassName('lyric-body')[0].scrollTop + ) { + clearInterval(checkIfScrollIsStatic); // do something } - position = document.getElementsByClassName('lyric-body')[0].scrollTop - } catch (e) { - } - + position = document.getElementsByClassName('lyric-body')[0].scrollTop; + } catch (e) {} }, 50); // WebGPU Console Notification async function webGPU() { try { - const currentGPU = await navigator.gpu.requestAdapter() - console.log("WebGPU enabled on", currentGPU.name, "with feature ID", currentGPU.features.size) + const currentGPU = await navigator.gpu.requestAdapter(); + console.log( + 'WebGPU enabled on', + currentGPU.name, + 'with feature ID', + currentGPU.features.size + ); } catch (e) { - console.log("WebGPU disabled / WebGPU initialization failed") + console.log('WebGPU disabled / WebGPU initialization failed'); } } -webGPU().then() +webGPU().then(); let screenWidth = screen.width; let screenHeight = screen.height; - - diff --git a/src/renderer/index_old.html b/src/renderer/index_old.html index 7d8da566..353abb90 100644 --- a/src/renderer/index_old.html +++ b/src/renderer/index_old.html @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + + @@ -23,332 +23,321 @@ -