-
+
+ style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh;">
{{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
@@ -77,7 +77,13 @@
v-else-if="app.mk.repeatMode == 2">
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 37c83284..12e8e362 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -289,7 +289,7 @@
}
},
{
- "icon": "./assets/feather/x-circle.svg",
+ "icon": "./assets/feather/unheart.svg",
"id": "unlove",
"name": "Unlove",
"disabled": true,
@@ -348,19 +348,15 @@
menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
}
}
- try{
- let rating = await app.getRating(self.item).catch();
- if (rating) {
- if(rating == 0) {
- menus.normal.items.find(x => x.id == 'love').disabled = false
- menus.normal.items.find(x => x.id == 'dislike').disabled = false
- }else if(rating == 1) {
- menus.normal.items.find(x => x.id == 'unlove').disabled = false
- }else if(rating == -1) {
- menus.normal.items.find(x => x.id == 'undo_dislike').disabled = false
- }
+ let rating = await app.getRating(self.item)
+ if (rating == 0) {
+ menus.normal.items.find(x => x.id == 'love').disabled = false
+ menus.normal.items.find(x => x.id == 'dislike').disabled = false
+ } else if (rating == 1) {
+ menus.normal.items.find(x => x.id == 'unlove').disabled = false
+ } else if (rating == -1) {
+ menus.normal.items.find(x => x.id == 'undo_dislike').disabled = false
}
- } catch(_){}
CiderContextMenu.Create(event, menus[useMenu])
},
visibilityChanged: function (isVisible, entry) {
@@ -402,12 +398,81 @@
let item = this.item
let parent = this.parent
let childIndex = this.index
- console.log(item, parent, childIndex)
+ let kind = (item.attributes.playParams ? (item.attributes.playParams.kind ?? (item.type ?? '')) : (item.type ?? ''));
+ let id = (item.attributes.playParams ? (item.attributes.playParams.id ?? (item.id ?? '')) : (item.id ?? ''));;
+ let isLibrary = item.attributes.playParams ? (item.attributes.playParams.isLibrary ?? false) : false;
+ console.log(item, parent, childIndex, kind, id, isLibrary, kind == "playlists", id.startsWith("p.") || id.startsWith("pl.u"))
+ app.mk.stop().then(() => {
if (parent != null && childIndex != null) {
app.queueParentandplayChild(parent, childIndex, item);
+ } else if (kind.includes("playlist") && (id.startsWith("p.") || id.startsWith("pl."))){
+ /* Randomize array in-place using Durstenfeld shuffle algorithm */
+ function shuffleArray(array) {
+ for (var i = array.length - 1; i > 0; i--) {
+ var j = Math.floor(Math.random() * (i + 1));
+ var temp = array[i];
+ array[i] = array[j];
+ array[j] = temp;
+ }
+ }
+ app.mk.clearQueue().then(function () {
+ app.mk.setQueue({[item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id}).then(function () {
+ app.mk.play().then(function (){
+ app.mk.clearQueue().then(function (){
+ var playlistId = id
+ const params = {
+ include: "tracks",
+ platform: "web",
+ "include[library-playlists]": "catalog,tracks",
+ "fields[playlists]": "curatorName,playlistType,name,artwork,url",
+ "include[library-songs]": "catalog,artists,albums",
+ "fields[catalog]": "artistUrl,albumUrl",
+ "fields[songs]": "artistUrl,albumUrl"
+ }
+ var playlistId = ''
+ function getPlaylist(id, params, isLibrary){
+ if (isLibrary){
+ return app.mk.api.library.playlist(id, params)
+ } else { return app.mk.api.playlist(id, params)}
+ }
+ try {
+
+ getPlaylist(id, params, isLibrary).then(res => {
+ let query = res.relationships.tracks.data.map(item => new MusicKit.MediaItem(item));
+ if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
+ app.mk.queue.append(query)
+ if (!res.relationships.tracks.next) {
+ return
+ } else {
+ getPlaylistTracks(res.relationships.tracks.next)
+ }
+
+ function getPlaylistTracks(next) {
+ app.apiCall(app.musicBaseUrl + next, res => {
+ if (res.id != playlistId) {
+ return
+ }
+ let query = res.data.map(item => new MusicKit.MediaItem(item))
+ if (app.mk.shuffleMode == 1){shuffleArray(query); console.log('shf')}
+ app.mk.queue.append(query)
+
+ if (res.next) {
+ getPlaylistTracks(res.next)
+ }
+ })
+ }
+ })
+ } catch (e) {}
+
+
+ })
+ })
+ })
+
+ })
} else {
app.playMediaItemById(item.attributes.playParams.id ?? item.id, item.attributes.playParams.kind ?? item.type, item.attributes.playParams.isLibrary ?? false, item.attributes.url)
- }
+ }})
}
}
});
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index b3fbf55a..f5e320d7 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -356,7 +356,7 @@
}
},
{
- "icon": "./assets/feather/x-circle.svg",
+ "icon": "./assets/feather/unheart.svg",
"id": "unlove",
"name": "Unlove",
"disabled": true,
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index e0d409a3..1c6f6248 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -69,7 +69,7 @@
-
+
diff --git a/workbox-config.js b/workbox-config.js
index 126cbf12..1483a0e7 100644
--- a/workbox-config.js
+++ b/workbox-config.js
@@ -1,39 +1,49 @@
module.exports = {
- globDirectory: 'src/renderer/',
- swDest: 'src/renderer/sw.js',
- // Define runtime caching rules.
- runtimeCaching: [{
- // Match any request that ends with .png, .jpg, .jpeg or .svg.
- urlPattern: /\.(?:png|jpg|jpeg|svg|webp)$/,
+ globDirectory: 'src/renderer/',
+ swDest: 'src/renderer/sw.js',
+ // Define runtime caching rules.
+ runtimeCaching: [{
+ // Match any request that ends with .png, .jpg, .jpeg or .svg.
+ urlPattern: /\.(?:png|jpg|jpeg|svg|webp)$/,
- // Apply a cache-first strategy.
- handler: 'CacheFirst',
+ // Apply a cache-first strategy.
+ handler: 'CacheFirst',
- options: {
- // Use a custom cache name.
- cacheName: 'imageinternet',
+ options: {
+ // Use a custom cache name.
+ cacheName: 'imageinternet',
- // Only cache 10 images.
-
- },
- },
- {
- urlPattern: /https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/,
- handler: "CacheFirst",
- },
- {
- urlPattern: /^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/,
- handler: "CacheFirst",
- },
+ // Only cache 10 images.
+
+ },
+ },
+ {
+ urlPattern: /https:\/\/amp-api.music.apple.com\/v1\//,
+ handler: 'StaleWhileRevalidate',
+ options: {
+ cacheName: 'amp-api',
+ cacheableResponse: {
+ statuses: [0, 200],
+ },
+ },
+ },
+ {
+ urlPattern: /https:\/\/is[0-9]-ssl\.mzstatic\.com\/image+/,
+ handler: "CacheFirst",
+ },
+ {
+ urlPattern: /^https:\/\/store-\d{3}\.blobstore\.apple\.com\/.{65}\/image+/,
+ handler: "CacheFirst",
+ },
],
- ignoreURLParametersMatching: [
- /^utm_/,
- /^fbclid$/,
- /^X-Amz-Algorithm/,
- /^X-Amz-Date/,
- /^X-Amz-SignedHeaders/,
- /^X-Amz-Expires/,
- /^X-Amz-Credential/,
- /^X-Amz-Signature/,
- ]
+ ignoreURLParametersMatching: [
+ /^utm_/,
+ /^fbclid$/,
+ /^X-Amz-Algorithm/,
+ /^X-Amz-Date/,
+ /^X-Amz-SignedHeaders/,
+ /^X-Amz-Expires/,
+ /^X-Amz-Credential/,
+ /^X-Amz-Signature/,
+ ]
};