Make RetriableError separate class and avoid macros

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

lib/libelectronic-id

@@ -22,7 +22,6 @@ add_library(controller STATIC
     logging.cpp
     logging.hpp
     qeid.hpp
-    retriableerror.cpp
     retriableerror.hpp
     threads/cardeventmonitorthread.hpp
     threads/commandhandlerconfirmthread.hpp

src/controller/CMakeLists.txt

@@ -167,7 +167,7 @@ CommandWithArgumentsPtr Application::parseArgs()
         if (command == CMDLINE_GET_SIGNING_CERTIFICATE || command == CMDLINE_AUTHENTICATE
             || command == CMDLINE_SIGN) {
             // TODO: add command-specific argument validation
-            return std::make_unique<CommandWithArguments>(commandNameToCommandType(command),
+            return std::make_unique<CommandWithArguments>(CommandType(command),
                                                           parseArgumentJson(arguments));
         }
         throw ArgumentError("The command has to be one of " + COMMANDS.toStdString());
@@ -193,7 +193,6 @@ CommandWithArgumentsPtr Application::parseArgs()
 
 void Application::registerMetatypes()
 {
-    qRegisterMetaType<electronic_id::AutoSelectFailed::Reason>();
     qRegisterMetaType<electronic_id::ElectronicID::ptr>();
     qRegisterMetaType<std::vector<electronic_id::ElectronicID::ptr>>();
     qRegisterMetaType<electronic_id::VerifyPinFailed::Status>();

src/controller/application.cpp

@@ -24,6 +24,8 @@
 
 #include "signauthutils.hpp"
 
+#include "pcsc-cpp/pcsc-cpp-utils.hpp"
+
 #include <QApplication>
 #include <QJsonObject>
 #include <QJsonArray>

src/controller/command-handlers/authenticate.cpp

@@ -26,6 +26,8 @@
 #include "ui.hpp"
 #include "commandhandler.hpp"
 
+#include "pcsc-cpp/pcsc-cpp-utils.hpp"
+
 using namespace electronic_id;
 
 // Take argument names by copy/move as they will be modified.

src/controller/command-handlers/signauthutils.cpp

@@ -22,7 +22,7 @@
 
 #include "commands.hpp"
 
-#include "magic_enum/magic_enum.hpp"
+#include <QMetaEnum>
 
 #include <stdexcept>
 #include <map>
@@ -33,7 +33,7 @@ const QString CMDLINE_SIGN = QStringLiteral("sign");
 // A special command for stdin mode for quitting the application after sending the version.
 const QString STDINMODE_QUIT = QStringLiteral("quit");
 
-CommandType commandNameToCommandType(const QString& cmdName)
+CommandType::CommandType(const QString& cmdName)
 {
     static const std::map<QString, CommandType> SUPPORTED_COMMANDS {
         {CMDLINE_GET_SIGNING_CERTIFICATE, CommandType::GET_SIGNING_CERTIFICATE},
@@ -43,13 +43,13 @@ CommandType commandNameToCommandType(const QString& cmdName)
     };
 
     try {
-        return SUPPORTED_COMMANDS.at(cmdName);
+        value = SUPPORTED_COMMANDS.at(cmdName);
     } catch (const std::out_of_range&) {
         throw std::invalid_argument("Command '" + cmdName.toStdString() + "' is not supported");
     }
 }
 
 CommandType::operator std::string() const
 {
-    return std::string(magic_enum::enum_name(value));
+    return QMetaEnum::fromType<CommandType::CommandTypeEnum>().valueToKey(value);
 }

src/controller/commands.cpp

@@ -29,35 +29,34 @@
 
 class CommandType
 {
+    Q_GADGET
 public:
-    enum CommandTypeEnum {
+    enum CommandTypeEnum : quint8 {
+        NONE,
         INSERT_CARD,
         GET_SIGNING_CERTIFICATE,
         AUTHENTICATE,
         SIGN,
         QUIT,
         ABOUT,
-        NONE = -1
     };
+    Q_ENUM(CommandTypeEnum)
 
-    CommandType() = default;
-    constexpr CommandType(const CommandTypeEnum _value) : value(_value) {}
+    constexpr CommandType(CommandTypeEnum _value = NONE) noexcept : value(_value) { }
+    explicit CommandType(const QString& cmdName);
 
-    constexpr bool operator==(CommandTypeEnum other) const { return value == other; }
-    constexpr bool operator!=(CommandTypeEnum other) const { return value != other; }
-    constexpr operator CommandTypeEnum() const { return value; }
+    constexpr bool operator==(CommandTypeEnum other) const noexcept { return value == other; }
+    constexpr operator CommandTypeEnum() const noexcept { return value; }
 
     operator std::string() const;
 
 private:
-    CommandTypeEnum value = NONE;
+    CommandTypeEnum value;
 };
 
 extern const QString CMDLINE_GET_SIGNING_CERTIFICATE;
 extern const QString CMDLINE_AUTHENTICATE;
 extern const QString CMDLINE_SIGN;
 
-CommandType commandNameToCommandType(const QString& cmdName);
-
 using CommandWithArguments = std::pair<CommandType, QVariantMap>;
 using CommandWithArgumentsPtr = std::unique_ptr<CommandWithArguments>;

src/controller/commands.hpp

@@ -228,7 +228,7 @@ void Controller::onCommandHandlerConfirmCompleted(const QVariantMap& res)
         _result = res;
         writeResponseToStdOut(isInStdinMode, res, commandHandler->commandType());
     } catch (const std::exception& error) {
-        qCritical() << "Command" << std::string(commandType())
+        qCritical() << "Command" << commandType()
                     << "fatal error while writing response to stdout:" << error;
     }
 
@@ -283,8 +283,7 @@ void Controller::onDialogCancel()
 void Controller::onCriticalFailure(const QString& error)
 {
     emit stopCardEventMonitorThread();
-    qCritical() << "Exiting due to command" << std::string(commandType())
-                << "fatal error:" << error;
+    qCritical() << "Exiting due to command" << commandType() << "fatal error:" << error;
     _result =
         makeErrorObject(RESP_TECH_ERROR, QStringLiteral("Technical error, see application logs"));
     disposeUI();

src/controller/controller.cpp

@@ -101,6 +101,6 @@ CommandWithArgumentsPtr readCommandFromStdin()
                                     "contain a 'command' string and 'arguments' object");
     }
 
-    return std::make_unique<CommandWithArguments>(commandNameToCommandType(command.toString()),
+    return std::make_unique<CommandWithArguments>(CommandType(command.toString()),
                                                   arguments.toObject().toVariantMap());
 }

src/controller/inputoutputmode.cpp

@@ -26,17 +26,13 @@
 
 void setupLogging();
 
-inline QDebug operator<<(QDebug out, const std::string& s)
+#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
+template <typename... Args>
+inline QDebug operator<<(QDebug out, const std::basic_string<char, Args...>& s)
 {
-    out << QString::fromStdString(s);
-    return out;
-}
-
-inline QDebug operator<<(QDebug out, const std::wstring& s)
-{
-    out << QString::fromStdWString(s);
-    return out;
+    return out << QUtf8StringView(s);
 }
+#endif
 
 inline QDebug operator<<(QDebug out, const std::exception& e)
 {