From 77765136511a9014d1e5734fc37b0d9b49f5c292 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 24 Mar 2019 21:36:21 +0300 Subject: [PATCH] Ignore .nomedia file in statisitcs and flle gc. GitOrigin-RevId: 2b1ab488b4686563d4d7368261c784c8cd7ad691 --- td/telegram/files/FileGcWorker.cpp | 2 +- td/telegram/files/FileStatsWorker.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/td/telegram/files/FileGcWorker.cpp b/td/telegram/files/FileGcWorker.cpp index 6dbfdd942..900010e54 100644 --- a/td/telegram/files/FileGcWorker.cpp +++ b/td/telegram/files/FileGcWorker.cpp @@ -110,7 +110,7 @@ void FileGcWorker::run_gc(const FileGcParameters ¶meters, std::vector(info.mtime_nsec / 1000000000) > now - parameters.immunity_delay) { - // new files are immune to gc. + // new files are immune to gc time_immunity_ignored_cnt++; new_stats.add(FullFileInfo(info)); return true; diff --git a/td/telegram/files/FileStatsWorker.cpp b/td/telegram/files/FileStatsWorker.cpp index ef36002c2..94d955a13 100644 --- a/td/telegram/files/FileStatsWorker.cpp +++ b/td/telegram/files/FileStatsWorker.cpp @@ -19,6 +19,7 @@ #include "td/utils/format.h" #include "td/utils/logging.h" +#include "td/utils/misc.h" #include "td/utils/PathView.h" #include "td/utils/port/path.h" #include "td/utils/port/Stat.h" @@ -115,6 +116,11 @@ Status scan_fs(CallbackT &&callback) { return; } auto stat = r_stat.move_as_ok(); + if (ends_with(path, "/.nomedia") && stat.size_ == 0) { + // skip .nomedia file + return; + } + FsFileInfo info; info.path = path.str(); info.size = stat.size_;