feat: subscribe url progress

lovegaoshi · Nov 12, 2023 · d145807 · d145807
1 parent ffd1fd7
commit d145807
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/components/FavList.js b/src/components/FavList.js
@@ -72,7 +72,7 @@ export const FavList = memo(
     playerSettings,
   }) => {
     const StorageManager = useContext(StorageManagerCtx);
-    const [
+    const {
       favLists,
       setFavLists,
       searchList,
@@ -95,8 +95,7 @@ export const FavList = memo(
       onAddFav,
       onDragEnd,
       updateSubscribeFavList,
-    ] = useFavList();
-
+    } = useFavList();
     const handleSearch = useCallback(
       (list) => {
         setSearchList(list);
@@ -353,7 +352,7 @@ export const FavList = memo(
               onSongIndexChange={onPlayOneFromFav}
               handleDeleteFromSearchList={handleDeleteFromSearchList}
               handleAddToFavClick={handleAddToFavClick}
-              rssUpdate={async (subscribeUrls) =>
+              rssUpdate={(subscribeUrls) =>
                 updateSubscribeFavList({
                   playlist: selectedList,
                   StorageManager,

diff --git a/src/components/FavListMobile.js b/src/components/FavListMobile.js
@@ -92,7 +92,7 @@ export default memo(
     const [open, setOpen] = useState(false);
     const StorageManager = useContext(StorageManagerCtx);
     const confirm = useConfirm();
-    const [
+    const {
       favLists,
       setFavLists,
       searchList,
@@ -115,7 +115,7 @@ export default memo(
       handleAddToFavClick,
       onAddFav,
       onDragEnd,
-    ] = useFavList();
+    } = useFavList();
 
     useEffect(() => {
       if (!selectedList) {

diff --git a/src/hooks/useFavList.ts b/src/hooks/useFavList.ts
@@ -183,6 +183,7 @@ const useFavList = () => {
       for (let i = 0, n = subscribeUrls.length; i < n; i++) {
         playlist.songList = (
           await searchBiliURLs({
+            progressEmitter: setPlaylistRefreshProgress,
             input: subscribeUrls[i],
             favList: [
               ...playlist.songList.map((val) => val.bvid),
@@ -211,7 +212,7 @@ const useFavList = () => {
     }
   };
 
-  return [
+  return {
     favLists,
     setFavLists,
     searchList,
@@ -233,7 +234,7 @@ const useFavList = () => {
     handleAddToFavClick,
     onAddFav,
     onDragEnd,
-  ];
+  };
 };
 
 export default useFavList;
diff --git a/src/hooks/useStore.ts b/src/hooks/useStore.ts
@@ -8,10 +8,10 @@ interface NoxStore {
 
 const useNoxStore = create<NoxStore>((set, get) => ({
   playlistRefreshProgress: 100,
-  setPlaylistRefreshProgress: (val: number) =>
-    set({
-      playlistRefreshProgress: val,
-    }),
+  setPlaylistRefreshProgress: (playlistRefreshProgress: number) => {
+    console.log('debug', playlistRefreshProgress);
+    set({ playlistRefreshProgress });
+  },
 }));
 
 export default useNoxStore;