[Test] Try fix play not return.

[Feat] Add File_op_semaphore.
canxin121 · May 11, 2024 · 8394d80 · 8394d80
1 parent c7e6870
commit 8394d80
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/lib/page/in_music_album.dart b/lib/page/in_music_album.dart
@@ -413,6 +413,7 @@ List<PullDownMenuEntry> musicAlbumActionPullDown(
                   cacheFile(file: music.info.artPic!, cachePath: picCachePath);
                 }
               }
+              cacheFile(file: musiclist.artPic, cachePath: picCachePath);
               await globalSqlMusicFactory
                   .createMusicListTable(musicLists: [musiclist]);
               await globalSqlMusicFactory.insertMusic(

diff --git a/lib/page/in_search_music_list.dart b/lib/page/in_search_music_list.dart
@@ -415,6 +415,7 @@ List<PullDownMenuEntry> musicListActionPullDown(
                 cacheFile(file: music.info.artPic!, cachePath: picCachePath);
               }
             }
+            cacheFile(file: musiclist.artPic, cachePath: picCachePath);
             await globalSqlMusicFactory
                 .createMusicListTable(musicLists: [musiclist]);
             await globalSqlMusicFactory.insertMusic(

diff --git a/lib/page/search_page.dart b/lib/page/search_page.dart
@@ -389,6 +389,7 @@ List<PullDownMenuEntry> searchMusicListCardPullDown(
                 cacheFile(file: music.info.artPic!, cachePath: picCachePath);
               }
             }
+            cacheFile(file: musiclist.artPic, cachePath: picCachePath);
             await globalSqlMusicFactory.insertMusic(
                 musicList: musiclist,
                 musics: musics.map((e) => e.ref).toList());

diff --git a/lib/util/audio_controller.dart b/lib/util/audio_controller.dart
@@ -194,8 +194,8 @@ class AudioHandler extends GetxController {
       playMusicList.add(firstMusic);
       await playSourceList.add(firstMusic.toAudioSource());
       updateRx(music: firstMusic);
-      await seek(Duration.zero, index: 0);
-      play();
+
+      await play();
 
       List<PlayMusic> newPlayMusics = [];
       List<AudioSource> newAudioSources = [];
@@ -295,7 +295,7 @@ class AudioHandler extends GetxController {
 
   Future<void> play() async {
     try {
-      await _player.play();
+      Future.microtask(() => _player.play());
       // talker.info("[Music Handler] In play, succeed");
     } catch (e) {
       talker.error("[Music Handler] In play. error occur: $e");

diff --git a/rust/src/api/cache.rs b/rust/src/api/cache.rs
@@ -7,14 +7,17 @@ use lazy_static::lazy_static;
 use reqwest_middleware::{ClientBuilder, ClientWithMiddleware};
 use reqwest_retry::policies::ExponentialBackoff;
 use reqwest_retry::RetryTransientMiddleware;
+use std::sync::Arc;
 use tokio::io::AsyncWriteExt as _;
+use tokio::sync::Semaphore;
 
 lazy_static! {
     pub static ref CLIENT: ClientWithMiddleware = ClientBuilder::new(reqwest::Client::new())
         .with(RetryTransientMiddleware::new_with_policy(
             ExponentialBackoff::builder().build_with_max_retries(5),
         ))
         .build();
+    static ref FILE_OP_SEMAPHORE: Arc<Semaphore> = Arc::new(Semaphore::new(100));
 }
 
 // 生成哈希值作为文件名
@@ -31,6 +34,7 @@ pub async fn cache_file(
     cache_path: &str,
     filename: Option<String>,
 ) -> Result<String, anyhow::Error> {
+    let _ = FILE_OP_SEMAPHORE.acquire().await?;
     let filename = match filename {
         None => gen_hash(file),
         Some(filename) => filename.to_string(),
@@ -68,6 +72,8 @@ pub async fn use_cache_file(
     cache_path: &str,
     filename: Option<String>,
 ) -> Option<String> {
+    let _ = FILE_OP_SEMAPHORE.acquire().await;
+
     let filename = match filename {
         None => gen_hash(file),
         Some(filename) => filename.to_string(),
@@ -90,6 +96,8 @@ pub async fn delete_cache_file(
     cache_path: &str,
     filename: Option<String>,
 ) -> Result<(), anyhow::Error> {
+    let _ = FILE_OP_SEMAPHORE.acquire().await?;
+
     let filename = match filename {
         None => gen_hash(file),
         Some(filename) => filename.to_string(),