diff --git a/app/.eslintrc.js b/app/.eslintrc.js
new file mode 100644
index 0000000..aeb94a0
--- /dev/null
+++ b/app/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+ "env": {
+ "browser": true,
+ "commonjs": true,
+ "node": true,
+ "es2021": true
+ },
+ "extends": "eslint:recommended",
+ "parserOptions": {
+ "ecmaVersion": 12
+ },
+ "rules": {
+ "allowEmptyCatch": true
+ }
+};
diff --git a/app/client/public/lastfm.svg b/app/client/public/lastfm.svg
new file mode 100644
index 0000000..d98cf3c
--- /dev/null
+++ b/app/client/public/lastfm.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/app/client/src/App.vue b/app/client/src/App.vue
index 3f5b1bb..78bb1df 100644
--- a/app/client/src/App.vue
+++ b/app/client/src/App.vue
@@ -124,18 +124,24 @@
mdi-arrow-right
-
+
-
+ @keyup='search'
+ ref='searchBar'
+ v-model='searchQuery'
+ :search-input.sync='searchInput'
+ :items='suggestions'
+ >
+
@@ -269,7 +275,10 @@ export default {
showPlayer: false,
position: '0.00',
searchQuery: '',
- searchLoading: false
+ searchLoading: false,
+ searchInput: null,
+ suggestions: [],
+ preventDoubleEnter: false
}
},
methods: {
@@ -288,19 +297,24 @@ export default {
},
async search(event) {
//KeyUp event, enter
- if (event.keyCode !== 13) return;
+ if (event && event.keyCode !== 13) return;
+ //Prevent double navigation
+ if (this.preventDoubleEnter) return;
+ this.preventDoubleEnter = true;
+ setInterval(() => {this.preventDoubleEnter = false}, 50);
//Check if url
- if (this.searchQuery.startsWith('http')) {
+ let query = this.searchInput;
+ if (query.startsWith('http')) {
this.searchLoading = true;
- let url = new URL(this.searchQuery);
+ let url = new URL(query);
//Normal link
if (url.hostname == 'www.deezer.com' || url.hostname == 'deezer.com' || url.hostname == 'deezer.page.link') {
//Share link
if (url.hostname == 'deezer.page.link') {
- let res = await this.$axios.get('/fullurl?url=' + encodeURIComponent(this.searchQuery));
+ let res = await this.$axios.get('/fullurl?url=' + encodeURIComponent(query));
url = new URL(res.data.url);
}
@@ -332,7 +346,7 @@ export default {
this.searchLoading = false;
} else {
//Normal search
- this.$router.push({path: '/search', query: {q: this.searchQuery}});
+ this.$router.push({path: '/search', query: {q: query}});
}
},
seek(val) {
@@ -383,6 +397,33 @@ export default {
//Update position
'$root.position'() {
this.position = (this.$root.position / this.$root.duration()) * 100;
+ },
+ //Autofill
+ searchInput(query) {
+ //Filters
+ if (query && query.startsWith('/')) {
+ query = query.substring(1);
+ this.searchInput = query;
+ }
+ if (!query || (query && query.startsWith('http'))) {
+ this.searchLoading = false;
+ this.suggestions = [];
+ return;
+ }
+ this.searchLoading = true;
+ //Prevent spam
+ setTimeout(() => {
+ if (query != this.searchInput) return;
+ this.$axios.get('/suggestions/' + encodeURIComponent(query)).then((res) => {
+ if (query != this.searchInput) return;
+ this.suggestions = res.data;
+ this.searchLoading = false;
+ });
+ }, 300);
+ },
+ searchQuery(q) {
+ this.searchInput = q;
+ this.search(null);
}
}
};
diff --git a/app/client/src/components/ArtistTile.vue b/app/client/src/components/ArtistTile.vue
index 99eea55..9116a80 100644
--- a/app/client/src/components/ArtistTile.vue
+++ b/app/client/src/components/ArtistTile.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/app/client/src/components/DownloadDialog.vue b/app/client/src/components/DownloadDialog.vue
index adfd299..f263b7d 100644
--- a/app/client/src/components/DownloadDialog.vue
+++ b/app/client/src/components/DownloadDialog.vue
@@ -108,6 +108,17 @@ export default {
dShow() {
if (!this.dShow) this.$emit('close');
}
+ },
+ mounted() {
+ //Auto download
+ if (!this.$root.settings.downloadDialog) {
+ this.download();
+ setInterval(() => {
+ this.$emit('close');
+ this.dShow = false;
+ }, 50);
+
+ }
}
}
\ No newline at end of file
diff --git a/app/client/src/components/LibraryTracks.vue b/app/client/src/components/LibraryTracks.vue
index 8e944a5..682d213 100644
--- a/app/client/src/components/LibraryTracks.vue
+++ b/app/client/src/components/LibraryTracks.vue
@@ -74,10 +74,6 @@ export default {
},
//Play track
async play(index) {
- if (this.tracks.length < this.count) {
- await this.loadAll();
- }
-
this.$root.queue.source = {
text: 'Loved tracks',
source: 'playlist',
@@ -85,6 +81,15 @@ export default {
};
this.$root.replaceQueue(this.tracks);
this.$root.playIndex(index);
+
+ //Load all tracks
+ if (this.tracks.length < this.count) {
+ this.loadAll().then(() => {
+ this.$root.replaceQueue(this.tracks);
+ });
+ }
+
+
},
removedTrack(index) {
this.tracks.splice(index, 1);
diff --git a/app/client/src/components/Lyrics.vue b/app/client/src/components/Lyrics.vue
index 2f8ce76..1b78969 100644
--- a/app/client/src/components/Lyrics.vue
+++ b/app/client/src/components/Lyrics.vue
@@ -85,7 +85,7 @@ export default {
},
//Scroll to currently playing lyric
scrollLyric() {
- if (!this.lyrics) return;
+ if (!this.lyrics || !this.lyrics.lyrics || this.lyrics.lyrics.length == 0) return;
//Prevent janky scrolling
if (this.currentLyricIndex == this.currentLyric()) return;
diff --git a/app/client/src/components/PlaylistTile.vue b/app/client/src/components/PlaylistTile.vue
index d35b6c1..b54a57c 100644
--- a/app/client/src/components/PlaylistTile.vue
+++ b/app/client/src/components/PlaylistTile.vue
@@ -109,14 +109,12 @@ export default {
methods: {
async play() {
let playlist = this.playlist;
- //Load playlist tracks
- if (playlist.tracks.length != playlist.trackCount) {
- let data = await this.$axios.get(`/playlist/${playlist.id}?full=iguess`);
- playlist = data.data;
- }
- //Error handling
+ //Load if no tracks
+ if (!playlist || playlist.tracks.length == 0)
+ playlist = (await this.$axios.get(`/playlist/${playlist.id}?full=iguess`)).data;
if (!playlist) return;
-
+
+ //Play
this.$root.queue.source = {
text: playlist.title,
source: 'playlist',
@@ -124,6 +122,12 @@ export default {
};
this.$root.replaceQueue(playlist.tracks);
this.$root.playIndex(0);
+
+ //Load all tracks
+ if (playlist.tracks.length != playlist.trackCount) {
+ let data = await this.$axios.get(`/playlist/${playlist.id}?full=iguess`);
+ playlist = data.data;
+ }
},
//On click navigate to details
click() {
diff --git a/app/client/src/components/TrackTile.vue b/app/client/src/components/TrackTile.vue
index f45ed0a..d5b7e73 100644
--- a/app/client/src/components/TrackTile.vue
+++ b/app/client/src/components/TrackTile.vue
@@ -180,12 +180,14 @@ export default {
this.$axios.put(`/library/tracks?id=${this.track.id}`);
},
goAlbum() {
+ this.$emit('redirect')
this.$router.push({
path: '/album',
query: {album: JSON.stringify(this.track.album)}
});
},
goArtist(a) {
+ this.$emit('redirect');
this.$router.push({
path: '/artist',
query: {artist: JSON.stringify(a)}
diff --git a/app/client/src/main.js b/app/client/src/main.js
index b17c237..9c472a8 100644
--- a/app/client/src/main.js
+++ b/app/client/src/main.js
@@ -131,9 +131,11 @@ new Vue({
this.play();
},
seek(t) {
- if (!this.audio) return;
+ if (!this.audio || isNaN(t) || !t) return;
//ms -> s
this.audio.currentTime = (t / 1000);
+
+ this.updateState();
},
//Current track duration
@@ -161,11 +163,11 @@ new Vue({
this.savePlaybackInfo();
},
//Skip n tracks, can be negative
- skip(n) {
+ async skip(n) {
let newIndex = this.queue.index + n;
//Out of bounds
if (newIndex < 0 || newIndex >= this.queue.data.length) return;
- this.playIndex(newIndex);
+ await this.playIndex(newIndex);
},
//Skip wrapper with shuffle
skipNext() {
@@ -253,7 +255,7 @@ new Vue({
}
//Repeat list
- if (this.queue.index == this.queue.data.length - 1) {
+ if (this.repeat == 1 && this.queue.index == this.queue.data.length - 1) {
this.skip(-(this.queue.data.length - 1));
return;
}
@@ -403,6 +405,18 @@ new Vue({
this.logListenId = this.track.id;
await this.$axios.post(`/log`, this.track);
+ },
+ //Send state update to integrations
+ async updateState() {
+ //Wait for duration
+ if (this.state == 2 && (this.duration() == null || isNaN(this.duration())))
+ await new Promise((res) => setTimeout(res, 1000));
+ this.$socket.emit('stateChange', {
+ position: this.position,
+ duration: this.duration(),
+ state: this.state,
+ track: this.track
+ });
}
},
async created() {
@@ -471,6 +485,12 @@ new Vue({
this.sockets.subscribe('download', (data) => {
this.download = data;
});
+ //Play at offset (for integrations)
+ this.sockets.subscribe('playOffset', async (data) => {
+ this.queue.data.splice(this.queue.index + 1, 0, data.track);
+ await this.skip(1);
+ this.seek(data.position);
+ });
r();
},
@@ -499,6 +519,12 @@ new Vue({
if (e.keyCode === 106 || e.keyCode === 74) this.$root.seek((this.position - 10000));
});
},
+ watch: {
+ //Watch state for integrations
+ state() {
+ this.updateState();
+ }
+ },
router,
vuetify,
diff --git a/app/client/src/views/FullscreenPlayer.vue b/app/client/src/views/FullscreenPlayer.vue
index 0e0f4b3..e3d6a44 100644
--- a/app/client/src/views/FullscreenPlayer.vue
+++ b/app/client/src/views/FullscreenPlayer.vue
@@ -144,6 +144,7 @@
>
@@ -161,14 +162,13 @@
>
Artists:
-
+
@@ -179,6 +179,7 @@
Source: {{$root.playbackInfo.source}}
Format: {{$root.playbackInfo.format}}
Quality: {{$root.playbackInfo.quality}}
+ ID: {{$root.track.id}}
diff --git a/app/client/src/views/PlaylistPage.vue b/app/client/src/views/PlaylistPage.vue
index 99d79cd..190014a 100644
--- a/app/client/src/views/PlaylistPage.vue
+++ b/app/client/src/views/PlaylistPage.vue
@@ -87,9 +87,8 @@ export default {
methods: {
async playIndex(index) {
//Load tracks
- if (this.playlist.tracks.length < this.playlist.trackCount) {
+ if (this.playlist.tracks.length == 0)
await this.loadAllTracks();
- }
this.$root.queue.source = {
text: this.playlist.title,
@@ -98,6 +97,13 @@ export default {
};
this.$root.replaceQueue(this.playlist.tracks);
this.$root.playIndex(index);
+
+ //Load rest of tracks on background
+ if (this.playlist.tracks.length < this.playlist.trackCount) {
+ this.loadAllTracks().then(() => {
+ this.$root.replaceQueue(this.playlist.tracks);
+ });
+ }
},
play() {
this.playIndex(0);
diff --git a/app/client/src/views/Settings.vue b/app/client/src/views/Settings.vue
index 33bc6fa..3a2828a 100644
--- a/app/client/src/views/Settings.vue
+++ b/app/client/src/views/Settings.vue
@@ -28,6 +28,17 @@
append-icon='mdi-open-in-app'
@click:append='selectDownloadPath'
>
+
+
+
+
+
+
+
+ Show download dialog
+ Always show download confirm dialog before downloading.
+
+
@@ -57,6 +68,10 @@
hint='Variables: %title%, %artists%, %artist%, %feats%, %trackNumber%, %0trackNumber%, %album%'
>
+
+ Integrations
+
+
@@ -69,11 +84,46 @@
+
+
+
Login with LastFM
Connect your LastFM account to allow scrobbling.
+
+
+ mdi-logout
+
+
+ Disconnect LastFM
+
+
+
+
+
+
+
+
+ Discord Rich Presence
+ Enable Discord Rich Presence, requires restart to toggle!
+
+
+
+
+
+
+
+
+ Discord Join Button
+ Enable Discord join button for syncing tracks, requires restart to toggle!
+
+
+
+
+ Other
+
@@ -108,6 +158,22 @@
Save
+
+
+ {{ snackbarText }}
+
+
+
+ Dismiss
+
+
+
+