Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

revert(lyrics-plus): netease api #2636

Merged
merged 2 commits into from
Nov 8, 2023
Merged

revert(lyrics-plus): netease api #2636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
747263e
revert neteaseapiv2
Lseoksee Nov 7, 2023
468a30d
modified: ProviderNetease.js
Lseoksee Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 16 additions & 65 deletions CustomApps/lyrics-plus/ProviderNetease.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,28 @@
/**
* @typedef {{
* result: {
* songs: {
* name: string,
* id: number,
* dt: number, // duration in ms
* al: { // album
* name: string,
* },
* }[],
* },
* }} SearchResponse
*
* @typedef {{
* title: string,
* artist: string,
* album: string,
* duration: number,
* }} Info
*/

const ProviderNetease = (function () {
/**
* Search with PyNCM api.
*
* @param {Info} info
* @throw "Cannot find track"
*/
async function search(info) {
const searchURL = "https://pyncmd.apis.imouto.in/api/pyncm?module=cloudsearch&method=GetSearchResult&keyword=";
const requestHeader = {
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"
};

async function findLyrics(info) {
const searchURL = "https://music.xianqiao.wang/neteaseapiv2/search?limit=10&type=1&keywords=";
const lyricURL = "https://music.xianqiao.wang/neteaseapiv2/lyric?id=";

const cleanTitle = Utils.removeExtraInfo(Utils.removeSongFeat(Utils.normalize(info.title)));
const finalURL = searchURL + encodeURIComponent(`${cleanTitle} ${info.artist}`);

/** @type {SearchResponse} */
const searchResults = await Spicetify.CosmosAsync.get(finalURL);
const searchResults = await CosmosAsync.get(finalURL, null, requestHeader);
const items = searchResults.result.songs;

// Find the best match.
for (const song of items) {
const expectedDuration = info.duration;
const actualDuration = song.dt;

// normalized expected album name
const neAlbumName = Utils.normalize(info.album);
const expectedAlbumName = Utils.containsHanCharacter(neAlbumName) ? await Utils.toSimplifiedChinese(neAlbumName) : neAlbumName;
const actualAlbumName = Utils.normalize(song.al.name); // usually in Simplified Chinese

if (actualAlbumName == expectedAlbumName || Math.abs(expectedDuration - actualDuration) < 1000) {
return song;
}
if (!items?.length) {
throw "Cannot find track";
}

throw "Cannot find track";
}

/**
* @param {Info} info
*
* @returns {{
* lrc: {
* lyric: string,
* klyric: undefined, // unimplemented
* },
* }}
*/
async function findLyrics(info) {
const lyricURL = "https://pyncmd.apis.imouto.in/api/pyncm?module=track&method=GetTrackLyrics&song_id=";

const searchResponse = await search(info);
const songID = searchResponse.id;
// normalized expected album name
const neAlbumName = Utils.normalize(info.album);
const expectedAlbumName = Utils.containsHanCharacter(neAlbumName) ? await Utils.toSimplifiedChinese(neAlbumName) : neAlbumName;
let itemId = items.findIndex(val => Utils.normalize(val.album.name) === expectedAlbumName || Math.abs(info.duration - val.duration) < 1000);
if (itemId === -1) throw "Cannot find track";

return CosmosAsync.get(lyricURL + songID);
return await CosmosAsync.get(lyricURL + items[itemId].id, null, requestHeader);
}

const creditInfo = [
Expand Down
49 changes: 9 additions & 40 deletions Extensions/popupLyrics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,36 +78,6 @@ function PopupLyrics() {
}

class LyricProviders {
/** Netease PyNCM API
*
* @typedef {{
* result: {
* songs: {
* name: string,
* id: number,
* dt: number, // duration in ms
* al: { // album
* name: string,
* },
* }[],
* },
* }} SearchResponse
*
* @typedef {{
* title: string,
* artist: string,
* album: string,
* duration: number,
* }} Info
*
* @typedef {{
* lrc: {
* lyric: string,
* klyric: undefined, // unimplemented
* },
* }} NeteaseLyric
*/

static async fetchSpotify(info) {
const baseURL = "wg://lyrics/v1/track/";
const id = info.uri.split(":")[2];
Expand Down Expand Up @@ -189,27 +159,26 @@ function PopupLyrics() {
}

static async fetchNetease(info) {
const searchURL = "https://pyncmd.apis.imouto.in/api/pyncm?module=cloudsearch&method=GetSearchResult&keyword=";
const lyricURL = "https://pyncmd.apis.imouto.in/api/pyncm?module=track&method=GetTrackLyrics&song_id=";
const searchURL = "https://music.xianqiao.wang/neteaseapiv2/search?limit=10&type=1&keywords=";
const lyricURL = "https://music.xianqiao.wang/neteaseapiv2/lyric?id=";
const requestHeader = {
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Firefox/93.0"
};

const cleanTitle = LyricUtils.removeExtraInfo(LyricUtils.normalize(info.title));
const finalURL = searchURL + encodeURIComponent(`${cleanTitle} ${info.artist}`);

/** @type {SearchResponse} */
const searchResults = await CosmosAsync.get(finalURL);
const searchResults = await CosmosAsync.get(finalURL, null, requestHeader);
const items = searchResults.result.songs;

if (!items) {
if (!items || !items.length) {
return { error: "Cannot find track" };
}

const album = LyricUtils.capitalize(info.album);

let itemId = items.findIndex(val => LyricUtils.capitalize(val.al.name) === album || Math.abs(info.duration - val.dt) < 1000);
let itemId = items.findIndex(val => LyricUtils.capitalize(val.album.name) === album || Math.abs(info.duration - val.duration) < 1000);
if (itemId === -1) return { error: "Cannot find track" };

/** @type {NeteaseLyric} */
const meta = await CosmosAsync.get(lyricURL + items[itemId].id);
const meta = await CosmosAsync.get(lyricURL + items[itemId].id, null, requestHeader);
let lyricStr = meta.lrc;

if (!lyricStr || !lyricStr.lyric) {
Expand Down