wilderjds
/
krunner-pass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add config options, remove deprecations, optimize

Browse Source
master
alex1701c 6 years ago
parent c0c88e97d1
commit 7194271cec
8 changed files with 120 additions and 93 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 3
      README.md
  3. 83
      config.cpp
  4. 1
      config.h
  5. 47
      config.ui
  6. 2
      install.sh
  7. 51
      pass.cpp
  8. 4
      pass.h

2
CMakeLists.txt
Unescape View File

@ -44,6 +44,6 @@ target_link_libraries(krunner_pass KF5::Runner Qt5::Widgets
add_dependencies(krunner_pass kcm_krunner_pass) add_dependencies(krunner_pass kcm_krunner_pass)
install(TARGETS krunner_pass kcm_krunner_pass DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS krunner_pass kcm_krunner_pass DESTINATION ${KDE_INSTALL_QTPLUGINDIR})
install(FILES plasma-runner-pass.desktop plasma-runner-pass_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES plasma-runner-pass.desktop plasma-runner-pass_config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
install(FILES krunner_pass.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR}) install(FILES krunner_pass.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})

3
README.md
Unescape View File

@ -34,7 +34,8 @@ apt-get install build-essential cmake extra-cmake-modules gettext \
libkf5service-dev \ libkf5service-dev \
libkf5runner-dev \ libkf5runner-dev \
libkf5textwidgets-dev \ libkf5textwidgets-dev \
libkf5notifications-dev libkf5notifications-dev \
libkf5kcmutils-dev
mkdir -p build mkdir -p build
cd build cd build

83
config.cpp
Unescape View File

@ -22,13 +22,13 @@
#include <QToolButton> #include <QToolButton>
#include <QtCore/QDir> #include <QtCore/QDir>
#include "kcmutils_version.h"
#include "config.h" #include "config.h"
K_PLUGIN_FACTORY(PassConfigFactory, registerPlugin<PassConfig>("kcm_krunner_pass");) K_PLUGIN_FACTORY(PassConfigFactory, registerPlugin<PassConfig>("kcm_krunner_pass");)
PassConfigForm::PassConfigForm(QWidget *parent)
: QWidget(parent)
PassConfigForm::PassConfigForm(QWidget *parent) : QWidget(parent)
{ {
setupUi(this); setupUi(this);
this->listSavedActions->setDragEnabled(true); this->listSavedActions->setDragEnabled(true);
@ -49,16 +49,17 @@ PassConfigForm::PassConfigForm(QWidget *parent) : QWidget(parent)
}); });
// Disable add button if the necessary field are not filled out // Disable add button if the necessary field are not filled out
connect(this->lineIcon, SIGNAL(textChanged(QString)), this, SLOT(validateAddButton())); connect(this->lineIcon, &QLineEdit::textChanged, this, &PassConfigForm::validateAddButton);
connect(this->lineName, SIGNAL(textChanged(QString)), this, SLOT(validateAddButton())); connect(this->lineName, &QLineEdit::textChanged, this, &PassConfigForm::validateAddButton);
connect(this->lineRegEx, SIGNAL(textChanged(QString)), this, SLOT(validateAddButton())); connect(this->lineRegEx, &QLineEdit::textChanged, this, &PassConfigForm::validateAddButton);
validateAddButton(); validateAddButton();
} }
void PassConfigForm::addPassAction(const QString &name, const QString &icon, const QString &regex, bool isNew /* = true */) void
PassConfigForm::addPassAction(const QString &name, const QString &icon, const QString &regex, bool isNew /* = true */)
{ {
// Checks // Checks
for (const auto& act: this->passActions()) for (const auto &act: this->passActions())
if (act.name == name) if (act.name == name)
return; return;
@ -74,8 +75,8 @@ void PassConfigForm::addPassAction(const QString &name, const QString &icon, con
listWidget->setLayout(layoutAction); listWidget->setLayout(layoutAction);
// Item // Item
auto *item = new QListWidgetItem(name + (isNew ? "*":""), this->listSavedActions); auto *item = new QListWidgetItem(name + (isNew ? "*" : ""), this->listSavedActions);
item->setData(Qt::UserRole, QVariant::fromValue(PassAction {name, icon, regex})); item->setData(Qt::UserRole, QVariant::fromValue(PassAction{name, icon, regex}));
this->listSavedActions->setItemWidget(item, listWidget); this->listSavedActions->setItemWidget(item, listWidget);
this->clearInputs(); this->clearInputs();
@ -95,9 +96,8 @@ void PassConfigForm::addPassAction(const QString &name, const QString &icon, con
QVector<PassAction> PassConfigForm::passActions() QVector<PassAction> PassConfigForm::passActions()
{ {
QVector<PassAction> passActions; QVector<PassAction> passActions;
const int listSavedActionsCount = this->listSavedActions->count(); for (int i = 0; i < listSavedActions->count(); ++i) {
for(int i = 0; i < listSavedActionsCount; ++i) { QListWidgetItem *item = this->listSavedActions->item(i);
QListWidgetItem* item = this->listSavedActions->item(i);
passActions << item->data(Qt::UserRole).value<PassAction>(); passActions << item->data(Qt::UserRole).value<PassAction>();
} }
return passActions; return passActions;
@ -105,9 +105,8 @@ QVector<PassAction> PassConfigForm::passActions()
void PassConfigForm::clearPassActions() void PassConfigForm::clearPassActions()
{ {
const int listSavedActionsCount = this->listSavedActions->count(); for (int i = 0; i < listSavedActions->count(); ++i) {
for(int i = 0; i < listSavedActionsCount; ++i) { QListWidgetItem *item = this->listSavedActions->item(i);
QListWidgetItem* item = this->listSavedActions->item(i);
delete this->listSavedActions->itemWidget(item); delete this->listSavedActions->itemWidget(item);
} }
@ -121,25 +120,31 @@ void PassConfigForm::clearInputs()
this->lineRegEx->clear(); this->lineRegEx->clear();
} }
void PassConfigForm::validateAddButton() { void PassConfigForm::validateAddButton()
{
this->buttonAddAction->setDisabled(this->lineIcon->text().isEmpty() || this->buttonAddAction->setDisabled(this->lineIcon->text().isEmpty() ||
this->lineName->text().isEmpty() || this->lineName->text().isEmpty() ||
this->lineRegEx->text().isEmpty()); this->lineRegEx->text().isEmpty());
} }
PassConfig::PassConfig(QWidget *parent, const QVariantList &args)
PassConfig::PassConfig(QWidget *parent, const QVariantList &args) : :
KCModule(parent, args) KCModule(parent, args)
{ {
this->ui = new PassConfigForm(this); this->ui = new PassConfigForm(this);
QGridLayout* layout = new QGridLayout(this); QGridLayout *layout = new QGridLayout(this);
layout->addWidget(ui, 0, 0); layout->addWidget(ui, 0, 0);
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 64, 0)
connect(this->ui,SIGNAL(passActionAdded()),this,SLOT(changed())); const auto changedSlotPointer = &PassConfig::markAsChanged;
connect(this->ui,SIGNAL(passActionRemoved()),this,SLOT(changed())); #else
connect(this->ui->checkAdditionalActions,SIGNAL(stateChanged(int)),this,SLOT(changed())); const auto changedSlotPointer = static_cast<void (PassConfig::*)()>(&PassConfig::changed);
connect(this->ui->checkShowFileContentAction,SIGNAL(stateChanged(int)),this,SLOT(changed())); #endif
connect(this->ui->listSavedActions,SIGNAL(itemSelectionChanged()), this, SLOT(changed())); connect(this->ui, &PassConfigForm::passActionAdded, this, changedSlotPointer);
connect(this->ui, &PassConfigForm::passActionRemoved, this, changedSlotPointer);
connect(this->ui->checkShowOnlyPrefixed, &QCheckBox::stateChanged, this, changedSlotPointer);
connect(this->ui->checkAdditionalActions, &QCheckBox::stateChanged, this, changedSlotPointer);
connect(this->ui->checkShowFileContentAction, &QCheckBox::stateChanged, this, changedSlotPointer);
connect(this->ui->listSavedActions, &QListWidget::itemSelectionChanged, this, changedSlotPointer);
} }
void PassConfig::load() void PassConfig::load()
@ -147,13 +152,13 @@ void PassConfig::load()
KCModule::load(); KCModule::load();
KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc")); KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc"));
KConfigGroup passCfg = cfg->group("Runners"); KConfigGroup passCfg = cfg->group("Runners").group("Pass");
passCfg = KConfigGroup(&passCfg, "Pass");
bool showOnlyPrefixed = passCfg.readEntry(Config::showOnlyPrefixed, false);
bool showActions = passCfg.readEntry(Config::showActions, false); bool showActions = passCfg.readEntry(Config::showActions, false);
bool showFileContentAction = passCfg.readEntry(Config::showFileContentAction, false); bool showFileContentAction = passCfg.readEntry(Config::showFileContentAction, false);
this->ui->checkShowOnlyPrefixed->setChecked(showOnlyPrefixed);
this->ui->checkAdditionalActions->setChecked(showActions); this->ui->checkAdditionalActions->setChecked(showActions);
this->ui->checkShowFileContentAction->setChecked(showFileContentAction); this->ui->checkShowFileContentAction->setChecked(showFileContentAction);
@ -161,14 +166,11 @@ void PassConfig::load()
this->ui->clearPassActions(); this->ui->clearPassActions();
const auto actionGroup = passCfg.group(Config::Group::Actions); const auto actionGroup = passCfg.group(Config::Group::Actions);
for (const auto& name: actionGroup.groupList()) { for (const auto &name: actionGroup.groupList()) {
auto group = actionGroup.group(name); auto group = actionGroup.group(name);
auto passAction = PassAction::fromConfig(group); auto passAction = PassAction::fromConfig(group);
this->ui->addPassAction(passAction.name, passAction.icon, passAction.regex, false); this->ui->addPassAction(passAction.name, passAction.icon, passAction.regex, false);
} }
emit changed(false);
} }
void PassConfig::save() void PassConfig::save()
@ -176,13 +178,13 @@ void PassConfig::save()
KCModule::save(); KCModule::save();
KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc")); KSharedConfig::Ptr cfg = KSharedConfig::openConfig(QStringLiteral("krunnerrc"));
KConfigGroup passCfg = cfg->group("Runners"); KConfigGroup passCfg = cfg->group("Runners").group("Pass");
passCfg = KConfigGroup(&passCfg, "Pass");
auto showOnlyPrefixed = this->ui->checkShowOnlyPrefixed->isChecked();
auto showActions = this->ui->checkAdditionalActions->isChecked(); auto showActions = this->ui->checkAdditionalActions->isChecked();
auto showFileContentAction = this->ui->checkShowFileContentAction->isChecked(); auto showFileContentAction = this->ui->checkShowFileContentAction->isChecked();
passCfg.writeEntry(Config::showOnlyPrefixed, showOnlyPrefixed);
passCfg.writeEntry(Config::showActions, showActions); passCfg.writeEntry(Config::showActions, showActions);
passCfg.writeEntry(Config::showFileContentAction, showFileContentAction); passCfg.writeEntry(Config::showFileContentAction, showFileContentAction);
@ -190,25 +192,28 @@ void PassConfig::save()
if (showActions) { if (showActions) {
int i = 0; int i = 0;
for (PassAction& act: this->ui->passActions()) { for (PassAction &act: this->ui->passActions()) {
auto group = passCfg.group(Config::Group::Actions).group(QString::number(i++)); auto group = passCfg.group(Config::Group::Actions).group(QString::number(i++));
act.writeToConfig(group); act.writeToConfig(group);
} }
} }
emit changed(false);
} }
void PassConfig::defaults() void PassConfig::defaults()
{ {
KCModule::defaults(); KCModule::defaults();
ui->checkShowOnlyPrefixed->setChecked(false);
ui->checkAdditionalActions->setChecked(false); ui->checkAdditionalActions->setChecked(false);
ui->checkShowFileContentAction->setChecked(false); ui->checkShowFileContentAction->setChecked(false);
ui->clearPassActions(); ui->clearPassActions();
ui->clearInputs(); ui->clearInputs();
#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 64, 0)
emit markAsChanged();
#else
emit changed(true); emit changed(true);
#endif
} }

1
config.h
Unescape View File

@ -25,6 +25,7 @@
struct Config { struct Config {
constexpr static const char *showOnlyPrefixed = "showOnlyPrefixed";
constexpr static const char *showActions = "showAdditionalActions"; constexpr static const char *showActions = "showAdditionalActions";
constexpr static const char *showFileContentAction = "showFullFileContentAction"; constexpr static const char *showFileContentAction = "showFullFileContentAction";
struct Group { struct Group {

47
config.ui
Unescape View File

@ -6,32 +6,37 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>314</width> <width>356</width>
<height>420</height> <height>421</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Pass Config</string> <string>Pass Config</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="checkAdditionalActions"> <widget class="QGroupBox" name="boxSavedActions">
<property name="text"> <property name="enabled">
<string>Show additional actions</string> <bool>false</bool>
</property>
<property name="title">
<string>Saved Actions</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QListWidget" name="listSavedActions"/>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="checkShowFileContentAction"> <widget class="QCheckBox" name="checkAdditionalActions">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text"> <property name="text">
<string>Show an action for displaying full file content</string> <string>Show additional actions</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="boxNewAction"> <widget class="QGroupBox" name="boxNewAction">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -93,19 +98,21 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QGroupBox" name="boxSavedActions"> <widget class="QCheckBox" name="checkShowFileContentAction">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="title"> <property name="text">
<string>Saved Actions</string> <string>Show an action for displaying full file content</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> </widget>
<item row="0" column="0">
<widget class="QListWidget" name="listSavedActions"/>
</item> </item>
</layout> <item row="0" column="0">
<widget class="QCheckBox" name="checkShowOnlyPrefixed">
<property name="text">
<string>Show only options when query starts with &quot;pass&quot;</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

2
install.sh
Unescape View File

@ -5,7 +5,7 @@ set -e
mkdir -p build mkdir -p build
cd build cd build
cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` -DQT_PLUGIN_INSTALL_DIR=`kf5-config --qt-plugins` -DCMAKE_BUILD_TYPE=Release cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_INSTALL_PREFIX=`kf5-config --prefix` -DCMAKE_BUILD_TYPE=Release
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install

51
pass.cpp
Unescape View File

@ -17,7 +17,7 @@
*****************************************************************************/ *****************************************************************************/
#include <KSharedConfig> #include <KSharedConfig>
#include <KLocalizedString> #include <KLocalizedString>
#include <knotification.h> #include <KNotification>
#include <QAction> #include <QAction>
#include <QDirIterator> #include <QDirIterator>
@ -60,20 +60,24 @@ void Pass::reloadConfiguration()
KConfigGroup cfg = config(); KConfigGroup cfg = config();
this->showActions = cfg.readEntry(Config::showActions, false); this->showActions = cfg.readEntry(Config::showActions, false);
this->showOnlyPrefixed = cfg.readEntry(Config::showOnlyPrefixed, false);
if (showActions) { if (showActions) {
const auto configActions = cfg.group(Config::Group::Actions); const auto configActions = cfg.group(Config::Group::Actions);
// Create actions for every additional field // Create actions for every additional field
for (const auto& name: configActions.groupList() ) { for (const auto &name: configActions.groupList()) {
auto group = configActions.group(name); auto group = configActions.group(name);
auto passAction = PassAction::fromConfig(group); auto passAction = PassAction::fromConfig(group);
auto icon = QIcon::fromTheme(passAction.icon, QIcon::fromTheme("object-unlocked")); auto icon = QIcon::fromTheme(passAction.icon, QIcon::fromTheme("object-unlocked"));
QAction *act = addAction(passAction.name, icon , passAction.name); QAction *act = addAction(passAction.name, icon, passAction.name);
act->setData(passAction.regex); act->setData(passAction.regex);
this->orderedActions << act; this->orderedActions << act;
} }
} else {
this->orderedActions.clear();
} }
if (cfg.readEntry(Config::showFileContentAction, false)) { if (cfg.readEntry(Config::showFileContentAction, false)) {
@ -113,10 +117,11 @@ void Pass::init()
initPasswords(); initPasswords();
connect(&watcher, SIGNAL(directoryChanged(QString)), this, SLOT(reinitPasswords(QString))); connect(&watcher, &QFileSystemWatcher::directoryChanged, this, &Pass::reinitPasswords);
} }
void Pass::initPasswords() { void Pass::initPasswords()
{
passwords.clear(); passwords.clear();
watcher.addPath(this->baseDir.absolutePath()); watcher.addPath(this->baseDir.absolutePath());
@ -124,7 +129,7 @@ void Pass::initPasswords() {
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
const auto fileInfo = it.fileInfo(); const auto fileInfo = it.fileInfo();
if (fileInfo.isFile() && fileInfo.suffix() == "gpg") { if (fileInfo.isFile() && fileInfo.suffix() == QLatin1String("gpg")) {
QString password = this->baseDir.relativeFilePath(fileInfo.absoluteFilePath()); QString password = this->baseDir.relativeFilePath(fileInfo.absoluteFilePath());
// Remove suffix ".gpg" // Remove suffix ".gpg"
password.chop(4); password.chop(4);
@ -135,7 +140,8 @@ void Pass::initPasswords() {
} }
} }
void Pass::reinitPasswords(const QString &path) { void Pass::reinitPasswords(const QString &path)
{
Q_UNUSED(path); Q_UNUSED(path);
lock.lockForWrite(); lock.lockForWrite();
@ -145,15 +151,24 @@ void Pass::reinitPasswords(const QString &path) {
void Pass::match(Plasma::RunnerContext &context) void Pass::match(Plasma::RunnerContext &context)
{ {
if (!context.isValid()) return; if (!context.isValid()) {
return;
}
const auto input = context.query(); auto input = context.query();
if (showOnlyPrefixed) {
if (input.startsWith(queryPrefix)) {
input = input.remove(queryPrefix).simplified();
} else {
return;
}
}
QList<Plasma::QueryMatch> matches; QList<Plasma::QueryMatch> matches;
lock.lockForRead(); lock.lockForRead();
for (const auto& password: passwords) { for (const auto &password: qAsConst(passwords)) {
if (password.contains(input,Qt::CaseInsensitive)) { if (password.contains(input, Qt::CaseInsensitive)) {
Plasma::QueryMatch match(this); Plasma::QueryMatch match(this);
match.setType(input.length() == password.length() ? match.setType(input.length() == password.length() ?
Plasma::QueryMatch::ExactMatch : Plasma::QueryMatch::CompletionMatch); Plasma::QueryMatch::ExactMatch : Plasma::QueryMatch::CompletionMatch);
@ -172,7 +187,7 @@ void Pass::clip(const QString &msg)
QClipboard *cb = QApplication::clipboard(); QClipboard *cb = QApplication::clipboard();
cb->setText(msg); cb->setText(msg);
QTimer::singleShot(timeout * 1000, cb, [cb]() { QTimer::singleShot(timeout * 1000, cb, [cb]() {
cb->clear(); cb->setText(QString());
}); });
} }
@ -185,10 +200,9 @@ void Pass::run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &m
auto *pass = new QProcess(); auto *pass = new QProcess();
QStringList args; QStringList args;
if (isOtp) { if (isOtp) {
args << "otp" << "show" << match.text(); args << "otp";
} else {
args << "show" << match.text();
} }
args << "show" << match.text();
pass->start("pass", args); pass->start("pass", args);
connect(pass, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), connect(pass, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
@ -239,15 +253,12 @@ QList<QAction *> Pass::actionsForMatch(const Plasma::QueryMatch &match)
{ {
Q_UNUSED(match) Q_UNUSED(match)
if (showActions)
return this->orderedActions; return this->orderedActions;
return QList<QAction *>();
} }
void Pass::showNotification(const QString &text, const QString &actionName /* = "" */) void Pass::showNotification(const QString &text, const QString &actionName)
{ {
const QString msgPrefix = actionName.isEmpty() ? "":actionName + i18n(" of "); const QString msgPrefix = actionName.isEmpty() ? "" : actionName + i18n(" of ");
const QString msg = i18n("Password %1 copied to clipboard for %2 seconds", text, timeout); const QString msg = i18n("Password %1 copied to clipboard for %2 seconds", text, timeout);
KNotification::event("password-unlocked", "Pass", msgPrefix + msg, KNotification::event("password-unlocked", "Pass", msgPrefix + msg,
"object-unlocked", nullptr, KNotification::CloseOnTimeout, "object-unlocked", nullptr, KNotification::CloseOnTimeout,

4
pass.h
Unescape View File

@ -45,7 +45,7 @@ public slots:
protected: protected:
void init() override; void init() override;
void initPasswords(); void initPasswords();
void showNotification(const QString &, const QString & = ""); void showNotification(const QString &, const QString & = QString());
private: private:
QDir baseDir; QDir baseDir;
@ -58,6 +58,8 @@ private:
bool showActions; bool showActions;
QList<QAction *> orderedActions; QList<QAction *> orderedActions;
bool showOnlyPrefixed;
QLatin1String queryPrefix = QLatin1String("pass");
}; };
#endif #endif

Write Preview
Loading…
Cancel
Save