xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract directory/filename splitting in a function

Browse Source
This commit is contained in:
Maxime Coste 2015-02-06 13:47:19 +00:00
parent 622919bafd
commit eb5f458138
1 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/file.cc
View File

@ -54,6 +54,23 @@ String parse_filename(StringView filename)
return result; return result;
} }
std::pair<StringView, StringView> split_path(StringView path)
{
StringView dir, file = path;
ByteCount dir_end = -1;
for (ByteCount i = 0; i < path.length(); ++i)
{
if (path[i] == '/')
dir_end = i;
}
if (dir_end != -1)
{
dir = path.substr(0, dir_end + 1);
file = path.substr(dir_end + 1);
}
return { dir, file };
}
String real_path(StringView filename) String real_path(StringView filename)
{ {
char buffer[PATH_MAX+1]; char buffer[PATH_MAX+1];
@ -218,9 +235,18 @@ void write_buffer_to_file(Buffer& buffer, StringView filename)
void write_buffer_to_backup_file(Buffer& buffer) void write_buffer_to_backup_file(Buffer& buffer)
{ {
String path = real_path(buffer.name());
StringView dir, file;
std::tie(dir,file) = split_path(path);
char pattern[PATH_MAX+1]; char pattern[PATH_MAX+1];
snprintf(pattern, PATH_MAX+1, ".%s.kak.XXXXXX", if (not dir.empty())
real_path(buffer.name()).c_str()); snprintf(pattern, PATH_MAX+1, "%s/.%s.kak.XXXXXX",
(const char*)dir.zstr(), (const char*) file.zstr());
else
snprintf(pattern, PATH_MAX+1, ".%s.kak.XXXXXX",
(const char*)file.zstr());
int fd = mkstemp(pattern); int fd = mkstemp(pattern);
if (fd >= 0) if (fd >= 0)
{ {
@ -305,23 +331,11 @@ CandidateList complete_filename(StringView prefix,
ByteCount cursor_pos) ByteCount cursor_pos)
{ {
String real_prefix = parse_filename(prefix.substr(0, cursor_pos)); String real_prefix = parse_filename(prefix.substr(0, cursor_pos));
String dirname; StringView dirname, fileprefix;
String fileprefix = real_prefix; std::tie(dirname, fileprefix) = split_path(real_prefix);
ByteCount dir_end = -1;
for (ByteCount i = 0; i < real_prefix.length(); ++i)
{
if (real_prefix[i] == '/')
dir_end = i;
}
if (dir_end != -1)
{
dirname = real_prefix.substr(0, dir_end + 1);
fileprefix = real_prefix.substr(dir_end + 1);
}
const bool check_ignored_regex = not ignored_regex.empty() and const bool check_ignored_regex = not ignored_regex.empty() and
not regex_match(fileprefix.c_str(), ignored_regex); not regex_match(fileprefix.begin(), fileprefix.end(), ignored_regex);
auto filter = [&](const dirent& entry) auto filter = [&](const dirent& entry)
{ {
@ -338,22 +352,15 @@ CandidateList complete_filename(StringView prefix,
Vector<String> complete_command(StringView prefix, ByteCount cursor_pos) Vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
{ {
String real_prefix = parse_filename(prefix.substr(0, cursor_pos)); String real_prefix = parse_filename(prefix.substr(0, cursor_pos));
StringView dirname, fileprefix;
std::tie(dirname, fileprefix) = split_path(real_prefix);
ByteCount dir_end = -1; if (not dirname.empty())
for (ByteCount i = 0; i < real_prefix.length(); ++i)
{ {
if (real_prefix[i] == '/')
dir_end = i;
}
if (dir_end != -1)
{
auto dirname = real_prefix.substr(0, dir_end + 1);
auto fileprefix = real_prefix.substr(dir_end + 1);
auto filter = [&](const dirent& entry) auto filter = [&](const dirent& entry)
{ {
struct stat st; struct stat st;
if (stat((dirname + entry.d_name).c_str(), &st)) if (stat((dirname.str() + entry.d_name).c_str(), &st))
return false; return false;
bool executable = (st.st_mode & S_IXUSR) bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP) | (st.st_mode & S_IXGRP)
@ -387,25 +394,25 @@ Vector<String> complete_command(StringView prefix, ByteCount cursor_pos)
if (stat(dirname.substr(0_byte, dirname.length() - 1).zstr(), &st)) if (stat(dirname.substr(0_byte, dirname.length() - 1).zstr(), &st))
continue; continue;
auto filter = [&](const dirent& entry) {
struct stat st;
if (stat((dirname + entry.d_name).c_str(), &st))
return false;
bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP)
| (st.st_mode & S_IXOTH);
return S_ISREG(st.st_mode) and executable;
};
auto& cache = command_cache[dirname]; auto& cache = command_cache[dirname];
if (memcmp(&cache.mtime, &st.st_mtime, sizeof(TimeSpec)) != 0) if (memcmp(&cache.mtime, &st.st_mtime, sizeof(TimeSpec)) != 0)
{ {
memcpy(&cache.mtime, &st.st_mtime, sizeof(TimeSpec)); auto filter = [&](const dirent& entry) {
struct stat st;
if (stat((dirname + entry.d_name).c_str(), &st))
return false;
bool executable = (st.st_mode & S_IXUSR)
| (st.st_mode & S_IXGRP)
| (st.st_mode & S_IXOTH);
return S_ISREG(st.st_mode) and executable;
};
cache.commands = list_files("", dirname, filter); cache.commands = list_files("", dirname, filter);
memcpy(&cache.mtime, &st.st_mtime, sizeof(TimeSpec));
} }
for (auto& cmd : cache.commands) for (auto& cmd : cache.commands)
{ {
if (prefix_match(cmd, real_prefix)) if (prefix_match(cmd, fileprefix))
res.push_back(cmd); res.push_back(cmd);
} }
} }