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

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
booploops 2022-04-13 08:38:18 -07:00
commit ad70a2cc85
2 changed files with 97 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/base/browserwindow.ts
View file

@ -597,6 +597,21 @@ export class BrowserWindow {
details.requestHeaders["Referer"] = "https://music.163.com/";
details.requestHeaders["user-agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Cider/1.0.0 Chrome/96.0.4664.45 Electron/16.0.0 Safari/537.36";
}
if (details.url.includes("https://qq.com")) {
details.requestHeaders['Accept'] = '*/*',
details.requestHeaders['Accept-Encoding'] = 'gzip, deflate, br',
details.requestHeaders['Accept-Language'] = 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
details.requestHeaders['Referer'] = 'https://y.qq.com/',
details.requestHeaders['User-Agent'] = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ('
'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '}
if (details.url.includes("https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg")) {
details.requestHeaders['Accept'] = '*/*',
details.requestHeaders['Accept-Encoding'] = 'gzip, deflate, br',
details.requestHeaders['Accept-Language'] = 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
details.requestHeaders['User-Agent'] = 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_3_1 like Mac OS X; zh-CN) AppleWebKit/537.51.1 ('
'KHTML, like Gecko) Mobile/17D50 UCBrowser/12.8.2.1268 Mobile AliApp(TUnionSDK/0.1.20.3) '
details.requestHeaders['Referer'] = "https://y.qq.com/portal/player.html"
}
callback({requestHeaders: details.requestHeaders});
}
);

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

@ -2720,13 +2720,13 @@ const app = new Vue({
}
} catch (e) {
console.log('error');
app.loadNeteaseLyrics();
app.loadQQLyrics();
//app.loadAMLyrics();
}
};
req.onerror = function () {
console.log('error');
app.loadNeteaseLyrics();
app.loadQQLyrics();
// app.loadAMLyrics();
};
req.send();
@ -2765,7 +2765,7 @@ const app = new Vue({
}
if (lrcfile == "") {
app.loadNeteaseLyrics();
app.loadQQLyrics();
// app.loadAMLyrics()
} else {
if (richsync == [] || richsync.length == 0) {
@ -2815,12 +2815,12 @@ const app = new Vue({
getMXMTrans(id, lang, token);
} else {
// app.loadAMLyrics()
app.loadNeteaseLyrics();
app.loadQQLyrics();
}
}
} catch (e) {
console.log(e);
app.loadNeteaseLyrics();
app.loadQQLyrics();
// app.loadAMLyrics()
}
} else { //4xx rejected
@ -2828,12 +2828,12 @@ const app = new Vue({
}
} catch (e) {
console.log(e);
app.loadNeteaseLyrics();
app.loadQQLyrics();
//app.loadAMLyrics()
}
}
req.onerror = function () {
app.loadNeteaseLyrics();
app.loadQQLyrics();
console.log('error');
// app.loadAMLyrics();
};
@ -2951,6 +2951,81 @@ const app = new Vue({
}
},
loadQQLyrics() {
const track = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.title ?? '' : '');
const artist = encodeURIComponent((this.mk.nowPlayingItem != null) ? this.mk.nowPlayingItem.artistName ?? '' : '');
const time = encodeURIComponent((this.mk.nowPlayingItem != null) ? (Math.round((this.mk.nowPlayingItem.attributes["durationInMillis"] ?? -1000) / 1000) ?? -1) : -1);
var url = `https://c.y.qq.com/soso/fcgi-bin/client_search_cp?w=${track+" "+artist}&t=0&n=1&page=1&cr=1&new_json=1&format=json&platform=yqq.json`;
var req = new XMLHttpRequest();
req.overrideMimeType("application/json");
req.open('GET', url, true);
req.onload = function () {
try {
var jsonResponse = JSON.parse(req.responseText);
let id = jsonResponse?.data?.song?.list[0]?.mid;
console.log(jsonResponse)
let usz = new Date().getTime()
var url2 = `https://c.y.qq.com/lyric/fcgi-bin/fcg_query_lyric_new.fcg?-=MusicJsonCallback_lrc&songmid=${id}&pcachetime=${usz}&g_tk=5381&loginUin=3003436226&hostUin=0&inCharset=utf-8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0`;
var req2 = new XMLHttpRequest();
req2.overrideMimeType("application/json");
req2.open('GET', url2, true);
req2.onload = function () {
try {
function b64_to_utf8( str ) {
return decodeURIComponent(escape(window.atob( str )));
}
const htmlDecode = (input) => {
const doc = new DOMParser().parseFromString(input, "text/html");
return doc.documentElement.textContent;
}
var jsonResponse2 = JSON.parse(req2.responseText.replace("MusicJsonCallback(","").replace("})","}"));
var lrcfile = htmlDecode(b64_to_utf8(jsonResponse2["lyric"]));
app.lyricsMediaItem = lrcfile
let u = app.lyricsMediaItem.split(/[\n]/);
let preLrc = []
for (var i = u.length - 1; i >= 0; i--) {
let xline = (/(\[[0-9.:\[\]]*\])+(.*)/).exec(u[i])
if (xline != null) {
let end = (preLrc.length > 0) ? ((preLrc[preLrc.length - 1].startTime) ?? 99999) : 99999
preLrc.push({
startTime: app.toMS(xline[1].substring(1, xline[1].length - 2)) ?? 0,
endTime: end,
line: xline[2],
translation: ''
})}
}
if (preLrc.length > 0)
preLrc.push({
startTime: 0,
endTime: preLrc[preLrc.length - 1].startTime,
line: "lrcInstrumental",
translation: ''
});
app.lyrics = preLrc.reverse();
}
catch (e) {
console.log(e)
app.loadNeteaseLyrics();
app.lyrics = "";
}
};
req2.onerror = function(){
app.loadNeteaseLyrics();
}
req2.send();
} catch (e) {
console.log(e)
app.loadNeteaseLyrics();
app.lyrics = "";
}
}
req.onerror = function(){
app.loadNeteaseLyrics();
}
req.send();
},
toMS(str) {
let rawTime = str.match(/(\d+:)?(\d+:)?(\d+)(\.\d+)?/);
let hours = (rawTime[2] != null) ? (rawTime[1].replace(":", "")) : 0;