lint code
This commit is contained in:
@@ -44,6 +44,7 @@ const saveViewPrevStateThrottle = throttle((state) => {
|
||||
}, 1000)
|
||||
|
||||
const initPosition = async() => {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
listPosition ??= await getListPositionInfoFromData() ?? {}
|
||||
}
|
||||
export const getListPosition = async(id: string): Promise<number> => {
|
||||
@@ -74,6 +75,7 @@ const saveListPrevSelectIdThrottle = throttle(() => {
|
||||
saveListPrevSelectIdFromData(listPrevSelectId)
|
||||
}, 200)
|
||||
export const getListPrevSelectId = async() => {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
listPrevSelectId ??= await getListPrevSelectIdFromData() ?? LIST_IDS.DEFAULT
|
||||
return listPrevSelectId ?? LIST_IDS.DEFAULT
|
||||
}
|
||||
@@ -88,6 +90,7 @@ const saveListUpdateInfo = throttle(() => {
|
||||
|
||||
const initListUpdateInfo = async() => {
|
||||
if (listUpdateInfo == null) {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
listUpdateInfo = await getListUpdateInfoFromData() ?? {}
|
||||
for (const [id, info] of Object.entries(listUpdateInfo)) {
|
||||
setUpdateTime(id, info.updateTime ? dateFormat(info.updateTime) : '')
|
||||
@@ -138,6 +141,7 @@ export const overwriteListUpdateInfo = async(ids: string[]) => {
|
||||
|
||||
|
||||
export const getSearchSetting = async() => {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
searchSetting ??= await getSearchSettingFromData()
|
||||
return { ...searchSetting }
|
||||
}
|
||||
@@ -154,6 +158,7 @@ export const setSearchSetting = async(setting: Partial<typeof DEFAULT_SETTING['s
|
||||
}
|
||||
|
||||
export const getSongListSetting = async() => {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
songListSetting ??= await getSongListSettingFromData()
|
||||
return { ...songListSetting }
|
||||
}
|
||||
@@ -164,6 +169,7 @@ export const setSongListSetting = async(setting: Partial<typeof DEFAULT_SETTING[
|
||||
}
|
||||
|
||||
export const getLeaderboardSetting = async() => {
|
||||
// eslint-disable-next-line require-atomic-updates
|
||||
leaderboardSetting ??= await getLeaderboardSettingFromData()
|
||||
return { ...leaderboardSetting }
|
||||
}
|
||||
|
||||
@@ -73,5 +73,5 @@ export const deduplicationList = <T extends LX.Music.MusicInfo>(list: T[]): T[]
|
||||
}
|
||||
|
||||
export const langS2T = async(str: string) => {
|
||||
return await window.lx.worker.main.langS2t(Buffer.from(str).toString('base64')).then(b64 => Buffer.from(b64, 'base64').toString())
|
||||
return window.lx.worker.main.langS2t(Buffer.from(str).toString('base64')).then(b64 => Buffer.from(b64, 'base64').toString())
|
||||
}
|
||||
|
||||
+11
-11
@@ -37,7 +37,7 @@ export const clearOtherSource = async() => {
|
||||
await rendererInvoke(WIN_MAIN_RENDERER_EVENT_NAME.clear_other_source)
|
||||
}
|
||||
export const getOtherSourceCount = async() => {
|
||||
return await rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_other_source_count)
|
||||
return rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_other_source_count)
|
||||
}
|
||||
|
||||
|
||||
@@ -254,7 +254,7 @@ export const saveLeaderboardSetting = (source: typeof DEFAULT_SETTING['leaderboa
|
||||
})
|
||||
}
|
||||
export const getLeaderboardSetting = async() => {
|
||||
return await rendererInvoke<string, typeof DEFAULT_SETTING['leaderboard']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.leaderboardSetting) ?? { ...DEFAULT_SETTING.leaderboard }
|
||||
return (await rendererInvoke<string, typeof DEFAULT_SETTING['leaderboard']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.leaderboardSetting)) ?? { ...DEFAULT_SETTING.leaderboard }
|
||||
}
|
||||
export const saveSongListSetting = (setting: typeof DEFAULT_SETTING['songList']) => {
|
||||
rendererSend(WIN_MAIN_RENDERER_EVENT_NAME.save_data, {
|
||||
@@ -263,7 +263,7 @@ export const saveSongListSetting = (setting: typeof DEFAULT_SETTING['songList'])
|
||||
})
|
||||
}
|
||||
export const getSongListSetting = async() => {
|
||||
return await rendererInvoke<string, typeof DEFAULT_SETTING['songList']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.songListSetting) ?? { ...DEFAULT_SETTING.songList }
|
||||
return (await rendererInvoke<string, typeof DEFAULT_SETTING['songList']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.songListSetting)) ?? { ...DEFAULT_SETTING.songList }
|
||||
}
|
||||
export const saveSearchSetting = (setting: typeof DEFAULT_SETTING['search']) => {
|
||||
rendererSend(WIN_MAIN_RENDERER_EVENT_NAME.save_data, {
|
||||
@@ -272,7 +272,7 @@ export const saveSearchSetting = (setting: typeof DEFAULT_SETTING['search']) =>
|
||||
})
|
||||
}
|
||||
export const getSearchSetting = async() => {
|
||||
return await rendererInvoke<string, typeof DEFAULT_SETTING['search']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.searchSetting) ?? { ...DEFAULT_SETTING.search }
|
||||
return (await rendererInvoke<string, typeof DEFAULT_SETTING['search']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.searchSetting)) ?? { ...DEFAULT_SETTING.search }
|
||||
}
|
||||
export const saveViewPrevState = (state: typeof DEFAULT_SETTING['viewPrevState']) => {
|
||||
rendererSend(WIN_MAIN_RENDERER_EVENT_NAME.save_data, {
|
||||
@@ -281,7 +281,7 @@ export const saveViewPrevState = (state: typeof DEFAULT_SETTING['viewPrevState']
|
||||
})
|
||||
}
|
||||
export const getViewPrevState = async() => {
|
||||
return await rendererInvoke<string, typeof DEFAULT_SETTING['viewPrevState']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.viewPrevState) ?? { ...DEFAULT_SETTING.viewPrevState }
|
||||
return (await rendererInvoke<string, typeof DEFAULT_SETTING['viewPrevState']>(WIN_MAIN_RENDERER_EVENT_NAME.get_data, DATA_KEYS.viewPrevState)) ?? { ...DEFAULT_SETTING.viewPrevState }
|
||||
}
|
||||
|
||||
|
||||
@@ -292,7 +292,7 @@ export const getSystemFonts = async() => {
|
||||
}
|
||||
|
||||
export const getUserSoundEffectEQPresetList = async() => {
|
||||
return await rendererInvoke<LX.SoundEffect.EQPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_eq_preset)
|
||||
return rendererInvoke<LX.SoundEffect.EQPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_eq_preset)
|
||||
}
|
||||
|
||||
export const saveUserSoundEffectEQPresetList = (list: LX.SoundEffect.EQPreset[]) => {
|
||||
@@ -300,7 +300,7 @@ export const saveUserSoundEffectEQPresetList = (list: LX.SoundEffect.EQPreset[])
|
||||
}
|
||||
|
||||
export const getUserSoundEffectConvolutionPresetList = async() => {
|
||||
return await rendererInvoke<LX.SoundEffect.ConvolutionPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_convolution_preset)
|
||||
return rendererInvoke<LX.SoundEffect.ConvolutionPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_convolution_preset)
|
||||
}
|
||||
|
||||
export const saveUserSoundEffectConvolutionPresetList = (list: LX.SoundEffect.ConvolutionPreset[]) => {
|
||||
@@ -308,7 +308,7 @@ export const saveUserSoundEffectConvolutionPresetList = (list: LX.SoundEffect.Co
|
||||
}
|
||||
|
||||
// export const getUserSoundEffectPitchShifterPresetList = async() => {
|
||||
// return await rendererInvoke<LX.SoundEffect.PitchShifterPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_pitch_shifter_preset)
|
||||
// return rendererInvoke<LX.SoundEffect.PitchShifterPreset[]>(WIN_MAIN_RENDERER_EVENT_NAME.get_sound_effect_pitch_shifter_preset)
|
||||
// }
|
||||
|
||||
// export const saveUserSoundEffectPitchShifterPresetList = (list: LX.SoundEffect.PitchShifterPreset[]) => {
|
||||
@@ -507,7 +507,7 @@ export const clearLyricRaw = async() => {
|
||||
}
|
||||
|
||||
export const getLyricRawCount = async() => {
|
||||
return await rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_lyric_raw_count)
|
||||
return rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_lyric_raw_count)
|
||||
}
|
||||
|
||||
|
||||
@@ -559,7 +559,7 @@ export const clearLyricEdited = async() => {
|
||||
}
|
||||
|
||||
export const getLyricEditedCount = async() => {
|
||||
return await rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_lyric_edited_count)
|
||||
return rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_lyric_edited_count)
|
||||
}
|
||||
|
||||
|
||||
@@ -603,7 +603,7 @@ export const clearMusicUrl = async() => {
|
||||
}
|
||||
|
||||
export const getMusicUrlCount = async() => {
|
||||
return await rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_music_url_count)
|
||||
return rendererInvoke<number>(WIN_MAIN_RENDERER_EVENT_NAME.get_music_url_count)
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,7 +7,7 @@ export const checkDownloadFileAvailable = async(musicInfo: LX.Download.ListItem,
|
||||
}
|
||||
|
||||
export const checkLocalFileAvailable = async(musicInfo: LX.Music.MusicInfoLocal): Promise<boolean> => {
|
||||
return await checkPath(musicInfo.meta.filePath)
|
||||
return checkPath(musicInfo.meta.filePath)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -17,9 +17,9 @@ export const checkLocalFileAvailable = async(musicInfo: LX.Music.MusicInfoLocal)
|
||||
*/
|
||||
export const checkMusicFileAvailable = async(musicInfo: LX.Music.MusicInfo | LX.Download.ListItem, savePath: string): Promise<boolean> => {
|
||||
if ('progress' in musicInfo) {
|
||||
return await checkDownloadFileAvailable(musicInfo, savePath)
|
||||
return checkDownloadFileAvailable(musicInfo, savePath)
|
||||
} else if (musicInfo.source == 'local') {
|
||||
return await checkLocalFileAvailable(musicInfo)
|
||||
return checkLocalFileAvailable(musicInfo)
|
||||
} else return true
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ export const getDownloadFilePath = async(musicInfo: LX.Download.ListItem, savePa
|
||||
}
|
||||
|
||||
export const getLocalFilePath = async(musicInfo: LX.Music.MusicInfoLocal): Promise<string> => {
|
||||
return await checkPath(musicInfo.meta.filePath) ? musicInfo.meta.filePath : ''
|
||||
return (await checkPath(musicInfo.meta.filePath)) ? musicInfo.meta.filePath : ''
|
||||
}
|
||||
|
||||
|
||||
@@ -45,9 +45,9 @@ export const getLocalFilePath = async(musicInfo: LX.Music.MusicInfoLocal): Promi
|
||||
*/
|
||||
export const getMusicFilePath = async(musicInfo: LX.Music.MusicInfo | LX.Download.ListItem, savePath: string): Promise<string> => {
|
||||
if ('progress' in musicInfo) {
|
||||
return await getDownloadFilePath(musicInfo, savePath)
|
||||
return getDownloadFilePath(musicInfo, savePath)
|
||||
} else if (musicInfo.source == 'local') {
|
||||
return await getLocalFilePath(musicInfo)
|
||||
return getLocalFilePath(musicInfo)
|
||||
}
|
||||
return ''
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ export default {
|
||||
// })
|
||||
// requestObj.promise = requestObj.promise.then(({ body, statusCode }) => {
|
||||
// if (statusCode !== 200) {
|
||||
// if (tryNum > 5) return Promise.reject('歌词获取失败')
|
||||
// if (tryNum > 5) return Promise.reject(new Error('歌词获取失败'))
|
||||
// let tryRequestObj = this.getLyric(songInfo, ++tryNum)
|
||||
// requestObj.cancelHttp = tryRequestObj.cancelHttp.bind(tryRequestObj)
|
||||
// return tryRequestObj.promise
|
||||
@@ -98,7 +98,7 @@ export default {
|
||||
})
|
||||
requestObj.promise = requestObj.promise.then(({ body, statusCode }) => {
|
||||
if (statusCode !== 200) {
|
||||
if (tryNum > 5) return Promise.reject('歌词获取失败')
|
||||
if (tryNum > 5) return Promise.reject(new Error('歌词获取失败'))
|
||||
let tryRequestObj = this.searchLyric(name, hash, time, ++tryNum)
|
||||
requestObj.cancelHttp = tryRequestObj.cancelHttp.bind(tryRequestObj)
|
||||
return tryRequestObj.promise
|
||||
@@ -121,7 +121,7 @@ export default {
|
||||
})
|
||||
requestObj.promise = requestObj.promise.then(({ body, statusCode }) => {
|
||||
if (statusCode !== 200) {
|
||||
if (tryNum > 5) return Promise.reject('歌词获取失败')
|
||||
if (tryNum > 5) return Promise.reject(new Error('歌词获取失败'))
|
||||
let tryRequestObj = this.getLyric(id, accessKey, ++tryNum)
|
||||
requestObj.cancelHttp = tryRequestObj.cancelHttp.bind(tryRequestObj)
|
||||
return tryRequestObj.promise
|
||||
|
||||
@@ -38,10 +38,10 @@ export default {
|
||||
},
|
||||
)
|
||||
return requestObj.promise.then(({ body }) => {
|
||||
if (body.error_code !== 0) return Promise.reject('图片获取失败')
|
||||
if (body.error_code !== 0) return Promise.reject(new Error('图片获取失败'))
|
||||
let info = body.data[0].info
|
||||
const img = info.imgsize ? info.image.replace('{size}', info.imgsize[0]) : info.image
|
||||
if (!img) return Promise.reject('Pic get failed')
|
||||
if (!img) return Promise.reject(new Error('Pic get failed'))
|
||||
return img
|
||||
})
|
||||
},
|
||||
|
||||
@@ -57,7 +57,7 @@ const mrcTools = {
|
||||
})
|
||||
return requestObj.promise.then(({ statusCode, body }) => {
|
||||
if (statusCode == 200) return body
|
||||
if (tryNum > 5 || statusCode == 404) return Promise.reject('歌词获取失败')
|
||||
if (tryNum > 5 || statusCode == 404) return Promise.reject(new Error('歌词获取失败'))
|
||||
return this.getText(url, ++tryNum)
|
||||
})
|
||||
},
|
||||
@@ -84,7 +84,7 @@ const mrcTools = {
|
||||
let p
|
||||
if (info.mrcUrl) p = this.getMrc(info.mrcUrl)
|
||||
else if (info.lrcUrl) p = this.getLrc(info.lrcUrl)
|
||||
if (p == null) return Promise.reject('获取歌词失败')
|
||||
if (p == null) return Promise.reject(new Error('获取歌词失败'))
|
||||
return Promise.all([p, this.getTrc(info.trcUrl)]).then(([lrcInfo, tlyric]) => {
|
||||
lrcInfo.tlyric = tlyric
|
||||
return lrcInfo
|
||||
@@ -102,7 +102,7 @@ export default {
|
||||
let requestObj = httpFetch(songInfo.lrcUrl)
|
||||
requestObj.promise = requestObj.promise.then(({ body, statusCode }) => {
|
||||
if (statusCode !== 200) {
|
||||
if (tryNum > 5) return Promise.reject('歌词获取失败')
|
||||
if (tryNum > 5) return Promise.reject(new Error('歌词获取失败'))
|
||||
let tryRequestObj = this.getLyricWeb(songInfo, ++tryNum)
|
||||
requestObj.cancelHttp = tryRequestObj.cancelHttp.bind(tryRequestObj)
|
||||
return tryRequestObj.promise
|
||||
|
||||
@@ -10,7 +10,7 @@ export default {
|
||||
})
|
||||
requestObj.promise.then(({ body }) => {
|
||||
if (body.returnCode !== '000000') {
|
||||
if (tryNum > 5) return Promise.reject('图片获取失败')
|
||||
if (tryNum > 5) return Promise.reject(new Error('图片获取失败'))
|
||||
let tryRequestObj = this.getPic(songId, ++tryNum)
|
||||
requestObj.cancelHttp = tryRequestObj.cancelHttp.bind(tryRequestObj)
|
||||
return tryRequestObj.promise
|
||||
|
||||
@@ -168,7 +168,7 @@ export default {
|
||||
// return this._requestObj_list.promise.then(({ statusCode, body }) => {
|
||||
// if (statusCode !== 200) return this.getList(sortId, tagId, page)
|
||||
// let list = body.replace(/[\r\n]/g, '').match(this.regExps.list)
|
||||
// if (!list) return Promise.reject('获取列表失败')
|
||||
// if (!list) return Promise.reject(new Error('获取列表失败'))
|
||||
// return list.map(item => {
|
||||
// let info = item.match(this.regExps.listInfo)
|
||||
// return {
|
||||
|
||||
@@ -33,7 +33,7 @@ export default (songmid) => {
|
||||
})
|
||||
return requestObj.promise.then(({ body }) => {
|
||||
// console.log(body)
|
||||
if (body.code != 0 || body.req.code != 0) return Promise.reject('获取歌曲信息失败')
|
||||
if (body.code != 0 || body.req.code != 0) return Promise.reject(new Error('获取歌曲信息失败'))
|
||||
const item = body.req.data.track_info
|
||||
if (!item.file?.media_mid) return null
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ export default songmid => {
|
||||
})
|
||||
requestObj.promise = requestObj.promise.then(({ body }) => {
|
||||
// console.log(body)
|
||||
if (body.code !== 200 || !body.songs.length) return Promise.reject('获取歌曲信息失败')
|
||||
if (body.code !== 200 || !body.songs.length) return Promise.reject(new Error('获取歌曲信息失败'))
|
||||
return body.songs[0]
|
||||
})
|
||||
return requestObj
|
||||
|
||||
@@ -18,7 +18,7 @@ const address = [
|
||||
]
|
||||
|
||||
const request = async(url, retryNum = 0) => {
|
||||
return await new Promise((resolve, reject) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
httpGet(url, {
|
||||
timeout: 10000,
|
||||
}, (err, resp, body) => {
|
||||
|
||||
Reference in New Issue
Block a user