gw: bump to 0.9.1
This commit is contained in:
Chongyun Lee
parent
94a53094f1
commit
3966e4d44c
|
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/kcleal/gw
|
|||
TERMUX_PKG_DESCRIPTION="A browser for genomic sequencing data (.bam/.cram format)"
|
||||
TERMUX_PKG_LICENSE="MIT"
|
||||
TERMUX_PKG_MAINTAINER="clealk@cardiff.ac.uk"
|
||||
TERMUX_PKG_VERSION=0.8.2
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_VERSION=0.9.1
|
||||
TERMUX_PKG_SRCURL=https://github.com/kcleal/gw/archive/v${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=519f06fac2635a59614517ff00dc1e86e4f78c2926df504b03ba62a66a5de3e8
|
||||
TERMUX_PKG_SHA256=10a65107717811179a124e8bac5b2f202bdbde6679a9e6eb67ef97c990b7cf9d
|
||||
TERMUX_PKG_DEPENDS="glfw, htslib, libc++, libjpeg-turbo, opengl"
|
||||
TERMUX_PKG_BUILD_DEPENDS="fontconfig, freetype, libicu, libuuid, mesa-dev"
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
|
|
@ -15,10 +14,9 @@ TERMUX_PKG_BUILD_IN_SRC=true
|
|||
TERMUX_PKG_BLACKLISTED_ARCHES="arm"
|
||||
|
||||
termux_step_pre_configure() {
|
||||
LDFLAGS+=" -lEGL -llog"
|
||||
LDFLAGS+=" -llog"
|
||||
|
||||
sed -i \
|
||||
-e 's/-lpthread//g' \
|
||||
-e '/\/usr\/local\/include/d' \
|
||||
-e '/\/usr\/local\/lib/d' \
|
||||
./Makefile
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
diff -uNr gw-0.7.0/src/main.cpp gw-0.7.0.mod/src/main.cpp
|
||||
--- gw-0.7.0/src/main.cpp 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/main.cpp 2023-03-22 11:45:32.090313596 +0200
|
||||
@@ -35,6 +35,7 @@
|
||||
#include "include/core/SkDocument.h"
|
||||
#include "include/docs/SkPDFDocument.h"
|
||||
|
||||
+namespace fs = std::filesystem;
|
||||
|
||||
// skia context has to be managed from global space to work
|
||||
GrDirectContext *sContext = nullptr;
|
||||
diff -uNr gw-0.7.0/src/plot_controls.cpp gw-0.7.0.mod/src/plot_controls.cpp
|
||||
--- gw-0.7.0/src/plot_controls.cpp 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/plot_controls.cpp 2023-03-22 11:45:36.670355876 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
#include "term_out.h"
|
||||
#include "themes.h"
|
||||
|
||||
+namespace fs = std::filesystem;
|
||||
|
||||
namespace Manager {
|
||||
|
||||
diff -uNr gw-0.7.0/src/plot_manager.cpp gw-0.7.0.mod/src/plot_manager.cpp
|
||||
--- gw-0.7.0/src/plot_manager.cpp 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/plot_manager.cpp 2023-03-22 11:45:43.594419791 +0200
|
||||
@@ -31,6 +31,7 @@
|
||||
#include "../include/termcolor.h"
|
||||
#include "themes.h"
|
||||
|
||||
+namespace fs = std::filesystem;
|
||||
|
||||
using namespace std::literals;
|
||||
|
||||
diff -uNr gw-0.7.0/src/plot_manager.h gw-0.7.0.mod/src/plot_manager.h
|
||||
--- gw-0.7.0/src/plot_manager.h 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/plot_manager.h 2023-03-22 11:45:19.706199285 +0200
|
||||
@@ -41,6 +41,7 @@
|
||||
#include "include/core/SkColorSpace.h"
|
||||
#include "include/core/SkSurface.h"
|
||||
|
||||
+namespace fs = std::filesystem;
|
||||
|
||||
namespace Manager {
|
||||
|
||||
@@ -246,4 +247,4 @@
|
||||
long stop;
|
||||
};
|
||||
|
||||
-}
|
||||
\ В конце файла нет новой строки
|
||||
+}
|
||||
|
|
@ -1,852 +0,0 @@
|
|||
diff -uNr gw-0.7.0/include/glob_cpp.h gw-0.7.0.mod/include/glob_cpp.h
|
||||
--- gw-0.7.0/include/glob_cpp.h 1970-01-01 03:00:00.000000000 +0300
|
||||
+++ gw-0.7.0.mod/include/glob_cpp.h 2023-03-20 12:59:19.000000000 +0200
|
||||
@@ -0,0 +1,410 @@
|
||||
+
|
||||
+#pragma once
|
||||
+#include <cassert>
|
||||
+#include <filesystem>
|
||||
+#include <functional>
|
||||
+#include <iostream>
|
||||
+#include <map>
|
||||
+#include <regex>
|
||||
+#include <string>
|
||||
+#include <vector>
|
||||
+namespace fs = std::filesystem;
|
||||
+
|
||||
+namespace glob {
|
||||
+
|
||||
+ namespace {
|
||||
+
|
||||
+ static inline
|
||||
+ bool string_replace(std::string &str, const std::string &from, const std::string &to) {
|
||||
+ std::size_t start_pos = str.find(from);
|
||||
+ if (start_pos == std::string::npos)
|
||||
+ return false;
|
||||
+ str.replace(start_pos, from.length(), to);
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::string translate(const std::string &pattern) {
|
||||
+ std::size_t i = 0, n = pattern.size();
|
||||
+ std::string result_string;
|
||||
+
|
||||
+ while (i < n) {
|
||||
+ auto c = pattern[i];
|
||||
+ i += 1;
|
||||
+ if (c == '*') {
|
||||
+ result_string += ".*";
|
||||
+ } else if (c == '?') {
|
||||
+ result_string += ".";
|
||||
+ } else if (c == '[') {
|
||||
+ auto j = i;
|
||||
+ if (j < n && pattern[j] == '!') {
|
||||
+ j += 1;
|
||||
+ }
|
||||
+ if (j < n && pattern[j] == ']') {
|
||||
+ j += 1;
|
||||
+ }
|
||||
+ while (j < n && pattern[j] != ']') {
|
||||
+ j += 1;
|
||||
+ }
|
||||
+ if (j >= n) {
|
||||
+ result_string += "\\[";
|
||||
+ } else {
|
||||
+ auto stuff = std::string(pattern.begin() + i, pattern.begin() + j);
|
||||
+ if (stuff.find("--") == std::string::npos) {
|
||||
+ string_replace(stuff, std::string{"\\"}, std::string{R"(\\)"});
|
||||
+ } else {
|
||||
+ std::vector<std::string> chunks;
|
||||
+ std::size_t k = 0;
|
||||
+ if (pattern[i] == '!') {
|
||||
+ k = i + 2;
|
||||
+ } else {
|
||||
+ k = i + 1;
|
||||
+ }
|
||||
+
|
||||
+ while (true) {
|
||||
+ k = pattern.find("-", k, j);
|
||||
+ if (k == std::string::npos) {
|
||||
+ break;
|
||||
+ }
|
||||
+ chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + k));
|
||||
+ i = k + 1;
|
||||
+ k = k + 3;
|
||||
+ }
|
||||
+
|
||||
+ chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + j));
|
||||
+ // Escape backslashes and hyphens for set difference (--).
|
||||
+ // Hyphens that create ranges shouldn't be escaped.
|
||||
+ bool first = false;
|
||||
+ for (auto &s : chunks) {
|
||||
+ string_replace(s, std::string{"\\"}, std::string{R"(\\)"});
|
||||
+ string_replace(s, std::string{"-"}, std::string{R"(\-)"});
|
||||
+ if (first) {
|
||||
+ stuff += s;
|
||||
+ first = false;
|
||||
+ } else {
|
||||
+ stuff += "-" + s;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // Escape set operations (&&, ~~ and ||).
|
||||
+ std::string result;
|
||||
+ std::regex_replace(std::back_inserter(result), // result
|
||||
+ stuff.begin(), stuff.end(), // string
|
||||
+ std::regex(std::string{R"([&~|])"}), // pattern
|
||||
+ std::string{R"(\\\1)"}); // repl
|
||||
+ stuff = result;
|
||||
+ i = j + 1;
|
||||
+ if (stuff[0] == '!') {
|
||||
+ stuff = "^" + std::string(stuff.begin() + 1, stuff.end());
|
||||
+ } else if (stuff[0] == '^' || stuff[0] == '[') {
|
||||
+ stuff = "\\\\" + stuff;
|
||||
+ }
|
||||
+ result_string = result_string + "[" + stuff + "]";
|
||||
+ }
|
||||
+ } else {
|
||||
+ // SPECIAL_CHARS
|
||||
+ // closing ')', '}' and ']'
|
||||
+ // '-' (a range in character set)
|
||||
+ // '&', '~', (extended character set operations)
|
||||
+ // '#' (comment) and WHITESPACE (ignored) in verbose mode
|
||||
+ static std::string special_characters = "()[]{}?*+-|^$\\.&~# \t\n\r\v\f";
|
||||
+ static std::map<int, std::string> special_characters_map;
|
||||
+ if (special_characters_map.empty()) {
|
||||
+ for (auto &sc : special_characters) {
|
||||
+ special_characters_map.insert(
|
||||
+ std::make_pair(static_cast<int>(sc), std::string{"\\"} + std::string(1, sc)));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (special_characters.find(c) != std::string::npos) {
|
||||
+ result_string += special_characters_map[static_cast<int>(c)];
|
||||
+ } else {
|
||||
+ result_string += c;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return std::string{"(("} + result_string + std::string{R"()|[\r\n])$)"};
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::regex compile_pattern(const std::string &pattern) {
|
||||
+ return std::regex(translate(pattern), std::regex::ECMAScript);
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ bool fnmatch(const fs::path &name, const std::string &pattern) {
|
||||
+ return std::regex_match(name.string(), compile_pattern(pattern));
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> filter(const std::vector<fs::path> &names,
|
||||
+ const std::string &pattern) {
|
||||
+ // std::cout << "Pattern: " << pattern << "\n";
|
||||
+ std::vector<fs::path> result;
|
||||
+ for (auto &name : names) {
|
||||
+ // std::cout << "Checking for " << name.string() << "\n";
|
||||
+ if (fnmatch(name, pattern)) {
|
||||
+ result.push_back(name);
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ fs::path expand_tilde(fs::path path) {
|
||||
+ if (path.empty()) return path;
|
||||
+#ifdef _WIN32
|
||||
+ char* home;
|
||||
+ size_t sz;
|
||||
+ _dupenv_s(&home, &sz, "USERPROFILE");
|
||||
+#else
|
||||
+ const char * home = std::getenv("HOME");
|
||||
+#endif
|
||||
+ if (home == nullptr) {
|
||||
+ throw std::invalid_argument("error: Unable to expand `~` - HOME environment variable not set.");
|
||||
+ }
|
||||
+
|
||||
+ std::string s = path.string();
|
||||
+ if (s[0] == '~') {
|
||||
+ s = std::string(home) + s.substr(1, s.size() - 1);
|
||||
+ return fs::path(s);
|
||||
+ } else {
|
||||
+ return path;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ bool has_magic(const std::string &pathname) {
|
||||
+ static const auto magic_check = std::regex("([*?[])");
|
||||
+ return std::regex_search(pathname, magic_check);
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ bool is_hidden(const std::string &pathname) {
|
||||
+ return std::regex_match(pathname, std::regex("^(.*\\/)*\\.[^\\.\\/]+\\/*$"));
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ bool is_recursive(const std::string &pattern) { return pattern == "**"; }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> iter_directory(const fs::path &dirname, bool dironly) {
|
||||
+ std::vector<fs::path> result;
|
||||
+
|
||||
+ auto current_directory = dirname;
|
||||
+ if (current_directory.empty()) {
|
||||
+ current_directory = fs::current_path();
|
||||
+ }
|
||||
+
|
||||
+ if (fs::exists(current_directory)) {
|
||||
+ try {
|
||||
+ for (auto &entry : fs::directory_iterator(
|
||||
+ current_directory, fs::directory_options::follow_directory_symlink |
|
||||
+ fs::directory_options::skip_permission_denied)) {
|
||||
+ if (!dironly || entry.is_directory()) {
|
||||
+ if (dirname.is_absolute()) {
|
||||
+ result.push_back(entry.path());
|
||||
+ } else {
|
||||
+ result.push_back(fs::relative(entry.path()));
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ } catch (std::exception&) {
|
||||
+ // not a directory
|
||||
+ // do nothing
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+// Recursively yields relative pathnames inside a literal directory.
|
||||
+ static inline
|
||||
+ std::vector<fs::path> rlistdir(const fs::path &dirname, bool dironly) {
|
||||
+ std::vector<fs::path> result;
|
||||
+ auto names = iter_directory(dirname, dironly);
|
||||
+ for (auto &x : names) {
|
||||
+ if (!is_hidden(x.string())) {
|
||||
+ result.push_back(x);
|
||||
+ for (auto &y : rlistdir(x, dironly)) {
|
||||
+ result.push_back(y);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+// This helper function recursively yields relative pathnames inside a literal
|
||||
+// directory.
|
||||
+ static inline
|
||||
+ std::vector<fs::path> glob2(const fs::path &dirname, [[maybe_unused]] const std::string &pattern,
|
||||
+ bool dironly) {
|
||||
+ // std::cout << "In glob2\n";
|
||||
+ std::vector<fs::path> result;
|
||||
+ assert(is_recursive(pattern));
|
||||
+ for (auto &dir : rlistdir(dirname, dironly)) {
|
||||
+ result.push_back(dir);
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+// These 2 helper functions non-recursively glob inside a literal directory.
|
||||
+// They return a list of basenames. _glob1 accepts a pattern while _glob0
|
||||
+// takes a literal basename (so it only has to check for its existence).
|
||||
+ static inline
|
||||
+ std::vector<fs::path> glob1(const fs::path &dirname, const std::string &pattern,
|
||||
+ bool dironly) {
|
||||
+ // std::cout << "In glob1\n";
|
||||
+ auto names = iter_directory(dirname, dironly);
|
||||
+ std::vector<fs::path> filtered_names;
|
||||
+ for (auto &n : names) {
|
||||
+ if (!is_hidden(n.string())) {
|
||||
+ filtered_names.push_back(n.filename());
|
||||
+ // if (n.is_relative()) {
|
||||
+ // // std::cout << "Filtered (Relative): " << n << "\n";
|
||||
+ // filtered_names.push_back(fs::relative(n));
|
||||
+ // } else {
|
||||
+ // // std::cout << "Filtered (Absolute): " << n << "\n";
|
||||
+ // filtered_names.push_back(n.filename());
|
||||
+ // }
|
||||
+ }
|
||||
+ }
|
||||
+ return filter(filtered_names, pattern);
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> glob0(const fs::path &dirname, const fs::path &basename,
|
||||
+ bool /*dironly*/) {
|
||||
+ // std::cout << "In glob0\n";
|
||||
+ std::vector<fs::path> result;
|
||||
+ if (basename.empty()) {
|
||||
+ // 'q*x/' should match only directories.
|
||||
+ if (fs::is_directory(dirname)) {
|
||||
+ result = {basename};
|
||||
+ }
|
||||
+ } else {
|
||||
+ if (fs::exists(dirname / basename)) {
|
||||
+ result = {basename};
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> glob(const std::string &pathname, bool recursive = false,
|
||||
+ bool dironly = false) {
|
||||
+ std::vector<fs::path> result;
|
||||
+
|
||||
+ auto path = fs::path(pathname);
|
||||
+
|
||||
+ if (pathname[0] == '~') {
|
||||
+ // expand tilde
|
||||
+ path = expand_tilde(path);
|
||||
+ }
|
||||
+
|
||||
+ auto dirname = path.parent_path();
|
||||
+ const auto basename = path.filename();
|
||||
+
|
||||
+ if (!has_magic(pathname)) {
|
||||
+ assert(!dironly);
|
||||
+ if (!basename.empty()) {
|
||||
+ if (fs::exists(path)) {
|
||||
+ result.push_back(path);
|
||||
+ }
|
||||
+ } else {
|
||||
+ // Patterns ending with a slash should match only directories
|
||||
+ if (fs::is_directory(dirname)) {
|
||||
+ result.push_back(path);
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ if (dirname.empty()) {
|
||||
+ if (recursive && is_recursive(basename.string())) {
|
||||
+ return glob2(dirname, basename.string(), dironly);
|
||||
+ } else {
|
||||
+ return glob1(dirname, basename.string(), dironly);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ std::vector<fs::path> dirs;
|
||||
+ if (dirname != fs::path(pathname) && has_magic(dirname.string())) {
|
||||
+ dirs = glob(dirname.string(), recursive, true);
|
||||
+ } else {
|
||||
+ dirs = {dirname};
|
||||
+ }
|
||||
+
|
||||
+ std::function<std::vector<fs::path>(const fs::path &, const std::string &, bool)>
|
||||
+ glob_in_dir;
|
||||
+ if (has_magic(basename.string())) {
|
||||
+ if (recursive && is_recursive(basename.string())) {
|
||||
+ glob_in_dir = glob2;
|
||||
+ } else {
|
||||
+ glob_in_dir = glob1;
|
||||
+ }
|
||||
+ } else {
|
||||
+ glob_in_dir = glob0;
|
||||
+ }
|
||||
+
|
||||
+ for (auto &d : dirs) {
|
||||
+ for (auto &name : glob_in_dir(d, basename.string(), dironly)) {
|
||||
+ fs::path subresult = name;
|
||||
+ if (name.parent_path().empty()) {
|
||||
+ subresult = d / name;
|
||||
+ }
|
||||
+ result.push_back(subresult);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ } // namespace end
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> glob(const std::string &pathname) {
|
||||
+ return glob(pathname, false);
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<fs::path> rglob(const std::string &pathname) {
|
||||
+ return glob(pathname, true);
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<std::filesystem::path> glob(const std::vector<std::string> &pathnames) {
|
||||
+ std::vector<std::filesystem::path> result;
|
||||
+ for (auto &pathname : pathnames) {
|
||||
+ for (auto &match : glob(pathname, false)) {
|
||||
+ result.push_back(std::move(match));
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<std::filesystem::path> rglob(const std::vector<std::string> &pathnames) {
|
||||
+ std::vector<std::filesystem::path> result;
|
||||
+ for (auto &pathname : pathnames) {
|
||||
+ for (auto &match : glob(pathname, true)) {
|
||||
+ result.push_back(std::move(match));
|
||||
+ }
|
||||
+ }
|
||||
+ return result;
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<std::filesystem::path>
|
||||
+ glob(const std::initializer_list<std::string> &pathnames) {
|
||||
+ return glob(std::vector<std::string>(pathnames));
|
||||
+ }
|
||||
+
|
||||
+ static inline
|
||||
+ std::vector<std::filesystem::path>
|
||||
+ rglob(const std::initializer_list<std::string> &pathnames) {
|
||||
+ return rglob(std::vector<std::string>(pathnames));
|
||||
+ }
|
||||
+
|
||||
+} // namespace glob
|
||||
diff -uNr gw-0.7.0/include/glob.h gw-0.7.0.mod/include/glob.h
|
||||
--- gw-0.7.0/include/glob.h 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/include/glob.h 1970-01-01 03:00:00.000000000 +0300
|
||||
@@ -1,410 +0,0 @@
|
||||
-
|
||||
-#pragma once
|
||||
-#include <cassert>
|
||||
-#include <filesystem>
|
||||
-#include <functional>
|
||||
-#include <iostream>
|
||||
-#include <map>
|
||||
-#include <regex>
|
||||
-#include <string>
|
||||
-#include <vector>
|
||||
-namespace fs = std::filesystem;
|
||||
-
|
||||
-namespace glob {
|
||||
-
|
||||
- namespace {
|
||||
-
|
||||
- static inline
|
||||
- bool string_replace(std::string &str, const std::string &from, const std::string &to) {
|
||||
- std::size_t start_pos = str.find(from);
|
||||
- if (start_pos == std::string::npos)
|
||||
- return false;
|
||||
- str.replace(start_pos, from.length(), to);
|
||||
- return true;
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::string translate(const std::string &pattern) {
|
||||
- std::size_t i = 0, n = pattern.size();
|
||||
- std::string result_string;
|
||||
-
|
||||
- while (i < n) {
|
||||
- auto c = pattern[i];
|
||||
- i += 1;
|
||||
- if (c == '*') {
|
||||
- result_string += ".*";
|
||||
- } else if (c == '?') {
|
||||
- result_string += ".";
|
||||
- } else if (c == '[') {
|
||||
- auto j = i;
|
||||
- if (j < n && pattern[j] == '!') {
|
||||
- j += 1;
|
||||
- }
|
||||
- if (j < n && pattern[j] == ']') {
|
||||
- j += 1;
|
||||
- }
|
||||
- while (j < n && pattern[j] != ']') {
|
||||
- j += 1;
|
||||
- }
|
||||
- if (j >= n) {
|
||||
- result_string += "\\[";
|
||||
- } else {
|
||||
- auto stuff = std::string(pattern.begin() + i, pattern.begin() + j);
|
||||
- if (stuff.find("--") == std::string::npos) {
|
||||
- string_replace(stuff, std::string{"\\"}, std::string{R"(\\)"});
|
||||
- } else {
|
||||
- std::vector<std::string> chunks;
|
||||
- std::size_t k = 0;
|
||||
- if (pattern[i] == '!') {
|
||||
- k = i + 2;
|
||||
- } else {
|
||||
- k = i + 1;
|
||||
- }
|
||||
-
|
||||
- while (true) {
|
||||
- k = pattern.find("-", k, j);
|
||||
- if (k == std::string::npos) {
|
||||
- break;
|
||||
- }
|
||||
- chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + k));
|
||||
- i = k + 1;
|
||||
- k = k + 3;
|
||||
- }
|
||||
-
|
||||
- chunks.push_back(std::string(pattern.begin() + i, pattern.begin() + j));
|
||||
- // Escape backslashes and hyphens for set difference (--).
|
||||
- // Hyphens that create ranges shouldn't be escaped.
|
||||
- bool first = false;
|
||||
- for (auto &s : chunks) {
|
||||
- string_replace(s, std::string{"\\"}, std::string{R"(\\)"});
|
||||
- string_replace(s, std::string{"-"}, std::string{R"(\-)"});
|
||||
- if (first) {
|
||||
- stuff += s;
|
||||
- first = false;
|
||||
- } else {
|
||||
- stuff += "-" + s;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- // Escape set operations (&&, ~~ and ||).
|
||||
- std::string result;
|
||||
- std::regex_replace(std::back_inserter(result), // result
|
||||
- stuff.begin(), stuff.end(), // string
|
||||
- std::regex(std::string{R"([&~|])"}), // pattern
|
||||
- std::string{R"(\\\1)"}); // repl
|
||||
- stuff = result;
|
||||
- i = j + 1;
|
||||
- if (stuff[0] == '!') {
|
||||
- stuff = "^" + std::string(stuff.begin() + 1, stuff.end());
|
||||
- } else if (stuff[0] == '^' || stuff[0] == '[') {
|
||||
- stuff = "\\\\" + stuff;
|
||||
- }
|
||||
- result_string = result_string + "[" + stuff + "]";
|
||||
- }
|
||||
- } else {
|
||||
- // SPECIAL_CHARS
|
||||
- // closing ')', '}' and ']'
|
||||
- // '-' (a range in character set)
|
||||
- // '&', '~', (extended character set operations)
|
||||
- // '#' (comment) and WHITESPACE (ignored) in verbose mode
|
||||
- static std::string special_characters = "()[]{}?*+-|^$\\.&~# \t\n\r\v\f";
|
||||
- static std::map<int, std::string> special_characters_map;
|
||||
- if (special_characters_map.empty()) {
|
||||
- for (auto &sc : special_characters) {
|
||||
- special_characters_map.insert(
|
||||
- std::make_pair(static_cast<int>(sc), std::string{"\\"} + std::string(1, sc)));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (special_characters.find(c) != std::string::npos) {
|
||||
- result_string += special_characters_map[static_cast<int>(c)];
|
||||
- } else {
|
||||
- result_string += c;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- return std::string{"(("} + result_string + std::string{R"()|[\r\n])$)"};
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::regex compile_pattern(const std::string &pattern) {
|
||||
- return std::regex(translate(pattern), std::regex::ECMAScript);
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- bool fnmatch(const fs::path &name, const std::string &pattern) {
|
||||
- return std::regex_match(name.string(), compile_pattern(pattern));
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> filter(const std::vector<fs::path> &names,
|
||||
- const std::string &pattern) {
|
||||
- // std::cout << "Pattern: " << pattern << "\n";
|
||||
- std::vector<fs::path> result;
|
||||
- for (auto &name : names) {
|
||||
- // std::cout << "Checking for " << name.string() << "\n";
|
||||
- if (fnmatch(name, pattern)) {
|
||||
- result.push_back(name);
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- fs::path expand_tilde(fs::path path) {
|
||||
- if (path.empty()) return path;
|
||||
-#ifdef _WIN32
|
||||
- char* home;
|
||||
- size_t sz;
|
||||
- _dupenv_s(&home, &sz, "USERPROFILE");
|
||||
-#else
|
||||
- const char * home = std::getenv("HOME");
|
||||
-#endif
|
||||
- if (home == nullptr) {
|
||||
- throw std::invalid_argument("error: Unable to expand `~` - HOME environment variable not set.");
|
||||
- }
|
||||
-
|
||||
- std::string s = path.string();
|
||||
- if (s[0] == '~') {
|
||||
- s = std::string(home) + s.substr(1, s.size() - 1);
|
||||
- return fs::path(s);
|
||||
- } else {
|
||||
- return path;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- bool has_magic(const std::string &pathname) {
|
||||
- static const auto magic_check = std::regex("([*?[])");
|
||||
- return std::regex_search(pathname, magic_check);
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- bool is_hidden(const std::string &pathname) {
|
||||
- return std::regex_match(pathname, std::regex("^(.*\\/)*\\.[^\\.\\/]+\\/*$"));
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- bool is_recursive(const std::string &pattern) { return pattern == "**"; }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> iter_directory(const fs::path &dirname, bool dironly) {
|
||||
- std::vector<fs::path> result;
|
||||
-
|
||||
- auto current_directory = dirname;
|
||||
- if (current_directory.empty()) {
|
||||
- current_directory = fs::current_path();
|
||||
- }
|
||||
-
|
||||
- if (fs::exists(current_directory)) {
|
||||
- try {
|
||||
- for (auto &entry : fs::directory_iterator(
|
||||
- current_directory, fs::directory_options::follow_directory_symlink |
|
||||
- fs::directory_options::skip_permission_denied)) {
|
||||
- if (!dironly || entry.is_directory()) {
|
||||
- if (dirname.is_absolute()) {
|
||||
- result.push_back(entry.path());
|
||||
- } else {
|
||||
- result.push_back(fs::relative(entry.path()));
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- } catch (std::exception&) {
|
||||
- // not a directory
|
||||
- // do nothing
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
-// Recursively yields relative pathnames inside a literal directory.
|
||||
- static inline
|
||||
- std::vector<fs::path> rlistdir(const fs::path &dirname, bool dironly) {
|
||||
- std::vector<fs::path> result;
|
||||
- auto names = iter_directory(dirname, dironly);
|
||||
- for (auto &x : names) {
|
||||
- if (!is_hidden(x.string())) {
|
||||
- result.push_back(x);
|
||||
- for (auto &y : rlistdir(x, dironly)) {
|
||||
- result.push_back(y);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
-// This helper function recursively yields relative pathnames inside a literal
|
||||
-// directory.
|
||||
- static inline
|
||||
- std::vector<fs::path> glob2(const fs::path &dirname, [[maybe_unused]] const std::string &pattern,
|
||||
- bool dironly) {
|
||||
- // std::cout << "In glob2\n";
|
||||
- std::vector<fs::path> result;
|
||||
- assert(is_recursive(pattern));
|
||||
- for (auto &dir : rlistdir(dirname, dironly)) {
|
||||
- result.push_back(dir);
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
-// These 2 helper functions non-recursively glob inside a literal directory.
|
||||
-// They return a list of basenames. _glob1 accepts a pattern while _glob0
|
||||
-// takes a literal basename (so it only has to check for its existence).
|
||||
- static inline
|
||||
- std::vector<fs::path> glob1(const fs::path &dirname, const std::string &pattern,
|
||||
- bool dironly) {
|
||||
- // std::cout << "In glob1\n";
|
||||
- auto names = iter_directory(dirname, dironly);
|
||||
- std::vector<fs::path> filtered_names;
|
||||
- for (auto &n : names) {
|
||||
- if (!is_hidden(n.string())) {
|
||||
- filtered_names.push_back(n.filename());
|
||||
- // if (n.is_relative()) {
|
||||
- // // std::cout << "Filtered (Relative): " << n << "\n";
|
||||
- // filtered_names.push_back(fs::relative(n));
|
||||
- // } else {
|
||||
- // // std::cout << "Filtered (Absolute): " << n << "\n";
|
||||
- // filtered_names.push_back(n.filename());
|
||||
- // }
|
||||
- }
|
||||
- }
|
||||
- return filter(filtered_names, pattern);
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> glob0(const fs::path &dirname, const fs::path &basename,
|
||||
- bool /*dironly*/) {
|
||||
- // std::cout << "In glob0\n";
|
||||
- std::vector<fs::path> result;
|
||||
- if (basename.empty()) {
|
||||
- // 'q*x/' should match only directories.
|
||||
- if (fs::is_directory(dirname)) {
|
||||
- result = {basename};
|
||||
- }
|
||||
- } else {
|
||||
- if (fs::exists(dirname / basename)) {
|
||||
- result = {basename};
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> glob(const std::string &pathname, bool recursive = false,
|
||||
- bool dironly = false) {
|
||||
- std::vector<fs::path> result;
|
||||
-
|
||||
- auto path = fs::path(pathname);
|
||||
-
|
||||
- if (pathname[0] == '~') {
|
||||
- // expand tilde
|
||||
- path = expand_tilde(path);
|
||||
- }
|
||||
-
|
||||
- auto dirname = path.parent_path();
|
||||
- const auto basename = path.filename();
|
||||
-
|
||||
- if (!has_magic(pathname)) {
|
||||
- assert(!dironly);
|
||||
- if (!basename.empty()) {
|
||||
- if (fs::exists(path)) {
|
||||
- result.push_back(path);
|
||||
- }
|
||||
- } else {
|
||||
- // Patterns ending with a slash should match only directories
|
||||
- if (fs::is_directory(dirname)) {
|
||||
- result.push_back(path);
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- if (dirname.empty()) {
|
||||
- if (recursive && is_recursive(basename.string())) {
|
||||
- return glob2(dirname, basename.string(), dironly);
|
||||
- } else {
|
||||
- return glob1(dirname, basename.string(), dironly);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- std::vector<fs::path> dirs;
|
||||
- if (dirname != fs::path(pathname) && has_magic(dirname.string())) {
|
||||
- dirs = glob(dirname.string(), recursive, true);
|
||||
- } else {
|
||||
- dirs = {dirname};
|
||||
- }
|
||||
-
|
||||
- std::function<std::vector<fs::path>(const fs::path &, const std::string &, bool)>
|
||||
- glob_in_dir;
|
||||
- if (has_magic(basename.string())) {
|
||||
- if (recursive && is_recursive(basename.string())) {
|
||||
- glob_in_dir = glob2;
|
||||
- } else {
|
||||
- glob_in_dir = glob1;
|
||||
- }
|
||||
- } else {
|
||||
- glob_in_dir = glob0;
|
||||
- }
|
||||
-
|
||||
- for (auto &d : dirs) {
|
||||
- for (auto &name : glob_in_dir(d, basename.string(), dironly)) {
|
||||
- fs::path subresult = name;
|
||||
- if (name.parent_path().empty()) {
|
||||
- subresult = d / name;
|
||||
- }
|
||||
- result.push_back(subresult);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- } // namespace end
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> glob(const std::string &pathname) {
|
||||
- return glob(pathname, false);
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<fs::path> rglob(const std::string &pathname) {
|
||||
- return glob(pathname, true);
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<std::filesystem::path> glob(const std::vector<std::string> &pathnames) {
|
||||
- std::vector<std::filesystem::path> result;
|
||||
- for (auto &pathname : pathnames) {
|
||||
- for (auto &match : glob(pathname, false)) {
|
||||
- result.push_back(std::move(match));
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<std::filesystem::path> rglob(const std::vector<std::string> &pathnames) {
|
||||
- std::vector<std::filesystem::path> result;
|
||||
- for (auto &pathname : pathnames) {
|
||||
- for (auto &match : glob(pathname, true)) {
|
||||
- result.push_back(std::move(match));
|
||||
- }
|
||||
- }
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<std::filesystem::path>
|
||||
- glob(const std::initializer_list<std::string> &pathnames) {
|
||||
- return glob(std::vector<std::string>(pathnames));
|
||||
- }
|
||||
-
|
||||
- static inline
|
||||
- std::vector<std::filesystem::path>
|
||||
- rglob(const std::initializer_list<std::string> &pathnames) {
|
||||
- return rglob(std::vector<std::string>(pathnames));
|
||||
- }
|
||||
-
|
||||
-} // namespace glob
|
||||
diff -uNr gw-0.7.0/src/main.cpp gw-0.7.0.mod/src/main.cpp
|
||||
--- gw-0.7.0/src/main.cpp 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/main.cpp 2023-03-22 11:50:14.052916259 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "argparse.h"
|
||||
#include "../include/BS_thread_pool.h"
|
||||
#include "../include/strnatcmp.h"
|
||||
-#include "glob.h"
|
||||
+#include "glob_cpp.h"
|
||||
#include "hts_funcs.h"
|
||||
#include "parser.h"
|
||||
#include "plot_manager.h"
|
||||
diff -uNr gw-0.7.0/src/themes.h gw-0.7.0.mod/src/themes.h
|
||||
--- gw-0.7.0/src/themes.h 2023-03-20 12:59:19.000000000 +0200
|
||||
+++ gw-0.7.0.mod/src/themes.h 2023-03-22 11:50:04.348826687 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
#include "../include/robin_hood.h"
|
||||
#include "../include/argparse.h"
|
||||
-#include "glob.h"
|
||||
+#include "glob_cpp.h"
|
||||
#include "../include/ini.h"
|
||||
#include "utils.h"
|
||||
|
||||
Loading…
Reference in New Issue