added tests commands for modular ui elements
This commit is contained in:
booploops
parent
b57fe0f3ac
commit
df6ba93242
2 changed files with 199 additions and 153 deletions
|
|
@ -279,6 +279,13 @@ const app = new Vue({
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
modularUITest(val = false) {
|
||||
if (val) {
|
||||
document.querySelector("#app-main").classList.add("modular-fs")
|
||||
} else {
|
||||
document.querySelector("#app-main").classList.remove("modular-fs")
|
||||
}
|
||||
},
|
||||
navigateBack() {
|
||||
history.back()
|
||||
},
|
||||
|
|
@ -286,7 +293,7 @@ const app = new Vue({
|
|||
history.forward()
|
||||
},
|
||||
getHTMLStyle() {
|
||||
switch(this.cfg.visual.window_transparency) {
|
||||
switch (this.cfg.visual.window_transparency) {
|
||||
case "acrylic":
|
||||
default:
|
||||
document.querySelector("html").style.background = "";
|
||||
|
|
@ -338,10 +345,10 @@ const app = new Vue({
|
|||
this.mk = MusicKit.getInstance()
|
||||
this.mk.authorize()
|
||||
this.$forceUpdate()
|
||||
if(this.isDev) {
|
||||
if (this.isDev) {
|
||||
this.mk.privateEnabled = true
|
||||
}
|
||||
if(this.cfg.visual.hw_acceleration == "disabled") {
|
||||
if (this.cfg.visual.hw_acceleration == "disabled") {
|
||||
document.body.classList.add("no-gpu")
|
||||
}
|
||||
this.mk._services.timing.mode = 0
|
||||
|
|
@ -376,10 +383,10 @@ const app = new Vue({
|
|||
this.library.albums.displayListing = this.library.albums.listing
|
||||
}
|
||||
|
||||
window.onbeforeunload = function(e) {
|
||||
window.localStorage.setItem("currentTrack",JSON.stringify(app.mk.nowPlayingItem))
|
||||
window.localStorage.setItem("currentTime",JSON.stringify(app.mk.currentPlaybackTime))
|
||||
window.localStorage.setItem("currentQueue",JSON.stringify(app.mk.queue.items))
|
||||
window.onbeforeunload = function (e) {
|
||||
window.localStorage.setItem("currentTrack", JSON.stringify(app.mk.nowPlayingItem))
|
||||
window.localStorage.setItem("currentTime", JSON.stringify(app.mk.currentPlaybackTime))
|
||||
window.localStorage.setItem("currentQueue", JSON.stringify(app.mk.queue.items))
|
||||
};
|
||||
|
||||
// load last played track
|
||||
|
|
@ -393,24 +400,24 @@ const app = new Vue({
|
|||
let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
|
||||
app.mk.setQueue({ [truekind]: [lastItem.attributes.playParams.id] })
|
||||
app.mk.mute()
|
||||
setTimeout(() =>{
|
||||
setTimeout(() => {
|
||||
app.mk.play().then(() => {
|
||||
app.mk.pause().then(() => {
|
||||
if (time != null) {
|
||||
app.mk.seekToTime(time)
|
||||
}
|
||||
app.mk.unmute()
|
||||
if (queue != null ){
|
||||
if (queue != null) {
|
||||
queue = JSON.parse(queue)
|
||||
if (queue && queue.length > 0){
|
||||
let ids = queue.map ( e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '') ))
|
||||
if (queue && queue.length > 0) {
|
||||
let ids = queue.map(e => (e.playParams ? e.playParams.id : (e.attributes.playParams ? e.attributes.playParams.id : '')))
|
||||
let i = 0;
|
||||
if (ids.length > 0) {
|
||||
for (id of ids){
|
||||
if (!(i == 0 && ids[0] == lastItem.attributes.playParams.id)){
|
||||
try{
|
||||
app.mk.playLater({songs: [id] })
|
||||
} catch (err){}
|
||||
for (id of ids) {
|
||||
if (!(i == 0 && ids[0] == lastItem.attributes.playParams.id)) {
|
||||
try {
|
||||
app.mk.playLater({ songs: [id] })
|
||||
} catch (err) { }
|
||||
}
|
||||
i++;
|
||||
}
|
||||
|
|
@ -420,11 +427,12 @@ const app = new Vue({
|
|||
|
||||
})
|
||||
|
||||
})},1500)
|
||||
})
|
||||
}, 1500)
|
||||
|
||||
}
|
||||
|
||||
} catch (e) {console.log(e)}
|
||||
} catch (e) { console.log(e) }
|
||||
|
||||
MusicKit.getInstance().videoContainerElement = document.getElementById("apple-music-video-player")
|
||||
|
||||
|
|
@ -842,7 +850,7 @@ const app = new Vue({
|
|||
window.location.hash = `${kind}/${id}`
|
||||
document.querySelector("#app-content").scrollTop = 0
|
||||
|
||||
}else if (kind.toString().includes("record-label") || kind.toString().includes("curator")) {
|
||||
} else if (kind.toString().includes("record-label") || kind.toString().includes("curator")) {
|
||||
if (kind.toString().includes("record-label")) {
|
||||
kind = "recordLabel"
|
||||
} else {
|
||||
|
|
@ -889,7 +897,7 @@ const app = new Vue({
|
|||
let artistId = '';
|
||||
try {
|
||||
if (item.relationships.artists && item.relationships.artists.data.length > 0 && !item.relationships.artists.data[0].type.includes("library")) {
|
||||
if (item.relationships.artists.data[0].type === "artist" || item.relationships.artists.data[0].type === "artists" ) {
|
||||
if (item.relationships.artists.data[0].type === "artist" || item.relationships.artists.data[0].type === "artists") {
|
||||
artistId = item.relationships.artists.data[0].id
|
||||
}
|
||||
}
|
||||
|
|
@ -1617,12 +1625,13 @@ const app = new Vue({
|
|||
},
|
||||
loadLyrics() {
|
||||
const musicType = (MusicKit.getInstance().nowPlayingItem != null) ? MusicKit.getInstance().nowPlayingItem["type"] ?? '' : '';
|
||||
console.log("mt",musicType)
|
||||
console.log("mt", musicType)
|
||||
if (musicType === "musicVideo") {
|
||||
this.loadYTLyrics();} else {
|
||||
if(app.cfg.lyrics.enable_mxm){
|
||||
this.loadYTLyrics();
|
||||
} else {
|
||||
if (app.cfg.lyrics.enable_mxm) {
|
||||
this.loadMXM();
|
||||
} else {this.loadAMLyrics();}
|
||||
} else { this.loadAMLyrics(); }
|
||||
}
|
||||
},
|
||||
loadAMLyrics() {
|
||||
|
|
@ -1642,10 +1651,10 @@ const app = new Vue({
|
|||
self.getLibrarySongsFull(true)
|
||||
})
|
||||
},
|
||||
removeFromLibrary(kind,id) {
|
||||
removeFromLibrary(kind, id) {
|
||||
let self = this
|
||||
let truekind = (!kind.endsWith("s")) ? (kind + "s") : kind;
|
||||
this.mk.api.library.remove({[truekind]: id }).then((data) => {
|
||||
this.mk.api.library.remove({ [truekind]: id }).then((data) => {
|
||||
self.getLibrarySongsFull(true)
|
||||
})
|
||||
},
|
||||
|
|
@ -1686,9 +1695,10 @@ const app = new Vue({
|
|||
req2.onload = function () {
|
||||
try {
|
||||
const ttmlLyrics = this.responseText;
|
||||
if (ttmlLyrics){
|
||||
if (ttmlLyrics) {
|
||||
this.lyricsMediaItem = ttmlLyrics
|
||||
this.parseTTML()}
|
||||
this.parseTTML()
|
||||
}
|
||||
} catch (e) {
|
||||
app.loadMXM();
|
||||
}
|
||||
|
|
@ -1767,7 +1777,7 @@ const app = new Vue({
|
|||
let usertoken = encodeURIComponent(token);
|
||||
let richsyncQuery = (app.cfg.lyrics.mxm_karaoke) ? "&optional_calls=track.richsync" : ""
|
||||
let timecustom = (!time || (time && time < 0)) ? '' : `&f_subtitle_length=${time}&q_duration=${time}&f_subtitle_length_max_deviation=40`;
|
||||
let url = "https://apic-desktop.musixmatch.com/ws/1.1/macro.subtitles.get?format=json&namespace=lyrics_richsynched"+ richsyncQuery +"&subtitle_format=lrc&q_artist=" + artist + "&q_track=" + track + "&usertoken=" + usertoken + timecustom + "&app_id=web-desktop-app-v1.0&t=" + revisedRandId();
|
||||
let url = "https://apic-desktop.musixmatch.com/ws/1.1/macro.subtitles.get?format=json&namespace=lyrics_richsynched" + richsyncQuery + "&subtitle_format=lrc&q_artist=" + artist + "&q_track=" + track + "&usertoken=" + usertoken + timecustom + "&app_id=web-desktop-app-v1.0&t=" + revisedRandId();
|
||||
let req = new XMLHttpRequest();
|
||||
req.overrideMimeType("application/json");
|
||||
req.open('GET', url, true);
|
||||
|
|
@ -2193,9 +2203,9 @@ const app = new Vue({
|
|||
}
|
||||
},
|
||||
getMediaItemArtwork(url, height = 64, width) {
|
||||
let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900)? "sr" :"cc"))}`;
|
||||
let newurl = `${url.replace('{w}', width ?? height).replace('{h}', height).replace('{f}', "webp").replace('{c}', ((width === 900) ? "sr" : "cc"))}`;
|
||||
|
||||
if (newurl.includes("900x516")){newurl = newurl.replace("900x516cc","900x516sr").replace("900x516bb","900x516sr");}
|
||||
if (newurl.includes("900x516")) { newurl = newurl.replace("900x516cc", "900x516sr").replace("900x516bb", "900x516sr"); }
|
||||
return newurl
|
||||
},
|
||||
getNowPlayingArtworkBG(size = 600) {
|
||||
|
|
@ -2368,7 +2378,7 @@ const app = new Vue({
|
|||
let data_type = this.mk.nowPlayingItem.playParams.kind
|
||||
let item_id = this.mk.nowPlayingItem.attributes.playParams.id ?? this.mk.nowPlayingItem.id
|
||||
let isLibrary = this.mk.nowPlayingItem.attributes.playParams.isLibrary ?? false
|
||||
let params = {"fields[songs]": "inLibrary","fields[albums]": "inLibrary","relate" : "library","t" : "1"}
|
||||
let params = { "fields[songs]": "inLibrary", "fields[albums]": "inLibrary", "relate": "library", "t": "1" }
|
||||
// let res = await app.mkapi(data_type, isLibrary , item_id, params);
|
||||
// if (res && res.relationships && res.relationships.library && res.relationships.library.data && res.relationships.library.data.length > 0) {
|
||||
// item_id = res.relationships.library.data[0].id
|
||||
|
|
@ -2378,7 +2388,7 @@ const app = new Vue({
|
|||
let useMenu = "normal"
|
||||
let menus = {
|
||||
multiple: {
|
||||
items: [ ]
|
||||
items: []
|
||||
},
|
||||
normal: {
|
||||
items: [
|
||||
|
|
@ -2398,7 +2408,7 @@ const app = new Vue({
|
|||
{
|
||||
"name": "Start Radio",
|
||||
"action": function () {
|
||||
app.mk.setStationQueue({song: item_id}).then(() => {
|
||||
app.mk.setStationQueue({ song: item_id }).then(() => {
|
||||
app.mk.play()
|
||||
app.selectedMediaItems = []
|
||||
})
|
||||
|
|
@ -2407,9 +2417,9 @@ const app = new Vue({
|
|||
]
|
||||
}
|
||||
}
|
||||
if(this.contextExt) {
|
||||
if (this.contextExt) {
|
||||
// if this.context-ext.normal is true append all options to the 'normal' menu which is a kvp of arrays
|
||||
if(this.contextExt.normal) {
|
||||
if (this.contextExt.normal) {
|
||||
menus.normal.items = menus.normal.items.concat(this.contextExt.normal)
|
||||
}
|
||||
}
|
||||
|
|
@ -2485,7 +2495,8 @@ document.addEventListener('musickitloaded', function () {
|
|||
});
|
||||
setTimeout(() => {
|
||||
app.init()
|
||||
}, 1000)}
|
||||
}, 1000)
|
||||
}
|
||||
request.addEventListener("load", loadAlternateKey);
|
||||
request.open("GET", "https://raw.githubusercontent.com/lujjjh/LitoMusic/main/token.json");
|
||||
request.send();
|
||||
|
|
@ -2496,7 +2507,7 @@ document.addEventListener('musickitloaded', function () {
|
|||
request.addEventListener("load", initMusicKit);
|
||||
request.onreadystatechange = function (aEvt) {
|
||||
if (request.readyState == 4) {
|
||||
if(request.status != 200)
|
||||
if (request.status != 200)
|
||||
fallbackinitMusicKit()
|
||||
}
|
||||
};
|
||||
|
|
@ -2596,7 +2607,7 @@ var checkIfScrollIsStatic = setInterval(() => {
|
|||
|
||||
// WebGPU Console Notification
|
||||
async function webGPU() {
|
||||
try{
|
||||
try {
|
||||
const currentGPU = await navigator.gpu.requestAdapter()
|
||||
console.log("WebGPU enabled on", currentGPU.name, "with feature ID", currentGPU.features.size)
|
||||
} catch (e) {
|
||||
|
|
|
|||
|
|
@ -2949,6 +2949,41 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
|
|||
|
||||
/* Cider */
|
||||
|
||||
// Modular
|
||||
.modular-fs {
|
||||
.app-drawer {
|
||||
width:100%;
|
||||
right:0px;
|
||||
top:0px;
|
||||
height:100%;
|
||||
border-radius: 0px;
|
||||
box-shadow: unset;
|
||||
background: black;
|
||||
.lyric-body {
|
||||
justify-content: center;
|
||||
align-items:center;
|
||||
|
||||
.lyric-line {
|
||||
pointer-events: none;
|
||||
font-weight: 500;
|
||||
font-size: 1.6em;
|
||||
|
||||
&:not(.active) {
|
||||
display: none;
|
||||
margin: 0;
|
||||
transform: scale(1);
|
||||
}
|
||||
|
||||
&.active {
|
||||
margin: 0;
|
||||
transform: scale(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Modular
|
||||
|
||||
/* Transitions */
|
||||
|
||||
.modal-enter-active,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue