Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanup in cli/Show.cpp

Browse Source
This commit is contained in:
louib 2020-01-23 20:54:36 -05:00 committed by Jonathan White
parent b78ca924fd
commit c97ee5395b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/Show.cpp
View File

@ -78,7 +78,7 @@ int Show::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
} }
// If no attributes specified, output the default attribute set. // If no attributes specified, output the default attribute set.
bool showAttributeNames = attributes.isEmpty() && !showTotp; bool showDefaultAttributes = attributes.isEmpty() && !showTotp;
if (attributes.isEmpty() && !showTotp) { if (attributes.isEmpty() && !showTotp) {
attributes = EntryAttributes::DefaultAttributes; attributes = EntryAttributes::DefaultAttributes;
} }
@ -91,10 +91,10 @@ int Show::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
errorTextStream << QObject::tr("ERROR: unknown attribute %1.").arg(attributeName) << endl; errorTextStream << QObject::tr("ERROR: unknown attribute %1.").arg(attributeName) << endl;
continue; continue;
} }
if (showAttributeNames) { if (showDefaultAttributes) {
outputTextStream << attributeName << ": "; outputTextStream << attributeName << ": ";
} }
if (entry->attributes()->isProtected(attributeName) && showAttributeNames && !showProtectedAttributes) { if (entry->attributes()->isProtected(attributeName) && showDefaultAttributes && !showProtectedAttributes) {
outputTextStream << "PROTECTED" << endl; outputTextStream << "PROTECTED" << endl;
} else { } else {
outputTextStream << entry->resolveMultiplePlaceholders(entry->attributes()->value(attributeName)) << endl; outputTextStream << entry->resolveMultiplePlaceholders(entry->attributes()->value(attributeName)) << endl;
@ -102,9 +102,6 @@ int Show::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<
} }
if (showTotp) { if (showTotp) {
if (showAttributeNames) {
outputTextStream << "TOTP: ";
}
outputTextStream << entry->totp() << endl; outputTextStream << entry->totp() << endl;
} }