tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better handling of secondary file types in scan_fs.

Browse Source 
GitOrigin-RevId: 7602a2e14c39fb280be03053160e2ad922ea1ca4
This commit is contained in:
levlam 2020-06-28 22:04:21 +03:00
parent 8e22bdb887
commit 5507d58339
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
td/telegram/files/FileStatsWorker.cpp
View File

@ -100,13 +100,14 @@ struct FsFileInfo {
template <class CallbackT> template <class CallbackT>
void scan_fs(CancellationToken &token, CallbackT &&callback) { void scan_fs(CancellationToken &token, CallbackT &&callback) {
std::unordered_set<string> scanned_file_dirs;
for (int32 i = 0; i < MAX_FILE_TYPE; i++) { for (int32 i = 0; i < MAX_FILE_TYPE; i++) {
int32 main_file_type = static_cast<int32>(get_main_file_type(static_cast<FileType>(i)));
if (i != main_file_type) {
continue;
}
auto file_type = static_cast<FileType>(i); auto file_type = static_cast<FileType>(i);
auto file_dir = get_files_dir(file_type); auto file_dir = get_files_dir(file_type);
if (!scanned_file_dirs.insert(file_dir).second) {
continue;
}
auto main_file_type = get_main_file_type(file_type);
walk_path(file_dir, [&](CSlice path, WalkPath::Type type) { walk_path(file_dir, [&](CSlice path, WalkPath::Type type) {
if (token) { if (token) {
return WalkPath::Action::Abort; return WalkPath::Action::Abort;
@ -120,7 +121,7 @@ void scan_fs(CancellationToken &token, CallbackT &&callback) {
return WalkPath::Action::Continue; return WalkPath::Action::Continue;
} }
auto stat = r_stat.move_as_ok(); auto stat = r_stat.move_as_ok();
if (ends_with(path, "/.nomedia") && stat.size_ == 0) { if (stat.size_ == 0 && ends_with(path, "/.nomedia")) {
// skip .nomedia file // skip .nomedia file
return WalkPath::Action::Continue; return WalkPath::Action::Continue;
} }
@ -128,7 +129,7 @@ void scan_fs(CancellationToken &token, CallbackT &&callback) {
FsFileInfo info; FsFileInfo info;
info.path = path.str(); info.path = path.str();
info.size = stat.real_size_; info.size = stat.real_size_;
info.file_type = file_type; info.file_type = main_file_type;
info.atime_nsec = stat.atime_nsec_; info.atime_nsec = stat.atime_nsec_;
info.mtime_nsec = stat.mtime_nsec_; info.mtime_nsec = stat.mtime_nsec_;
callback(info); callback(info);