From d0e18236a66692bb1ec29af43c9a4bf91e41338c Mon Sep 17 00:00:00 2001
From: Core <core@coredev.uk>
Date: Thu, 15 Sep 2022 01:29:10 +0100
Subject: [PATCH] live icon

Signed-off-by: Core <core@coredev.uk>
---
 .prettierignore                          | 1 +
 src/main/index.ts                        | 7 +------
 src/renderer/style.less                  | 6 ++++++
 src/renderer/views/app/chrome-bottom.ejs | 7 +++----
 src/renderer/views/app/chrome-top.ejs    | 5 +++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 7645927e..c8c940fc 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,3 +2,4 @@ src/renderer/apple-hls*
 build/*
 src/renderer/lib/*
 *.min.*
+.pnpm-store
diff --git a/src/main/index.ts b/src/main/index.ts
index a3c7f54f..16a57dbe 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,10 +1,6 @@
 require("v8-compile-cache");
 
-import { join } from "path";
-import { app } from "electron";
-if (!app.isPackaged) {
-  app.setPath("userData", join(app.getPath("appData"), "Cider"));
-}
+import { app, components, ipcMain } from "electron";
 
 import { Store } from "./base/store";
 import { AppEvents } from "./base/app";
@@ -12,7 +8,6 @@ import { Plugins } from "./base/plugins";
 import { BrowserWindow } from "./base/browserwindow";
 import { init as Sentry } from "@sentry/electron";
 import { RewriteFrames } from "@sentry/integrations";
-import { components, ipcMain } from "electron";
 
 // Analytics for debugging fun yeah.
 Sentry({
diff --git a/src/renderer/style.less b/src/renderer/style.less
index d4e0fa52..3403196e 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -1339,6 +1339,12 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.cl
     flex: 1;
   }
 
+  .live-icon {
+    filter: none !important;
+    margin-left: 0.5em !important;
+    flex: 1;
+  }
+
   .chrome-icon-container {
     display: flex;
     position: absolute;
diff --git a/src/renderer/views/app/chrome-bottom.ejs b/src/renderer/views/app/chrome-bottom.ejs
index dab5dcb8..02cd2643 100644
--- a/src/renderer/views/app/chrome-bottom.ejs
+++ b/src/renderer/views/app/chrome-bottom.ejs
@@ -69,6 +69,7 @@
                                  :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')"
                                  v-b-tooltip.hover
                             ></div>
+                            <svg class="audio-type live-icon" v-if="mk.nowPlayingItem?.attributes?.isLive === true" :title="$root.getLz('term.live')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="var(--keyColor)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" v-b-tooltip.hover><path d="M5 12.55a11 11 0 0 1 14.08 0"></path><path d="M1.42 9a16 16 0 0 1 21.16 0"></path><path d="M8.53 16.11a6 6 0 0 1 6.95 0"></path><line x1="12" y1="20" x2="12.01" y2="20"></line></svg>
                         </div>
                     </div>
                     <template v-if="mk.nowPlayingItem['attributes']['playParams']">
@@ -101,10 +102,8 @@
     </div>
     <div class="app-chrome--center">
         <div class="app-chrome-playback-duration-bottom">
-            <b-row v-if="mkReady()">
-                <b-col sm="auto" v-if="!mk.nowPlayingItem?.isLiveRadioStation">{{ convertTime(getSongProgress()) }}
-                </b-col>
-                <b-col sm="auto" v-else>--:--</b-col>
+            <b-row v-if="mkReady() && mk.nowPlayingItem?.attributes?.isLive !== true">
+                <b-col sm="auto">{{ convertTime(getSongProgress()) }}</b-col>
                 <b-col>
                     <input type="range" step="0.01" min="0" :style="progressBarStyle()"
                            @input="playerLCD.desiredDuration = $event.target.value;playerLCD.userInteraction = true"
diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs
index ac472819..4d7056d5 100644
--- a/src/renderer/views/app/chrome-top.ejs
+++ b/src/renderer/views/app/chrome-top.ejs
@@ -134,7 +134,7 @@
                     </b-popover>
                     <div class="playback-info">
                         <div class="chrome-icon-container">
-                            <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true"></div>
+                            <div class="audio-type private-icon" v-if="cfg.general.privateEnabled === true" :title="$root.getLz('term.privateSession')" v-b-tooltip.hover></div>
                             <div class="audio-type spatial-icon" v-if="cfg.audio.maikiwiAudio.spatial === true"
                                  :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization') + ' (' + getProfileLz('CTS', cfg.audio.maikiwiAudio.spatialProfile) + ')'"
                                  v-b-tooltip.hover
@@ -149,6 +149,7 @@
                                  :title="$root.getLz('settings.option.audio.enableAdvancedFunctionality.ciderPPE')"
                                  v-b-tooltip.hover
                             ></div>
+                            <svg class="audio-type live-icon" v-if="mk.nowPlayingItem?.attributes?.isLive === true" :title="$root.getLz('term.live')" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="var(--keyColor)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" v-b-tooltip.hover><path d="M5 12.55a11 11 0 0 1 14.08 0"></path><path d="M1.42 9a16 16 0 0 1 21.16 0"></path><path d="M8.53 16.11a6 6 0 0 1 6.95 0"></path><line x1="12" y1="20" x2="12.01" y2="20"></line></svg>
                         </div>
                         <div class="info-rect">
                             <div class="song-name"
@@ -185,7 +186,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="song-progress">
+                        <div class="song-progress" v-if="mk.nowPlayingItem?.attributes?.isLive !== true">
                             <div class="song-duration" style="justify-content: space-between; height: 1px"
                                  :style="[chrome.progresshover ? {'display': 'flex'} : {'display' : 'none'} ]">
                                 <p style="width: auto">{{ convertTime(getSongProgress()) }}</p>