Reduce local-anime/local-manga disk access for speed up on mechanical harddrives, add local_anime.recursive option to make local-anime much faster when local-anime directory is a downloads directory

3 files changed, 50 insertions, 26 deletions

diff --git a/src/plugins/LocalAnime.cpp b/src/plugins/LocalAnime.cpp
index c906b9b..59e52ad 100644
--- a/src/plugins/LocalAnime.cpp
+++ b/src/plugins/LocalAnime.cpp
@@ -190,7 +190,7 @@ namespace QuickMedia {
 
     static std::vector<LocalAnimeItem> get_episodes_in_directory(const Path &directory) {
         std::vector<LocalAnimeItem> episodes;
-        for_files_in_dir_sort_name(directory, [&episodes](const Path &filepath, FileType file_type) -> bool {
+        for_files_in_dir_sort_name(directory, [&episodes](const Path &filepath, FileType file_type, time_t) -> bool {
             if(file_type != FileType::REGULAR || !is_video_ext(filepath.ext()))
                 return true;
 
@@ -206,21 +206,28 @@ namespace QuickMedia {
 
     static std::vector<LocalAnimeItem> get_episodes_or_seasons_in_directory(const Path &directory) {
         std::vector<LocalAnimeItem> anime_items;
-        auto callback = [&](const Path &filepath, FileType file_type) -> bool {
-            time_t modified_time_seconds;
-            if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &modified_time_seconds))
-                return true;
-
+        auto callback = [&](const Path &filepath, FileType file_type, time_t last_modified_seconds) -> bool {
             if(file_type == FileType::REGULAR) {
-                if(is_video_ext(filepath.ext()))
-                    anime_items.push_back(LocalAnimeEpisode{ filepath, modified_time_seconds });
+                if(is_video_ext(filepath.ext())) {
+                    if(last_modified_seconds == 0) {
+                        if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds))
+                            return true;
+                    }
+
+                    anime_items.push_back(LocalAnimeEpisode{ filepath, last_modified_seconds });
+                }
                 return true;
             }
 
+            if(last_modified_seconds == 0) {
+                if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds))
+                    return true;
+            }
+
             LocalAnimeSeason season;
             season.name = filepath.filename();
             season.episodes = get_episodes_in_directory(filepath);
-            season.modified_time_seconds = modified_time_seconds;
+            season.modified_time_seconds = last_modified_seconds;
             if(season.episodes.empty())
                 return true;
 
@@ -236,23 +243,33 @@ namespace QuickMedia {
         return anime_items;
     }
 
-    std::vector<LocalAnimeItem> get_anime_in_directory(const Path &directory) {
+    std::vector<LocalAnimeItem> get_anime_in_directory(const Path &directory, bool recursive) {
         std::vector<LocalAnimeItem> anime_items;
-        auto callback = [&anime_items](const Path &filepath, FileType file_type) -> bool {
-            time_t modified_time_seconds;
-            if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &modified_time_seconds))
-                return true;
-
+        auto callback = [&anime_items, recursive](const Path &filepath, FileType file_type, time_t last_modified_seconds) -> bool {
             if(file_type == FileType::REGULAR) {
-                if(is_video_ext(filepath.ext()))
-                    anime_items.push_back(LocalAnimeEpisode{ filepath, modified_time_seconds });
+                if(is_video_ext(filepath.ext())) {
+                    if(last_modified_seconds == 0) {
+                        if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds))
+                            return true;
+                    }
+
+                    anime_items.push_back(LocalAnimeEpisode{ filepath, last_modified_seconds });
+                }
                 return true;
             }
+
+            if(!recursive)
+                return true;
             
+            if(last_modified_seconds == 0) {
+                if(!file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds))
+                    return true;
+            }
+
             LocalAnime anime;
             anime.name = filepath.filename();
             anime.items = get_episodes_or_seasons_in_directory(filepath);
-            anime.modified_time_seconds = modified_time_seconds;
+            anime.modified_time_seconds = last_modified_seconds;
             if(anime.items.empty())
                 return true;
 
@@ -352,7 +369,7 @@ namespace QuickMedia {
     PluginResult LocalAnimeSearchPage::lazy_fetch(BodyItems &result_items) {
         if(fetch_home_page) {
             fetch_home_page = false;
-            anime_items = get_anime_in_directory(get_config().local_anime.directory);
+            anime_items = get_anime_in_directory(get_config().local_anime.directory, get_config().local_anime.recursive);
         }
         
         std::unordered_map<std::string, WatchProgress> watch_progress = get_watch_progress_for_plugin("local-anime");
diff --git a/src/plugins/LocalManga.cpp b/src/plugins/LocalManga.cpp
index fa0df27..21e8780 100644
--- a/src/plugins/LocalManga.cpp
+++ b/src/plugins/LocalManga.cpp
@@ -83,7 +83,7 @@ namespace QuickMedia {
     // Pages are sorted from 1.png to n.png
     static std::vector<LocalMangaPage> get_images_in_manga(const Path &directory) {
         std::vector<LocalMangaPage> page_list;
-        for_files_in_dir(directory, [&page_list](const Path &filepath, FileType file_type) -> bool {
+        for_files_in_dir(directory, [&page_list](const Path &filepath, FileType file_type, time_t) -> bool {
             if(file_type != FileType::REGULAR)
                 return true;
 
@@ -107,7 +107,7 @@ namespace QuickMedia {
 
     static std::vector<LocalMangaChapter> get_chapters_in_manga(std::string manga_name, const Path &directory, bool only_include_latest, bool include_pages, bool only_get_coverpage = false) {
         std::vector<LocalMangaChapter> chapter_list;
-        auto callback = [&chapter_list, &manga_name, only_include_latest, include_pages, only_get_coverpage](const Path &filepath, FileType file_type) -> bool {
+        auto callback = [&chapter_list, &manga_name, only_include_latest, include_pages, only_get_coverpage](const Path &filepath, FileType file_type, time_t last_modified_seconds) -> bool {
             if(file_type != FileType::DIRECTORY)
                 return true;
 
@@ -130,8 +130,11 @@ namespace QuickMedia {
                 }
             }
 
-            if(!only_get_coverpage)
-                file_get_last_modified_time_seconds(filepath.data.c_str(), &local_manga_chapter.modified_time_seconds);
+            if(!only_get_coverpage) {
+                if(last_modified_seconds == 0)
+                    file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds);
+                local_manga_chapter.modified_time_seconds = last_modified_seconds;
+            }
 
             chapter_list.push_back(std::move(local_manga_chapter));
             return only_include_latest ? false : true;
@@ -147,16 +150,20 @@ namespace QuickMedia {
 
     static std::vector<LocalManga> get_manga_in_directory(const Path &directory, bool only_get_coverpage) {
         std::vector<LocalManga> manga_list;
-        auto callback = [&manga_list, only_get_coverpage](const Path &filepath, FileType file_type) -> bool {
+        auto callback = [&manga_list, only_get_coverpage](const Path &filepath, FileType file_type, time_t last_modified_seconds) -> bool {
             if(file_type != FileType::DIRECTORY)
                 return true;
 
             LocalManga local_manga;
             local_manga.name = filepath.filename();
             local_manga.chapters = get_chapters_in_manga(local_manga.name, filepath, true, false, only_get_coverpage);
-            if(local_manga.chapters.empty() || !file_get_last_modified_time_seconds(filepath.data.c_str(), &local_manga.modified_time_seconds))
+            if(local_manga.chapters.empty())
                 return true;
 
+            if(last_modified_seconds == 0)
+                file_get_last_modified_time_seconds(filepath.data.c_str(), &last_modified_seconds);
+            local_manga.modified_time_seconds = last_modified_seconds;
+
             manga_list.push_back(std::move(local_manga));
             return true;
         };
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index c4aa076..1b43b2d 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -5102,7 +5102,7 @@ namespace QuickMedia {
 
         //Path filter_cache_path = get_storage_dir().join("matrix").join("filter");
         //remove(filter_cache_path.data.c_str());
-        for_files_in_dir(get_cache_dir().join("matrix").join("events"), [](const Path &filepath, FileType) {
+        for_files_in_dir(get_cache_dir().join("matrix").join("events"), [](const Path &filepath, FileType, time_t) {
             remove(filepath.data.c_str());
             return true;
         });