From a7015d228bb215c0d7cc465f209e8207e3d0e7dd Mon Sep 17 00:00:00 2001 From: q3aql Date: Mon, 22 May 2023 16:13:52 +0200 Subject: [PATCH] Change calc command for bc --- src/ks-av1 | 22 ++++++++++------------ src/ks-av1s | 22 ++++++++++------------ src/ks-avi | 22 ++++++++++------------ src/ks-mp4 | 22 ++++++++++------------ src/ks-mp4k | 22 ++++++++++------------ src/ks-mp4s | 22 ++++++++++------------ 6 files changed, 60 insertions(+), 72 deletions(-) diff --git a/src/ks-av1 b/src/ks-av1 index 65524a3..ff332c2 100755 --- a/src/ks-av1 +++ b/src/ks-av1 @@ -51,16 +51,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -68,14 +68,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else diff --git a/src/ks-av1s b/src/ks-av1s index e4bc05e..78aa22f 100755 --- a/src/ks-av1s +++ b/src/ks-av1s @@ -51,16 +51,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -68,14 +68,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else diff --git a/src/ks-avi b/src/ks-avi index f30dd81..9e90576 100755 --- a/src/ks-avi +++ b/src/ks-avi @@ -54,16 +54,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -71,14 +71,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else diff --git a/src/ks-mp4 b/src/ks-mp4 index 16af41b..227c176 100755 --- a/src/ks-mp4 +++ b/src/ks-mp4 @@ -54,16 +54,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -71,14 +71,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else diff --git a/src/ks-mp4k b/src/ks-mp4k index 826d3d4..1cd563b 100755 --- a/src/ks-mp4k +++ b/src/ks-mp4k @@ -54,16 +54,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -71,14 +71,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else diff --git a/src/ks-mp4s b/src/ks-mp4s index 829bb1e..eeecb2f 100755 --- a/src/ks-mp4s +++ b/src/ks-mp4s @@ -54,16 +54,16 @@ fi # Setting the correct resolution for the video file # Sintaxis: set_resolution function set_resolution() { - check_calc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" + check_bc_app_directories="/usr/bin /bin /usr/local/bin ${HOME}/.local/bin" set_rel="${1}" input_video_file="${2}" - calc_found="1" - for file in ${check_calc_app_directories} ; do - if [ -f ${file}/calc ] ; then - calc_found=0 + bc_found="1" + for file in ${check_bc_app_directories} ; do + if [ -f ${file}/bc ] ; then + bc_found=0 fi done - if [ ${calc_found} -eq 0 ] ; then + if [ ${bc_found} -eq 0 ] ; then file_rel=$(ffmpeg -i "${2}" 2>&1 | grep Stream | grep Video: | grep -Po '\d{3,5}x\d{3,5}') if [ -z "${file_rel}" ] ; then echo ${set_rel} @@ -71,14 +71,12 @@ function set_resolution() { file_rel_width=$(echo ${file_rel} | cut -d "x" -f 1) file_rel_height=$(echo ${file_rel} | cut -d "x" -f 2) set_rel_width=$(echo ${set_rel} | cut -d "x" -f 1) - aspect_rel=$(calc ${file_rel_width} / ${file_rel_height} | tr -s "~" " ") - new_rel_height=$(calc ${set_rel_width} / ${aspect_rel} | cut -d "." -f 1 | tr -s "~" " ") - even_number=$(calc ${new_rel_height} % 2) + aspect_rel=$(echo ${file_rel_width} / ${file_rel_height} | bc -l) + new_rel_height=$(echo ${set_rel_width} / ${aspect_rel} | bc) + even_number=$(echo ${new_rel_height} % 2 | bc) if [ ${even_number} -ne 0 ] ; then - new_rel_height=$(calc ${new_rel_height} + 1) + new_rel_height=$(expr ${new_rel_height} + 1) fi - set_rel_width=$(echo ${set_rel_width}) - new_rel_height=$(echo ${new_rel_height}) echo ${set_rel_width}x${new_rel_height} fi else