Don't move an error report unless it's actually sent.

Author: Mysticial

SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp

@@ -279,12 +279,6 @@ void SendableErrorReport::save(Logger* logger) const{
     report.dump(m_directory + "Report.json");
 }
 
-#ifndef PA_OFFICIAL
-bool SendableErrorReport::send(Logger& logger){
-    return false;
-}
-#endif
-
 void SendableErrorReport::move_to_sent(){
 //    cout << "move_to_sent()" << endl;
     QDir().mkdir(QString::fromStdString(ERROR_PATH_SENT));
@@ -320,15 +314,22 @@ std::vector<std::string> SendableErrorReport::get_pending_reports(){
     return ret;
 }
 
+#ifndef PA_OFFICIAL
+void SendableErrorReport::send(Logger& logger, std::shared_ptr<SendableErrorReport> report){}
+#endif
+
 
 
+//  Send all the reports. This function will return early and all the reports
+//  will be sent asynchronously in the background.
 void send_reports(Logger& logger, const std::vector<std::string>& reports){
     for (const std::string& path : reports){
         try{
 //            static int c = 0;
 //            cout << "Sending... " << c++ << endl;
-            SendableErrorReport report(path);
-            report.send(logger);
+            //  std:::shared_ptr because it needs to take ownership for
+            //  destruction at a later time.
+            SendableErrorReport::send(logger, std::make_shared<SendableErrorReport>(path));
         }catch (Exception& e){
             logger.log("Unable to send report: " + path + ", Message: " + e.to_str(), COLOR_RED);
         }catch (...){

SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h

@@ -78,10 +78,10 @@ class SendableErrorReport{
     void add_file(std::string filename);
 
     void save(Logger* logger) const;
-    bool send(Logger& logger);
     void move_to_sent();
 
     static std::vector<std::string> get_pending_reports();
+    static void send(Logger& logger, std::shared_ptr<SendableErrorReport> report);
 
 private:
     std::string m_timestamp;

SerialPrograms/Source/Integrations/DiscordWebhook.cpp

@@ -60,13 +60,21 @@ void DiscordWebhookSender::send(
     Logger& logger,
     const QUrl& url, std::chrono::milliseconds delay,
     const JsonObject& obj,
-    std::shared_ptr<PendingFileSend> file
+    std::shared_ptr<PendingFileSend> file,
+    std::function<void()> finish_callback
 ){
     cleanup_stuck_requests();
     std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
+//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
+    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
     m_queue.add_event(
         delay,
-        [this, url, json = std::move(json), file = std::move(file)]{
+        [
+            this, url,
+            json = std::move(json),
+            file = std::move(file),
+            finish_callback = std::move(finish_callback)
+        ]{
             throttle();
             std::vector<DiscordFileAttachment> attachments;
             if (file){
@@ -75,22 +83,31 @@ void DiscordWebhookSender::send(
                 );
             }
             internal_send(url, *json, attachments);
+            if (finish_callback){
+                finish_callback();
+            }
         }
     );
-//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
-    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
 }
 void DiscordWebhookSender::send(
     Logger& logger,
     const QUrl& url, std::chrono::milliseconds delay,
     const JsonObject& obj,
-    std::vector<std::shared_ptr<PendingFileSend>> files
+    std::vector<std::shared_ptr<PendingFileSend>> files,
+    std::function<void()> finish_callback
 ){
     cleanup_stuck_requests();
     std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
+//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
+    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
     m_queue.add_event(
         delay,
-        [this, url, json = std::move(json), files = std::move(files)]{
+        [
+            this, url,
+            json = std::move(json),
+            files = std::move(files),
+            finish_callback = std::move(finish_callback)
+        ]{
             throttle();
             std::vector<DiscordFileAttachment> attachments;
             for (auto& file : files){
@@ -99,10 +116,11 @@ void DiscordWebhookSender::send(
                 );
             }
             internal_send(url, *json, attachments);
+            if (finish_callback){
+                finish_callback();
+            }
         }
     );
-//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
-    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
 }
 
 void DiscordWebhookSender::cleanup_stuck_requests(){

SerialPrograms/Source/Integrations/DiscordWebhook.h

@@ -47,13 +47,15 @@ class DiscordWebhookSender : public QObject{
         Logger& logger,
         const QUrl& url, std::chrono::milliseconds delay,
         const JsonObject& obj,
-        std::shared_ptr<PendingFileSend> file
+        std::shared_ptr<PendingFileSend> file,
+        std::function<void()> finish_callback = nullptr
     );
     void send(
         Logger& logger,
         const QUrl& url, std::chrono::milliseconds delay,
         const JsonObject& obj,
-        std::vector<std::shared_ptr<PendingFileSend>> files
+        std::vector<std::shared_ptr<PendingFileSend>> files,
+        std::function<void()> finish_callback = nullptr
     );
 
     static DiscordWebhookSender& instance();
@@ -70,9 +72,6 @@ class DiscordWebhookSender : public QObject{
         const std::vector<DiscordFileAttachment>& files
     );
 
-signals:
-    void stop_event_loop();
-
 private:
     TaggedLogger m_logger;
     std::atomic<bool> m_stopping;