Refactoring code based on #21 PR comments

Author: selfuryon

logging.tmux

@@ -6,26 +6,11 @@ source "$CURRENT_DIR/scripts/variables.sh"
 source "$CURRENT_DIR/scripts/shared.sh"
 
 
-setup_logging_key_binding() {
+main() {
 	tmux bind-key "$logging_key" run-shell "$CURRENT_DIR/scripts/toggle_logging.sh"
-}
-
-setup_screen_capture_key_binding() {
 	tmux bind-key "$pane_screen_capture_key" run-shell "$CURRENT_DIR/scripts/screen_capture.sh"
-}
-
-setup_save_complete_history_key_binding() {
 	tmux bind-key "$save_complete_history_key" run-shell "$CURRENT_DIR/scripts/save_complete_history.sh"
-}
-
-setup_clear_history_key_binding() {
 	tmux bind-key "$clear_history_key" run-shell "$CURRENT_DIR/scripts/clear_history.sh"
 }
 
-main() {
-	setup_logging_key_binding
-	setup_screen_capture_key_binding
-	setup_save_complete_history_key_binding
-	setup_clear_history_key_binding
-}
 main

scripts/capture_pane_helpers.sh

@@ -4,11 +4,14 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_DIR/variables.sh"
 source "$CURRENT_DIR/shared.sh"
-source "$CURRENT_DIR/capture_pane_helpers.sh"
 
 main() {
 	if supported_tmux_version_ok; then
-		capture_pane "History"
+		local file=$(expand_tmux_format_path "${save_complete_history_full_filename}")
+		local history_limit="$(tmux display-message -p -F "#{history_limit}")"
+		tmux capture-pane -J -S "-${history_limit}" -p > "${file}"
+		remove_empty_lines_from_end_of_file "${file}"
+		display_message "History saved to ${file}"
 	fi
 }
 main

scripts/save_complete_history.sh

@@ -4,11 +4,13 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$CURRENT_DIR/variables.sh"
 source "$CURRENT_DIR/shared.sh"
-source "$CURRENT_DIR/capture_pane_helpers.sh"
 
 main() {
 	if supported_tmux_version_ok; then
-		capture_pane "Screen capture"
+		local file=$(expand_tmux_format_path "${screen_capture_full_filename}")
+		tmux capture-pane -J -p > "${file}"
+		remove_empty_lines_from_end_of_file "${file}"
+		display_message "Screen capture saved to ${file}"
 	fi
 }
 main

scripts/screen_capture.sh

@@ -43,3 +43,13 @@ remove_empty_lines_from_end_of_file() {
 supported_tmux_version_ok() {
 	$CURRENT_DIR/check_tmux_version.sh "$SUPPORTED_VERSION"
 }
+
+# Checking full path to logfile and expanding tmux format in normal path
+# As example: expand %Y-%m-%d to current date
+expand_tmux_format_path() {
+	local tmux_format_path=$1
+	local full_path=$(tmux display-message -p "${tmux_format_path}")
+	local full_directory_path=${full_path%/*}
+	mkdir -p "${full_directory_path}"
+	echo "${full_path}"
+}

scripts/shared.sh

@@ -7,11 +7,9 @@ source "$CURRENT_DIR/shared.sh"
 
 
 start_pipe_pane() {
-	local file=$(tmux display-message -p "$logging_full_filename")
-	local path=$(tmux display-message -p "$logging_path")
-	mkdir -p "$path"
-	"$CURRENT_DIR/start_logging.sh" "$file"
-	display_message "Started logging to $logging_full_filename"
+	local file=$(expand_tmux_format_path "${logging_full_filename}")
+	"$CURRENT_DIR/start_logging.sh" "${file}"
+	display_message "Started logging to ${logging_full_filename}"
 }
 
 stop_pipe_pane() {