fetchAll从index.js提到各个utils中
This commit is contained in:
		@@ -2,6 +2,7 @@ const fs = require('fs');
 | 
			
		||||
const path = require('path');
 | 
			
		||||
 | 
			
		||||
const requestUtils = require('../../../utils/requestUtils');
 | 
			
		||||
const sleepUtils = require('../../../utils/sleepUtils');
 | 
			
		||||
 | 
			
		||||
const dbUtils = global.dbUtils;
 | 
			
		||||
 | 
			
		||||
@@ -20,6 +21,26 @@ async function getFromDatabase({ albumId }) {
 | 
			
		||||
    return albumInfo;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 从数据库中查出还缺少的专辑,并进行爬取
 | 
			
		||||
async function fetchAll() {
 | 
			
		||||
    console.log("start fetching albums ...")
 | 
			
		||||
    var albumIds = await dbUtils.query(`
 | 
			
		||||
        SELECT DISTINCT album_id FROM song_album_relation WHERE album_id NOT IN ( SELECT DISTINCT album_id FROM album )
 | 
			
		||||
    `, []);
 | 
			
		||||
    albumIds = albumIds.map(item => item.album_id);
 | 
			
		||||
    for (let i = 0; i < albumIds.length; i++) {
 | 
			
		||||
        await global.checkIsExit();
 | 
			
		||||
        const albumId = albumIds[i];
 | 
			
		||||
        console.log(`${i}/${albumIds.length} | album: ${albumId} | ${await global.statistics()}`);
 | 
			
		||||
        try {
 | 
			
		||||
            await fetch({ albumId: albumId });
 | 
			
		||||
        } catch (err) {
 | 
			
		||||
            console.error(err);
 | 
			
		||||
        }
 | 
			
		||||
        await sleepUtils.sleep(global.sleepTime);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 获取专辑详情
 | 
			
		||||
async function fetch({ albumId, debug = false }) {
 | 
			
		||||
    let result = await dbUtils.query('SELECT count(*) as count FROM album WHERE album_id = ?', [albumId]);
 | 
			
		||||
@@ -186,5 +207,6 @@ async function update({ albumId }) {
 | 
			
		||||
module.exports = {
 | 
			
		||||
    getFromDatabase: getFromDatabase,
 | 
			
		||||
    fetch: fetch,
 | 
			
		||||
    fetchAll: fetchAll,
 | 
			
		||||
    update: update,
 | 
			
		||||
}
 | 
			
		||||
@@ -2,6 +2,7 @@ const fs = require('fs');
 | 
			
		||||
const path = require('path');
 | 
			
		||||
 | 
			
		||||
const requestUtils = require('../../../utils/requestUtils');
 | 
			
		||||
const sleepUtils = require('../../../utils/sleepUtils');
 | 
			
		||||
 | 
			
		||||
const dbUtils = global.dbUtils;
 | 
			
		||||
 | 
			
		||||
@@ -20,6 +21,26 @@ async function getFromDatabase({ artistId }) {
 | 
			
		||||
    return artistInfo;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 从数据库中查出还缺少的歌手,并进行爬取
 | 
			
		||||
async function fetchAll() {
 | 
			
		||||
    console.log("start fetching artists ...")
 | 
			
		||||
    var artistIds = await dbUtils.query(`
 | 
			
		||||
        SELECT DISTINCT artist_id FROM song_artist_relation WHERE artist_id NOT IN ( SELECT DISTINCT artist_id FROM artist )
 | 
			
		||||
    `, []);
 | 
			
		||||
    artistIds = artistIds.map(item => item.artist_id);
 | 
			
		||||
    for (let i = 0; i < artistIds.length; i++) {
 | 
			
		||||
        await global.checkIsExit();
 | 
			
		||||
        const artistId = artistIds[i];
 | 
			
		||||
        console.log(`${i}/${artistIds.length} | artist: ${artistId} | ${await global.statistics()}`);
 | 
			
		||||
        try {
 | 
			
		||||
            await fetch({ artistId: artistId });
 | 
			
		||||
        } catch (err) {
 | 
			
		||||
            console.error(err);
 | 
			
		||||
        }
 | 
			
		||||
        await sleepUtils.sleep(global.sleepTime);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 获取音乐人详情
 | 
			
		||||
async function fetch({ artistId, debug = false }) {
 | 
			
		||||
    let result = await dbUtils.query('SELECT count(*) as count FROM artist WHERE artist_id = ?', [artistId]);
 | 
			
		||||
@@ -85,4 +106,5 @@ async function fetch({ artistId, debug = false }) {
 | 
			
		||||
module.exports = {
 | 
			
		||||
    getFromDatabase: getFromDatabase,
 | 
			
		||||
    fetch: fetch,
 | 
			
		||||
    fetchAll: fetchAll,
 | 
			
		||||
}
 | 
			
		||||
@@ -2,11 +2,32 @@ const fs = require('fs');
 | 
			
		||||
const path = require('path');
 | 
			
		||||
 | 
			
		||||
const requestUtils = require('../../../utils/requestUtils');
 | 
			
		||||
const sleepUtils = require('../../../utils/sleepUtils');
 | 
			
		||||
 | 
			
		||||
const dbUtils = global.dbUtils;
 | 
			
		||||
 | 
			
		||||
// 从数据库中查出还缺少的歌词,并进行爬取
 | 
			
		||||
async function fetchAll() {
 | 
			
		||||
    console.log("start fetching lyrics ...");
 | 
			
		||||
    var songIds = await dbUtils.query(`
 | 
			
		||||
        SELECT DISTINCT song_id FROM song WHERE song_id NOT IN ( SELECT DISTINCT song_id FROM lyric )
 | 
			
		||||
    `, []);
 | 
			
		||||
    songIds = songIds.map(song => song.song_id);
 | 
			
		||||
    for (let i = 0; i < songIds.length; i++) {
 | 
			
		||||
        await global.checkIsExit();
 | 
			
		||||
        const songId = songIds[i];
 | 
			
		||||
        console.log(`${i}/${songIds.length} | lyric: ${songId} | ${await global.statistics()}`);
 | 
			
		||||
        try {
 | 
			
		||||
            await fetch({ songId: songId });
 | 
			
		||||
        } catch (err) {
 | 
			
		||||
            console.error(err);
 | 
			
		||||
        }
 | 
			
		||||
        await sleepUtils.sleep(global.sleepTime);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 获取歌词详情
 | 
			
		||||
async function fetch({ songId }) {
 | 
			
		||||
async function fetch({ songId, debug = false }) {
 | 
			
		||||
    var url = `https://music.163.com/api/song/lyric?id=${songId}&lv=1`;
 | 
			
		||||
 | 
			
		||||
    try {
 | 
			
		||||
@@ -41,4 +62,5 @@ async function fetch({ songId }) {
 | 
			
		||||
 | 
			
		||||
module.exports = {
 | 
			
		||||
    fetch: fetch,
 | 
			
		||||
    fetchAll: fetchAll,
 | 
			
		||||
}
 | 
			
		||||
@@ -2,6 +2,7 @@ const fs = require('fs');
 | 
			
		||||
const path = require('path');
 | 
			
		||||
 | 
			
		||||
const requestUtils = require('../../../utils/requestUtils');
 | 
			
		||||
const sleepUtils = require('../../../utils/sleepUtils');
 | 
			
		||||
 | 
			
		||||
const dbUtils = global.dbUtils;
 | 
			
		||||
 | 
			
		||||
@@ -22,6 +23,28 @@ async function getFromDatabase({ songId }) {
 | 
			
		||||
    return songInfo;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 从数据库中查出还缺少的歌曲,并进行爬取
 | 
			
		||||
async function fetchAll() {
 | 
			
		||||
    console.log("start fetching songs ...");
 | 
			
		||||
    var songIds = await dbUtils.query(`
 | 
			
		||||
        SELECT DISTINCT song_id FROM song_artist_relation WHERE song_id NOT IN ( SELECT DISTINCT song_id FROM song )
 | 
			
		||||
        UNION
 | 
			
		||||
        SELECT DISTINCT song_id FROM song_album_relation WHERE song_id NOT IN ( SELECT DISTINCT song_id FROM song )
 | 
			
		||||
    `, []);
 | 
			
		||||
    songIds = songIds.map(item => item.song_id);
 | 
			
		||||
    for (let i = 0; i < songIds.length; i++) {
 | 
			
		||||
        await global.checkIsExit();
 | 
			
		||||
        const songId = songIds[i];
 | 
			
		||||
        console.log(`${i}/${songIds.length} | song: ${songId} | ${await global.statistics()}`);
 | 
			
		||||
        try {
 | 
			
		||||
            await fetch({ songId: songId });
 | 
			
		||||
        } catch (err) {
 | 
			
		||||
            console.error(err);
 | 
			
		||||
        }
 | 
			
		||||
        await sleepUtils.sleep(global.sleepTime);
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// 获取音乐详情
 | 
			
		||||
async function fetch({ songId, debug = false }) {
 | 
			
		||||
    let result = await dbUtils.query('SELECT count(*) as count FROM song WHERE song_id = ?', [songId]);
 | 
			
		||||
@@ -119,4 +142,5 @@ async function fetch({ songId, debug = false }) {
 | 
			
		||||
module.exports = {
 | 
			
		||||
    getFromDatabase: getFromDatabase,
 | 
			
		||||
    fetch: fetch,
 | 
			
		||||
    fetchAll: fetchAll,
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user