From ac4a229f4ac1332d4ab5b12603b9681399853f2b Mon Sep 17 00:00:00 2001 From: coredev-uk Date: Sun, 11 Sep 2022 04:32:24 +0000 Subject: [PATCH 1/4] chore: Prettified Code [ci skip] --- src/preload/cider-preload.js | 6 +++--- src/renderer/main/vueapp.js | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 8a5ca40c..324c2891 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -83,7 +83,7 @@ const MusicKitInterop = { }); }, - async fetchSongRelationships({id = app.mk.nowPlayingItem.attributes.playParams.catalogId || app.mk.nowPlayingItem.attributes.playParams.id, relationship = "primaryName"}={}) { + async fetchSongRelationships({ id = app.mk.nowPlayingItem.attributes.playParams.catalogId || app.mk.nowPlayingItem.attributes.playParams.id, relationship = "primaryName" } = {}) { const res = await MusicKit.getInstance().api.v3.music("/v1/catalog/" + MusicKit.getInstance().storefrontId + `/songs/${id}`, { include: { songs: ["artists"], @@ -108,7 +108,7 @@ const MusicKitInterop = { const albumData = songData.relationships.albums.data; const primaryArtist = artistData[0]; - switch(relationship) { + switch (relationship) { default: case "primaryName": if (artistData.length < 1) { @@ -121,7 +121,7 @@ const MusicKitInterop = { return primaryArtist; case "album": - return albumData[0] + return albumData[0]; } }, diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 23164f60..7b8581a7 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -2147,7 +2147,7 @@ const app = new Vue({ // app.getTypeFromID((kind), (id), (isLibrary), params); } else if (kind.toString().includes("song")) { const albumUrl = new Promise(async (resolve, reject) => { - resolve(await MusicKitInterop.fetchSongRelationships({id: id, relationship: "album"})); + resolve(await MusicKitInterop.fetchSongRelationships({ id: id, relationship: "album" })); }); albumUrl.then((data) => { if (data && data.type === "albums" && data.id) { @@ -2155,8 +2155,7 @@ const app = new Vue({ } else { app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? ""); } - }) - + }); } else { app.playMediaItemById(id, kind, isLibrary, item.attributes.url ?? ""); } @@ -4554,7 +4553,7 @@ const app = new Vue({ if (app.mk.nowPlayingItem.relationships.artists.data[0].id) { app.appRoute(`artist/${app.mk.nowPlayingItem.relationships.artists.data[0].id}`); } else { - const primaryArtist = await MusicKitInterop.fetchSongRelationships({ relationship: "primaryArtist"}) + const primaryArtist = await MusicKitInterop.fetchSongRelationships({ relationship: "primaryArtist" }); app.appRoute(`artist/${primaryArtist.id}`); } }, From c1170119e0b68cacc7dc19566367f6f8b436f221 Mon Sep 17 00:00:00 2001 From: yazninja Date: Sun, 11 Sep 2022 22:43:53 +0800 Subject: [PATCH 2/4] bump electron v20.1.3 --- package.json | 4 ++-- src/renderer/audio/impulses/XM3_Cider.wav | Bin 0 -> 19244 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/renderer/audio/impulses/XM3_Cider.wav diff --git a/package.json b/package.json index fbaa6f4e..73b4e013 100644 --- a/package.json +++ b/package.json @@ -116,9 +116,9 @@ } ], "build": { - "electronVersion": "20.1.1", + "electronVersion": "20.1.3", "electronDownload": { - "version": "20.1.1+wvcus", + "version": "20.1.3+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", diff --git a/src/renderer/audio/impulses/XM3_Cider.wav b/src/renderer/audio/impulses/XM3_Cider.wav new file mode 100644 index 0000000000000000000000000000000000000000..fc61fe52c5bfe0095733a5a49b81e3564092e72d GIT binary patch literal 19244 zcmeI3TWnQD6o&s|r4|A4f}$W|gM#E($aGZg*o%^b*-5_vu4d@ z@4aSs#Gu^Vw$B4E_01db+8fi`Gy{-^26%5x_(yRAq@x*L9XEX(!ZN|=V08AW>{CVQ zMd`i6R2UQn3rZK1&bc_}V#l(MWxd#oIcYg*-O(K@!}NKWg0vuQGA5%NyK!yV+Op>5 z&C6ScDT5j86sEBli+A}hKMGTEd2xAGkQK}=pKJM<%;d9p7R$MuZ{uxj;08{_M2z7W zei^2MpdiR+KDPv0g1y|!Ibr$?pP^%zwuET~SMXw(&Ijj%5BVWa2d9G_+`)cf>WZ#d z!X+G!@mR)X?1MhYV;;W?)1}~2u#`(#5|jknxQ%_n^bj7xT+U@Ka`aWWxR})T*(m_fyG?R z9OOX#=#0*o&-r{BPvaAQ!ciE7bzH|un1rp|O8HcMc@uA9H+OR;X5s`-So_5+=KFXb zzw%ek!#o`4ar56k?&DNUg?u#))3BfWIUUoDQ!oWZEaK~U-RhNJc5){tV1nuMk&gpB zVC~6AZ{aPgcLrwQBv0}kyo1v`ZS6=_{xKdiI}h=Y)gwD!!7JF#?aV`-`D-YKVlCHl z5C-83e!=JP99DC+`B}33y@qQz5Cc)b0zMy3M2-D03^PBxh!@Sykr;_x+(jqLpYo6V zE~>o7atMZCGdEj(s;58tn;reouYykh6~D54l^=is)}HKBeX{p!er@)A%Wth-QTB<0 zF&N+Q8|#nk()GHoFZxf+m|vd26BV-hFTKh= zi6`wkm6yHU(9Qa#`J;aJKo4tA^=lkO*&)jAUg%|%EIS=_o$^(W^iir`lEtU+R0TC} zBs*%H)t@M}-jpwUMcJ=<)E~8@eu|Idacf`mU-ouFC*xyy>@sSN%g!iuy<|t#FWFJ; zN_Lcek{$POkI7me(rdj$sr4e+QR_kSK_0w}n(xv_`6wR6VIHPq2XwIf_Go_@+o7Gw zZPC{1eFTpfvygQeAI8HbJGMa^lVhoUOLjylJ0v?E;SrN#sdcV$j^FcplO2!psL766 z?<()8eMfREwJ%C9wnpm;YX6cfK8Oe7vK3mHK9()f()5lG-~p4P)V_2-?zjD_DxTsg zwm=KSQu~|qvHX!gnm!)y!+rRPKUu!$Wbq8onCz(ghV+T}3xBcvDDTC+kSw0%*(OLfWly~7SljHFm&r$k#yc2htUOdn9tS*~{ z&o3%3maycCyaRVwxhOC20wu>|Q#3XGmDmJL@H>BJb=eq=t$cO(2mj#hxE)u+MrdT$ ziGT7>)|8pZ#9#c&t`nVH6aLM=?Yby$!)=gU74>YV{HtLGGVHo2OIb?EHDN);;}*ajv{?388EQ= z<1sCKOOn1W$nd9jYQpgC&B|X(s_p9j)Hju_@6?=7KccLQIZ{`1v9|4K&B`CKjIB2| zKUQ|-WA$|@yS*n~f1-A{a*m10yZl(X^09g^r~V$Gaddum{XX%?fsxVE74l=dt2)E_UOIb-Ge<- z^9-f;fBCyACM!!}=XQ9P$6ahrJYpG0vXua6%uONC#qCeEjLV>Djqmpg}Li@SqQ*HNke|>W9 zkKT{ok9GOJ;opb<|9;5F1FpY#fRDc={thh_akU%G-^uvi&d1R!$Ie&^!H{^lL~s^+Y}7u=lpg4&LIeR Date: Sun, 11 Sep 2022 22:44:18 +0800 Subject: [PATCH 3/4] Revert "bump electron v20.1.3" This reverts commit c1170119e0b68cacc7dc19566367f6f8b436f221. --- package.json | 4 ++-- src/renderer/audio/impulses/XM3_Cider.wav | Bin 19244 -> 0 bytes 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/renderer/audio/impulses/XM3_Cider.wav diff --git a/package.json b/package.json index 73b4e013..fbaa6f4e 100644 --- a/package.json +++ b/package.json @@ -116,9 +116,9 @@ } ], "build": { - "electronVersion": "20.1.3", + "electronVersion": "20.1.1", "electronDownload": { - "version": "20.1.3+wvcus", + "version": "20.1.1+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider", diff --git a/src/renderer/audio/impulses/XM3_Cider.wav b/src/renderer/audio/impulses/XM3_Cider.wav deleted file mode 100644 index fc61fe52c5bfe0095733a5a49b81e3564092e72d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19244 zcmeI3TWnQD6o&s|r4|A4f}$W|gM#E($aGZg*o%^b*-5_vu4d@ z@4aSs#Gu^Vw$B4E_01db+8fi`Gy{-^26%5x_(yRAq@x*L9XEX(!ZN|=V08AW>{CVQ zMd`i6R2UQn3rZK1&bc_}V#l(MWxd#oIcYg*-O(K@!}NKWg0vuQGA5%NyK!yV+Op>5 z&C6ScDT5j86sEBli+A}hKMGTEd2xAGkQK}=pKJM<%;d9p7R$MuZ{uxj;08{_M2z7W zei^2MpdiR+KDPv0g1y|!Ibr$?pP^%zwuET~SMXw(&Ijj%5BVWa2d9G_+`)cf>WZ#d z!X+G!@mR)X?1MhYV;;W?)1}~2u#`(#5|jknxQ%_n^bj7xT+U@Ka`aWWxR})T*(m_fyG?R z9OOX#=#0*o&-r{BPvaAQ!ciE7bzH|un1rp|O8HcMc@uA9H+OR;X5s`-So_5+=KFXb zzw%ek!#o`4ar56k?&DNUg?u#))3BfWIUUoDQ!oWZEaK~U-RhNJc5){tV1nuMk&gpB zVC~6AZ{aPgcLrwQBv0}kyo1v`ZS6=_{xKdiI}h=Y)gwD!!7JF#?aV`-`D-YKVlCHl z5C-83e!=JP99DC+`B}33y@qQz5Cc)b0zMy3M2-D03^PBxh!@Sykr;_x+(jqLpYo6V zE~>o7atMZCGdEj(s;58tn;reouYykh6~D54l^=is)}HKBeX{p!er@)A%Wth-QTB<0 zF&N+Q8|#nk()GHoFZxf+m|vd26BV-hFTKh= zi6`wkm6yHU(9Qa#`J;aJKo4tA^=lkO*&)jAUg%|%EIS=_o$^(W^iir`lEtU+R0TC} zBs*%H)t@M}-jpwUMcJ=<)E~8@eu|Idacf`mU-ouFC*xyy>@sSN%g!iuy<|t#FWFJ; zN_Lcek{$POkI7me(rdj$sr4e+QR_kSK_0w}n(xv_`6wR6VIHPq2XwIf_Go_@+o7Gw zZPC{1eFTpfvygQeAI8HbJGMa^lVhoUOLjylJ0v?E;SrN#sdcV$j^FcplO2!psL766 z?<()8eMfREwJ%C9wnpm;YX6cfK8Oe7vK3mHK9()f()5lG-~p4P)V_2-?zjD_DxTsg zwm=KSQu~|qvHX!gnm!)y!+rRPKUu!$Wbq8onCz(ghV+T}3xBcvDDTC+kSw0%*(OLfWly~7SljHFm&r$k#yc2htUOdn9tS*~{ z&o3%3maycCyaRVwxhOC20wu>|Q#3XGmDmJL@H>BJb=eq=t$cO(2mj#hxE)u+MrdT$ ziGT7>)|8pZ#9#c&t`nVH6aLM=?Yby$!)=gU74>YV{HtLGGVHo2OIb?EHDN);;}*ajv{?388EQ= z<1sCKOOn1W$nd9jYQpgC&B|X(s_p9j)Hju_@6?=7KccLQIZ{`1v9|4K&B`CKjIB2| zKUQ|-WA$|@yS*n~f1-A{a*m10yZl(X^09g^r~V$Gaddum{XX%?fsxVE74l=dt2)E_UOIb-Ge<- z^9-f;fBCyACM!!}=XQ9P$6ahrJYpG0vXua6%uONC#qCeEjLV>Djqmpg}Li@SqQ*HNke|>W9 zkKT{ok9GOJ;opb<|9;5F1FpY#fRDc={thh_akU%G-^uvi&d1R!$Ie&^!H{^lL~s^+Y}7u=lpg4&LIeR Date: Sun, 11 Sep 2022 22:44:52 +0800 Subject: [PATCH 4/4] bump electron v20.1.3 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fbaa6f4e..73b4e013 100644 --- a/package.json +++ b/package.json @@ -116,9 +116,9 @@ } ], "build": { - "electronVersion": "20.1.1", + "electronVersion": "20.1.3", "electronDownload": { - "version": "20.1.1+wvcus", + "version": "20.1.3+wvcus", "mirror": "https://github.com/castlabs/electron-releases/releases/download/v" }, "appId": "cider",