[Fix] unused custom cache root

canxin121 · Nov 10, 2024 · b91346d · b91346d
1 parent 1790a01
commit b91346d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/lib/common_pages/setting_page.dart b/lib/common_pages/setting_page.dart
@@ -441,9 +441,13 @@ class StorageConfigPage extends StatefulWidget {
 
 class StorageConfigPageState extends State<StorageConfigPage>
     with WidgetsBindingObserver {
+  String StoragePath = "";
+
   @override
   void initState() {
     super.initState();
+    StoragePath =
+        globalConfig.getStorageFolder(documentFolder: globalDocumentPath);
     WidgetsBinding.instance.addObserver(this);
   }
 
@@ -480,20 +484,23 @@ class StorageConfigPageState extends State<StorageConfigPage>
 
         await moveCacheData(
             documentPath: globalDocumentPath,
-            newCustomCacheRoot: newCustomCacheRoot);
+            newCustomCacheRoot: newCustomCacheRoot,
+            oldCustomCacheRoot: globalConfig.storageConfig.customCacheRoot);
       } else {
         if (mounted) {
           await showWaitDialog(context, isDesktop, "正在清理旧数据中,稍后将自动退出应用以应用更改");
         }
-        await delOldCacheData(documentPath: globalDocumentPath);
+        await delOldCacheData(
+            documentPath: globalDocumentPath,
+            oldCustomCacheRoot: globalConfig.storageConfig.customCacheRoot);
       }
 
       globalConfig.storageConfig.customCacheRoot = newCustomCacheRoot;
       await globalConfig.save(documentFolder: globalDocumentPath);
-
-      if (mounted) {
-        context.findAncestorStateOfType<SettingPageState>()?.refresh();
-      }
+      setState(() {
+        StoragePath =
+            globalConfig.getStorageFolder(documentFolder: globalDocumentPath);
+      });
     } finally {
       if (mounted) {
         popPage(context, isDesktop);
@@ -557,8 +564,7 @@ class StorageConfigPageState extends State<StorageConfigPage>
                                   alignment: Alignment.centerRight,
                                   height: 50,
                                   child: Text(
-                                    globalConfig.getStorageFolder(
-                                        documentFolder: globalDocumentPath),
+                                    StoragePath,
                                     style: TextStyle(color: textColor)
                                         .useSystemChineseFont(),
                                   ))),
@@ -914,7 +920,9 @@ class StorageConfigPageState extends State<StorageConfigPage>
                               if (confirm == null || !confirm) return;
                               try {
                                 await delOldCacheData(
-                                    documentPath: globalDocumentPath);
+                                    documentPath: globalDocumentPath,
+                                    oldCustomCacheRoot: globalConfig
+                                        .storageConfig.customCacheRoot);
                                 LogToast.success("清理空间", "清理缓存成功",
                                     "[storageConfig.clearCache] success");
                               } catch (e) {
@@ -1093,6 +1101,8 @@ class ExternalApiConfigPageState extends State<ExternalApiConfigPage>
                                 var externalApi =
                                     await ExternalApiConfig.fromPath(
                                         path: filePath,
+                                        customCacheRoot: globalConfig
+                                            .storageConfig.customCacheRoot,
                                         documentFolder: globalDocumentPath);
 
                                 globalConfig.externalApi = externalApi;
@@ -1137,7 +1147,10 @@ class ExternalApiConfigPageState extends State<ExternalApiConfigPage>
                                 var externalApi =
                                     await ExternalApiConfig.fromUrl(
                                         url: link,
-                                        documentFolder: globalDocumentPath);
+                                        documentFolder: globalDocumentPath,
+                                        customCacheRoot: globalConfig
+                                            .storageConfig.customCacheRoot);
+
                                 globalConfig.externalApi = externalApi;
                                 await globalConfig.save(
                                     documentFolder: globalDocumentPath);

diff --git a/lib/desktop/comps/music_agg_comp/music_agg_list_item.dart b/lib/desktop/comps/music_agg_comp/music_agg_list_item.dart
@@ -365,6 +365,7 @@ class OptionsCellState extends State<OptionsCell> {
     hasCacheMusic(
             name: widget.musicAgg.name,
             artists: widget.musicAgg.artist,
+            customCacheRoot: globalConfig.storageConfig.customCacheRoot,
             documentFolder: globalDocumentPath)
         .then((value) {
       if (mounted) {

diff --git a/lib/mobile/comps/music_agg_comp/music_agg_list_item.dart b/lib/mobile/comps/music_agg_comp/music_agg_list_item.dart
@@ -68,6 +68,7 @@ class MobileMusicAggregatorListItemState
     bool cacheStatus = await hasCacheMusic(
         name: widget.musicAgg.name,
         artists: widget.musicAgg.artist,
+        customCacheRoot: globalConfig.storageConfig.customCacheRoot,
         documentFolder: globalDocumentPath);
     if (mounted) {
       setState(() {

diff --git a/lib/pulldown_menus/music_aggregator_pulldown_menu.dart b/lib/pulldown_menus/music_aggregator_pulldown_menu.dart
@@ -30,6 +30,7 @@ Future<void> showMusicAggregatorMenu(
     hasCache = await hasCacheMusic(
         name: musicAgg.name,
         artists: musicAgg.artist,
+        customCacheRoot: globalConfig.storageConfig.customCacheRoot,
         documentFolder: globalDocumentPath);
     if (!context.mounted) return;
     menuItems = _musicAggregetorPullDownItems(

diff --git a/lib/utils/cache_helper.dart b/lib/utils/cache_helper.dart
@@ -75,7 +75,7 @@ ExtendedImage imageWithCache(
   }
 
   String? uri =
-      _getFileCacheWithUriWrapper(url, picCacheFolder, cacheNow: enableCache);
+      _getFileCacheWithUriWrapper(url, picCacheFolder, cacheNow: enableCache,);
 
   if (uri.startsWith("http")) {
     return ExtendedImage.network(

diff --git a/lib/utils/music_api_helper.dart b/lib/utils/music_api_helper.dart
@@ -214,6 +214,7 @@ Future<void> delMusicCache(
 }) async {
   if (!await rust_api_music_cache.hasCacheMusic(
       documentFolder: globalDocumentPath,
+      customCacheRoot: globalConfig.storageConfig.customCacheRoot,
       name: musicAggregator.name,
       artists: musicAggregator.artist)) {
     return;
@@ -247,6 +248,7 @@ Future<void> cacheMusicContainer(MusicContainer musicContainer,
     {bool hasCache = false}) async {
   if (await rust_api_music_cache.hasCacheMusic(
       documentFolder: globalDocumentPath,
+      customCacheRoot: globalConfig.storageConfig.customCacheRoot,
       name: musicContainer.musicAggregator.name,
       artists: musicContainer.musicAggregator.artist)) {
     return;
@@ -264,7 +266,8 @@ Future<void> cacheMusicContainer(MusicContainer musicContainer,
         artists: musicContainer.musicAggregator.artist,
         playinfo: musicContainer.playinfo!,
         lyric: musicContainer.lyric,
-        documentFolder: globalDocumentPath);
+        documentFolder: globalDocumentPath,
+        customCacheRoot: globalConfig.storageConfig.customCacheRoot);
 
     musicAggregatorCacheController
         .add((true, musicContainer.musicAggregator.identity()));