amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 18:50:20 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

确保deleteRecordDirectory接口忽略正在录制的mp4文件 (#3032)

Browse Source
This commit is contained in:
xiongziliang 2023-12-02 21:12:26 +08:00
parent 527d9b9e64
commit 22732ea3f4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 7a403274c385f59a7eefd5474a05a05139220ee6 Subproject commit f8471ab1e6810358646f39e72f9ea035b1458363

7
server/WebApi.cpp
View File

@ -1547,20 +1547,21 @@ void installWebApi() {
} }
val["path"] = record_path; val["path"] = record_path;
if (!recording) { if (!recording) {
val["code"] = File::delete_file(record_path); val["code"] = File::delete_file(record_path, true);
return; return;
} }
File::scanDir(record_path, [](const string &path, bool is_dir) { File::scanDir(record_path, [](const string &path, bool is_dir) {
if (is_dir) { if (is_dir) {
return true; return true;
} }
if (path.find("./") != std::string::npos) { if (path.find("/.") == std::string::npos) {
File::delete_file(path); File::delete_file(path);
} else { } else {
TraceL << "Ignore tmp mp4 file: " << path; TraceL << "Ignore tmp mp4 file: " << path;
} }
return true; return true;
}, true); }, true, true);
File::deleteEmptyDir(record_path);
}); });
//获取录像文件夹列表或mp4文件列表 //获取录像文件夹列表或mp4文件列表