chore(yt): cache & data directories thingys

MSOB7YY · MSOB7YY · commit e62f47bc529b · 2024-07-02T02:27:18.000+03:00
diff --git a/lib/core/constants.dart b/lib/core/constants.dart
@@ -187,6 +187,7 @@ class AppPaths {
 
 /// Directories used by Namida
 class AppDirs {
+  static String ROOT_DIR = '';
   static String USER_DATA = '';
   static String APP_CACHE = '';
   static String INTERNAL_STORAGE = '';
@@ -217,18 +218,13 @@ class AppDirs {
   static final YOUTUBE_MAIN_DIRECTORY = '$USER_DATA/Youtube';
 
   static final YOUTIPIE_CACHE = '$YOUTUBE_MAIN_DIRECTORY/Youtipie/';
-  static final YOUTIPIE_DATA = '$YOUTUBE_MAIN_DIRECTORY/Youtipie_data/';
+  static final YOUTIPIE_DATA = '$ROOT_DIR/Youtipie/Youtipie_data/'; // this should never be accessed/backed up etc.
 
   static final YT_PLAYLISTS = '$YOUTUBE_MAIN_DIRECTORY/Youtube Playlists/';
   static final YT_HISTORY_PLAYLIST = '$YOUTUBE_MAIN_DIRECTORY/Youtube History/';
   static final YT_THUMBNAILS = '$YOUTUBE_MAIN_DIRECTORY/YTThumbnails/';
   static final YT_THUMBNAILS_CHANNELS = '$YOUTUBE_MAIN_DIRECTORY/YTThumbnails Channels/';
 
-  static final YT_METADATA = '$YOUTUBE_MAIN_DIRECTORY/Metadata Videos/';
-  static final YT_METADATA_TEMP = '$YOUTUBE_MAIN_DIRECTORY/Metadata Videos Temp/';
-  static final YT_METADATA_CHANNELS = '$YOUTUBE_MAIN_DIRECTORY/Metadata Channels/';
-  static final YT_METADATA_COMMENTS = '$YOUTUBE_MAIN_DIRECTORY/Metadata Comments/';
-
   static final YT_STATS = '$YOUTUBE_MAIN_DIRECTORY/Youtube Stats/';
   static final YT_PALETTES = '$YOUTUBE_MAIN_DIRECTORY/Palettes/';
   static final YT_DOWNLOAD_TASKS = '$YOUTUBE_MAIN_DIRECTORY/Download Tasks/';
@@ -254,10 +250,9 @@ class AppDirs {
     YT_HISTORY_PLAYLIST,
     YT_THUMBNAILS,
     YT_THUMBNAILS_CHANNELS,
-    YT_METADATA,
-    YT_METADATA_TEMP,
-    YT_METADATA_CHANNELS,
-    YT_METADATA_COMMENTS,
+
+    YOUTIPIE_CACHE,
+
     YT_STATS,
     YT_PALETTES,
     YT_DOWNLOAD_TASKS,
diff --git a/lib/main.dart b/lib/main.dart
@@ -92,8 +92,26 @@ void mainInitialization() async {
     FAudioTaggerController.inst.updateLogsPath();
   }
 
+  Future<void> fetchRootDir() async {
+    Directory? dir;
+    try {
+      dir = await pp.getApplicationSupportDirectory();
+    } catch (_) {
+      try {
+        dir = await pp.getApplicationDocumentsDirectory();
+      } catch (_) {}
+    }
+    String? path = dir?.path;
+    if (path == null) {
+      final appDatas = await NamidaStorage.inst.getStorageDirectoriesAppData();
+      path = appDatas.firstOrNull ?? '';
+    }
+    AppDirs.ROOT_DIR = path;
+  }
+
   await Future.wait([
     fetchAppData(),
+    fetchRootDir(),
     NamidaStorage.inst.getStorageDirectories().then((value) => paths = value),
     NamidaStorage.inst.getStorageDirectoriesAppCache().then((value) => AppDirs.APP_CACHE = value.firstOrNull ?? ''),
   ]);
diff --git a/lib/ui/widgets/settings/backup_restore_settings.dart b/lib/ui/widgets/settings/backup_restore_settings.dart
@@ -211,9 +211,7 @@ class BackupAndRestore extends SettingSubpageProvider {
                   AppDirs.YT_PALETTES,
                   AppDirs.YT_THUMBNAILS,
                   AppDirs.YT_THUMBNAILS_CHANNELS,
-                  AppDirs.YT_METADATA,
-                  AppDirs.YT_METADATA_CHANNELS,
-                  AppDirs.YT_METADATA_COMMENTS,
+                  AppDirs.YOUTIPIE_CACHE,
                 ];
 
                 final sizesMap = <String, int>{}.obs;
@@ -498,9 +496,7 @@ class BackupAndRestore extends SettingSubpageProvider {
                               title: lang.METADATA_CACHE,
                               icon: Broken.message_text,
                               items: [
-                                AppDirs.YT_METADATA,
-                                AppDirs.YT_METADATA_CHANNELS,
-                                AppDirs.YT_METADATA_COMMENTS,
+                                AppDirs.YOUTIPIE_CACHE,
                               ],
                               youtubeAvailable: true,
                               youtubeForceFollowItems: true,
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: namida
 description: A Beautiful and Feature-rich Music Player, With YouTube & Video Support Built in Flutter
 publish_to: "none"
-version: 2.8.7-beta+240701231
+version: 2.8.8-beta+240701234
 
 environment:
   sdk: ">=3.4.0 <4.0.0"
