amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +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 15:22:16 +08:00
parent 10663fd3b4
commit e1f199c986
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/WebApi.cpp
View File

@ -1536,13 +1536,29 @@ void installWebApi() {
if (!name.empty()) {
record_path += name;
}
int result = File::delete_file(record_path.data());
if (result) {
// 不等于0时代表失败
record_path = "delete error";
bool recording = false;
{
auto src = MediaSource::find(allArgs["vhost"], allArgs["app"], allArgs["stream"]);
if (src && src->isRecording(Recorder::type_mp4)) {
recording = true;
}
}
val["path"] = record_path;
val["code"] = result;
if (!recording) {
val["code"] = File::delete_file(record_path.data());
return;
}
File::scanDir(record_path, [](const string &path, bool is_dir) {
if (is_dir) {
return true;
}
if (path.find("./") != std::string::npos) {
File::delete_file(path.data());
} else {
TraceL << "Ignore tmp mp4 file: " << path;
}
return true;
}, true);
});
//获取录像文件夹列表或mp4文件列表