zii/MRCI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a new internal command.

Browse Source 
Added a new fs_tree command that list all files and directories in a directory
tree. Just like fs_list, it has the option to output human readable text or
FILE_INFO frames. Also added the option to hide hidden files for both commands.

1.1.2 --> 1.1.3
This commit is contained in:
Maurice ONeal 2019-09-26 19:04:04 -04:00
parent 124fb538fa
commit 364924c383
10 changed files with 174 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd_docs.qrc
View File

@ -27,6 +27,7 @@
<file>docs/intern_commands/fs_list.md</file>
<file>docs/intern_commands/fs_mkpath.md</file>
<file>docs/intern_commands/fs_move.md</file>
<file>docs/intern_commands/fs_tree.md</file>
<file>docs/intern_commands/fs_upload.md</file>
<file>docs/intern_commands/host_config.md</file>
<file>docs/intern_commands/host_info.md</file>

4
docs/intern_commands/fs_list.md
View File

@ -4,8 +4,8 @@ list all files or sub-directories in a directory.
### IO ###
```[{-path (text)} {-info_frame}]/[text] or [FILE_INFO]```
```[{-path (text)} {-info_frame} {-no_hidden}]/[text] or [FILE_INFO]```
### Description ###
this list all files in the current directory or the directory specified in -path. this command normally returns human readable text for each file or sub-directory that is listed but you can pass -info_frame to make the command return FILE_INFO frames for each file/sub-directory instead. note: if displaying as text, all directory names are displayed with a '/' at the end.
this list all files in the current directory or the directory specified in -path. this command normally returns human readable text for each file or sub-directory that is listed but you can pass -info_frame to make the command return FILE_INFO frames for each file/sub-directory instead. note: if displaying as text, all directory names are displayed with a '/' at the end. by default, this command will list all hidden files and directories among the visible but you can pass the -no_hidden option to have it not list the hidden files or directories.

11
docs/intern_commands/fs_tree.md Normal file
View File

@ -0,0 +1,11 @@
### Summary ###
list all files and sub-directories of an entire directory tree.
### IO ###
```[{-path (text)} {-info_frame} {-no_hidden}]/[text] or [FILE_INFO]```
### Description ###
this list all files and sub-directories in the entire tree of the current directory or the directory specified in -path. this command normally returns human readable text for each file or sub-directory that is listed but you can pass -info_frame to make the command return FILE_INFO frames for each file/sub-directory instead. note: if displaying as text, all directory names are displayed with a '/' at the end. by default, this command will list all hidden files and directories among the visible but you can pass the -no_hidden option to have it not list the hidden files or directories.

21
src/commands/command.h
View File

@ -19,13 +19,10 @@
#define TXT_CODEC "UTF-16LE"
#define TXT_CODEC_BITS 16
#define MOD_LOADER_IID "MCRI.host.module"
#include <QObject>
#include <QTextCodec>
#include <QCoreApplication>
#include <QHash>
#include <QPluginLoader>
enum TypeID
{
@ -111,14 +108,14 @@ public:
virtual void procBin(const SharedObjs *, const QByteArray &, uchar) {}
virtual void aboutToDelete() {}
virtual void term() {}
virtual bool handlesGenfile() {return false;}
virtual void term() {}
virtual bool errState();
virtual QString shortText() {return "";}
virtual QString ioText() {return "";}
virtual QString longText() {return "";}
virtual QString libText() {return "";}
virtual QStringList internRequest() {return QStringList();}
virtual bool handlesGenfile() {return false;}
virtual QString shortText() {return "";}
virtual QString ioText() {return "";}
virtual QString longText() {return "";}
virtual QString libText() {return "";}
virtual QStringList internRequest() {return QStringList();}
QHash<QString, ExternCommand*> internCommands;
quint16 cmdId;
@ -163,8 +160,4 @@ public:
virtual ExternCommand *cmdObj(const QString &) {return nullptr;}
};
QT_BEGIN_NAMESPACE
Q_DECLARE_INTERFACE(CommandLoader, MOD_LOADER_IID)
QT_END_NAMESPACE
#endif // EXTERN_COMMAND_H

133
src/commands/fs.cpp
View File

@ -20,11 +20,12 @@ DownloadFile::DownloadFile(QObject *parent) : InternCommand(parent) {file = new
UploadFile::UploadFile(QObject *parent) : InternCommand(parent) {file = new QFile(this);}
Delete::Delete(QObject *parent) : InternCommand(parent) {}
Copy::Copy(QObject *parent) : InternCommand(parent) {src = new QFile(this); dst = new QFile(this);}
Move::Move(QObject *parent) : Copy(parent) {}
Move::Move(QObject *parent) : Copy(parent) {}
MakePath::MakePath(QObject *parent) : InternCommand(parent) {}
ListFiles::ListFiles(QObject *parent) : InternCommand(parent) {}
FileInfo::FileInfo(QObject *parent) : InternCommand(parent) {}
ChangeDir::ChangeDir(QObject *parent) : InternCommand(parent) {}
Tree::Tree(QObject *parent) : InternCommand(parent) {}
QString DownloadFile::cmdName() {return "fs_download";}
QString UploadFile::cmdName() {return "fs_upload";}
@ -35,6 +36,7 @@ QString MakePath::cmdName() {return "fs_mkpath";}
QString ListFiles::cmdName() {return "fs_list";}
QString FileInfo::cmdName() {return "fs_info";}
QString ChangeDir::cmdName() {return "fs_cd";}
QString Tree::cmdName() {return "fs_tree";}
bool DownloadFile::handlesGenfile()
{
@ -74,7 +76,7 @@ void DownloadFile::sendChunk()
void DownloadFile::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if ((dType == GEN_FILE) && (moreInputEnabled() || loopEnabled()))
{
@ -196,7 +198,7 @@ void UploadFile::run()
void UploadFile::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (((dType == GEN_FILE) || (dType == TEXT)) && confirm)
{
@ -299,7 +301,7 @@ void Delete::run()
void Delete::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (moreInputEnabled() && (dType == TEXT))
{
@ -460,7 +462,7 @@ void Copy::run()
void Copy::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (loopEnabled())
{
@ -652,7 +654,7 @@ bool Move::permissionsOk(bool dstExists)
void MakePath::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (dType == TEXT)
{
@ -672,13 +674,14 @@ void MakePath::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uc
void ListFiles::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (dType == TEXT)
{
QStringList args = parseArgs(binIn, 3);
QStringList args = parseArgs(binIn, 4);
QString path = getParam("-path", args);
bool infoFrame = argExists("-info_frame", args);
bool noHidden = argExists("-no_hidden", args);
if (path.isEmpty())
{
@ -703,7 +706,15 @@ void ListFiles::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, u
{
QDir dir(path);
dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
if (noHidden)
{
dir.setFilter(QDir::AllEntries | QDir::System | QDir::NoDotAndDotDot);
}
else
{
dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
}
dir.setSorting(QDir::DirsFirst | QDir::Name);
QFileInfoList list = dir.entryInfoList();
@ -729,7 +740,7 @@ void ListFiles::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, u
void FileInfo::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (dType == TEXT)
{
@ -783,7 +794,7 @@ void FileInfo::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uc
void ChangeDir::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (dType == TEXT)
{
@ -810,3 +821,103 @@ void ChangeDir::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, u
}
}
}
void Tree::term()
{
queue.clear();
infoFrames = false;
noHidden = false;
}
void Tree::printList(const QString &path)
{
QDir dir(path);
if (noHidden)
{
dir.setFilter(QDir::AllEntries | QDir::System | QDir::NoDotAndDotDot);
}
else
{
dir.setFilter(QDir::AllEntries | QDir::Hidden | QDir::System | QDir::NoDotAndDotDot);
}
dir.setSorting(QDir::DirsFirst | QDir::Name);
QFileInfoList list = dir.entryInfoList();
for (auto&& info : list)
{
if (infoFrames)
{
emit dataToClient(toFILE_INFO(info), FILE_INFO);
}
else if (info.isDir())
{
mainTxt(info.filePath() + "/" + "\n");
}
else
{
mainTxt(info.filePath() + "\n");
}
if (info.isDir())
{
queue.append(info);
}
}
if (queue.isEmpty())
{
term();
emit enableLoop(false);
}
else
{
emit enableLoop(true);
}
}
void Tree::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs)
if (loopEnabled())
{
printList(queue.takeFirst().filePath());
}
else if (dType == TEXT)
{
QStringList args = parseArgs(binIn, 4);
QString path = getParam("-path", args);
infoFrames = argExists("-info_frame", args);
noHidden = argExists("-no_hidden", args);
if (path.isEmpty())
{
path = QDir::currentPath();
}
QFileInfo pathInfo(path);
if (!pathInfo.exists())
{
errTxt("err: '" + path + "' does not exists.\n");
}
else if (!pathInfo.isDir())
{
errTxt("err: '" + path + "' is not a directory.\n");
}
else if (!pathInfo.isReadable())
{
errTxt("err: Cannot read '" + path + "' permission denied.\n");
}
else
{
printList(path);
}
}
}

24
src/commands/fs.h
View File

@ -217,4 +217,28 @@ public:
explicit ChangeDir(QObject *parent = nullptr);
};
//--------------------------
class Tree : public InternCommand
{
Q_OBJECT
private:
QFileInfoList queue;
bool infoFrames;
bool noHidden;
void printList(const QString &path);
public:
static QString cmdName();
void term();
void procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType);
explicit Tree(QObject *parent = nullptr);
};
#endif // FS_H

8
src/commands/mods.cpp
View File

@ -125,13 +125,11 @@ void UploadMod::procFinished(int exStatus)
}
else if (!libExists(modPath + "/main"))
{
errTxt("\nerr: The module's main library file does not exists.\n");
errTxt("\nerr: The module's main library file does not exists or is not supported.\n");
clearOnfailure();
}
else
{
modPath = modPath + "/main";
Query db(this);
db.setType(Query::UPDATE, TABLE_MODULES);
@ -229,7 +227,7 @@ void UploadMod::setup()
void UploadMod::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (moreInputEnabled() && (dType == GEN_FILE) && (proc->state() == QProcess::NotRunning))
{
@ -322,7 +320,7 @@ void UploadMod::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, u
void DelMod::procBin(const SharedObjs *sharedObjs, const QByteArray &binIn, uchar dType)
{
Q_UNUSED(sharedObjs);
Q_UNUSED(sharedObjs)
if (dType == TEXT)
{

2
src/db.h
View File

@ -37,7 +37,7 @@
#include "shell.h"
#define APP_NAME "MRCI"
#define APP_VER "1.1.2"
#define APP_VER "1.1.3"
#define APP_TARGET "mrci"
#ifdef Q_OS_WIN

2
src/int_loader.cpp
View File

@ -117,6 +117,7 @@ InternalCommandLoader::InternalCommandLoader(RWSharedObjs *sharedData, QObject *
objNames << SetGroupRank::cmdName();
objNames << CmdInfo::cmdName();
objNames << OwnerOverride::cmdName();
objNames << Tree::cmdName();
}
void InternalCommandLoader::loadSettings()
@ -292,6 +293,7 @@ InternCommand *InternalCommandLoader::cmdObj(const QString &name)
else if (noCaseMatch(name, SetGroupRank::cmdName())) ret = new SetGroupRank(this);
else if (noCaseMatch(name, CmdInfo::cmdName())) ret = new CmdInfo(this);
else if (noCaseMatch(name, OwnerOverride::cmdName())) ret = new OwnerOverride(this);
else if (noCaseMatch(name, Tree::cmdName())) ret = new Tree(this);
if (ret == nullptr)
{

1
src/main.cpp
View File

@ -77,6 +77,7 @@ int main(int argc, char *argv[])
serializeThread(app.thread());
QDir::setCurrent(QDir::homePath());
QCoreApplication::setApplicationName(APP_NAME);
QCoreApplication::setApplicationVersion(APP_VER);