From cf2334391110d5443c37c00241bd53beee06d7db Mon Sep 17 00:00:00 2001
From: Louis-Bertrand Varin <louisv@unito.io>
Date: Sun, 12 Mar 2017 13:57:44 -0400
Subject: [PATCH] Using openDatabaseFile in List.

---
 src/cli/List.cpp | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/cli/List.cpp b/src/cli/List.cpp
index cfeba3ceb..b2d673f51 100644
--- a/src/cli/List.cpp
+++ b/src/cli/List.cpp
@@ -22,14 +22,12 @@
 
 #include <QCommandLineParser>
 #include <QCoreApplication>
-#include <QFile>
 #include <QStringList>
 #include <QTextStream>
 
 #include "core/Database.h"
 #include "core/Entry.h"
 #include "core/Group.h"
-#include "format/KeePass2Reader.h"
 #include "keys/CompositeKey.h"
 
 void printGroup(Group* group, QString baseName, int depth) {
@@ -81,22 +79,8 @@ int List::execute(int argc, char **argv)
     QString line = inputTextStream.readLine();
     CompositeKey key = CompositeKey::readFromLine(line);
 
-    QString databaseFilename = args.at(0);
-    QFile dbFile(databaseFilename);
-    if (!dbFile.exists()) {
-        qCritical("File %s does not exist.", qPrintable(databaseFilename));
-        return EXIT_FAILURE;
-    }
-    if (!dbFile.open(QIODevice::ReadOnly)) {
-        qCritical("Unable to open file %s.", qPrintable(databaseFilename));
-        return EXIT_FAILURE;
-    }
-
-    KeePass2Reader reader;
-    Database* db = reader.readDatabase(&dbFile, key);
-
-    if (reader.hasError()) {
-        qCritical("Error while parsing the database:\n%s\n", qPrintable(reader.errorString()));
+    Database* db = Database::openDatabaseFile(args.at(0), key);
+    if (db == nullptr) {
         return EXIT_FAILURE;
     }