mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 15:47:46 +00:00
New code style refactor
This commit is contained in:
Jack Andersen
@@ -18,18 +18,17 @@
|
||||
|
||||
extern logvisor::Module LogModule;
|
||||
|
||||
struct ToolPassInfo
|
||||
{
|
||||
hecl::SystemString pname;
|
||||
hecl::SystemString cwd;
|
||||
std::vector<hecl::SystemString> args;
|
||||
std::vector<hecl::SystemChar> flags;
|
||||
hecl::SystemString output;
|
||||
hecl::Database::Project* project = nullptr;
|
||||
unsigned verbosityLevel = 0;
|
||||
bool force = false;
|
||||
bool yes = false;
|
||||
bool gui = false;
|
||||
struct ToolPassInfo {
|
||||
hecl::SystemString pname;
|
||||
hecl::SystemString cwd;
|
||||
std::vector<hecl::SystemString> args;
|
||||
std::vector<hecl::SystemChar> flags;
|
||||
hecl::SystemString output;
|
||||
hecl::Database::Project* project = nullptr;
|
||||
unsigned verbosityLevel = 0;
|
||||
bool force = false;
|
||||
bool yes = false;
|
||||
bool gui = false;
|
||||
};
|
||||
|
||||
#define RED "\033[0;31m"
|
||||
@@ -48,228 +47,189 @@ struct ToolPassInfo
|
||||
|
||||
extern bool XTERM_COLOR;
|
||||
|
||||
class ToolBase
|
||||
{
|
||||
class ToolBase {
|
||||
protected:
|
||||
const ToolPassInfo& m_info;
|
||||
bool m_good = false;
|
||||
const ToolPassInfo& m_info;
|
||||
bool m_good = false;
|
||||
|
||||
bool continuePrompt()
|
||||
{
|
||||
if (!m_info.yes)
|
||||
{
|
||||
if (XTERM_COLOR)
|
||||
hecl::Printf(_SYS_STR("\n" BLUE BOLD "Continue?" NORMAL " (Y/n) "));
|
||||
else
|
||||
hecl::Printf(_SYS_STR("\nContinue? (Y/n) "));
|
||||
fflush(stdout);
|
||||
bool continuePrompt() {
|
||||
if (!m_info.yes) {
|
||||
if (XTERM_COLOR)
|
||||
hecl::Printf(_SYS_STR("\n" BLUE BOLD "Continue?" NORMAL " (Y/n) "));
|
||||
else
|
||||
hecl::Printf(_SYS_STR("\nContinue? (Y/n) "));
|
||||
fflush(stdout);
|
||||
|
||||
int ch;
|
||||
int ch;
|
||||
#ifndef _WIN32
|
||||
struct termios tioOld, tioNew;
|
||||
tcgetattr(0, &tioOld);
|
||||
tioNew = tioOld;
|
||||
tioNew.c_lflag &= ~ICANON;
|
||||
tcsetattr(0, TCSANOW, &tioNew);
|
||||
while ((ch = getchar()))
|
||||
struct termios tioOld, tioNew;
|
||||
tcgetattr(0, &tioOld);
|
||||
tioNew = tioOld;
|
||||
tioNew.c_lflag &= ~ICANON;
|
||||
tcsetattr(0, TCSANOW, &tioNew);
|
||||
while ((ch = getchar()))
|
||||
#else
|
||||
while ((ch = getch()))
|
||||
#endif
|
||||
{
|
||||
if (ch == 'n' || ch == 'N')
|
||||
{
|
||||
hecl::Printf(_SYS_STR("\n"));
|
||||
return false;
|
||||
}
|
||||
if (ch == 'y' || ch == 'Y' || ch == '\r' || ch == '\n')
|
||||
break;
|
||||
}
|
||||
#ifndef _WIN32
|
||||
tcsetattr(0, TCSANOW, &tioOld);
|
||||
while ((ch = getch()))
|
||||
#endif
|
||||
{
|
||||
if (ch == 'n' || ch == 'N') {
|
||||
hecl::Printf(_SYS_STR("\n"));
|
||||
return false;
|
||||
}
|
||||
hecl::Printf(_SYS_STR("\n"));
|
||||
return true;
|
||||
if (ch == 'y' || ch == 'Y' || ch == '\r' || ch == '\n')
|
||||
break;
|
||||
}
|
||||
#ifndef _WIN32
|
||||
tcsetattr(0, TCSANOW, &tioOld);
|
||||
#endif
|
||||
}
|
||||
hecl::Printf(_SYS_STR("\n"));
|
||||
return true;
|
||||
}
|
||||
|
||||
public:
|
||||
ToolBase(const ToolPassInfo& info)
|
||||
: m_info(info)
|
||||
{
|
||||
hecl::VerbosityLevel = info.verbosityLevel;
|
||||
hecl::GuiMode = info.gui;
|
||||
}
|
||||
virtual ~ToolBase() = default;
|
||||
virtual hecl::SystemString toolName() const=0;
|
||||
virtual int run()=0;
|
||||
virtual void cancel() {}
|
||||
inline operator bool() const {return m_good;}
|
||||
ToolBase(const ToolPassInfo& info) : m_info(info) {
|
||||
hecl::VerbosityLevel = info.verbosityLevel;
|
||||
hecl::GuiMode = info.gui;
|
||||
}
|
||||
virtual ~ToolBase() = default;
|
||||
virtual hecl::SystemString toolName() const = 0;
|
||||
virtual int run() = 0;
|
||||
virtual void cancel() {}
|
||||
inline operator bool() const { return m_good; }
|
||||
};
|
||||
|
||||
class HelpOutput
|
||||
{
|
||||
class HelpOutput {
|
||||
public:
|
||||
typedef void(*HelpFunc)(HelpOutput&);
|
||||
typedef void (*HelpFunc)(HelpOutput&);
|
||||
|
||||
private:
|
||||
FILE* m_sout;
|
||||
HelpFunc m_helpFunc;
|
||||
int m_lineWidth;
|
||||
hecl::SystemString m_wrapBuffer;
|
||||
FILE* m_sout;
|
||||
HelpFunc m_helpFunc;
|
||||
int m_lineWidth;
|
||||
hecl::SystemString m_wrapBuffer;
|
||||
|
||||
void _wrapBuf(hecl::SystemString& string)
|
||||
{
|
||||
int counter;
|
||||
hecl::SystemString::iterator it = string.begin();
|
||||
void _wrapBuf(hecl::SystemString& string) {
|
||||
int counter;
|
||||
hecl::SystemString::iterator it = string.begin();
|
||||
|
||||
while (it != string.end())
|
||||
{
|
||||
std::ptrdiff_t v = it - string.begin();
|
||||
while (it != string.end()) {
|
||||
std::ptrdiff_t v = it - string.begin();
|
||||
|
||||
/* copy string until the end of the line is reached */
|
||||
for (counter=WRAP_INDENT ; counter < m_lineWidth ; ++counter)
|
||||
{
|
||||
if (it >= string.end())
|
||||
return;
|
||||
if (*it == _SYS_STR('\n'))
|
||||
{
|
||||
counter = WRAP_INDENT;
|
||||
++it;
|
||||
}
|
||||
if (counter == WRAP_INDENT)
|
||||
{
|
||||
for (int i=0 ; i<WRAP_INDENT ; ++i)
|
||||
it = string.insert(it, _SYS_STR(' ')) + 1;
|
||||
}
|
||||
if (it >= string.end())
|
||||
return;
|
||||
if (*it != _SYS_STR('\n'))
|
||||
++it;
|
||||
}
|
||||
/* check for whitespace */
|
||||
if (isspace(*it))
|
||||
{
|
||||
*it = _SYS_STR('\n');
|
||||
counter = WRAP_INDENT;
|
||||
++it;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* check for nearest whitespace back in string */
|
||||
for (hecl::SystemString::iterator k=it ; k!=string.begin() ; --k)
|
||||
{
|
||||
if (isspace(*k))
|
||||
{
|
||||
counter = WRAP_INDENT;
|
||||
if (k - string.begin() < v)
|
||||
k = string.insert(it, _SYS_STR('\n'));
|
||||
else
|
||||
*k = _SYS_STR('\n');
|
||||
it = k + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
/* copy string until the end of the line is reached */
|
||||
for (counter = WRAP_INDENT; counter < m_lineWidth; ++counter) {
|
||||
if (it >= string.end())
|
||||
return;
|
||||
if (*it == _SYS_STR('\n')) {
|
||||
counter = WRAP_INDENT;
|
||||
++it;
|
||||
}
|
||||
if (counter == WRAP_INDENT) {
|
||||
for (int i = 0; i < WRAP_INDENT; ++i)
|
||||
it = string.insert(it, _SYS_STR(' ')) + 1;
|
||||
}
|
||||
if (it >= string.end())
|
||||
return;
|
||||
if (*it != _SYS_STR('\n'))
|
||||
++it;
|
||||
}
|
||||
/* check for whitespace */
|
||||
if (isspace(*it)) {
|
||||
*it = _SYS_STR('\n');
|
||||
counter = WRAP_INDENT;
|
||||
++it;
|
||||
} else {
|
||||
/* check for nearest whitespace back in string */
|
||||
for (hecl::SystemString::iterator k = it; k != string.begin(); --k) {
|
||||
if (isspace(*k)) {
|
||||
counter = WRAP_INDENT;
|
||||
if (k - string.begin() < v)
|
||||
k = string.insert(it, _SYS_STR('\n'));
|
||||
else
|
||||
*k = _SYS_STR('\n');
|
||||
it = k + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
HelpOutput(HelpFunc helpFunc)
|
||||
: m_sout(NULL), m_helpFunc(helpFunc), m_lineWidth(hecl::GuiMode ? 120 : hecl::ConsoleWidth()) {}
|
||||
|
||||
HelpOutput(HelpFunc helpFunc)
|
||||
: m_sout(NULL), m_helpFunc(helpFunc), m_lineWidth(hecl::GuiMode ? 120 : hecl::ConsoleWidth())
|
||||
{}
|
||||
|
||||
void go()
|
||||
{
|
||||
void go() {
|
||||
#if _WIN32
|
||||
m_sout = stdout;
|
||||
m_helpFunc(*this);
|
||||
m_sout = stdout;
|
||||
m_helpFunc(*this);
|
||||
#else
|
||||
m_sout = popen("less -R", "w");
|
||||
if (m_sout)
|
||||
{
|
||||
m_helpFunc(*this);
|
||||
pclose(m_sout);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_sout = stdout;
|
||||
m_helpFunc(*this);
|
||||
}
|
||||
m_sout = popen("less -R", "w");
|
||||
if (m_sout) {
|
||||
m_helpFunc(*this);
|
||||
pclose(m_sout);
|
||||
} else {
|
||||
m_sout = stdout;
|
||||
m_helpFunc(*this);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
void print(const hecl::SystemChar* str)
|
||||
{
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s"), str);
|
||||
}
|
||||
void print(const hecl::SystemChar* str) { hecl::FPrintf(m_sout, _SYS_STR("%s"), str); }
|
||||
|
||||
void printBold(const hecl::SystemChar* str)
|
||||
{
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL ""), str);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s"), str);
|
||||
}
|
||||
void printBold(const hecl::SystemChar* str) {
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL ""), str);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s"), str);
|
||||
}
|
||||
|
||||
void secHead(const hecl::SystemChar* headName)
|
||||
{
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL "\n"), headName);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s\n"), headName);
|
||||
}
|
||||
void secHead(const hecl::SystemChar* headName) {
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL "\n"), headName);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s\n"), headName);
|
||||
}
|
||||
|
||||
void optionHead(const hecl::SystemChar* flag, const hecl::SystemChar* synopsis)
|
||||
{
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL " (%s)\n"), flag, synopsis);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s (%s)\n"), flag, synopsis);
|
||||
}
|
||||
void optionHead(const hecl::SystemChar* flag, const hecl::SystemChar* synopsis) {
|
||||
if (XTERM_COLOR)
|
||||
hecl::FPrintf(m_sout, _SYS_STR("" BOLD "%s" NORMAL " (%s)\n"), flag, synopsis);
|
||||
else
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s (%s)\n"), flag, synopsis);
|
||||
}
|
||||
|
||||
void beginWrap()
|
||||
{
|
||||
m_wrapBuffer.clear();
|
||||
}
|
||||
void beginWrap() { m_wrapBuffer.clear(); }
|
||||
|
||||
void wrap(const hecl::SystemChar* str)
|
||||
{
|
||||
m_wrapBuffer += str;
|
||||
}
|
||||
void wrap(const hecl::SystemChar* str) { m_wrapBuffer += str; }
|
||||
|
||||
void wrapBold(const hecl::SystemChar* str)
|
||||
{
|
||||
if (XTERM_COLOR)
|
||||
m_wrapBuffer += _SYS_STR("" BOLD "");
|
||||
m_wrapBuffer += str;
|
||||
if (XTERM_COLOR)
|
||||
m_wrapBuffer += _SYS_STR("" NORMAL "");
|
||||
}
|
||||
void wrapBold(const hecl::SystemChar* str) {
|
||||
if (XTERM_COLOR)
|
||||
m_wrapBuffer += _SYS_STR("" BOLD "");
|
||||
m_wrapBuffer += str;
|
||||
if (XTERM_COLOR)
|
||||
m_wrapBuffer += _SYS_STR("" NORMAL "");
|
||||
}
|
||||
|
||||
void endWrap()
|
||||
{
|
||||
_wrapBuf(m_wrapBuffer);
|
||||
m_wrapBuffer += _SYS_STR('\n');
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s"), m_wrapBuffer.c_str());
|
||||
m_wrapBuffer.clear();
|
||||
}
|
||||
void endWrap() {
|
||||
_wrapBuf(m_wrapBuffer);
|
||||
m_wrapBuffer += _SYS_STR('\n');
|
||||
hecl::FPrintf(m_sout, _SYS_STR("%s"), m_wrapBuffer.c_str());
|
||||
m_wrapBuffer.clear();
|
||||
}
|
||||
};
|
||||
|
||||
static hecl::SystemString MakePathArgAbsolute(const hecl::SystemString& arg,
|
||||
const hecl::SystemString& cwd)
|
||||
{
|
||||
static hecl::SystemString MakePathArgAbsolute(const hecl::SystemString& arg, const hecl::SystemString& cwd) {
|
||||
#if _WIN32
|
||||
if (arg.size() >= 2 && iswalpha(arg[0]) && arg[1] == _SYS_STR(':'))
|
||||
return arg;
|
||||
if (arg[0] == _SYS_STR('\\') || arg[0] == _SYS_STR('/'))
|
||||
return arg;
|
||||
return cwd + _SYS_STR('\\') + arg;
|
||||
if (arg.size() >= 2 && iswalpha(arg[0]) && arg[1] == _SYS_STR(':'))
|
||||
return arg;
|
||||
if (arg[0] == _SYS_STR('\\') || arg[0] == _SYS_STR('/'))
|
||||
return arg;
|
||||
return cwd + _SYS_STR('\\') + arg;
|
||||
#else
|
||||
if (arg[0] == _SYS_STR('/') || arg[0] == _SYS_STR('\\'))
|
||||
return arg;
|
||||
if (cwd.back() == _SYS_STR('/') || cwd.back() == _SYS_STR('\\'))
|
||||
return cwd + arg;
|
||||
return cwd + _SYS_STR('/') + arg;
|
||||
if (arg[0] == _SYS_STR('/') || arg[0] == _SYS_STR('\\'))
|
||||
return arg;
|
||||
if (cwd.back() == _SYS_STR('/') || cwd.back() == _SYS_STR('\\'))
|
||||
return cwd + arg;
|
||||
return cwd + _SYS_STR('/') + arg;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user