charge_tracker: remove old 'send_in_progress' flag

Author: ffreddow

software/src/modules/charge_tracker/Generation State.uint8.enum

@@ -1,4 +1,4 @@
 Ready
 LocalDownload
 RemoteSend
-RemoteSendTest
+ManualRemoteSend

software/src/modules/charge_tracker/charge_tracker.cpp

@@ -1051,11 +1051,7 @@ void ChargeTracker::register_urls()
 #if MODULE_REMOTE_ACCESS_AVAILABLE()
 
     server.on_HTTPThread("/charge_tracker/send_charge_log", HTTP_PUT, [this](WebServerRequest request) {
-        if (this->send_in_progress) {
-            return request.send_plain(429, "Another upload is already in progress");
-        }
-
-        std::unique_ptr<ChargeLogGenerationLockHelper> lock_helper = ChargeLogGenerationLockHelper::try_lock(GenerationState::RemoteSend);
+        std::unique_ptr<ChargeLogGenerationLockHelper> lock_helper = ChargeLogGenerationLockHelper::try_lock(GenerationState::ManualRemoteSend);
         if (lock_helper == nullptr) {
             return request.send_plain(429, "Another charge log generation is already in progress");
         }
@@ -1167,7 +1163,7 @@ void ChargeTracker::register_urls()
     if (config.get("remote_upload_configs")->count() > 0) {
         task_scheduler.scheduleWithFixedDelay([this]() {
             // only send when no charge is in progress. This avoids not sending a charge that started at the end of the last month
-            if (this->send_in_progress || this->currentlyCharging()) {
+            if (this->currentlyCharging()) {
                 return;
             }
 
@@ -1244,7 +1240,6 @@ static esp_err_t check_remote_client_status(std::unique_ptr<RemoteUploadRequest>
         });
 
         logger.printfln("Charge-log generation and remote upload completed successfully. Status: %d", status);
-        charge_tracker.send_in_progress = false;
         upload_args->remote_client->close_chunked_request();
     } else {
         logger.printfln("Charge-log generation and remote upload failed. Status: %d", status);
@@ -1567,7 +1562,6 @@ static void upload_charge_logs_task(void *arg)
 #endif
     }
 
-    charge_tracker.send_in_progress = false;
 #if MODULE_WATCHDOG_AVAILABLE()
     watchdog.remove(wd_handle);
 #endif
@@ -1576,8 +1570,6 @@ static void upload_charge_logs_task(void *arg)
 
 void ChargeTracker::upload_charge_logs(const int8_t retry_count)
 {
-    send_in_progress = true;
-
     uint32_t remote_upload_config_count = config.get("remote_upload_configs")->count();
 
     RemoteUploadRequest *args = new RemoteUploadRequest;
@@ -1590,7 +1582,6 @@ void ChargeTracker::upload_charge_logs(const int8_t retry_count)
     args->generation_lock = ChargeLogGenerationLockHelper::try_lock(GenerationState::RemoteSend);
     if (args->generation_lock == nullptr) {
         logger.printfln("Could not acquire charge log generation lock for remote upload");
-        send_in_progress = false;
         delete args;
         return;
     }
@@ -1599,7 +1590,6 @@ void ChargeTracker::upload_charge_logs(const int8_t retry_count)
 
     if (ret != pdPASS_safe) {
         logger.printfln("ChargeLogUpload task could not be created: %s (0x%lx)", esp_err_to_name(ret), static_cast<uint32_t>(ret));
-        send_in_progress = false;
         delete args;
     }
 }
@@ -1613,8 +1603,6 @@ void ChargeTracker::start_charge_log_upload_for_config(const uint8_t config_inde
         return;
     }
 
-    send_in_progress = true;
-
     RemoteUploadRequest *task_args = new RemoteUploadRequest;
     task_args->config_count = remote_upload_config_count;
     task_args->cookie = cookie;
@@ -1633,7 +1621,6 @@ void ChargeTracker::start_charge_log_upload_for_config(const uint8_t config_inde
 
     if (ret != pdPASS_safe) {
         logger.printfln("ChargeLogUpload task could not be created: %s (0x%lx)", esp_err_to_name(ret), static_cast<uint32_t>(ret));
-        send_in_progress = false;
     }
 }
 #endif

software/src/modules/charge_tracker/charge_tracker.h

@@ -64,7 +64,6 @@ class ChargeTracker final : public IModule
     void send_file(std::unique_ptr<RemoteUploadRequest> args);
     void upload_charge_logs(const int8_t retry_count = 0);
     void start_charge_log_upload_for_config(const uint8_t config_index, const uint32_t cookie, const int user_filter = -2, const uint32_t start_timestamp_min = 0, const uint32_t end_timestamp_min = 0, const Language language = Language::German, const FileType file_type = FileType::PDF, const CSVFlavor csv_delimiter = CSVFlavor::Excel, std::unique_ptr<char[]> letterhead = nullptr, std::unique_ptr<ChargeLogGenerationLockHelper> generation_lock = nullptr);
-    bool send_in_progress = false;
 #endif
 
     ConfigRoot last_charges;