Added method get_next_finished to fetch next complete curl_easy in curl_multi

Author: desertkun

include/curl_multi.h

@@ -28,6 +28,7 @@
 
 #include <memory>
 #include <vector>
+#include <unordered_map>
 
 #include "curl_easy.h"
 
@@ -268,6 +269,10 @@ namespace curl {
          * This method checks if the transfer on a curl_easy object is finished.
          */
         bool is_finished(const curl_easy &);
+        /**
+         * This method returhns the next finished curl_easy (if there is), otherwise nullptr is returned
+         */
+        curl_easy* get_next_finished();
         /**
          * Perform all the operations. Go baby! If the performing operations
          * have finished, the method returns true. Else, returns false. Check
@@ -326,6 +331,7 @@ namespace curl {
         int message_queued;
         int active_transfers;
         multi_ptr curl;
+        std::unordered_map<CURL*, curl_easy*> handles;
     };
 
     // Implementation of add method
@@ -378,4 +384,4 @@ namespace curl {
 }
 
 #undef CURLCPP_DEFINE_OPTION
-#endif	/* defined(__curlcpp__curl_multi__) */
+#endif	/* defined(__curlcpp__curl_multi__) */

src/curl_multi.cpp

@@ -53,15 +53,19 @@ curl_multi::~curl_multi() NOEXCEPT
 // Implementation of add method for easy handlers.
 void curl_multi::add(const curl_easy &easy) {
     const CURLMcode code = curl_multi_add_handle(this->curl.get(),easy.get_curl());
-    if (code != CURLM_OK) {
+    if (code == CURLM_OK) {
+        handles[easy.get_curl()] = (curl_easy*)&easy;
+    } else {
         throw curl_multi_exception(code,__FUNCTION__);
     }
 }
 
 // Implementation of remove for easy handlers.
 void curl_multi::remove(const curl_easy &easy) {
     const CURLMcode code = curl_multi_remove_handle(this->curl.get(),easy.get_curl());
-    if (code != CURLM_OK) {
+    if (code == CURLM_OK) {
+        handles.erase(easy.get_curl());
+    } else {
         throw curl_multi_exception(code,__FUNCTION__);
     }
 }
@@ -88,6 +92,20 @@ unique_ptr<curl_multi::curl_message> curl_multi::get_info(const curl_easy &easy)
     return nullptr;
 }
 
+// Implementation of get_next_finished method.
+curl_easy* curl_multi::get_next_finished() {
+    CURLMsg *message = curl_multi_info_read(this->curl.get(),&this->message_queued);
+    if (!message)
+        return nullptr;
+    if (message->msg == CURLMSG_DONE) {
+        std::unordered_map<CURL*, curl_easy*>::const_iterator it = handles.find(message->easy_handle);
+        if (it != handles.end()) {
+            return it->second;
+        }
+    }
+    return nullptr;
+}
+
 // Implementation of is_finished method.
 bool curl_multi::is_finished(const curl_easy &easy) {
     CURLMsg *message = nullptr;