pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/v6.4.0' into develop

Browse Source
This commit is contained in:
Elena.Subbotina
2021-08-23 10:24:30 +03:00
parent d36c3aeea3 effb0f0066
commit 9098f18db2
40 changed files with 1218 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
DesktopEditor/common/Directory.cpp
View File

@ -53,6 +53,7 @@
#endif
#include <string.h>
#include <regex>
#include "Directory.h"
namespace NSDirectory
@ -583,4 +584,19 @@ namespace NSDirectory
{
return Exists(pathName);
}
std::vector<std::wstring> GrepPaths(const std::vector<std::wstring> &paths, const std::wstring &strRegEx)
{
std::vector<std::wstring> filtredPaths;
std::wregex regEx(strRegEx);
std::wsmatch wSmath;
for (const auto& path : paths)
{
if (std::regex_match(path, wSmath, regEx))
filtredPaths.push_back(path);
}
return filtredPaths;
}
}

1
DesktopEditor/common/Directory.h
View File

@ -68,6 +68,7 @@ namespace NSDirectory
KERNEL_DECL void GetFiles2(std::wstring strDirectory, std::vector<std::wstring>& oArray, bool bIsRecursion = false);
KERNEL_DECL std::vector<std::wstring> GetFiles(std::wstring strDirectory, bool bIsRecursion = false);
KERNEL_DECL std::vector<std::wstring> GrepPaths(const std::vector<std::wstring>& paths, const std::wstring& strRegEx);
KERNEL_DECL std::vector<std::wstring> GetDirectories(std::wstring strDirectory);
KERNEL_DECL bool Exists(const std::wstring& strDirectory);
KERNEL_DECL bool CreateDirectory(const std::wstring& strDirectory);