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

Fix scanning of temporary directories.

Browse Source
This commit is contained in:
levlam 2022-10-02 22:26:03 +03:00
parent d29c86bb14
commit e6b7624811
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/telegram/files/FileManager.cpp
View File

@ -3867,7 +3867,7 @@ void FileManager::on_error_impl(FileNodePtr node, Query::Type type, bool was_act
!begins_with(status.message(), "FILE_DOWNLOAD_ID_INVALID") && !begins_with(status.message(), "FILE_DOWNLOAD_ID_INVALID") &&
!begins_with(status.message(), "FILE_DOWNLOAD_LIMIT")) { !begins_with(status.message(), "FILE_DOWNLOAD_LIMIT")) {
CSlice path = node->local_.partial().path_; CSlice path = node->local_.partial().path_;
if (begins_with(path, get_files_temp_dir(FileType::Encrypted)) || if (begins_with(path, get_files_temp_dir(FileType::SecureDecrypted)) ||
begins_with(path, get_files_temp_dir(FileType::Video))) { begins_with(path, get_files_temp_dir(FileType::Video))) {
LOG(INFO) << "Unlink file " << path; LOG(INFO) << "Unlink file " << path;
send_closure(file_load_manager_, &FileLoadManager::unlink_file, std::move(node->local_.partial().path_), send_closure(file_load_manager_, &FileLoadManager::unlink_file, std::move(node->local_.partial().path_),

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

@ -103,13 +103,11 @@ 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; std::unordered_set<string> scanned_file_dirs;
for (int32 i = 0; i < MAX_FILE_TYPE; i++) { auto scan_dir = [&](FileType file_type, const string &file_dir) {
auto file_type = static_cast<FileType>(i); LOG(INFO) << "Trying to scan directory " << file_dir;
auto file_dir = get_files_dir(file_type);
if (!scanned_file_dirs.insert(file_dir).second) { if (!scanned_file_dirs.insert(file_dir).second) {
continue; return;
} }
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;
@ -131,13 +129,19 @@ 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 = main_file_type; info.file_type = 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);
return WalkPath::Action::Continue; return WalkPath::Action::Continue;
}).ignore(); }).ignore();
};
for (int32 i = 0; i < MAX_FILE_TYPE; i++) {
auto file_type = static_cast<FileType>(i);
scan_dir(get_main_file_type(file_type), get_files_dir(file_type));
} }
scan_dir(get_main_file_type(FileType::Temp), get_files_temp_dir(FileType::SecureDecrypted));
scan_dir(get_main_file_type(FileType::Temp), get_files_temp_dir(FileType::Video));
} }
} // namespace } // namespace