diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index 7a403274..f8471ab1 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit 7a403274c385f59a7eefd5474a05a05139220ee6 +Subproject commit f8471ab1e6810358646f39e72f9ea035b1458363 diff --git a/server/WebApi.cpp b/server/WebApi.cpp index 6b069a8c..59f44f66 100755 --- a/server/WebApi.cpp +++ b/server/WebApi.cpp @@ -1547,20 +1547,21 @@ void installWebApi() { } val["path"] = record_path; if (!recording) { - val["code"] = File::delete_file(record_path); + val["code"] = File::delete_file(record_path, true); return; } File::scanDir(record_path, [](const string &path, bool is_dir) { if (is_dir) { return true; } - if (path.find("./") != std::string::npos) { + if (path.find("/.") == std::string::npos) { File::delete_file(path); } else { TraceL << "Ignore tmp mp4 file: " << path; } return true; - }, true); + }, true, true); + File::deleteEmptyDir(record_path); }); //获取录像文件夹列表或mp4文件列表