Merge d08eea1cf5862a21bbe83247bf0436803456cc82 into b8cd0ab4953d053fef09c48ba04f2fbb2df57aa4

Timeout added to forecast module, ncmpcpp now tracks player state (#1359 )
* Added timeout to getforecast to prevent status bar breakage. A 2 second timeout is used in the case that wttr.in is inaccessible when dwm is started; as otherwise it tries to curl wttr.in indefinitely, not allowing other status bar modules to be loaded. * Update music status bar module on player state change
2026-03-20 01:37:45 +01:00 · 2023-09-10 09:34:14 +02:00 · 2023-09-05 07:51:05 +00:00 · 2023-09-03 07:20:13 +00:00 · 2023-07-07 03:42:37 +03:00 · 2023-07-07 03:27:50 +03:00
4 changed files with 39 additions and 3 deletions
--- a/.config/ncmpcpp/config
+++ b/.config/ncmpcpp/config
@ -31,3 +31,4 @@ progressbar_elapsed_color = blue:b
 statusbar_color = red
 statusbar_time_color = cyan:b
 execute_on_song_change="pkill -RTMIN+11 dwmblocks"
 execute_on_player_state_change="pkill -RTMIN+11 dwmblocks"
--- a/.local/bin/booksplit
+++ b/.local/bin/booksplit
@ -12,7 +12,7 @@ inputaudio="$1"
 ext="${1##*.}"
 # Get a safe file name from the book.
-escbook="$(echo "$booktitle" | iconv -cf UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")"
+escbook="$(echo "$booktitle" | iconv -c -f UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")"
 ! mkdir -p "$escbook" &&
    echo "Do you have write access in this directory?" &&
@ -31,7 +31,7 @@ do
 	cmd="$cmd -metadata artist=\"$author\" -metadata title=\"$title\" -metadata album=\"$booktitle\" -metadata year=\"$year\" -metadata track=\"$track\" -metadata total=\"$total\" -ss \"$start\" -to \"$end\" -vn -c:a copy \"$file\" "
    fi
    title="$(echo "$x" | cut -d'	' -f2-)"
-    esctitle="$(echo "$title" | iconv -cf UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")"
+    esctitle="$(echo "$title" | iconv -c -f UTF-8 -t ASCII//TRANSLIT | tr -d '[:punct:]' | tr '[:upper:]' '[:lower:]' | tr ' ' '-' | sed "s/-\+/-/g;s/\(^-\|-\$\)//g")"
    track="$((track+1))"
    start="$end"
 done < "$2"
--- a/.local/bin/fixnames
+++ b/.local/bin/fixnames
@ -0,0 +1,35 @@
 #!/bin/sh
 [ "$(id -u)" = "0" ] && echo "This script should not be run as root" >&2 && exit 1
 find . -type d -path '*/.*' -prune -o -print0 | xargs -0 -n1 -P10 -I{} sh -c '
    generate_unique_name() {
        base_name="$1"; ext="$2"; dest_path="$3"; count=1
        [ -z "$ext" ] && new_name="$base_name" || new_name="${base_name}.${ext}"
        while [ -e "${dest_path}/${new_name}" ]; do
            [ -z "$ext" ] && new_name="${base_name}_${count}" || new_name="${base_name}_${count}.${ext}"
            count=$(( count + 1 ))
        done
        echo "$new_name"
    }
    process_item() {
        item_path="$1"; 
        [ "$item_path" = "." ] && return
        dir_name=$(dirname "$item_path"); base_name=$(basename "$item_path")
        [ -d "$item_path" ] && {
            new_name=$(echo "$base_name" | sed -E "s/[^a-zA-Z0-9 _.-]+//g; s/[ .-]+/_/g; s/_+/_/g; s/^_//; s/_$//; s/(.*)/\L\1/")
            [ -z "$new_name" ] && new_name="untitled"
        } || {
            file_ext="${base_name##*.}"
            base_name_no_ext="${base_name%.*}"
            new_base_name_no_ext=$(echo "$base_name_no_ext" | sed -E "s/[^a-zA-Z0-9 _.-]+//g; s/[ .-]+/_/g; s/_+/_/g; s/^_//; s/_$//; s/(.*)/\L\1/")
            [ -z "$new_base_name_no_ext" ] && new_base_name_no_ext="untitled"
            [ -z "$file_ext" ] || [ "$file_ext" = "$base_name_no_ext" ] && new_name="$new_base_name_no_ext" || new_name="${new_base_name_no_ext}.${file_ext}"
        }
        [ "$base_name" != "$new_name" ] && {
            [ -e "${dir_name}/${new_name}" ] && new_name=$(generate_unique_name "${new_name%.*}" "${new_name##*.}" "$dir_name")
            mv "$item_path" "${dir_name}/${new_name}" 2>/dev/null || true
        }
    }
    process_item "{}"
 ' 2>/dev/null
--- a/.local/bin/statusbar/sb-forecast
+++ b/.local/bin/statusbar/sb-forecast
@ -7,7 +7,7 @@ url="${WTTRURL:-wttr.in}"
 weatherreport="${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport"
 # Get a weather report from 'wttr.in' and save it locally.
-getforecast() { curl -sf "$url/$LOCATION" > "$weatherreport" || exit 1; }
+getforecast() { timeout --signal=1 2s curl -sf "$url/$LOCATION" > "$weatherreport" || exit 1; }
 # Forecast should be updated only once a day.
 checkforecast() {
Author	SHA1	Message	Date
Emre AKYÜZ	5a6a156826	Merge d08eea1cf5862a21bbe83247bf0436803456cc82 into b8cd0ab4953d053fef09c48ba04f2fbb2df57aa4	2023-09-10 09:34:14 +02:00
sban	b8cd0ab495	Timeout added to forecast module, ncmpcpp now tracks player state (#1359 ) * Added timeout to getforecast to prevent status bar breakage. A 2 second timeout is used in the case that wttr.in is inaccessible when dwm is started; as otherwise it tries to curl wttr.in indefinitely, not allowing other status bar modules to be loaded. * Update music status bar module on player state change	2023-09-05 07:51:05 +00:00
Hylke Hellinga	c550a7c6e5	Fixed Booksplit for termux (#1358 ) Co-authored-by: Simbaclaws <h.hellinga@inner-join.nl>	2023-09-03 07:20:13 +00:00
Emre AKYÜZ	d08eea1cf5	check files with no extensions	2023-07-07 03:42:37 +03:00
Emre AKYÜZ	fe6b9043b8	increased safety	2023-07-07 03:27:50 +03:00
Emre AKYÜZ	62618ae588	increased safety \| exclude dotfiles \| check root	2023-07-01 04:13:50 +03:00
Emre AKYÜZ	f313b6c0f5	Fix File Naming Conventions for Unix Environment Luke mentions about Unix naming conventions on his videos. Here is a script to increase consistency according to Unix conventions for all file names in parallel, very easily and fast in a safe way. Luke also asks: "What do you think about naming files with underscores instead of dashes?", stating his worry about the usage of underscores seems like a "soydev" thing 😂. I give my opinion below. Actually the justification is objective compared to an opinion. ### What The Script Does 1. Check if the item is a directory. If so; - a) Remove non-English characters. - b) Replace spaces, dots, and dashes with underscores. - c) Remove consecutive underscores. - d) Convert the name to lowercase. - e) Remove any other special characters. - f) If the resulting name is empty, set it to "untitled". - g) Every file or directory should start and end with an alphanumeric character. 2. If the item is a file, apply the same transformations as for directories, but keep the file extension intact. 3. Check if the original name and the new name are different. If so, and if a file or directory with the new name already exists, create a unique name. - The script can use Dash and parallel processes, ensuring safety and performance with a subshell environment. Therefore it can even rename more than 100.000 files that have extremely weird names in 30 seconds (I have tested bash built-in functions, tr, awk and sed. None of them was faster than sed for this task, awk was very close but still slower). Examples of How Every File Should Look: this_is_an_example_directory_name OR this_is_an_example_video_file.mp4 ### Why "_" is Preferred Instead of a Space or a Dot or a Dash In Unix environments, it is generally recommended to replace spaces in filenames with underscores (_), rather than dots (.) or dashes (-). This is because underscores are more commonly used and supported by Unix utilities and programming languages. Dots (.) are typically used as a separator between a file's name and its extension, so using them to replace spaces can lead to confusion and errors. Dashes (-) are sometimes used in place of spaces, but they can be problematic because they are often used as a command-line option delimiter in Unix, which can lead to unexpected behavior. - Readability: Underscores make file and directory names more readable, as they clearly separate words and components in the name, whereas spaces can be easily overlooked, and dots can be mistaken for file extensions. - Compatibility: Some command line tools and scripts may not handle file names with spaces or dots properly without additional configuration or escaping. Underscores, on the other hand, do not require special handling and are generally better supported across various tools and environments. - URL encoding: When sharing file paths in URLs or web applications, spaces and dots may require URL encoding (e.g., replacing spaces with "%20" and dots with "%2E"), which can make the URLs less readable and more cumbersome to work with ### The Reason Behind Using a Subshell Environment Subshells are used in the script to isolate the execution environment of each parallel process. This isolation ensures that the processes do not interfere with each other, as they have their own separate environments, including local variables and function definitions. This separation is particularly important when running multiple processes in parallel, as it reduces the risk of race conditions and other synchronization issues. Using subshells in the script also simplifies the process of launching parallel processes. By executing the process_item function within a subshell, the script can easily leverage the -P flag of xargs to specify the maximum number of parallel processes to run. This results in improved performance and efficiency when processing a large number of files and directories. ### The Benefit of Removing Non-English Characters - Compatibility: Non-English characters can cause compatibility issues with some tools, applications, or systems that are not properly configured to handle them. By removing these characters, you reduce the risk of encountering issues related to character encoding and ensure broader compatibility across different environments. - Consistency: Standardizing file and directory names by removing non-English characters can make it easier to organize, search, and manage your files. It helps maintain a consistent naming convention across your file system, which can be beneficial for both human users and automated processes. - Accessibility: Using only English characters in file and directory names can improve accessibility for users who may not be familiar with non-English characters or languages. This can be particularly important in multi-user or multi-language environments where not all users might be comfortable with non-English characters. ### A Lot More Details - find . -depth -name '' -print0: This find command searches for all files and directories recursively in the current directory (.). -depth ensures that the directory tree is traversed depth-first, and -name '' matches all items. -print0 prints the results separated by a null character (useful for handling filenames with spaces or special characters). - \| xargs -0 -n1 -P10 -I{} sh -c '...': The find command output is piped (\|) to xargs. The -0 option tells xargs to expect null-terminated items. -n1 processes one item at a time. -P10 runs 10 parallel processes. -I{} sets the placeholder for input items. sh -c '...' runs a shell script with the given commands for each input item. - generate_unique_name() { ... }: This is a function that generates a unique name for a file or directory. It takes three arguments: the base name, the extension (if any), and the destination path. It increments a counter and appends it to the base name until a unique name is found, then returns the unique name. - process_item() { ... }: This is the main function that processes a single file or directory path. It sanitizes the name and renames the item if needed. - [ "$item_path" = "." ] && return: This line checks if the item path is the current directory (.). If it is, the function returns without doing anything. - dir_name=$(dirname "$item_path"); base_name=$(basename "$item_path"): These commands extract the directory name and base name from the item path. - if [ -d "$item_path" ]; then ... else ... fi: This conditional block checks if the item is a directory (-d) and processes it accordingly. - new_name=$(echo "$base_name" \| sed -E "s/[^a-zA-Z0-9 _.-]+//g; s/[ .-]+/_/g; s/_+/_/g; s/^_//; s/_$//; s/(.)/\L\1/"): This line uses sed to sanitize the base name by removing unwanted characters, replacing spaces and periods with underscores, and converting the name to lowercase. The -E flag enables extended regular expressions. - [ -z "$new_name" ] && new_name="untitled": If the new name is empty, it is set to "untitled". - file_ext="${base_name##.}" base_name_no_ext="${base_name%.}": For files, this line extracts the file extension and the base name without the extension. - new_name="${new_base_name_no_ext}.${file_ext}": For files, this line constructs the new file name with the sanitized base name and the original file extension. - if [ "$base_name" != "$new_name" ]; then ... fi: This conditional block checks if the original name and the new name are different. - [ -e "${dir_name}/${new_name}" ] && new_name=$(generate_unique_name "${new_name%.}" "${new_name##*.}" "$dir_name"): If the new name already exists, the generate_unique_name function is called to get a unique name. - mv "$item_path" "${dir_name}/${new_name}" 2>/dev/null \|\| true: This line moves (renames) the item to the new path with the sanitized name. If an error occurs, it is redirected to /dev/null (ignored) and the script continues executing due to the \|\| true. - process_item "{}": This line calls the process_item function with the input item path (represented by {}) as the argument. - ' 2>/dev/null: This part of the script suppresses any error messages by redirecting the standard error output to /dev/null.	2023-05-10 04:13:36 +00:00