Make Reader simple struct

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

Author: metsma

.github/workflows/cmake-linux-fedora.yml

@@ -2,20 +2,19 @@ name: CMake (Fedora Linux)
 
 on: [push, pull_request]
 
-env:
-  BUILD_TYPE: RelWithDebInfo
-
 jobs:
   build:
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         container: ['fedora:latest']
+        build_type: [Release, RelWithDebInfo]
         experimental: [false]
         include:
           - container: 'fedora:rawhide'
             experimental: true
+            build_type: [Release]
 
     container:
       image: ${{ matrix.container }}
@@ -27,10 +26,10 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Configure CMake
-      run: cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -S . -B build
+      run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S . -B build
 
     - name: Build
-      run: cmake --build build --config $BUILD_TYPE -j $(nproc)
+      run: cmake --build build --config ${{ matrix.build_type }} -j $(nproc)
 
     - name: Test
-      run: ctest -V -C $BUILD_TYPE --test-dir build
+      run: ctest -V -C ${{ matrix.build_type }} --test-dir build

lib/libpcsc-cpp/CMakeLists.txt

@@ -9,10 +9,8 @@ add_library(${PROJECT_NAME}
   include/${PROJECT_NAME}/${PROJECT_NAME}.hpp
   include/${PROJECT_NAME}/${PROJECT_NAME}-utils.hpp
   include/${PROJECT_NAME}/comp_winscard.hpp
-  include/flag-set-cpp/flag_set.hpp
   include/magic_enum/magic_enum.hpp
   src/Context.hpp
-  src/Reader.cpp
   src/SCardCall.hpp
   src/SmartCard.cpp
   src/listReaders.cpp

lib/libpcsc-cpp/include/flag-set-cpp/flag_set.hpp

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "flag-set-cpp/flag_set.hpp"
-
+#include <limits>
 #include <memory>
+#include <stdexcept>
+#include <string>
 #include <vector>
-#include <limits>
 
 // The rule of five (C++ Core guidelines C.21).
 #define PCSC_CPP_DISABLE_COPY_MOVE(Class)                                                          \
@@ -253,39 +253,14 @@ class SmartCard
 };
 
 /** Reader provides card reader information, status and gives access to the smart card in it. */
-class Reader
+struct Reader
 {
-public:
-    enum class Status {
-        UNAWARE,
-        IGNORE,
-        CHANGED,
-        UNKNOWN,
-        UNAVAILABLE,
-        EMPTY,
-        PRESENT,
-        ATRMATCH,
-        EXCLUSIVE,
-        INUSE,
-        MUTE,
-        UNPOWERED,
-        _
-    };
-
-    Reader(ContextPtr context, string_t name, byte_vector cardAtr, flag_set<Status> status);
-
     SmartCard::ptr connectToCard() const { return std::make_unique<SmartCard>(ctx, name, cardAtr); }
 
-    bool isCardInserted() const { return status[Status::PRESENT]; }
-
-    std::string statusString() const;
-
+    ContextPtr ctx;
     const string_t name;
     const byte_vector cardAtr;
-    const flag_set<Status> status;
-
-private:
-    ContextPtr ctx;
+    const bool isCardInserted;
 };
 
 /**

lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp

@@ -65,37 +65,6 @@ std::vector<SCARD_READERSTATE> getReaderStates(const SCARDCONTEXT ctx, const str
     return readerStates;
 }
 
-inline flag_set<Reader::Status> flagSetFromReaderState(const DWORD readerState)
-{
-    if (!readerState) {
-        return flag_set<Reader::Status> {Reader::Status::UNAWARE};
-    }
-
-    static const std::map<DWORD, Reader::Status> READER_STATUS_MAP = {
-        // SCARD_STATE_UNAWARE is zero and covered with (!readerState) above.
-        {SCARD_STATE_IGNORE, Reader::Status::IGNORE},
-        {SCARD_STATE_CHANGED, Reader::Status::CHANGED},
-        {SCARD_STATE_UNKNOWN, Reader::Status::UNKNOWN},
-        {SCARD_STATE_UNAVAILABLE, Reader::Status::UNAVAILABLE},
-        {SCARD_STATE_EMPTY, Reader::Status::EMPTY},
-        {SCARD_STATE_PRESENT, Reader::Status::PRESENT},
-        {SCARD_STATE_ATRMATCH, Reader::Status::ATRMATCH},
-        {SCARD_STATE_EXCLUSIVE, Reader::Status::EXCLUSIVE},
-        {SCARD_STATE_INUSE, Reader::Status::INUSE},
-        {SCARD_STATE_MUTE, Reader::Status::MUTE},
-        {SCARD_STATE_UNPOWERED, Reader::Status::UNPOWERED}};
-
-    auto result = flag_set<Reader::Status> {};
-
-    for (const auto& [key, value] : READER_STATUS_MAP) {
-        if (readerState & key) {
-            result.set(value);
-        }
-    }
-
-    return result;
-}
-
 string_t populateReaderNames(const SCARDCONTEXT ctx)
 {
     // Buffer length is in characters, not bytes.
@@ -121,12 +90,14 @@ std::vector<Reader> listReaders()
 
     try {
         auto readerNames = populateReaderNames(ctx->handle());
-
-        for (const auto& readerState : getReaderStates(ctx->handle(), readerNames)) {
-            readers.emplace_back(
-                ctx, readerState.szReader,
-                byte_vector {readerState.rgbAtr, std::next(readerState.rgbAtr, readerState.cbAtr)},
-                flagSetFromReaderState(readerState.dwEventState));
+        auto readerStates = getReaderStates(ctx->handle(), readerNames);
+        readers.reserve(readerStates.size());
+        for (const auto& readerState : readerStates) {
+            readers.push_back(
+                {ctx, readerState.szReader,
+                 byte_vector {std::begin(readerState.rgbAtr),
+                              std::next(std::begin(readerState.rgbAtr), readerState.cbAtr)},
+                 bool(readerState.dwEventState & SCARD_STATE_PRESENT)});
         }
     } catch (const ScardNoReadersError& /* e */) {
     }