no

src/main/cider-base.js

@@ -8,9 +8,11 @@ const os = require('os');
 const yt = require('youtube-search-without-api-key');
 const discord = require('./discordrpc');
 const lastfm = require('./lastfm');
+const {writeFile} = require('fs');
 const mpris = require('./mpris');
 const mm = require('music-metadata');
 const fetch = require('electron-fetch').default;
+const {Stream} = require('stream');
 
 // Analytics for debugging.
 const ElectronSentry = require("@sentry/electron");
@@ -18,6 +20,8 @@ ElectronSentry.init({dsn: "https://68c422bfaaf44dea880b86aad5a820d2@o954055.inge
 
 const CiderBase = {
     win: null,
+    requests : [],
+    audiostream : new Stream.PassThrough(),
     async Start() {
         this.clientPort = await getPort({port: 9000});
         this.win = this.CreateBrowserWindow()
@@ -241,6 +245,10 @@ const CiderBase = {
             })
         });
 
+        ipcMain.on('writeAudio', function(event,buffer){       
+            CiderBase.audiostream.write(Buffer.from(buffer));        
+        })
+
         return win
     },
 
@@ -284,7 +292,7 @@ const CiderBase = {
 
         webapp.use(function (req, res, next) {
             // if not localhost
-            if (req.headers.host.includes("localhost") && req.headers["user-agent"].includes("Cider")) {
+            if (req.url.includes("audio.webm") ||(req.headers.host.includes("localhost") &&  req.headers["user-agent"].includes("Cider"))) {
                 next();
             }
         });
@@ -294,6 +302,25 @@ const CiderBase = {
             //res.sendFile(path.join(webRemotePath, 'index_old.html'));
             res.render("main", CiderBase.EnvironmentVariables)
         });
+        webapp.get('/audio.webm', function (req, res) { 
+            try {
+            req.connection.setTimeout(Number.MAX_SAFE_INTEGER);
+            // CiderBase.requests.push({req: req, res: res});
+            // var pos = CiderBase.requests.length - 1;
+            // req.on("close", () => {
+            //     console.info("CLOSED", CiderBase.requests.length);
+            //     requests.splice(pos, 1);
+            //     console.info("CLOSED", CiderBase.requests.length);
+            // });
+            CiderBase.audiostream.on('data', (data) => {
+                try {
+                    res.write(data);
+                } catch (ex) {
+                    console.log(ex)
+                }
+            })
+            } catch (ex) {console.log(ex)}
+        });
         webapp.listen(CiderBase.clientPort, function () {
             console.log(`Cider client port: ${CiderBase.clientPort}`);
         });

src/renderer/audio/audio.js

@@ -75,6 +75,21 @@ var CiderAudio = {
         CiderAudio.audioNodes.spatialNode.output.disconnect(CiderAudio.context.destination);
         CiderAudio.audioNodes.gainNode.disconnect(CiderAudio.audioNodes.spatialInput.input);} catch(e){}
         CiderAudio.audioNodes.gainNode.connect(CiderAudio.context.destination);
+    },
+    sendAudio: function (){
+        var options = {
+            mimeType : 'audio/webm; codecs=opus'
+          };
+          var destnode =  CiderAudio.context.createMediaStreamDestination();
+          CiderAudio.audioNodes.gainNode.connect(destnode)
+          var mediaRecorder = new MediaRecorder(destnode.stream,options); 
+          mediaRecorder.start(1);
+          mediaRecorder.ondataavailable = function(e) {
+            e.data.arrayBuffer().then(buffer => {  
+                ipcRenderer.send('writeAudio',buffer)
+            }
+          );                   
+        }
     }
 
 }

src/renderer/style.less

@@ -1556,34 +1556,6 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   font-weight: bold;
   font-size: 26px;
 }
-
-.lyric-footer {
-  bottom: 0;
-  height: 50px;
-  width: 100%;
-  position: absolute;
-  z-index: 1000;
-  opacity: 1;
-  background: rgba(30, 30, 30, 0.8);
-  justify-content: center;
-  align-items: center;
-  display: none;
-  transition: opacity 0.1s var(--appleEase);
-}
-
-.lyric-body:hover + .lyric-footer, .lyric-footer:hover {
-  display: flex; 
-}
-
-.modular-fs .app-drawer .lyric-footer {
-  background: rgba(30, 30, 30, 0.3);
-  display: flex;
-  opacity: 0.3;
-}
-
-.modular-fs .app-drawer .lyric-footer:hover {
-  opacity: 1;
-}
  
 .lyric-line {
   --bgSpeed: 1s;

src/renderer/views/components/mediaitem-square-large.ejs

@@ -1,5 +1,4 @@
 <script type="text/x-template" id="mediaitem-square-large">
-    <template>
         <div ref="main" style="position: relative; display: inline-flex;"  @contextmenu="contextMenu">
             <div @click.self='app.routeView(item)'
                  class="cd-mediaitem-square-large" ref="main2">
@@ -67,7 +66,6 @@
                 </div>
             </div>
         </div>
-    </template>
 </script>
 
 <script>
@@ -76,6 +74,8 @@
         props: ['item'],
         data: function () {
             return {
+                isVisible: false,
+                addedToLibrary: false,
                 app: this.$root,
             }
         },
@@ -92,11 +92,44 @@
                     0 /*left*/, null
                 );
                 this.$refs.main.dispatchEvent(evt);
-            }
+            },
-            , contextMenu(event) {
+            async isInLibrary() {
+                if (this.item.type && !this.item.type.includes("library")) {
+                    var params = {
+                        "fields[playlists]": "inLibrary",
+                        "fields[albums]": "inLibrary",
+                        "relate": "library",
+                        "extend": this.revisedRandId()
+                    }
+                    var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
+                    this.addedToLibrary = (res && res.attributes && res.attributes.inLibrary) ? res.attributes.inLibrary : false
+                } else {
+                    this.addedToLibrary = true
+                }
+            },
+            async removeFromLibrary(id) {
+                var params = {
+                    "fields[playlists]": "inLibrary",
+                    "fields[songs]": "inLibrary",
+                    "fields[albums]": "inLibrary",
+                    "relate": "library",
+                    "extend": this.revisedRandId()
+                }
+                var id = this.item.id ?? this.item.attributes.playParams.id
+                var res = await app.mkapi(this.item.attributes.playParams.kind ?? this.item.type, this.item.attributes.playParams.isLibrary ?? false, this.item.attributes.playParams.id ?? this.item.id, params);
+                if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
+                    id = res.relationships.library.data[0].id
+                }
+                let kind = this.item.attributes.playParams.kind ?? this.item.type ?? '';
+                var truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
+                app.mk.api.library.remove({[truekind]: id})
+                this.addedToLibrary = true
+            },
+            async contextMenu(event) {
                 if (!event) { event = this.$refs.main } else { console.log(event) }
                 let self = this
                 let useMenu = "normal"
+                await this.isInLibrary()
                 if (app.selectedMediaItems.length <= 1) {
                     app.selectedMediaItems = []
                     app.select_selectMediaItem(this.item.attributes.playParams.id ?? this.item.id, this.item.attributes.playParams.kind ?? this.item.type, this.index, this.guid)
@@ -154,7 +187,7 @@
                             {
                                 "name": "Play Next",
                                 "action": function () {
-                                    app.mk.playNext({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                                    app.mk.playNext({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
                                     app.mk.queue._reindex()
                                     app.selectedMediaItems = []
                                 }
@@ -162,11 +195,41 @@
                             {
                                 "name": "Play Later",
                                 "action": function () {
-                                    app.mk.playLater({ [self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id })
+                                    app.mk.playLater({[self.item.attributes.playParams.kind ?? self.item.type]: self.item.attributes.playParams.id ?? self.item.id})
                                     app.mk.queue._reindex()
                                     app.selectedMediaItems = []
                                 }
                             },
+                            {
+                                "id": "addToPlaylist",
+                                "name": "Add to Playlist...",
+                                "action": function () {
+                                    app.promptAddToPlaylist()
+                                }
+                            },
+                            {
+                                "name": (this.addedToLibrary) ? "Remove from Library..." : "Add to Library...",
+                                "action": async function () {
+                                    let item_id = self.item.attributes.playParams.id ?? self.item.id;
+                                    let data_type = self.item.attributes.playParams.kind ?? self.item.type;
+                                    if (self.addedToLibrary != true) {
+                                        console.log("add");
+                                        app.addToLibrary(item_id);
+                                        self.addedToLibrary = true
+                                    } else {
+                                        console.log("remove");
+                                        await self.removeFromLibrary(item_id);
+                                        self.addedToLibrary = false
+                                    }
+                                    ;
+                                }
+                            },
+                            {
+                                "name": "Share",
+                                "action": function () {
+                                    self.app.copyToClipboard(self.item.attributes.url)
+                                }
+                            }
                         ]
                     }
                 }