tyler.durden/d-fi-core
1
0
Fork 0
mirror of https://github.com/d-fi/d-fi-core.git synced 2025-07-29 00:24:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

imrpove parsing

Browse Source
This commit is contained in:
Sayem Chowdhury 2021-03-24 01:42:57 +06:00
parent 9309792bbd
commit 35a185fe3c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/converter/parse.ts
View File

@ -12,7 +12,7 @@ import * as spotify from './spotify';
import * as tidal from './tidal'; import * as tidal from './tidal';
import {isrc2deezer, upc2deezer} from './deezer'; import {isrc2deezer, upc2deezer} from './deezer';
import PQueue from 'p-queue'; import PQueue from 'p-queue';
import type {albumType, trackType} from '../types'; import type {albumType, artistInfoType, playlistInfo, trackType} from '../types';
type linkType = 'track' | 'album' | 'artist' | 'playlist'; type linkType = 'track' | 'album' | 'artist' | 'playlist';
@ -36,7 +36,7 @@ type urlPartsType = {
const queue = new PQueue({concurrency: 10}); const queue = new PQueue({concurrency: 10});
const getUrlParts = async (url: string): Promise<urlPartsType | null> => { const getUrlParts = async (url: string): Promise<urlPartsType> => {
if (url.startsWith('spotify:')) { if (url.startsWith('spotify:')) {
const spotify = url.split(':'); const spotify = url.split(':');
url = 'https://open.spotify.com/' + spotify[1] + '/' + spotify[2]; url = 'https://open.spotify.com/' + spotify[1] + '/' + spotify[2];
@ -59,7 +59,7 @@ const getUrlParts = async (url: string): Promise<urlPartsType | null> => {
const tidalUrlParts = url.split(/\/(\w+)\/(\d+|\w+-\w+-\w+-\w+-\w+)/); const tidalUrlParts = url.split(/\/(\w+)\/(\d+|\w+-\w+-\w+-\w+-\w+)/);
return {type: ('tidal-' + tidalUrlParts[1]) as any, id: tidalUrlParts[2]}; return {type: ('tidal-' + tidalUrlParts[1]) as any, id: tidalUrlParts[2]};
default: default:
return null; throw new Error('Unable to parse URL: ' + url);
} }
}; };
@ -69,14 +69,12 @@ const getUrlParts = async (url: string): Promise<urlPartsType | null> => {
*/ */
export const parseInfo = async (url: string) => { export const parseInfo = async (url: string) => {
let info = await getUrlParts(url); let info = await getUrlParts(url);
if (!info) { if (!info.id) {
return null;
} else if (!info.id) {
throw new Error('Unable to parse id'); throw new Error('Unable to parse id');
} }
let linktype: linkType = 'track'; let linktype: linkType = 'track';
let linkinfo: trackType | albumType | {} = {}; let linkinfo: trackType | albumType | playlistInfo | artistInfoType | {} = {};
let tracks: trackType[] = []; let tracks: trackType[] = [];
switch (info.type) { switch (info.type) {