okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added v3continuous

Browse source
This commit is contained in:
booploops 2022-03-03 05:25:02 -08:00
parent cce9b3b3a4
commit c8be288c66
4 changed files with 29 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/renderer/index.js
View file

@ -13,19 +13,6 @@ const MusicKitObjects = {
} }
} }
const MusicKitTools = {
getHeader() {
return new Headers({
Authorization: 'Bearer ' + MusicKit.getInstance().developerToken,
Accept: 'application/json',
'Content-Type': 'application/json',
'Music-User-Token': '' + MusicKit.getInstance().musicUserToken
});
}
}
// limit an array to a certain number of items // limit an array to a certain number of items
Array.prototype.limit = function (n) { Array.prototype.limit = function (n) {
return this.slice(0, n); return this.slice(0, n);

2
src/renderer/main/app.js
View file

@ -5,10 +5,12 @@ import {simulateGamepad} from './gamepad.js'
import {CiderAudio} from '../audio/audio.js' import {CiderAudio} from '../audio/audio.js'
import {Events} from './events.js' import {Events} from './events.js'
import { wsapi } from "./wsapi_interop.js" import { wsapi } from "./wsapi_interop.js"
import { MusicKitTools } from "./musickittools.js"
// Define window objects // Define window objects
window.app = app window.app = app
window.MusicKitTools = MusicKitTools
window.CiderAudio = CiderAudio window.CiderAudio = CiderAudio
window.CiderCache = CiderCache window.CiderCache = CiderCache
window.CiderFrontAPI = CiderFrontAPI window.CiderFrontAPI = CiderFrontAPI

27
src/renderer/main/musickittools.js Normal file
View file

@ -0,0 +1,27 @@
const MusicKitTools = {
async v3Continuous (href, options = {}, reqOptions = {}) {
let returnData = []
async function sendReq(href, options) {
const response = await app.mk.api.v3.music(href, options)
returnData = returnData.concat(response.data.data)
if(response.data.next) {
await sendReq(response.data.next, options)
}
}
await sendReq(href, options)
return returnData
},
getHeader() {
return new Headers({
Authorization: 'Bearer ' + MusicKit.getInstance().developerToken,
Accept: 'application/json',
'Content-Type': 'application/json',
'Music-User-Token': '' + MusicKit.getInstance().musicUserToken
});
}
}
export { MusicKitTools }

66
src/renderer/main/vueapp.js
View file

@ -1735,72 +1735,6 @@ const app = new Vue({
app.mk.play() app.mk.play()
}) })
} }
// 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({[truekind]: [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 = ''
// try {
// function getPlaylist(id, params, isLibrary){
// if (isLibrary){
// return app.mk.api.library.playlist(id, params)
// } else { return app.mk.api.playlist(id, params)}
// }
// 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 { else {
app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '') app.playMediaItemById((id), (kind), (isLibrary), item.attributes.url ?? '')
} }