Skip to content

修复“搜索歌单”功能在获取收藏夹视频列表时缺失最后一页的问题 #60

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

Open
Xlucidator wants to merge 3 commits into
base: master
Choose a base branch
from
Open

修复“搜索歌单”功能在获取收藏夹视频列表时缺失最后一页的问题 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
781f684
Fix: handle all misspellings of 'delete' from 'delte'
Xlucidator Apr 6, 2025
ad29c5b
Fix: patch the omission on the last page of FavList in 'fetchFavList'
Xlucidator Apr 6, 2025
02a56bc
Refact: optimize 'fetchFavList', using unpaged api
Xlucidator Apr 16, 2025
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
4 changes: 2 additions & 2 deletions src/components/Fav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ TablePaginationActions.propTypes = {
rowsPerPage: PropTypes.number.isRequired,
};

export const Fav = (function ({ FavList, onSongIndexChange, onAddOneFromFav, handleDelteFromSearchList, handleAddToFavClick }) {
export const Fav = (function ({ FavList, onSongIndexChange, onAddOneFromFav, handleDeleteFromSearchList, handleAddToFavClick }) {
const [currentFavList, setCurrentFavList] = useState(null)
const [rows, setRows] = useState(null)
const [page, setPage] = useState(0);
Expand Down Expand Up @@ -279,7 +279,7 @@ export const Fav = (function ({ FavList, onSongIndexChange, onAddOneFromFav, han
<AddBoxOutlinedIcon sx={CRUDIcon} onClick={() => handleAddToFavClick(currentFavList.info.id, song)} />
</Tooltip>
<Tooltip title="删除歌曲">
<DeleteOutlineOutlinedIcon sx={CRUDIcon} onClick={() => handleDelteFromSearchList(
<DeleteOutlineOutlinedIcon sx={CRUDIcon} onClick={() => handleDeleteFromSearchList(
currentFavList.info.id,
song.id,
{page:page, rowsPerPage:rowsPerPage, filterString:filterString})} />
Expand Down
4 changes: 2 additions & 2 deletions src/components/FavList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export const FavList = memo(function ({ onSongListChange, onPlayOneFromFav, onPl
}, [searchList, selectedList])

// Delete base on ID of the song
const handleDelteFromSearchList = useCallback((id, songId, currentTableInfo) => {
const handleDeleteFromSearchList = useCallback((id, songId, currentTableInfo) => {
let favList = id == 'FavList-Search' ? searchList : favLists.find(f => f.info.id == id)

favList.songList = favList.songList.filter(s => s.id != songId)
Expand Down Expand Up @@ -329,7 +329,7 @@ export const FavList = memo(function ({ onSongListChange, onPlayOneFromFav, onPl
onSongListChange={onSongListChange}
onSongIndexChange={onPlayOneFromFav}
onAddOneFromFav={onAddOneFromFav}
handleDelteFromSearchList={handleDelteFromSearchList}
handleDeleteFromSearchList={handleDeleteFromSearchList}
handleAddToFavClick={handleAddToFavClick}
/>}
</Box>
Expand Down
37 changes: 5 additions & 32 deletions src/utils/Data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const URL_BILISERIES_INFO = "https://api.bilibili.com/x/series/archives?mid={mid
const URL_BILICOLLE_INFO = 'https://api.bilibili.com/x/polymer/space/seasons_archives_list?mid={mid}&season_id={sid}&sort_reverse=false&page_num={pn}&page_size=30'
// Fav List
const URL_FAV_LIST = "https://api.bilibili.com/x/v3/fav/resource/list?media_id={mid}&pn={pn}&ps=20&keyword=&order=mtime&type=0&tid=0&platform=web&jsonp=jsonp"
const URL_FAV_LIST_UNPAGED = "https://api.bilibili.com/x/v3/fav/resource/ids?media_id={mid}"
// LRC Mapping
const URL_LRC_MAPPING = "https://raw.githubusercontent.com/kenmingwang/azusa-player-lrcs/main/mappings.txt"
// LRC Base
Expand Down Expand Up @@ -180,8 +181,6 @@ export const fetchBiliSeriesInfo = async (mid, sid) => {
return videoInfos
}



// copied from ytdlp. applies to collections such as:
// https://space.bilibili.com/287837/channel/collectiondetail?sid=793137
// method is copied from fetchFavList.
Expand Down Expand Up @@ -221,39 +220,13 @@ export const fetchBiliColleList = async (mid, sid, favList = []) => {
return videoInfos
}

// Simplified by using unpaged api
export const fetchFavList = async (mid) => {
logger.info("calling fetchFavList")
const res = await fetch(URL_FAV_LIST.replace('{mid}', mid).replace('{pn}', 1))
const res = await fetch(URL_FAV_LIST_UNPAGED.replace('{mid}', mid))
const json = await res.json()
const data = json.data

const mediaCount = data.info.media_count
let totalPagesRequired = Math.ceil(mediaCount / 20);

const BVidPromises = data.medias.map(m => fetchVideoInfo(m.bvid))
const pagesPromises = []

for (let page = 2; page <= totalPagesRequired; page++) {
pagesPromises.push(fetch(URL_FAV_LIST.replace('{mid}', mid).replace('{pn}', page)))
}

let videoInfos = []
await Promise.all(pagesPromises)
.then(async function (v) {
// console.log(BVidPromises)
for (let index = 0; index < v.length; index++) {
await v[index].json().then(js =>
js.data.has_more
&&
js.data.medias.map(m => BVidPromises.push(fetchVideoInfo(m.bvid))))
}

await Promise.all(BVidPromises).then(res => {
videoInfos = res
})
})

return videoInfos
const videoInfos = await Promise.all(json.data.map(m => fetchVideoInfo(m.bvid)))
return videoInfos.filter(Boolean)
}

// Private Util to extract json according to https://github.com/SocialSisterYi/bilibili-API-collect
Expand Down