Automated housekeeping

7 files changed, 76 insertions, 62 deletions

diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index 6e57589d..578f182d 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -224,18 +224,22 @@ void ConfigDialog::on_accepted() {
   QtPassSettings::setVersion(VERSION);
 }
 
-void ConfigDialog::on_autodetectButton_clicked()
-{
-    QString pass = Util::findBinaryInPath("pass");
-    if (!pass.isEmpty()) ui->passPath->setText(pass);
-    usePass(!pass.isEmpty());
-    QString gpg = Util::findBinaryInPath("gpg2");
-    if (gpg.isEmpty()) gpg = Util::findBinaryInPath("gpg");
-    if (!gpg.isEmpty()) ui->gpgPath->setText(gpg);
-    QString git = Util::findBinaryInPath("git");
-    if (!git.isEmpty()) ui->gitPath->setText(git);
-    QString pwgen = Util::findBinaryInPath("pwgen");
-    if (!pwgen.isEmpty()) ui->pwgenPath->setText(pwgen);
+void ConfigDialog::on_autodetectButton_clicked() {
+  QString pass = Util::findBinaryInPath("pass");
+  if (!pass.isEmpty())
+    ui->passPath->setText(pass);
+  usePass(!pass.isEmpty());
+  QString gpg = Util::findBinaryInPath("gpg2");
+  if (gpg.isEmpty())
+    gpg = Util::findBinaryInPath("gpg");
+  if (!gpg.isEmpty())
+    ui->gpgPath->setText(gpg);
+  QString git = Util::findBinaryInPath("git");
+  if (!git.isEmpty())
+    ui->gitPath->setText(git);
+  QString pwgen = Util::findBinaryInPath("pwgen");
+  if (!pwgen.isEmpty())
+    ui->pwgenPath->setText(pwgen);
 }
 
 /**
diff --git a/src/executor.cpp b/src/executor.cpp
index fc452805..902b6cf6 100644
--- a/src/executor.cpp
+++ b/src/executor.cpp
@@ -31,14 +31,13 @@ void Executor::executeNext() {
       running = true;
       if (!i.workingDir.isEmpty())
         m_process.setWorkingDirectory(i.workingDir);
-      if (i.app.startsWith("wsl "))
-      {
-          QStringList tmp = i.args;
-          QString app = i.app;
-          tmp.prepend(app.remove(0, 4));
-          m_process.start("wsl", tmp);
+      if (i.app.startsWith("wsl ")) {
+        QStringList tmp = i.args;
+        QString app = i.app;
+        tmp.prepend(app.remove(0, 4));
+        m_process.start("wsl", tmp);
       } else
-          m_process.start(i.app, i.args);
+        m_process.start(i.app, i.args);
       if (!i.input.isEmpty()) {
         m_process.waitForStarted(-1);
         QByteArray data = i.input.toUtf8();
@@ -120,7 +119,8 @@ void Executor::execute(int id, const QString &workDir, const QString &app,
   }
   QString appPath = app;
   if (!appPath.startsWith("wsl "))
-      appPath = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(app);
+    appPath =
+        QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(app);
   m_execQueue.push_back(
       {id, appPath, args, input, readStdout, readStderr, workDir});
   executeNext();
@@ -135,15 +135,14 @@ void Executor::execute(int id, const QString &workDir, const QString &app,
  * @param in input data
  * @return Input bytes decoded to string
  */
-static QString decodeAssumingUtf8(QByteArray in)
-{
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    QTextCodec::ConverterState state;
-    QString out = codec->toUnicode(in.constData(), in.size(), &state);
-    if (!state.invalidChars)
-        return out;
-    codec = QTextCodec::codecForUtfText(in);
-    return codec->toUnicode(in);
+static QString decodeAssumingUtf8(QByteArray in) {
+  QTextCodec *codec = QTextCodec::codecForName("UTF-8");
+  QTextCodec::ConverterState state;
+  QString out = codec->toUnicode(in.constData(), in.size(), &state);
+  if (!state.invalidChars)
+    return out;
+  codec = QTextCodec::codecForUtfText(in);
+  return codec->toUnicode(in);
 }
 
 /**
@@ -162,13 +161,12 @@ int Executor::executeBlocking(QString app, const QStringList &args,
                               QString input, QString *process_out,
                               QString *process_err) {
   QProcess internal;
-  if (app.startsWith("wsl "))
-  {
-      QStringList tmp = args;
-      tmp.prepend(app.remove(0, 4));
-      internal.start("wsl", tmp);
+  if (app.startsWith("wsl ")) {
+    QStringList tmp = args;
+    tmp.prepend(app.remove(0, 4));
+    internal.start("wsl", tmp);
   } else
-      internal.start(app, args);
+    internal.start(app, args);
   if (!input.isEmpty()) {
     QByteArray data = input.toUtf8();
     internal.waitForStarted(-1);
diff --git a/src/executor.h b/src/executor.h
index 2d96be22..d741576c 100644
--- a/src/executor.h
+++ b/src/executor.h
@@ -79,7 +79,8 @@ public:
                              QString *process_err = Q_NULLPTR);
 
   static int executeBlocking(QString app, const QStringList &args,
-                             QString *process_out, QString *process_err = Q_NULLPTR);
+                             QString *process_out,
+                             QString *process_err = Q_NULLPTR);
 
   void setEnvironment(const QStringList &env);
 
diff --git a/src/imitatepass.cpp b/src/imitatepass.cpp
index 3d169a99..0304de52 100644
--- a/src/imitatepass.cpp
+++ b/src/imitatepass.cpp
@@ -14,18 +14,18 @@ using namespace Enums;
  */
 ImitatePass::ImitatePass() {}
 
-static QString pgit(const QString &path)
-{
-    if (!QtPassSettings::getGitExecutable().startsWith("wsl ")) return path;
-    QString res = "$(wslpath " + path + ")";
-    return res.replace('\\', '/');
+static QString pgit(const QString &path) {
+  if (!QtPassSettings::getGitExecutable().startsWith("wsl "))
+    return path;
+  QString res = "$(wslpath " + path + ")";
+  return res.replace('\\', '/');
 }
 
-static QString pgpg(const QString &path)
-{
-    if (!QtPassSettings::getGpgExecutable().startsWith("wsl ")) return path;
-    QString res = "$(wslpath " + path + ")";
-    return res.replace('\\', '/');
+static QString pgpg(const QString &path) {
+  if (!QtPassSettings::getGpgExecutable().startsWith("wsl "))
+    return path;
+  QString res = "$(wslpath " + path + ")";
+  return res.replace('\\', '/');
 }
 
 /**
@@ -61,7 +61,7 @@ void ImitatePass::GitPush() {
  */
 void ImitatePass::Show(QString file) {
   file = QtPassSettings::getPassStore() + file + ".gpg";
-  QStringList args = {"-d",      "--quiet",     "--yes", "--no-encrypt-to",
+  QStringList args = {"-d",      "--quiet",     "--yes",   "--no-encrypt-to",
                       "--batch", "--use-agent", pgpg(file)};
   executeGpg(PASS_SHOW, args);
 }
@@ -281,8 +281,9 @@ void ImitatePass::reencryptPath(QString dir) {
       dbg() << "reencrypt " << fileName << " for " << gpgId;
 #endif
       QString local_lastDecrypt = "Could not decrypt";
-      args = QStringList{"-d",      "--quiet",     "--yes", "--no-encrypt-to",
-                         "--batch", "--use-agent", pgpg(fileName)};
+      args = QStringList{
+          "-d",      "--quiet",     "--yes",       "--no-encrypt-to",
+          "--batch", "--use-agent", pgpg(fileName)};
       exec.executeBlocking(QtPassSettings::getGpgExecutable(), args,
                            &local_lastDecrypt);
 
@@ -298,7 +299,8 @@ void ImitatePass::reencryptPath(QString dir) {
                            "file missing or invalid."));
           return;
         }
-        args = QStringList{"--yes", "--batch", "-eq", "--output", pgpg(fileName)};
+        args =
+            QStringList{"--yes", "--batch", "-eq", "--output", pgpg(fileName)};
         for (auto &i : recipients) {
           args.append("-r");
           args.append(i);
diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
index 117f501a..a38c3159 100644
--- a/src/qtpasssettings.cpp
+++ b/src/qtpasssettings.cpp
@@ -534,5 +534,13 @@ void QtPassSettings::setTemplateAllFields(const bool &templateAllFields) {
                           templateAllFields);
 }
 
-RealPass *QtPassSettings::getRealPass() { if (realPass.isNull()) realPass.reset(new RealPass()); return realPass.data(); }
-ImitatePass *QtPassSettings::getImitatePass() { if (imitatePass.isNull()) imitatePass.reset(new ImitatePass()); return imitatePass.data(); }
+RealPass *QtPassSettings::getRealPass() {
+  if (realPass.isNull())
+    realPass.reset(new RealPass());
+  return realPass.data();
+}
+ImitatePass *QtPassSettings::getImitatePass() {
+  if (imitatePass.isNull())
+    imitatePass.reset(new ImitatePass());
+  return imitatePass.data();
+}
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index a9fe5784..c451f238 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -118,7 +118,8 @@ void TrayIcon::iconActivated(QSystemTrayIcon::ActivationReason reason) {
   case QSystemTrayIcon::MiddleClick:
     showMessage("test", "test msg", 1000);
     break;
-  default: {};
+  default: {
+  };
   }
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 94575de9..e288e25b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -111,14 +111,13 @@ QString Util::findBinaryInPath(QString binary) {
     }
   }
 #ifdef Q_OS_WIN
-  if (ret.isEmpty())
-  {
-      binary.remove(0, 1);
-      binary.prepend("wsl ");
-      QString out, err;
-      if (Executor::executeBlocking(binary, {"--version"}, &out, &err) == 0 &&
-          !out.isEmpty() && err.isEmpty())
-          ret = binary;
+  if (ret.isEmpty()) {
+    binary.remove(0, 1);
+    binary.prepend("wsl ");
+    QString out, err;
+    if (Executor::executeBlocking(binary, {"--version"}, &out, &err) == 0 &&
+        !out.isEmpty() && err.isEmpty())
+      ret = binary;
   }
 #endif
 
@@ -149,7 +148,8 @@ bool Util::checkConfig() {
 QString Util::getDir(const QModelIndex &index, bool forPass,
                      const QFileSystemModel &model,
                      const StoreModel &storeModel) {
-  QString abspath = QDir(QtPassSettings::getPassStore()).absolutePath() + QDir::separator();
+  QString abspath =
+      QDir(QtPassSettings::getPassStore()).absolutePath() + QDir::separator();
   if (!index.isValid())
     return forPass ? "" : abspath;
   QFileInfo info = model.fileInfo(storeModel.mapToSource(index));