updated callback system

libnfc_cpptools/inc/libnfc_cpptools/FreeFareTagClassic.h

@@ -14,6 +14,24 @@ namespace FreeFare
 
 class FreeFareTagClassicInternal;
 
+struct FreeFareTagClassicMappingProgress
+{
+    int32_t done;
+    int32_t total;
+};
+
+struct FreeFareTagClassicReadProgress
+{
+    int32_t done;
+    int32_t total;
+};
+
+struct FreeFareTagClassicWriteProgress
+{
+    int32_t done;
+    int32_t total;
+};
+
 class FreeFareTagClassic : public FreeFareTag
 {
 public:
@@ -22,18 +40,18 @@ public:
     LibNfc::Utils::ResultBool authenticate(int sector, const std::string& key, int keyType);
 
     LibNfc::Utils::Result<MappedKeys> mapKeys(const std::vector<std::string>& keys,
-                                              std::function<void(int, int)> cb = nullptr);
+                                              std::function<void(FreeFareTagClassicMappingProgress)> mapCb = nullptr);
 
     LibNfc::Utils::ResultString readBlock(int sector, int block, const std::string& key, int keyType);
 
     LibNfc::Utils::Result<FreeFareClassicSector> readSector(int sector, const std::string& key, int keyType);
 
     LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> read(const MappedKeys& keys,
-                                                            std::function<void(int, int)> cb = nullptr);
+                                                            std::function<void(FreeFareTagClassicReadProgress)> readCb = nullptr);
 
     LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> read(const std::vector<std::string>& keys,
-                                                            std::function<void(int, int)> mapCb = nullptr,
-                                                            std::function<void(int, int)> readCb = nullptr);
+                                                            std::function<void(FreeFareTagClassicMappingProgress)> mapCb = nullptr,
+                                                            std::function<void(FreeFareTagClassicReadProgress)> readCb = nullptr);
 
     LibNfc::Utils::ResultBool writeBlock(int sector,
                                          int block,
@@ -46,13 +64,13 @@ public:
     LibNfc::Utils::ResultBool write(const MappedKeys& keys,
                                     const std::string& data,
                                     bool writeSector0,
-                                    std::function<void(int, int)> cb = nullptr);
+                                    std::function<void(FreeFareTagClassicWriteProgress)> writeCb = nullptr);
 
     LibNfc::Utils::ResultBool write(const std::vector<std::string>& keys,
                                     const std::string& data,
                                     bool writeSector0,
-                                    std::function<void(int, int)> mapCb = nullptr,
-                                    std::function<void(int, int)> writeCb = nullptr);
+                                    std::function<void(FreeFareTagClassicMappingProgress)> mapCb = nullptr,
+                                    std::function<void(FreeFareTagClassicWriteProgress)> writeCb = nullptr);
 };
 
 }; // FreeFare

libnfc_cpptools/src/freefare/Tags/Classic/FreeFareTagClassic.cpp

@@ -21,11 +21,12 @@ LibNfc::Utils::ResultBool FreeFareTagClassic::authenticate(int sector, const std
     return std::static_pointer_cast<FreeFareTagClassicInternal>(_tag)->authenticate(sector, key, keyType);
 }
 
-LibNfc::Utils::Result<MappedKeys> FreeFareTagClassic::mapKeys(const std::vector<std::string>& keys, std::function<void(int, int)> cb)
+LibNfc::Utils::Result<MappedKeys> FreeFareTagClassic::mapKeys(const std::vector<std::string>& keys,
+                                                              std::function<void(FreeFareTagClassicMappingProgress)> mapCb)
 {
     MappedKeys mappedKeys;
-    unsigned long done = 0;
-    unsigned long total = 16 * keys.size();
+    int32_t done = 0;
+    int32_t total = 16 * keys.size();
 
     for (int i = 0; i < 16; ++i) {
         std::pair<std::string, std::string> blockKeys;
@@ -37,8 +38,8 @@ LibNfc::Utils::Result<MappedKeys> FreeFareTagClassic::mapKeys(const std::vector<
             if (authenticate(i, key, MFC_KEY_B)) {
                 blockKeys.second = key;
             }
-            if (cb != nullptr) {
-                cb(++done, total);
+            if (mapCb != nullptr) {
+                mapCb({++done, total});
             }
             if (!blockKeys.first.empty() && !blockKeys.second.empty()) {
                 break;
@@ -46,8 +47,8 @@ LibNfc::Utils::Result<MappedKeys> FreeFareTagClassic::mapKeys(const std::vector<
         }
         mappedKeys.push_back(blockKeys);
     }
-    if (cb != nullptr && done < total) {
-        cb(total, total);
+    if (mapCb != nullptr && done < total) {
+        mapCb({total, total});
     }
 
     return LibNfc::Utils::Result<MappedKeys>::ok(mappedKeys);
@@ -74,13 +75,14 @@ LibNfc::Utils::Result<FreeFareClassicSector> FreeFareTagClassic::readSector(int
     return LibNfc::Utils::Result<FreeFareClassicSector>::ok(FreeFareClassicSector(res));
 }
 
-LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::read(const MappedKeys& keys, std::function<void(int, int)> cb)
+LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::read(const MappedKeys& keys,
+                                                                                   std::function<void(FreeFareTagClassicReadProgress)> readCb)
 {
     if (keys.size() != 16) {
         return LibNfc::Utils::Result<std::vector<FreeFareClassicSector>>::error("Must have 16 sectors keys");
     }
-    int done = 0;
-    int total = 4 * keys.size();
+    int32_t done = 0;
+    int32_t total = 4 * keys.size();
     std::vector<FreeFareClassicSector> sectors;
     for (int s = 0; s < keys.size(); ++s) {
         auto sectorKey = keys[s];
@@ -88,7 +90,7 @@ LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::re
         bool keyA = false;
         bool keyB = false;
         for (int b = 0; b < 3; ++b) {
-            std::string data = "";
+            std::string data;
             if (!sectorKey.first.empty()) {
                 auto blockResult = readBlock(s, b, sectorKey.first, MFC_KEY_A);
                 if (blockResult) {
@@ -106,8 +108,8 @@ LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::re
                 }
             }
             sector.setBlock(b, data);
-            if (cb != nullptr) {
-                cb(++done, total);
+            if (readCb != nullptr) {
+                readCb({++done, total});
             }
         }
         int b = 3;
@@ -127,8 +129,8 @@ LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::re
                 keyB = true;
             }
         }
-        if (cb != nullptr) {
-            cb(++done, total);
+        if (readCb != nullptr) {
+            readCb({++done, total});
         }
 
         sector.setBlock(b, dataA);
@@ -149,16 +151,16 @@ LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::re
 
         sectors.push_back(sector);
     }
-    if (cb != nullptr && done < total) {
-        cb(total, total);
+    if (readCb != nullptr && done < total) {
+        readCb({total, total});
     }
 
     return LibNfc::Utils::Result<std::vector<FreeFareClassicSector>>::ok(sectors);
 }
 
 LibNfc::Utils::Result<std::vector<FreeFareClassicSector>> FreeFareTagClassic::read(const std::vector<std::string>& keys,
-                                                                     std::function<void(int, int)> mapCb,
-                                                                     std::function<void(int, int)> readCb)
+                                                                     std::function<void(FreeFareTagClassicMappingProgress)> mapCb,
+                                                                     std::function<void(FreeFareTagClassicReadProgress)> readCb)
 {
     auto mappedKeysResult = mapKeys(keys, mapCb);
     if (!mappedKeysResult) {
@@ -190,17 +192,17 @@ LibNfc::Utils::ResultBool FreeFareTagClassic::writeSector(int sector, const std:
 }
 
 LibNfc::Utils::ResultBool FreeFareTagClassic::write(const MappedKeys& keys,
-                                             const std::string& data,
-                                             bool writeSector0,
-                                             std::function<void(int, int)> cb)
+                                                    const std::string& data,
+                                                    bool writeSector0,
+                                                    std::function<void(FreeFareTagClassicWriteProgress)> writeCb)
 {
     if (keys.size() != 16) {
         return LibNfc::Utils::ResultBool::error("Must have 16 sectors keys");
     }
     std::string d = LibNfc::Utils::StringUtils::ensureSize(data, 1024);
     std::string errors;
-    unsigned long done = 0;
-    unsigned long total = 4 * keys.size();
+    int32_t done = 0;
+    int32_t total = 4 * keys.size();
     for (unsigned long s = 0; s < keys.size(); ++s) {
         auto sectorKey = keys[s];
         for (int b = 0; b < 4; ++b) {
@@ -208,7 +210,7 @@ LibNfc::Utils::ResultBool FreeFareTagClassic::write(const MappedKeys& keys,
                 continue;
             }
             std::string blockData = d.substr((s * 64) + (b * 16), 16);
-            if (cb != nullptr && done < total) {
+            if (writeCb != nullptr && done < total) {
                 bool keyA = false;
                 bool keyB = false;
                 std::string sectorErrors;
@@ -235,12 +237,12 @@ LibNfc::Utils::ResultBool FreeFareTagClassic::write(const MappedKeys& keys,
                 if (!keyA && !keyB) {
                     errors += std::string(errors.empty() ? "" : "\n") + sectorErrors;
                 }
-                cb(++done, total);
+                writeCb({++done, total});
             }
         }
     }
-    if (cb != nullptr && done < total) {
-        cb(total, total);
+    if (writeCb != nullptr && done < total) {
+        writeCb({total, total});
     }
     if (errors.empty()) {
         return LibNfc::Utils::ResultBool::ok(true);
@@ -248,8 +250,11 @@ LibNfc::Utils::ResultBool FreeFareTagClassic::write(const MappedKeys& keys,
     return LibNfc::Utils::ResultBool::error(errors);
 }
 
-LibNfc::Utils::ResultBool FreeFareTagClassic::write(const std::vector<std::string>& keys, const std::string& data, bool writeSector0,
-                                             std::function<void(int, int)> mapCb, std::function<void(int, int)> writeCb)
+LibNfc::Utils::ResultBool FreeFareTagClassic::write(const std::vector<std::string>& keys,
+                                                    const std::string& data,
+                                                    bool writeSector0,
+                                                    std::function<void(FreeFareTagClassicMappingProgress)> mapCb,
+                                                    std::function<void(FreeFareTagClassicWriteProgress)> writeCb)
 {
     auto mappedKeysResult = mapKeys(keys, mapCb);
     if (!mappedKeysResult) {