X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=bin%2Fkhatus;h=5fa635d89c426523e2d626dc12d44de0525784eb;hb=9d47c179d190e9b01ef8f6c6d56c78ca1ecfabcf;hp=371b15c433f3243bf6280eeea23429e353bc8fd0;hpb=75b23ff8a814c76a4fa0fa12a40e6a929beec695;p=khatus.git diff --git a/bin/khatus b/bin/khatus index 371b15c..5fa635d 100755 --- a/bin/khatus +++ b/bin/khatus @@ -87,33 +87,31 @@ fork_poller() { main() { declare -A opts=( - ["--debug"]=0 ["--dir_bin"]="$HOME/bin" ["--dir_perf_logs"]='' ["--file_pipe"]=$(mktemp) ["--weather_station_id"]='KJFK' ["--screen_brightness_device_name"]='acpi_video0' - ["--net_interfaces_to_show"]='' # comma-separated ["--wifi_interface"]='' ["--disk_space_device"]='/' ["--disk_io_device"]='sda' ["--thermal_zone"]=0 ["--fan_path"]='/proc/acpi/ibm/fan' ["--pulseaudio_sink"]='0' - ["--interval_inp_datetime"]=1 - ["--interval_inp_brightness"]=1 - ["--interval_inp_weather"]=$(( 30 * 60)) # 30 minutes - ["--interval_inp_mpd"]=1 - ["--interval_inp_volume"]=1 - ["--interval_inp_bluetooth"]=1 - ["--interval_inp_net_wifi"]=1 - ["--interval_inp_net_io"]=1 - ["--interval_inp_disk_space"]=1 - ["--interval_inp_disk_io"]=1 - ["--interval_inp_loadavg"]=1 - ["--interval_inp_temp"]=1 - ["--interval_inp_fan"]=1 - ["--interval_inp_mem"]=1 + ["--interval_datetime"]=1 + ["--interval_brightness"]=1 + ["--interval_weather"]=$(( 30 * 60)) # 30 minutes + ["--interval_mpd"]=1 + ["--interval_volume"]=1 + ["--interval_bluetooth"]=1 + ["--interval_net_wifi"]=1 + ["--interval_net_io"]=1 + ["--interval_disk_space"]=1 + ["--interval_disk_io"]=1 + ["--interval_loadavg"]=1 + ["--interval_temp"]=1 + ["--interval_fan"]=1 + ["--interval_mem"]=1 ) while : do @@ -126,11 +124,7 @@ main() { * ) if [ -v opts["$key"] ] then - if [ "$key" == "--debug" ] - then - opts["$key"]=1 - shift - elif [ "$val" != "" ] + if [ "$val" != "" ] then opts["$key"]="$val" shift @@ -192,55 +186,23 @@ main() { cmd_sens_loadavg="khatus_sensor_loadavg $bin" cmd_sens_memory="khatus_sensor_memory $bin" - fork_watcher "$pipe" "$bin" "khatus_sensor_energy $bin" - fork_poller "${opts['--interval_inp_datetime']}" "$perf" "$pipe" "$bin" khatus_sensor_datetime - fork_poller "${opts['--interval_inp_brightness']}" "$perf" "$pipe" "$bin" "$cmd_sens_screen_brightness" - fork_poller "${opts['--interval_inp_weather']}" "$perf" "$pipe" "$bin" "$cmd_sens_weather" - fork_poller "${opts['--interval_inp_mpd']}" "$perf" "$pipe" "$bin" "$cmd_sens_mpd" - fork_poller "${opts['--interval_inp_volume']}" "$perf" "$pipe" "$bin" "$cmd_sens_volume" - fork_poller "${opts['--interval_inp_bluetooth']}" "$perf" "$pipe" "$bin" "$cmd_sens_bluetooth" - fork_poller "${opts['--interval_inp_net_wifi']}" "$perf" "$pipe" "$bin" "$cmd_sens_wifi" - fork_poller "${opts['--interval_inp_net_io']}" "$perf" "$pipe" "$bin" "$cmd_sens_net_addr_io" - fork_poller "${opts['--interval_inp_disk_space']}" "$perf" "$pipe" "$bin" "$cmd_sens_disk_space" - fork_poller "${opts['--interval_inp_disk_io']}" "$perf" "$pipe" "$bin" "$cmd_sens_disk_io" - fork_poller "${opts['--interval_inp_loadavg']}" "$perf" "$pipe" "$bin" "$cmd_sens_loadavg" - fork_poller "${opts['--interval_inp_temp']}" "$perf" "$pipe" "$bin" "$cmd_sens_temperature" - fork_poller "${opts['--interval_inp_fan']}" "$perf" "$pipe" "$bin" "$cmd_sens_fan" - fork_poller "${opts['--interval_inp_mem']}" "$perf" "$pipe" "$bin" "$cmd_sens_memory" - - stdbuf -o L tail -f "$pipe" \ - | stdbuf -o L "$bin"/khatus_transform_total_to_diff \ - -F "$MSG_FS" \ - -v status='OK' \ - -v src='khatus_sensor_net_addr_io' \ - -v key_prefix='bytes_read' \ - | stdbuf -o L "$bin"/khatus_transform_total_to_diff \ - -F "$MSG_FS" \ - -v status='OK' \ - -v src='khatus_sensor_net_addr_io' \ - -v key_prefix='bytes_written' \ - | stdbuf -o L "$bin"/khatus_transform_total_to_diff \ - -F "$MSG_FS" \ - -v status='OK' \ - -v src='khatus_sensor_disk_io' \ - -v key_prefix='sectors_read' \ - | stdbuf -o L "$bin"/khatus_transform_total_to_diff \ - -F "$MSG_FS" \ - -v status='OK' \ - -v src='khatus_sensor_disk_io' \ - -v key_prefix='sectors_written' \ - | stdbuf -o L "$bin"/khatus_bar \ - -F "$MSG_FS" \ - -v opt_debug=""${opts['--debug']}"" \ - -v opt_mpd_song_max_chars=10 \ - -v opt_net_interfaces_to_show="${opts['--net_interfaces_to_show']}" \ - -v opt_pulseaudio_sink="${opts['--pulseaudio_sink']}" \ - | stdbuf -o L tee >("$bin"/khatus_actuate_status_bar_to_xsetroot_name) \ - | stdbuf -o L "$bin"/khatus_monitor_energy \ - | stdbuf -o L "$bin"/khatus_monitor_errors \ - | stdbuf -o L tee >("$bin"/khatus_actuate_alert_to_notify_send) \ - > /dev/null - + fork_watcher "$pipe" "$bin" "khatus_sensor_energy $bin" + fork_poller "${opts['--interval_datetime']}" "$perf" "$pipe" "$bin" khatus_sensor_datetime + fork_poller "${opts['--interval_brightness']}" "$perf" "$pipe" "$bin" "$cmd_sens_screen_brightness" + fork_poller "${opts['--interval_weather']}" "$perf" "$pipe" "$bin" "$cmd_sens_weather" + fork_poller "${opts['--interval_mpd']}" "$perf" "$pipe" "$bin" "$cmd_sens_mpd" + fork_poller "${opts['--interval_volume']}" "$perf" "$pipe" "$bin" "$cmd_sens_volume" + fork_poller "${opts['--interval_bluetooth']}" "$perf" "$pipe" "$bin" "$cmd_sens_bluetooth" + fork_poller "${opts['--interval_net_wifi']}" "$perf" "$pipe" "$bin" "$cmd_sens_wifi" + fork_poller "${opts['--interval_net_io']}" "$perf" "$pipe" "$bin" "$cmd_sens_net_addr_io" + fork_poller "${opts['--interval_disk_space']}" "$perf" "$pipe" "$bin" "$cmd_sens_disk_space" + fork_poller "${opts['--interval_disk_io']}" "$perf" "$pipe" "$bin" "$cmd_sens_disk_io" + fork_poller "${opts['--interval_loadavg']}" "$perf" "$pipe" "$bin" "$cmd_sens_loadavg" + fork_poller "${opts['--interval_temp']}" "$perf" "$pipe" "$bin" "$cmd_sens_temperature" + fork_poller "${opts['--interval_fan']}" "$perf" "$pipe" "$bin" "$cmd_sens_fan" + fork_poller "${opts['--interval_mem']}" "$perf" "$pipe" "$bin" "$cmd_sens_memory" + + stdbuf -o L tail -f "$pipe" } main $@