444120e664
Fixes #1978 * Move tail and non-tail handler to method Defining them in the constructor is ugly. * script: Iterate over defined actions instead of fixed list * Separate running logic and lock m_output * Include POLYBAR_FLAGS in linker flags * Stop using m_prev in script_runner * Join module threads in stop function Joining in the destructor may lead to UB because the subclass is already deconstructed but the threads may still require it to be around (e.g. for calling any functions on the instance) * Cleanup script module * Update changelog * Remove AfterReturn class * Remove m_stopping from script module * Fix polybar not reading the entire line from child process. For every `readline` call we created a new fd_streambuf. This means once `readline` returns, the streambuf is destructed and and pending data in its temporary buffer discarded and we never actually read it. * Remove unused includes
58 lines
1.0 KiB
C++
58 lines
1.0 KiB
C++
#pragma once
|
|
|
|
#include <atomic>
|
|
#include <chrono>
|
|
#include <mutex>
|
|
|
|
#include "common.hpp"
|
|
#include "components/logger.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
class script_runner {
|
|
public:
|
|
using interval = std::chrono::duration<double>;
|
|
script_runner(std::function<void(void)> on_update, const string& exec, const string& exec_if, bool tail,
|
|
interval interval, const vector<pair<string, string>>& env);
|
|
|
|
bool check_condition() const;
|
|
interval process();
|
|
|
|
void clear_output();
|
|
|
|
void stop();
|
|
|
|
int get_pid() const;
|
|
int get_counter() const;
|
|
|
|
string get_output();
|
|
|
|
bool is_stopping() const;
|
|
|
|
protected:
|
|
bool set_output(const string&&);
|
|
|
|
interval run_tail();
|
|
interval run();
|
|
|
|
private:
|
|
const logger& m_log;
|
|
|
|
const std::function<void(void)> m_on_update;
|
|
|
|
const string m_exec;
|
|
const string m_exec_if;
|
|
const bool m_tail;
|
|
const interval m_interval;
|
|
const vector<pair<string, string>> m_env;
|
|
|
|
std::mutex m_output_lock;
|
|
string m_output;
|
|
|
|
std::atomic_int m_counter{0};
|
|
std::atomic_bool m_stopping{false};
|
|
std::atomic_int m_pid{-1};
|
|
};
|
|
|
|
POLYBAR_NS_END
|