mirror of
https://github.com/QuasarApp/CQtDeployer.git
synced 2025-05-02 20:49:35 +00:00
added ignoreRules
This commit is contained in:
parent
f90952068e
commit
89a3c267e4
@ -66,6 +66,10 @@ void Envirement::addEnv(const QString &dir, const QString &appDir, const QString
|
|||||||
_deployEnvironment.insert(QDir::fromNativeSeparators(path));
|
_deployEnvironment.insert(QDir::fromNativeSeparators(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Envirement::inThisEnvirement(const QString &file) const {
|
||||||
|
//return _deployEnvironment.contains(file);
|
||||||
|
}
|
||||||
|
|
||||||
int Envirement::size() const {
|
int Envirement::size() const {
|
||||||
return _deployEnvironment.size();
|
return _deployEnvironment.size();
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,8 @@ public:
|
|||||||
void setIgnoreEnvList(const QStringList &ignoreEnvList);
|
void setIgnoreEnvList(const QStringList &ignoreEnvList);
|
||||||
|
|
||||||
void addEnv(const QString &dir, const QString &appDir, const QString &targetDir);
|
void addEnv(const QString &dir, const QString &appDir, const QString &targetDir);
|
||||||
|
// return true if file exits in this envirement
|
||||||
|
bool inThisEnvirement(const QString &file) const;
|
||||||
|
|
||||||
int size() const;
|
int size() const;
|
||||||
QString concatEnv() const;
|
QString concatEnv() const;
|
||||||
|
@ -19,20 +19,27 @@ void IgnoreRule::addRule(const IgnoreData &rule) {
|
|||||||
_data.push_back(rule);
|
_data.push_back(rule);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IgnoreRule::check() {
|
bool IgnoreRule::check(const LibInfo &info, const QString& ignoreLabel) {
|
||||||
for (auto ignore : DeployCore::_config->ignoreList) {
|
if (info.fullPath().contains(ignoreLabel)) {
|
||||||
if (line.fullPath().contains(ignore)) {
|
QuasarAppUtils::Params::verboseLog(info.fullPath() + " ignored by filter" + ignoreLabel);
|
||||||
QuasarAppUtils::Params::verboseLog(line.fullPath() + " ignored by filter" + ignore);
|
return true;
|
||||||
isIgnore = true;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IgnoreRule::isIgnore(const LibInfo &info) {
|
bool IgnoreRule::isIgnore(const LibInfo &info) {
|
||||||
|
|
||||||
|
for (auto &ignore : _data) {
|
||||||
|
|
||||||
|
bool checkPlatform = ignore.platform == info.getPlatform() || ignore.platform == UnknownPlatform;
|
||||||
|
bool checkPriority = ignore.prority <= info.getPriority();
|
||||||
|
|
||||||
|
if (checkPlatform && ignore.prority <= info.getPriority() && ) {
|
||||||
|
|
||||||
|
}
|
||||||
|
ignore.prority >
|
||||||
|
}
|
||||||
|
|
||||||
check();
|
check();
|
||||||
}
|
}
|
||||||
|
@ -27,8 +27,7 @@ private:
|
|||||||
|
|
||||||
bool checkOnlytext(const QString& lib);
|
bool checkOnlytext(const QString& lib);
|
||||||
|
|
||||||
void check();
|
bool check(const LibInfo &info, const QString &ignoreLabel);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
IgnoreRule();
|
IgnoreRule();
|
||||||
void addRule(const IgnoreData& rule);
|
void addRule(const IgnoreData& rule);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user