Use FileContent parsing in PasswordDialog

1 files changed, 23 insertions, 39 deletions

diff --git a/src/passworddialog.cpp b/src/passworddialog.cpp
index 56718b2e..e1c72f6b 100644
--- a/src/passworddialog.cpp
+++ b/src/passworddialog.cpp
@@ -1,6 +1,7 @@
 #include "passworddialog.h"
 #include "debughelper.h"
 #include "qtpasssettings.h"
+#include "filecontent.h"
 #include "ui_passworddialog.h"
 #include <QDebug>
 #include <QLabel>
@@ -58,46 +59,29 @@ void PasswordDialog::on_createPasswordButton_clicked() {
  * @param password
  */
 void PasswordDialog::setPassword(QString password) {
-  QStringList tokens = password.split("\n");
-  ui->lineEditPassword->setText(tokens[0]);
-  tokens.pop_front();
-  if (templating) {
-    QWidget *previous = ui->checkBoxShow;
-    for (QLineEdit *line : templateLines) {
-      for (int j = 0; j < tokens.length(); ++j) {
-        QString token = tokens.at(j);
-        if (token.startsWith(line->objectName() + ':')) {
-          tokens.removeAt(j);
-          QString value = token.remove(0, line->objectName().length() + 1);
-          line->setText(value.trimmed());
-        }
-      }
-      previous = line;
-    }
-    if (allFields) {
-      otherLines.clear();
-      for (int j = 0; j < tokens.length(); ++j) {
-        QString token = tokens.at(j);
-        if (token.contains(':')) {
-          int colon = token.indexOf(':');
-          QString field = token.left(colon);
-          QString value = token.right(token.length() - colon - 1);
-          if (!fields.contains(field) && value.startsWith("//"))
-            continue; // colon is probably from a url
-          QLineEdit *line = new QLineEdit();
-          line->setObjectName(field.trimmed());
-          line->setText(value.trimmed());
-          ui->formLayout->addRow(new QLabel(field), line);
-          setTabOrder(previous, line);
-          otherLines.append(line);
-          previous = line;
-          tokens.removeAt(j);
-          --j; // tokens.length() also got shortened by the remove..
-        }
-      }
-    }
+  FileContent fileContent = FileContent::parse(password, templating ? fields : QStringList(), allFields);
+  ui->lineEditPassword->setText(fileContent.getPassword());
+
+  QWidget *previous = ui->checkBoxShow;
+  // first set templated values
+  NamedValues namedValues = fileContent.getNamedValues();
+  for (QLineEdit *line : templateLines) {
+    line->setText(namedValues.takeValue(line->objectName()));
+    previous = line;
   }
-  ui->plainTextEdit->insertPlainText(tokens.join("\n"));
+  // show remaining values (if there are)
+  otherLines.clear();
+  for (const NamedValue &nv : namedValues) {
+    QLineEdit *line = new QLineEdit();
+    line->setObjectName(nv.name);
+    line->setText(nv.value);
+    ui->formLayout->addRow(new QLabel(nv.name), line);
+    setTabOrder(previous, line);
+    otherLines.append(line);
+    previous = line;
+  }
+
+  ui->plainTextEdit->insertPlainText(fileContent.getRemainingData());
 }
 
 /**