From 7d3e513187bd534d97d9fdae043c0a5616e3ef18 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Sun, 19 Dec 2021 06:02:38 +0000 Subject: [PATCH] File structure update - all source files now in src directory, cider-ui renamed to renderer, main/backend-related files in main directory, base implementation of mpris and start of backend rework --- index.js | 6 +- package.json | 7 +- .../functions => src/main}/cider-base.js | 4 +- src/main/init.js | 5 + src/main/mpris.js | 102 ++++++++++++++++++ {resources => src}/preload/cider-preload.js | 0 .../renderer}/ameframework.css | 0 .../cider-ui => src/renderer}/apple-hls.js | 0 .../renderer}/assets/RatingsLove.png | Bin .../renderer}/assets/arrow-left.svg | 0 .../renderer}/assets/backward.svg | 0 .../renderer}/assets/cast_white.svg | 0 .../renderer}/assets/chevron-left.svg | 0 .../renderer}/assets/forward.svg | 0 .../cider-ui => src/renderer}/assets/list.svg | 0 .../renderer}/assets/logocut.png | Bin .../renderer}/assets/lossless.svg | 0 .../renderer}/assets/pause.svg | 0 .../cider-ui => src/renderer}/assets/play.svg | 0 .../renderer}/assets/quote-right.svg | 0 .../renderer}/assets/repeat.svg | 0 .../renderer}/assets/search.svg | 0 .../renderer}/assets/shuffle.svg | 0 .../renderer}/assets/transparent.png | Bin .../renderer}/assets/volume-down.svg | 0 .../renderer}/assets/volume-up.svg | 0 .../cider-ui => src/renderer}/hlscider.js | 0 {resources/cider-ui => src/renderer}/index.js | 0 .../cider-ui => src/renderer}/index_old.html | 0 {resources/cider-ui => src/renderer}/less.js | 0 .../cider-ui => src/renderer}/logotmp.png | Bin .../cider-ui => src/renderer}/sortable.min.js | 0 .../cider-ui => src/renderer}/style-old.css | 0 .../cider-ui => src/renderer}/style.less | 0 {resources/cider-ui => src/renderer}/sw.js | 0 .../cider-ui => src/renderer}/sw.js.map | 0 {resources/cider-ui => src/renderer}/todo.js | 0 .../views/components/animatedartwork-view.ejs | 0 .../views/components/editorialNotes.ejs | 0 .../views/components/hello-world.ejs | 0 .../renderer}/views/components/karaoke-in.ejs | 0 .../views/components/lyrics-view.ejs | 0 .../views/components/mediaitem-artwork.ejs | 0 .../views/components/mediaitem-hrect.ejs | 0 .../views/components/mediaitem-list-item.ejs | 0 .../views/components/mediaitem-mvview-sp.ejs | 0 .../views/components/mediaitem-mvview.ejs | 0 .../mediaitem-scroller-horizontal-large.ejs | 0 .../mediaitem-scroller-horizontal-mvview.ejs | 0 .../mediaitem-scroller-horizontal-sp.ejs | 0 .../mediaitem-scroller-horizontal.ejs | 0 .../components/mediaitem-square-large.ejs | 0 .../views/components/mediaitem-square-sp.ejs | 0 .../views/components/mediaitem-square.ejs | 0 .../renderer}/views/components/queue-item.ejs | 0 .../renderer}/views/components/queue.ejs | 0 .../cider-ui => src/renderer}/views/main.ejs | 0 .../renderer}/views/pages/about.ejs | 0 .../renderer}/views/pages/artist.ejs | 0 .../renderer}/views/pages/browse.ejs | 0 .../renderer}/views/pages/cider-playlist.ejs | 0 .../renderer}/views/pages/collection-list.ejs | 0 .../renderer}/views/pages/library-albums.ejs | 0 .../views/pages/library-recentlyadded.ejs | 0 .../renderer}/views/pages/library-songs.ejs | 0 .../renderer}/views/pages/listen_now.ejs | 0 .../renderer}/views/pages/radio.ejs | 0 .../renderer}/views/pages/recordLabel.ejs | 0 .../renderer}/views/pages/search.ejs | 0 .../renderer}/views/pages/settings.ejs | 0 .../renderer}/views/pages/webview.ejs | 0 .../renderer}/views/pages/zoo.ejs | 0 .../renderer}/views/svg/arrow-up.svg | 0 .../renderer}/views/svg/cast.svg | 0 .../renderer}/views/svg/chevron-left.svg | 0 .../renderer}/views/svg/chevron-right.svg | 0 .../renderer}/views/svg/fullscreen.svg | 0 .../renderer}/views/svg/more.svg | 0 .../renderer}/views/svg/play.svg | 0 .../renderer}/views/svg/redo.svg | 0 .../renderer}/vue-observe-visibility.min.js | 0 {resources/cider-ui => src/renderer}/vue.js | 0 .../renderer}/vuedraggable.umd.min.js | 0 .../renderer}/workbox-962786f2.js | 0 .../renderer}/workbox-962786f2.js.map | 0 85 files changed, 114 insertions(+), 10 deletions(-) rename {resources/functions => src/main}/cider-base.js (97%) create mode 100644 src/main/init.js create mode 100644 src/main/mpris.js rename {resources => src}/preload/cider-preload.js (100%) rename {resources/cider-ui => src/renderer}/ameframework.css (100%) rename {resources/cider-ui => src/renderer}/apple-hls.js (100%) rename {resources/cider-ui => src/renderer}/assets/RatingsLove.png (100%) rename {resources/cider-ui => src/renderer}/assets/arrow-left.svg (100%) rename {resources/cider-ui => src/renderer}/assets/backward.svg (100%) rename {resources/cider-ui => src/renderer}/assets/cast_white.svg (100%) rename {resources/cider-ui => src/renderer}/assets/chevron-left.svg (100%) rename {resources/cider-ui => src/renderer}/assets/forward.svg (100%) rename {resources/cider-ui => src/renderer}/assets/list.svg (100%) rename {resources/cider-ui => src/renderer}/assets/logocut.png (100%) rename {resources/cider-ui => src/renderer}/assets/lossless.svg (100%) rename {resources/cider-ui => src/renderer}/assets/pause.svg (100%) rename {resources/cider-ui => src/renderer}/assets/play.svg (100%) rename {resources/cider-ui => src/renderer}/assets/quote-right.svg (100%) rename {resources/cider-ui => src/renderer}/assets/repeat.svg (100%) rename {resources/cider-ui => src/renderer}/assets/search.svg (100%) rename {resources/cider-ui => src/renderer}/assets/shuffle.svg (100%) rename {resources/cider-ui => src/renderer}/assets/transparent.png (100%) rename {resources/cider-ui => src/renderer}/assets/volume-down.svg (100%) rename {resources/cider-ui => src/renderer}/assets/volume-up.svg (100%) rename {resources/cider-ui => src/renderer}/hlscider.js (100%) rename {resources/cider-ui => src/renderer}/index.js (100%) rename {resources/cider-ui => src/renderer}/index_old.html (100%) rename {resources/cider-ui => src/renderer}/less.js (100%) rename {resources/cider-ui => src/renderer}/logotmp.png (100%) rename {resources/cider-ui => src/renderer}/sortable.min.js (100%) rename {resources/cider-ui => src/renderer}/style-old.css (100%) rename {resources/cider-ui => src/renderer}/style.less (100%) rename {resources/cider-ui => src/renderer}/sw.js (100%) rename {resources/cider-ui => src/renderer}/sw.js.map (100%) rename {resources/cider-ui => src/renderer}/todo.js (100%) rename {resources/cider-ui => src/renderer}/views/components/animatedartwork-view.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/editorialNotes.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/hello-world.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/karaoke-in.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/lyrics-view.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-artwork.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-hrect.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-list-item.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-mvview-sp.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-mvview.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-scroller-horizontal-large.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-scroller-horizontal-mvview.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-scroller-horizontal-sp.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-scroller-horizontal.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-square-large.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-square-sp.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/mediaitem-square.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/queue-item.ejs (100%) rename {resources/cider-ui => src/renderer}/views/components/queue.ejs (100%) rename {resources/cider-ui => src/renderer}/views/main.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/about.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/artist.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/browse.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/cider-playlist.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/collection-list.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/library-albums.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/library-recentlyadded.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/library-songs.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/listen_now.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/radio.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/recordLabel.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/search.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/settings.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/webview.ejs (100%) rename {resources/cider-ui => src/renderer}/views/pages/zoo.ejs (100%) rename {resources/cider-ui => src/renderer}/views/svg/arrow-up.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/cast.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/chevron-left.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/chevron-right.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/fullscreen.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/more.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/play.svg (100%) rename {resources/cider-ui => src/renderer}/views/svg/redo.svg (100%) rename {resources/cider-ui => src/renderer}/vue-observe-visibility.min.js (100%) rename {resources/cider-ui => src/renderer}/vue.js (100%) rename {resources/cider-ui => src/renderer}/vuedraggable.umd.min.js (100%) rename {resources/cider-ui => src/renderer}/workbox-962786f2.js (100%) rename {resources/cider-ui => src/renderer}/workbox-962786f2.js.map (100%) diff --git a/index.js b/index.js index 6d1faf6d..e435a26d 100644 --- a/index.js +++ b/index.js @@ -16,7 +16,7 @@ function CreateWindow() { }); /** CIDER **/ - const ciderwin = require("./resources/functions/cider-base") + const ciderwin = require("./src/main/cider-base") app.win = ciderwin app.win.CreateBrowserWindow() /** CIDER **/ @@ -37,9 +37,7 @@ app.on('ready', () => { app.on('before-quit', () => { app.isQuiting = true; - console.warn('---------------------------------------------------------------------'); - console.warn(`${app.getName()} has closed.`); - console.warn('---------------------------------------------------------------------'); + console.warn(`${app.getName()} exited.`); }); // Widevine Stuff diff --git a/package.json b/package.json index ba9efd93..f4730f11 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "electron-window-state": "^5.0.3", "express": "^4.17.2", "get-port": "^5.1.1", + "mpris-service": "^2.1.2", "react": "^17.0.2", "react-dom": "^17.0.2", "source-map-support": "^0.5.21", @@ -87,14 +88,12 @@ "extends": null, "files": [ "**/*", + "./src/**/*", "./resources/icons/icon.*" ], "linux": { "target": [ - "AppImage", - "deb", - "snap", - "rpm" + "pacman" ], "synopsis": "A new look into listening and enjoying music in style and performance. ", "category": "AudioVideo", diff --git a/resources/functions/cider-base.js b/src/main/cider-base.js similarity index 97% rename from resources/functions/cider-base.js rename to src/main/cider-base.js index 301a1ac9..fbddc674 100644 --- a/resources/functions/cider-base.js +++ b/src/main/cider-base.js @@ -21,7 +21,7 @@ const CiderBase = { let win = null const options = { - icon: join(__dirname, `../icons/icon.ico`), + icon: join(__dirname, `../../resources/icons/icon.ico`), width: mainWindowState.width, height: mainWindowState.height, x: mainWindowState.x, @@ -174,7 +174,7 @@ const CiderBase = { async InitWebServer() { const webRemotePort = await getPort({port : 9000}); const webapp = express(); - const webRemotePath = path.join(__dirname, '../cider-ui/'); + const webRemotePath = path.join(__dirname, '../renderer/'); webapp.set("views", path.join(webRemotePath, "views")); webapp.set("view engine", "ejs"); diff --git a/src/main/init.js b/src/main/init.js new file mode 100644 index 00000000..69f2a796 --- /dev/null +++ b/src/main/init.js @@ -0,0 +1,5 @@ +const {app} = require('electron'); + +module.export = () => { + if (process.platform === "linux") app.commandLine.appendSwitch('disable-features', 'MediaSessionService'); +} \ No newline at end of file diff --git a/src/main/mpris.js b/src/main/mpris.js new file mode 100644 index 00000000..cd7d2a73 --- /dev/null +++ b/src/main/mpris.js @@ -0,0 +1,102 @@ +const {app} = require('electron'), + Player = require('mpris-service'); + +// Remember to use playerctl when debugging this. +// I'm just putting this here as I keep forgetting the command. +// Copied from AME + +let mediaPlayer; + +module.exports = { + connect: (win) => { + if (process.platform !== "linux") return; + + mediaPlayer = Player({ + name: 'Cider', + identity: 'Cider', + supportedUriSchemes: [], + supportedMimeTypes: [], + supportedInterfaces: ['player'] + }); + mediaPlayer = Object.assign(mediaPlayer, { canQuit: true, canControl: true, canPause: true, canPlay: true, canGoNext: true }) + + + let pos_atr = {durationInMillis: 0}; + mediaPlayer.getPosition = function () { + const durationInMicro = pos_atr.durationInMillis * 1000; + const percentage = parseFloat(0) || 0; + return durationInMicro * percentage; + } + + mediaPlayer.active = true + + mediaPlayer.on('playpause', async () => { + win.webContents.executeJavaScript('MusicKitInterop.pausePlay()').catch(err => console.error(err)) + }); + + mediaPlayer.on('play', async () => { + win.webContents.executeJavaScript('MusicKitInterop.pausePlay()').catch(err => console.error(err)) + }); + + mediaPlayer.on('pause', async () => { + win.webContents.executeJavaScript('MusicKitInterop.pausePlay()').catch(err => console.error(err)) + }); + + mediaPlayer.on('next', async () => { + win.webContents.executeJavaScript('MusicKitInterop.nextTrack()').catch(err => console.error(err)) + }); + + mediaPlayer.on('previous', async () => { + win.webContents.executeJavaScript('MusicKitInterop.previousTrack()').catch(err => console.error(err)) + }); + }, + + updateAttributes: (attributes) => { + if (process.platform !== "linux") return; + + const MetaData = { + 'mpris:trackid': mediaPlayer.objectPath(`track/${attributes.playParams.id.replace(/[.]+/g, "")}`), + 'mpris:length': attributes.durationInMillis * 1000, // In microseconds + 'mpris:artUrl': (attributes.artwork.url.replace('/{w}x{h}bb', '/512x512bb')).replace('/2000x2000bb', '/35x35bb'), + 'xesam:title': `${attributes.name}`, + 'xesam:album': `${attributes.albumName}`, + 'xesam:artist': [`${attributes.artistName}`,], + 'xesam:genre': attributes.genreNames + } + + if (mediaPlayer.metadata["mpris:trackid"] === MetaData["mpris:trackid"]) { + return + } + + mediaPlayer.metadata = MetaData + }, + + updateState: (attributes) => { + if (process.platform !== "linux") return; + + function setPlaybackIfNeeded(status) { + if (mediaPlayer.playbackStatus === status) { + return + } + mediaPlayer.playbackStatus = status; + } + + switch (attributes.status) { + case true: // Playing + setPlaybackIfNeeded('Playing'); + break; + case false: // Paused + setPlaybackIfNeeded('Paused'); + break; + default: // Stopped + setPlaybackIfNeeded('Stopped'); + break; + } + }, + + clearActivity: () => { + if (process.platform !== "linux") return; + mediaPlayer.metadata = {'mpris:trackid': '/org/mpris/MediaPlayer2/TrackList/NoTrack'} + mediaPlayer.playbackStatus = 'Stopped'; + }, +} \ No newline at end of file diff --git a/resources/preload/cider-preload.js b/src/preload/cider-preload.js similarity index 100% rename from resources/preload/cider-preload.js rename to src/preload/cider-preload.js diff --git a/resources/cider-ui/ameframework.css b/src/renderer/ameframework.css similarity index 100% rename from resources/cider-ui/ameframework.css rename to src/renderer/ameframework.css diff --git a/resources/cider-ui/apple-hls.js b/src/renderer/apple-hls.js similarity index 100% rename from resources/cider-ui/apple-hls.js rename to src/renderer/apple-hls.js diff --git a/resources/cider-ui/assets/RatingsLove.png b/src/renderer/assets/RatingsLove.png similarity index 100% rename from resources/cider-ui/assets/RatingsLove.png rename to src/renderer/assets/RatingsLove.png diff --git a/resources/cider-ui/assets/arrow-left.svg b/src/renderer/assets/arrow-left.svg similarity index 100% rename from resources/cider-ui/assets/arrow-left.svg rename to src/renderer/assets/arrow-left.svg diff --git a/resources/cider-ui/assets/backward.svg b/src/renderer/assets/backward.svg similarity index 100% rename from resources/cider-ui/assets/backward.svg rename to src/renderer/assets/backward.svg diff --git a/resources/cider-ui/assets/cast_white.svg b/src/renderer/assets/cast_white.svg similarity index 100% rename from resources/cider-ui/assets/cast_white.svg rename to src/renderer/assets/cast_white.svg diff --git a/resources/cider-ui/assets/chevron-left.svg b/src/renderer/assets/chevron-left.svg similarity index 100% rename from resources/cider-ui/assets/chevron-left.svg rename to src/renderer/assets/chevron-left.svg diff --git a/resources/cider-ui/assets/forward.svg b/src/renderer/assets/forward.svg similarity index 100% rename from resources/cider-ui/assets/forward.svg rename to src/renderer/assets/forward.svg diff --git a/resources/cider-ui/assets/list.svg b/src/renderer/assets/list.svg similarity index 100% rename from resources/cider-ui/assets/list.svg rename to src/renderer/assets/list.svg diff --git a/resources/cider-ui/assets/logocut.png b/src/renderer/assets/logocut.png similarity index 100% rename from resources/cider-ui/assets/logocut.png rename to src/renderer/assets/logocut.png diff --git a/resources/cider-ui/assets/lossless.svg b/src/renderer/assets/lossless.svg similarity index 100% rename from resources/cider-ui/assets/lossless.svg rename to src/renderer/assets/lossless.svg diff --git a/resources/cider-ui/assets/pause.svg b/src/renderer/assets/pause.svg similarity index 100% rename from resources/cider-ui/assets/pause.svg rename to src/renderer/assets/pause.svg diff --git a/resources/cider-ui/assets/play.svg b/src/renderer/assets/play.svg similarity index 100% rename from resources/cider-ui/assets/play.svg rename to src/renderer/assets/play.svg diff --git a/resources/cider-ui/assets/quote-right.svg b/src/renderer/assets/quote-right.svg similarity index 100% rename from resources/cider-ui/assets/quote-right.svg rename to src/renderer/assets/quote-right.svg diff --git a/resources/cider-ui/assets/repeat.svg b/src/renderer/assets/repeat.svg similarity index 100% rename from resources/cider-ui/assets/repeat.svg rename to src/renderer/assets/repeat.svg diff --git a/resources/cider-ui/assets/search.svg b/src/renderer/assets/search.svg similarity index 100% rename from resources/cider-ui/assets/search.svg rename to src/renderer/assets/search.svg diff --git a/resources/cider-ui/assets/shuffle.svg b/src/renderer/assets/shuffle.svg similarity index 100% rename from resources/cider-ui/assets/shuffle.svg rename to src/renderer/assets/shuffle.svg diff --git a/resources/cider-ui/assets/transparent.png b/src/renderer/assets/transparent.png similarity index 100% rename from resources/cider-ui/assets/transparent.png rename to src/renderer/assets/transparent.png diff --git a/resources/cider-ui/assets/volume-down.svg b/src/renderer/assets/volume-down.svg similarity index 100% rename from resources/cider-ui/assets/volume-down.svg rename to src/renderer/assets/volume-down.svg diff --git a/resources/cider-ui/assets/volume-up.svg b/src/renderer/assets/volume-up.svg similarity index 100% rename from resources/cider-ui/assets/volume-up.svg rename to src/renderer/assets/volume-up.svg diff --git a/resources/cider-ui/hlscider.js b/src/renderer/hlscider.js similarity index 100% rename from resources/cider-ui/hlscider.js rename to src/renderer/hlscider.js diff --git a/resources/cider-ui/index.js b/src/renderer/index.js similarity index 100% rename from resources/cider-ui/index.js rename to src/renderer/index.js diff --git a/resources/cider-ui/index_old.html b/src/renderer/index_old.html similarity index 100% rename from resources/cider-ui/index_old.html rename to src/renderer/index_old.html diff --git a/resources/cider-ui/less.js b/src/renderer/less.js similarity index 100% rename from resources/cider-ui/less.js rename to src/renderer/less.js diff --git a/resources/cider-ui/logotmp.png b/src/renderer/logotmp.png similarity index 100% rename from resources/cider-ui/logotmp.png rename to src/renderer/logotmp.png diff --git a/resources/cider-ui/sortable.min.js b/src/renderer/sortable.min.js similarity index 100% rename from resources/cider-ui/sortable.min.js rename to src/renderer/sortable.min.js diff --git a/resources/cider-ui/style-old.css b/src/renderer/style-old.css similarity index 100% rename from resources/cider-ui/style-old.css rename to src/renderer/style-old.css diff --git a/resources/cider-ui/style.less b/src/renderer/style.less similarity index 100% rename from resources/cider-ui/style.less rename to src/renderer/style.less diff --git a/resources/cider-ui/sw.js b/src/renderer/sw.js similarity index 100% rename from resources/cider-ui/sw.js rename to src/renderer/sw.js diff --git a/resources/cider-ui/sw.js.map b/src/renderer/sw.js.map similarity index 100% rename from resources/cider-ui/sw.js.map rename to src/renderer/sw.js.map diff --git a/resources/cider-ui/todo.js b/src/renderer/todo.js similarity index 100% rename from resources/cider-ui/todo.js rename to src/renderer/todo.js diff --git a/resources/cider-ui/views/components/animatedartwork-view.ejs b/src/renderer/views/components/animatedartwork-view.ejs similarity index 100% rename from resources/cider-ui/views/components/animatedartwork-view.ejs rename to src/renderer/views/components/animatedartwork-view.ejs diff --git a/resources/cider-ui/views/components/editorialNotes.ejs b/src/renderer/views/components/editorialNotes.ejs similarity index 100% rename from resources/cider-ui/views/components/editorialNotes.ejs rename to src/renderer/views/components/editorialNotes.ejs diff --git a/resources/cider-ui/views/components/hello-world.ejs b/src/renderer/views/components/hello-world.ejs similarity index 100% rename from resources/cider-ui/views/components/hello-world.ejs rename to src/renderer/views/components/hello-world.ejs diff --git a/resources/cider-ui/views/components/karaoke-in.ejs b/src/renderer/views/components/karaoke-in.ejs similarity index 100% rename from resources/cider-ui/views/components/karaoke-in.ejs rename to src/renderer/views/components/karaoke-in.ejs diff --git a/resources/cider-ui/views/components/lyrics-view.ejs b/src/renderer/views/components/lyrics-view.ejs similarity index 100% rename from resources/cider-ui/views/components/lyrics-view.ejs rename to src/renderer/views/components/lyrics-view.ejs diff --git a/resources/cider-ui/views/components/mediaitem-artwork.ejs b/src/renderer/views/components/mediaitem-artwork.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-artwork.ejs rename to src/renderer/views/components/mediaitem-artwork.ejs diff --git a/resources/cider-ui/views/components/mediaitem-hrect.ejs b/src/renderer/views/components/mediaitem-hrect.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-hrect.ejs rename to src/renderer/views/components/mediaitem-hrect.ejs diff --git a/resources/cider-ui/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-list-item.ejs rename to src/renderer/views/components/mediaitem-list-item.ejs diff --git a/resources/cider-ui/views/components/mediaitem-mvview-sp.ejs b/src/renderer/views/components/mediaitem-mvview-sp.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-mvview-sp.ejs rename to src/renderer/views/components/mediaitem-mvview-sp.ejs diff --git a/resources/cider-ui/views/components/mediaitem-mvview.ejs b/src/renderer/views/components/mediaitem-mvview.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-mvview.ejs rename to src/renderer/views/components/mediaitem-mvview.ejs diff --git a/resources/cider-ui/views/components/mediaitem-scroller-horizontal-large.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-scroller-horizontal-large.ejs rename to src/renderer/views/components/mediaitem-scroller-horizontal-large.ejs diff --git a/resources/cider-ui/views/components/mediaitem-scroller-horizontal-mvview.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-scroller-horizontal-mvview.ejs rename to src/renderer/views/components/mediaitem-scroller-horizontal-mvview.ejs diff --git a/resources/cider-ui/views/components/mediaitem-scroller-horizontal-sp.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-scroller-horizontal-sp.ejs rename to src/renderer/views/components/mediaitem-scroller-horizontal-sp.ejs diff --git a/resources/cider-ui/views/components/mediaitem-scroller-horizontal.ejs b/src/renderer/views/components/mediaitem-scroller-horizontal.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-scroller-horizontal.ejs rename to src/renderer/views/components/mediaitem-scroller-horizontal.ejs diff --git a/resources/cider-ui/views/components/mediaitem-square-large.ejs b/src/renderer/views/components/mediaitem-square-large.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-square-large.ejs rename to src/renderer/views/components/mediaitem-square-large.ejs diff --git a/resources/cider-ui/views/components/mediaitem-square-sp.ejs b/src/renderer/views/components/mediaitem-square-sp.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-square-sp.ejs rename to src/renderer/views/components/mediaitem-square-sp.ejs diff --git a/resources/cider-ui/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs similarity index 100% rename from resources/cider-ui/views/components/mediaitem-square.ejs rename to src/renderer/views/components/mediaitem-square.ejs diff --git a/resources/cider-ui/views/components/queue-item.ejs b/src/renderer/views/components/queue-item.ejs similarity index 100% rename from resources/cider-ui/views/components/queue-item.ejs rename to src/renderer/views/components/queue-item.ejs diff --git a/resources/cider-ui/views/components/queue.ejs b/src/renderer/views/components/queue.ejs similarity index 100% rename from resources/cider-ui/views/components/queue.ejs rename to src/renderer/views/components/queue.ejs diff --git a/resources/cider-ui/views/main.ejs b/src/renderer/views/main.ejs similarity index 100% rename from resources/cider-ui/views/main.ejs rename to src/renderer/views/main.ejs diff --git a/resources/cider-ui/views/pages/about.ejs b/src/renderer/views/pages/about.ejs similarity index 100% rename from resources/cider-ui/views/pages/about.ejs rename to src/renderer/views/pages/about.ejs diff --git a/resources/cider-ui/views/pages/artist.ejs b/src/renderer/views/pages/artist.ejs similarity index 100% rename from resources/cider-ui/views/pages/artist.ejs rename to src/renderer/views/pages/artist.ejs diff --git a/resources/cider-ui/views/pages/browse.ejs b/src/renderer/views/pages/browse.ejs similarity index 100% rename from resources/cider-ui/views/pages/browse.ejs rename to src/renderer/views/pages/browse.ejs diff --git a/resources/cider-ui/views/pages/cider-playlist.ejs b/src/renderer/views/pages/cider-playlist.ejs similarity index 100% rename from resources/cider-ui/views/pages/cider-playlist.ejs rename to src/renderer/views/pages/cider-playlist.ejs diff --git a/resources/cider-ui/views/pages/collection-list.ejs b/src/renderer/views/pages/collection-list.ejs similarity index 100% rename from resources/cider-ui/views/pages/collection-list.ejs rename to src/renderer/views/pages/collection-list.ejs diff --git a/resources/cider-ui/views/pages/library-albums.ejs b/src/renderer/views/pages/library-albums.ejs similarity index 100% rename from resources/cider-ui/views/pages/library-albums.ejs rename to src/renderer/views/pages/library-albums.ejs diff --git a/resources/cider-ui/views/pages/library-recentlyadded.ejs b/src/renderer/views/pages/library-recentlyadded.ejs similarity index 100% rename from resources/cider-ui/views/pages/library-recentlyadded.ejs rename to src/renderer/views/pages/library-recentlyadded.ejs diff --git a/resources/cider-ui/views/pages/library-songs.ejs b/src/renderer/views/pages/library-songs.ejs similarity index 100% rename from resources/cider-ui/views/pages/library-songs.ejs rename to src/renderer/views/pages/library-songs.ejs diff --git a/resources/cider-ui/views/pages/listen_now.ejs b/src/renderer/views/pages/listen_now.ejs similarity index 100% rename from resources/cider-ui/views/pages/listen_now.ejs rename to src/renderer/views/pages/listen_now.ejs diff --git a/resources/cider-ui/views/pages/radio.ejs b/src/renderer/views/pages/radio.ejs similarity index 100% rename from resources/cider-ui/views/pages/radio.ejs rename to src/renderer/views/pages/radio.ejs diff --git a/resources/cider-ui/views/pages/recordLabel.ejs b/src/renderer/views/pages/recordLabel.ejs similarity index 100% rename from resources/cider-ui/views/pages/recordLabel.ejs rename to src/renderer/views/pages/recordLabel.ejs diff --git a/resources/cider-ui/views/pages/search.ejs b/src/renderer/views/pages/search.ejs similarity index 100% rename from resources/cider-ui/views/pages/search.ejs rename to src/renderer/views/pages/search.ejs diff --git a/resources/cider-ui/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs similarity index 100% rename from resources/cider-ui/views/pages/settings.ejs rename to src/renderer/views/pages/settings.ejs diff --git a/resources/cider-ui/views/pages/webview.ejs b/src/renderer/views/pages/webview.ejs similarity index 100% rename from resources/cider-ui/views/pages/webview.ejs rename to src/renderer/views/pages/webview.ejs diff --git a/resources/cider-ui/views/pages/zoo.ejs b/src/renderer/views/pages/zoo.ejs similarity index 100% rename from resources/cider-ui/views/pages/zoo.ejs rename to src/renderer/views/pages/zoo.ejs diff --git a/resources/cider-ui/views/svg/arrow-up.svg b/src/renderer/views/svg/arrow-up.svg similarity index 100% rename from resources/cider-ui/views/svg/arrow-up.svg rename to src/renderer/views/svg/arrow-up.svg diff --git a/resources/cider-ui/views/svg/cast.svg b/src/renderer/views/svg/cast.svg similarity index 100% rename from resources/cider-ui/views/svg/cast.svg rename to src/renderer/views/svg/cast.svg diff --git a/resources/cider-ui/views/svg/chevron-left.svg b/src/renderer/views/svg/chevron-left.svg similarity index 100% rename from resources/cider-ui/views/svg/chevron-left.svg rename to src/renderer/views/svg/chevron-left.svg diff --git a/resources/cider-ui/views/svg/chevron-right.svg b/src/renderer/views/svg/chevron-right.svg similarity index 100% rename from resources/cider-ui/views/svg/chevron-right.svg rename to src/renderer/views/svg/chevron-right.svg diff --git a/resources/cider-ui/views/svg/fullscreen.svg b/src/renderer/views/svg/fullscreen.svg similarity index 100% rename from resources/cider-ui/views/svg/fullscreen.svg rename to src/renderer/views/svg/fullscreen.svg diff --git a/resources/cider-ui/views/svg/more.svg b/src/renderer/views/svg/more.svg similarity index 100% rename from resources/cider-ui/views/svg/more.svg rename to src/renderer/views/svg/more.svg diff --git a/resources/cider-ui/views/svg/play.svg b/src/renderer/views/svg/play.svg similarity index 100% rename from resources/cider-ui/views/svg/play.svg rename to src/renderer/views/svg/play.svg diff --git a/resources/cider-ui/views/svg/redo.svg b/src/renderer/views/svg/redo.svg similarity index 100% rename from resources/cider-ui/views/svg/redo.svg rename to src/renderer/views/svg/redo.svg diff --git a/resources/cider-ui/vue-observe-visibility.min.js b/src/renderer/vue-observe-visibility.min.js similarity index 100% rename from resources/cider-ui/vue-observe-visibility.min.js rename to src/renderer/vue-observe-visibility.min.js diff --git a/resources/cider-ui/vue.js b/src/renderer/vue.js similarity index 100% rename from resources/cider-ui/vue.js rename to src/renderer/vue.js diff --git a/resources/cider-ui/vuedraggable.umd.min.js b/src/renderer/vuedraggable.umd.min.js similarity index 100% rename from resources/cider-ui/vuedraggable.umd.min.js rename to src/renderer/vuedraggable.umd.min.js diff --git a/resources/cider-ui/workbox-962786f2.js b/src/renderer/workbox-962786f2.js similarity index 100% rename from resources/cider-ui/workbox-962786f2.js rename to src/renderer/workbox-962786f2.js diff --git a/resources/cider-ui/workbox-962786f2.js.map b/src/renderer/workbox-962786f2.js.map similarity index 100% rename from resources/cider-ui/workbox-962786f2.js.map rename to src/renderer/workbox-962786f2.js.map