Upload multiple logs

src/logging.cpp

@@ -156,4 +156,9 @@ void Logger::notify_data_valid() {
 void Logger::upload_last_log() {
   if(m_log_files.empty()) return;
   std::thread(upload_file, m_log_files.back()).detach();
+}
+
+void Logger::upload_last_logs() {
+  if(m_log_files.empty()) return;
+  std::thread(upload_files, m_log_files).detach();
 }

src/logging.h

@@ -49,6 +49,7 @@ public:
   void clear_log_data() noexcept { m_log_array.clear(); }
 
   void upload_last_log();
+  void upload_last_logs();
 private:
   std::vector<logData> m_log_array;
   std::vector<std::string> m_log_files;

src/overlay.cpp

@@ -808,6 +808,17 @@ void check_keybinds(struct swapchain_stats& sw_stats, struct overlay_params& par
          last_upload_press = now;
          logger->upload_last_log();
       }
+   }   
+   if (params.permit_upload && elapsedUpload >= keyPressDelay){
+#ifdef HAVE_X11
+      pressed = keys_are_pressed(params.upload_logs);
+#else
+      pressed = false;
+#endif
+      if (pressed){
+         last_upload_press = now;
+         logger->upload_last_logs();
+      }
    }
 }
 

src/overlay_params.cpp

@@ -113,11 +113,18 @@ parse_upload_log(const char *str)
    return parse_string_to_keysym_vec(str);
 }
 
+static std::vector<KeySym>
+parse_upload_logs(const char *str)
+{
+   return parse_string_to_keysym_vec(str);
+}
+
 #else
 #define parse_toggle_hud(x)      {}
 #define parse_toggle_logging(x)  {}
 #define parse_reload_cfg(x)      {}
 #define parse_upload_log(x)      {}
+#define parse_upload_logs(x)     {}
 #endif
 
 static uint32_t
@@ -435,6 +442,7 @@ parse_overlay_config(struct overlay_params *params,
    params->toggle_logging = { XK_Shift_L, XK_F2 };
    params->reload_cfg = { XK_Shift_L, XK_F4 };
    params->upload_log = { XK_Shift_L, XK_F3 };
+   params->upload_logs = { XK_Control_L, XK_F3 };
 #endif
 
    // first pass with env var

src/overlay_params.h

@@ -70,6 +70,7 @@ typedef unsigned long KeySym;
    OVERLAY_PARAM_CUSTOM(toggle_logging)              \
    OVERLAY_PARAM_CUSTOM(reload_cfg)                  \
    OVERLAY_PARAM_CUSTOM(upload_log)                  \
+   OVERLAY_PARAM_CUSTOM(upload_logs)                 \
    OVERLAY_PARAM_CUSTOM(offset_x)                    \
    OVERLAY_PARAM_CUSTOM(offset_y)                    \
    OVERLAY_PARAM_CUSTOM(background_alpha)            \
@@ -164,6 +165,7 @@ struct overlay_params {
    std::vector<KeySym> toggle_logging;
    std::vector<KeySym> reload_cfg;
    std::vector<KeySym> upload_log;
+   std::vector<KeySym> upload_logs;
    std::string time_format, output_file;
    std::string pci_dev;
    std::string media_player_name;