From 96db2c3753314c7b1d0103f766798689cf16c64e Mon Sep 17 00:00:00 2001
From: exttex <exttex@protonmail.com>
Date: Tue, 1 Sep 2020 20:37:02 +0200
Subject: [PATCH] Playback error fix, downloading on windows crash fix, logging
 POC

---
 app/client/src/components/DownloadDialog.vue | 12 +++++++-
 app/client/src/components/Lyrics.vue         |  2 +-
 app/client/src/main.js                       | 18 +++++++++++-
 app/client/src/views/DownloadsPage.vue       | 23 ++++++++++++---
 app/client/src/views/Settings.vue            | 11 +++++++
 app/package.json                             |  2 +-
 app/src/downloads.js                         | 25 +++++++++++++++-
 app/src/server.js                            | 30 +++++++++++++++++++-
 app/src/settings.js                          |  2 ++
 package.json                                 |  2 +-
 10 files changed, 116 insertions(+), 11 deletions(-)

diff --git a/app/client/src/components/DownloadDialog.vue b/app/client/src/components/DownloadDialog.vue
index da3a107..adfd299 100644
--- a/app/client/src/components/DownloadDialog.vue
+++ b/app/client/src/components/DownloadDialog.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
 
-    <v-dialog v-model='show' max-width='420'>
+    <v-dialog v-model='dShow' max-width='420'>
         <v-card>
 
             <v-card-title class='headline'>
@@ -57,6 +57,7 @@ export default {
             ],
             qualityString: 'Settings quality',
             autostart: true,
+            dShow: this.show
         }
     },
     methods: {
@@ -98,6 +99,15 @@ export default {
             return duration * this.$root.settings.downloadsQuality;
 
         }
+    },
+    watch: {
+        //Prevent errors on closing with mouse
+        show() {
+            this.dShow = this.show;
+        },
+        dShow() {
+            if (!this.dShow) this.$emit('close');
+        }
     }
 }
 </script>
\ No newline at end of file
diff --git a/app/client/src/components/Lyrics.vue b/app/client/src/components/Lyrics.vue
index 742060b..b25023c 100644
--- a/app/client/src/components/Lyrics.vue
+++ b/app/client/src/components/Lyrics.vue
@@ -49,7 +49,7 @@ export default {
             try {
 
                 let res = await this.$axios.get(`/lyrics/${this.songId}`);
-                if (res.data) this.lyrics = res.data;
+                if (res.data && res.data.lyrics.length > 0) this.lyrics = res.data;
             
             } catch (e) {true;}
             this.loading = false;
diff --git a/app/client/src/main.js b/app/client/src/main.js
index 0c34d54..8e8571e 100644
--- a/app/client/src/main.js
+++ b/app/client/src/main.js
@@ -94,7 +94,10 @@ new Vue({
                 source: 'none',
                 data: 'none'
             }
-        }
+        },
+
+        //Used to prevent double listen logging
+        logListenId: null
     },
     methods: {
         // PLAYBACK METHODS
@@ -106,6 +109,8 @@ new Vue({
             if (!this.audio || this.state != 1) return;
             this.audio.play();
             this.state = 2;
+
+            this.logListen();
         },
         pause() {
             if (!this.audio || this.state != 2) return;
@@ -217,6 +222,7 @@ new Vue({
                     //Play
                     this.state = 2;
                     this.audio.play();
+                    this.logListen();
                     await this.savePlaybackInfo();
                     return;
                 }
@@ -326,6 +332,16 @@ new Vue({
         async cacheLibrary() {
             let res = await this.$axios.get(`/playlist/${this.profile.favoritesPlaylist}?full=idk`);
             this.libraryTracks = res.data.tracks.map((t) => t.id);
+        },
+
+        //Log song listened to deezer, only if allowed
+        async logListen() {
+            if (!this.settings.logListen) return;
+            if (this.logListenId == this.track.id) return;
+            if (!this.track || !this.track.id) return;
+
+            this.logListenId = this.track.id;
+            await this.$axios.put(`/log/${this.track.id}`);
         }
     },
     async created() {
diff --git a/app/client/src/views/DownloadsPage.vue b/app/client/src/views/DownloadsPage.vue
index b625aa1..d345803 100644
--- a/app/client/src/views/DownloadsPage.vue
+++ b/app/client/src/views/DownloadsPage.vue
@@ -20,8 +20,8 @@
     </v-card>
 
     <h1 class='pb-2'>Queue:</h1>
-    <div class='text-h6 pb-2 d-flex'>Total: {{$root.downloads.length}}
-        <v-btn @click='$root.toggleDownload' class='ml-2' color='primary'>
+    <div class='text-h6 mr-4 pb-2 d-flex'>Total: {{$root.downloads.length}}
+        <v-btn @click='$root.toggleDownload' class='ml-4' color='primary'>
             <div v-if='$root.downloading'>
                 <v-icon>mdi-stop</v-icon>
                 Stop
@@ -32,15 +32,20 @@
             </div>
         </v-btn>
         <!-- Open dir -->
-        <v-btn @click='openDir' class='ml-2' v-if='$root.settings.electron'>
+        <v-btn @click='openDir' class='ml-4' v-if='$root.settings.electron'>
             <v-icon>mdi-folder</v-icon>
             Show folder
         </v-btn>
+        <!-- Delete all -->
+        <v-btn @click='deleteDownload(-1)' class='ml-4' color='red'>
+            <v-icon>mdi-delete</v-icon>
+            Clear queue
+        </v-btn>
     </div>
 
     <!-- Downloads -->
     <v-list dense>
-        <div v-for='download in $root.downloads' :key='download.id'>
+        <div v-for='(download, index) in $root.downloads' :key='download.id'>
             <v-list-item dense>
                 <v-list-item-avatar>
                     <v-img :src='download.track.albumArt.thumb'></v-img>
@@ -49,6 +54,11 @@
                     <v-list-item-title>{{download.track.title}}</v-list-item-title>
                     <v-list-item-subtitle>{{download.track.artistString}}</v-list-item-subtitle>
                 </v-list-item-content>
+                <v-liste-item-action>
+                    <v-btn icon @click='deleteDownload(index)'>
+                        <v-icon>mdi-delete</v-icon>
+                    </v-btn>
+                </v-liste-item-action>
             </v-list-item>
         </div>
     </v-list>
@@ -65,6 +75,11 @@ export default {
         openDir() {
             const {ipcRenderer} = window.require('electron');
             ipcRenderer.send('openDownloadsDir');
+        },
+        //Remove download from queue
+        async deleteDownload(i) {
+            await this.$axios.delete(`/downloads/${i}`);
+            this.$root.getDownloads();
         }
     }
 }
diff --git a/app/client/src/views/Settings.vue b/app/client/src/views/Settings.vue
index 56437fe..30e5ae8 100644
--- a/app/client/src/views/Settings.vue
+++ b/app/client/src/views/Settings.vue
@@ -57,6 +57,17 @@
             hint='Variables: %title%, %artists%, %artist%, %feats%, %trackNumber%, %0trackNumber%, %album%'
         ></v-text-field>
 
+        <!-- Log listening -->
+        <v-list-item>
+            <v-list-item-action>
+                <v-checkbox v-model='$root.settings.logListen'></v-checkbox>
+            </v-list-item-action>
+            <v-list-item-content>
+                <v-list-item-title>Log track listens to Deezer</v-list-item-title>
+                <v-list-item-subtitle>This allows listening history, flow and recommendations to work properly.</v-list-item-subtitle>
+            </v-list-item-content>
+        </v-list-item>
+
         <!-- Minimize to tray -->
         <v-list-item v-if='$root.settings.electron'>
             <v-list-item-action>
diff --git a/app/package.json b/app/package.json
index 32e7f2e..8282ed2 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "freezer",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "background.js",
   "scripts": {
diff --git a/app/src/downloads.js b/app/src/downloads.js
index d0bc051..d437834 100644
--- a/app/src/downloads.js
+++ b/app/src/downloads.js
@@ -156,6 +156,27 @@ class Downloads {
             fs.promises.mkdir(Settings.getTempDownloads(), {recursive: true});
         }
     }
+
+    //Remove download
+    async delete(index) {
+        //Clear all
+        if (index == -1) {
+            this.downloads = [];
+            await new Promise((res, rej) => {
+                this.db.remove({state: 0}, {}, (e) => {});
+                res();
+            })
+            return;
+        }
+
+        //Remove single
+        if (index >= this.downloads.length) return;
+        await new Promise((res, rej) => {
+            this.db.remove({_id: this.downloads[index].id}, {}, (e) => {});
+            res();
+        });
+        this.downloads.splice(index, 1);
+    }
 }
 
 class Download {
@@ -263,9 +284,11 @@ class Download {
         } catch (e) {};
 
         //Decrypt
-        decryptor.decryptFile(decryptor.getKey(this.track.id), tmp, this.path);
+        decryptor.decryptFile(decryptor.getKey(this.track.id), tmp, `${tmp}.DEC`);
+        fs.promises.copyFile(`${tmp}.DEC`, this.path);
         //Delete encrypted
         await fs.promises.unlink(tmp);
+        await fs.promises.unlink(`${tmp}.DEC`);
 
         //Tags
         await this.tagAudio(this.path, this.track);
diff --git a/app/src/server.js b/app/src/server.js
index 2d4db15..24de9fe 100644
--- a/app/src/server.js
+++ b/app/src/server.js
@@ -274,7 +274,7 @@ app.get('/stream/:info', (req, res) => {
     let dStart = start - (start % 2048);
 
     //Make request to Deezer CDN
-    https.get(url, {headers: {'Range': `bytes=${dStart}-${end}`}}, (r) => {
+    let _request = https.get(url, {headers: {'Range': `bytes=${dStart}-${end}`}}, (r) => {
         //Error from Deezer
         //TODO: Quality fallback
         if (r.statusCode < 200 || r.statusCode > 300) {
@@ -311,6 +311,13 @@ app.get('/stream/:info', (req, res) => {
         //Pipe: Deezer -> Decryptor -> Response
         decryptor.pipe(res);
         r.pipe(decryptor);
+        
+    });
+    //Internet/Request error
+    _request.on('error', (e) => {
+        //console.log('Streaming error: ' + e);
+        //HTML audio will restart automatically
+        res.destroy();
     });
 
 });
@@ -400,6 +407,27 @@ app.get('/downloads', async (req, res) => {
     });
 });
 
+//Delete singel download
+app.delete('/downloads/:index', async (req, res) => {
+    let index = parseInt(req.params.index, 10);
+    await downloads.delete(index);
+    res.status(200).end();
+});
+
+//Log listen to deezer
+app.put('/log/:id', async (req, res) => {
+    await deezer.callApi('log.listen', {
+        params: {
+            timestamp: Math.floor(new Date() / 1000),
+            ts_listen: Math.floor(new Date() / 1000),
+            type: 1,
+            stat: {seek: 0, pause: 0, sync: 0},
+            media: {id: req.params.id.toString(), type: 'song', format: 'MP3_128'}
+        }
+    });
+    res.status(200).end();
+});
+
 //Redirect to index on unknown path
 app.all('*', (req, res) => {
     res.redirect('/');
diff --git a/app/src/settings.js b/app/src/settings.js
index e144e5b..eb1f5f1 100644
--- a/app/src/settings.js
+++ b/app/src/settings.js
@@ -22,6 +22,8 @@ class Settings {
         this.createAlbumFolder = true;
         this.createArtistFolder = true;
         this.downloadFilename = '%0trackNumber%. %artists% - %title%';
+
+        this.logListen = false;
     }
 
     //Based on electorn app.getPath
diff --git a/package.json b/package.json
index bc5f33c..e7ad220 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "freezer",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "scripts": {
     "pack": "electron-builder --dir",