QuasarApp/CopyrightFixer
4
0
Fork 0
mirror of https://github.com/QuasarApp/CopyrightFixer.git synced 2025-04-27 02:04:41 +00:00
Code Issues Projects Releases Wiki Activity

ref #60 Fixing name varialble. Chanch license.

Browse Source
This commit is contained in:
IgorekLoschinin 2021-06-06 21:27:13 +03:00
parent 7789c4c170
commit ec411c47eb
2 changed files with 57 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/CopyrighFixer/CopyrighFixer/signer.cpp
View File

@ -35,7 +35,7 @@ bool Signer::checkSign(const Config &objConf) {
IFileManager *currFM = searchFileByExt(i_file.suffix()); IFileManager *currFM = searchFileByExt(i_file.suffix());
Signature signFromFile; Signature signFromFile;
Signature signForWrite; Signature resultSign;
if (currFM == nullptr) { if (currFM == nullptr) {
return false; return false;
@ -45,9 +45,9 @@ bool Signer::checkSign(const Config &objConf) {
return false; return false;
} }
signForWrite = mergeSign(currConfig.getSignVal(), signFromFile); resultSign = mergeSign(currConfig.getSignVal(), signFromFile);
if (!currFM->write(i_file.filePath(), signForWrite)) { if (!currFM->write(i_file.filePath(), resultSign)) {
return false; return false;
} }
} }
@ -62,48 +62,44 @@ const Signature Signer::mergeSign(const Signature &userSign, const Signature &fi
return userSign; return userSign;
} }
if (userSign.getLicenseTitle() == fileSign.getLicenseTitle()) { if (userSign.getLicenseTitle() != fileSign.getLicenseTitle()) {
if (!fileSign.isValid()) {
return userSign;
}
if (userSign.getMapOwn().size() > 1) {
QuasarAppUtils::Params::log("Config signature contains more owners.",
QuasarAppUtils::VerboseLvl::Warning);
return fileSign;
}
Signature signForSing = fileSign;
if (userSign.getMapOwn().cbegin().value().getOwnerName() == signForSing.getMapOwn().cbegin().value().getOwnerName()) {
QMap<int, CopyrighFixer::Owner> mapOwners = signForSing.getMapOwn();
mapOwners.remove(fileSign.getMapOwn().cbegin().key());
mapOwners.insert(userSign.getMapOwn().cbegin().key(),
userSign.getMapOwn().cbegin().value());
signForSing.setMapOwners(mapOwners);
return signForSing;
} else {
QMap<int, CopyrighFixer::Owner> mapOwners = signForSing.getMapOwn();
mapOwners.insert(userSign.getMapOwn().cbegin().key(),
userSign.getMapOwn().cbegin().value());
signForSing.setMapOwners(mapOwners);
return signForSing;
}
return fileSign;
} else {
QuasarAppUtils::Params::log("The signature in the file is different from the config signature.", QuasarAppUtils::Params::log("The signature in the file is different from the config signature.",
QuasarAppUtils::VerboseLvl::Warning); QuasarAppUtils::VerboseLvl::Warning);
return fileSign; return fileSign;
} }
if (userSign.getMapOwn().size() > 1) {
QuasarAppUtils::Params::log("Config signature contains more owners.",
QuasarAppUtils::VerboseLvl::Warning);
return fileSign;
}
Signature signForSing = fileSign;
if (userSign.getMapOwn().cbegin().value().getOwnerName() == signForSing.getMapOwn().cbegin().value().getOwnerName()) {
QMap<int, CopyrighFixer::Owner> mapOwners = signForSing.getMapOwn();
mapOwners.remove(fileSign.getMapOwn().cbegin().key());
mapOwners.insert(userSign.getMapOwn().cbegin().key(),
userSign.getMapOwn().cbegin().value());
signForSing.setMapOwners(mapOwners);
return signForSing;
}
if (userSign.getMapOwn().cbegin().value().getOwnerName() != signForSing.getMapOwn().cbegin().value().getOwnerName()) {
QMap<int, CopyrighFixer::Owner> mapOwners = signForSing.getMapOwn();
mapOwners.insert(userSign.getMapOwn().cbegin().key(),
userSign.getMapOwn().cbegin().value());
signForSing.setMapOwners(mapOwners);
return signForSing;
}
return fileSign;
} }
IFileManager *Signer::searchFileByExt(const QString &extension) { IFileManager *Signer::searchFileByExt(const QString &extension) {

42
tests/units/signertest.cpp
View File

@ -64,49 +64,49 @@ QList<SignerTest::Signers> SignerTest::lstSing() const {
// 1 // 1
// The case when the signatures in the config and the file match. // The case when the signatures in the config and the file match.
SignerTest::Signers equalSign; SignerTest::Signers equalSign;
equalSign.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); equalSign.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
equalSign.signFormFile = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); equalSign.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
equalSign.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); equalSign.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
// 2 // 2
// The Different licenses. // The Different licenses.
SignerTest::Signers signDiffLic; SignerTest::Signers signDiffLic;
signDiffLic.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signDiffLic.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
signDiffLic.signFormFile = genSign("Copyright (C) 2019-2020 QuasarApp.", "QuasarApp", 1622657022); signDiffLic.signFormFile = genSign("MIT License Copyright (C) 2019-2020 QuasarApp.", "QuasarApp", 1622657022);
signDiffLic.signAfterMerge = genSign("Copyright (C) 2019-2020 QuasarApp.", "QuasarApp", 1622657022); signDiffLic.signAfterMerge = genSign("MIT License Copyright (C) 2019-2020 QuasarApp.", "QuasarApp", 1622657022);
// 3 // 3
// The Different owners. // The Different owners.
SignerTest::Signers signDiffOwn; SignerTest::Signers signDiffOwn;
signDiffOwn.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signDiffOwn.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signDiffOwn.signFormFile = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022); signDiffOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022);
signDiffOwn.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022); signDiffOwn.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarAppSdfdf", 1622657022);
QMap<int, CopyrighFixer::Owner> multiSign = signDiffOwn.signAfterMerge.getMapOwn(); QMap<int, CopyrighFixer::Owner> multiSign = signDiffOwn.signAfterMerge.getMapOwn();
multiSign.insert(1700000000, genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000).getMapOwn().cbegin().value()); multiSign.insert(1700000000, genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000).getMapOwn().cbegin().value());
signDiffOwn.signAfterMerge.setMapOwners(multiSign); signDiffOwn.signAfterMerge.setMapOwners(multiSign);
// 4 // 4
// The equal owners. // The equal owners.
SignerTest::Signers signEqualOwn; SignerTest::Signers signEqualOwn;
signEqualOwn.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signEqualOwn.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signEqualOwn.signFormFile = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signEqualOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
signEqualOwn.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signEqualOwn.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
// 5 // 5
// The signature is missing from the file. // The signature is missing from the file.
SignerTest::Signers signMissingInFile; SignerTest::Signers signMissingInFile;
signMissingInFile.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signMissingInFile.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
signMissingInFile.signFormFile = genSign(); signMissingInFile.signFormFile = genSign();
signMissingInFile.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signMissingInFile.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
// 6 // 6
// Here are no owners in the file. // Here are no owners in the file.
SignerTest::Signers signMissOwnInFile; SignerTest::Signers signMissOwnInFile;
signMissOwnInFile.signFormConf = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signMissOwnInFile.signFormConf = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
signMissOwnInFile.signFormFile = genSign("Copyright (C) 2020-2021 QuasarApp."); signMissOwnInFile.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.");
signMissOwnInFile.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022); signMissOwnInFile.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1622657022);
// 7 // 7
// Generating multiple owners. // Generating multiple owners.
@ -124,9 +124,9 @@ QList<SignerTest::Signers> SignerTest::lstSing() const {
// The number of owners differs. // The number of owners differs.
SignerTest::Signers signDiffNumOwn; SignerTest::Signers signDiffNumOwn;
signDiffNumOwn.signFormConf = genSign(Owns, "Copyright (C) 2020-2021 QuasarApp."); signDiffNumOwn.signFormConf = genSign(Owns, "MIT License Copyright (C) 2020-2021 QuasarApp.");
signDiffNumOwn.signFormFile = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signDiffNumOwn.signFormFile = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
signDiffNumOwn.signAfterMerge = genSign("Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000); signDiffNumOwn.signAfterMerge = genSign("MIT License Copyright (C) 2020-2021 QuasarApp.", "QuasarApp", 1700000000);
return {equalSign, signDiffLic, signDiffOwn, signEqualOwn, signMissingInFile, signMissOwnInFile, signDiffNumOwn}; return {equalSign, signDiffLic, signDiffOwn, signEqualOwn, signMissingInFile, signMissOwnInFile, signDiffNumOwn};