PolytreeDE/polybar
1
0
Fork 0
mirror of https://github.com/polybar/polybar.git synced 2024-11-11 13:50:56 -05:00
Code Releases Activity

feat(config): include-directory directive (#2196)

Browse source 
Closes #1946
This commit is contained in:
Guilherme Silva 2020-10-08 16:44:29 +01:00 committed by GitHub
parent 31096de5e5
commit 8dbd1740a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/utils/file.hpp
View file

@ -109,6 +109,7 @@ namespace file_util {
vector<string> glob(string pattern); vector<string> glob(string pattern);
const string expand(const string& path); const string expand(const string& path);
string get_config_path(); string get_config_path();
vector<string> list_files(const string& dirname);
template <typename... Args> template <typename... Args>
decltype(auto) make_file_descriptor(Args&&... args) { decltype(auto) make_file_descriptor(Args&&... args) {

7
src/components/config_parser.cpp
View file

@ -144,6 +144,13 @@ void config_parser::parse_file(const string& file, file_list path) {
if (!line.is_header && line.key == "include-file") { if (!line.is_header && line.key == "include-file") {
parse_file(file_util::expand(line.value), path); parse_file(file_util::expand(line.value), path);
} else if (!line.is_header && line.key == "include-directory") {
const string expanded_path = file_util::expand(line.value);
vector<string> file_list = file_util::list_files(expanded_path);
sort(file_list.begin(), file_list.end());
for (const auto& filename : file_list) {
parse_file(expanded_path + "/" + filename, path);
}
} else { } else {
m_lines.push_back(line); m_lines.push_back(line);
} }

22
src/utils/file.cpp
View file

@ -1,5 +1,6 @@
#include "utils/file.hpp" #include "utils/file.hpp"
#include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <glob.h> #include <glob.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -294,6 +295,27 @@ namespace file_util {
} }
return ""; return "";
} }
/**
* Return a list of file names in a directory.
*/
vector<string> list_files(const string& dirname) {
vector<string> files;
DIR* dir;
if ((dir = opendir(dirname.c_str())) != NULL) {
struct dirent* ent;
while ((ent = readdir(dir)) != NULL) {
// Type can be unknown for filesystems that do not support d_type
if ((ent->d_type & DT_REG) ||
((ent->d_type & DT_UNKNOWN) && strcmp(ent->d_name, ".") != 0 && strcmp(ent->d_name, "..") != 0)) {
files.push_back(ent->d_name);
}
}
closedir(dir);
return files;
}
throw system_error("Failed to open directory stream for " + dirname);
}
} // namespace file_util } // namespace file_util
POLYBAR_NS_END POLYBAR_NS_END