- Move usr/lib to lib,

- Support rx3-base 1.1.2, - Bump release from 1.0.x to 1.1.x.
2026-04-19 12:19:39 +02:00
parent 1d4bc2626e
commit 66aaffa3a8
17 changed files with 49 additions and 30 deletions
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,4 +1,4 @@
-Welcome to Rx3 Music Tools 1.0.x !
+Welcome to Rx3 Music Tools 1.1.x !



--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,5 +1,15 @@
 ------------------------------------------------------------------------------------------------------------------------------------
-Music Tools V 1.0.0 - A. GIBERT - 2026/04/12
+Music Tools V 1.1.1 - A. GIBERT - 2026/05/02
+------------------------------------------------------------------------------------------------------------------------------------
+
+- Move usr/lib to lib,
+- Support rx3-base 1.1.2,
+- Bump release from 1.0.x to 1.1.x.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+Music Tools V 1.1.0 - A. GIBERT - 2026/04/12
 ------------------------------------------------------------------------------------------------------------------------------------

 - Initial Released version.
@@ -7,7 +17,7 @@ Music Tools V 1.0.0 - A. GIBERT - 2026/04/12


 ------------------------------------------------------------------------------------------------------------------------------------
-Music Tools Unreleased - A. GIBERT - 2016-2026
+Music Tools V 1.0.0 - A. GIBERT - 2016-2026
 ------------------------------------------------------------------------------------------------------------------------------------

 - Initial unreleased versions.
--- a/SPECS/music_tools.spec
+++ b/SPECS/music_tools.spec
@@ -25,7 +25,7 @@

 %define name                            music_tools

-%define version 		        1.0.0
+%define version 		        1.1.1
 %define release 		        %mkrel 1rx3


@@ -94,7 +94,7 @@ cp etc/bash_completion.d/*              %{buildroot}%{_sysconfdir}/bash_completi

 # Lib
 %{__mkdir_p}                            %{buildroot}%{_prefix}/lib/rx3
-cp usr/lib/rx3/*.bash                   %{buildroot}%{_prefix}/lib/rx3
+cp lib/rx3/*.bash                       %{buildroot}%{_prefix}/lib/rx3

 # Bin
 %{__mkdir_p}                            %{buildroot}%{_bindir}
@@ -125,5 +125,8 @@ cp bin/*                                %{buildroot}%{_bindir}
 #-----------------------------------------------------------------------------------------------------------------------------------

 %changelog
-* Sun Apr 12 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.0.0-1rx3.mga9
+* Sat May  2 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.1-1rx3.mga9
+- Update to 1.1.1 release
+
+* Sun Apr 12 2026 Arnaud G. GIBERT <arnaud@rx3.net> - 1.1.0-1rx3.mga9
 - Initial release
--- a/bin/album_convert
+++ b/bin/album_convert
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g    VERSION="1.0.0"
+declare -g    VERSION="1.1.0"
 declare -g       NAME="album_convert"
 declare -g       HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-r | --resample] [-d | --downsampled_tag] <source_dir> <target_dir>"

@@ -91,7 +91,7 @@ ac_args_parse()
 {
    tmp_args=$(getopt -o ThVvrd --long test,help,version,verbose,resample,downsampled_tag -n "${NAME}" -- "$@")

-    if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
+    if [ $? != 0 ] ; then echo_error "Terminating..." ; exit 1 ; fi

    # Note the quotes around `$TEMP': they are essential!
    eval set -- "${tmp_args}"
--- a/bin/album_merge
+++ b/bin/album_merge
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g   VERSION="1.0.0"
+declare -g   VERSION="1.1.0"
 declare -g      NAME="album_merge"
 declare -g      HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] <source_dir> <target_dir> <album_name> <prefix>"

--- a/bin/album_metadata_load
+++ b/bin/album_metadata_load
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g       VERSION="1.0.0"
+declare -g       VERSION="1.1.0"
 declare -g          NAME="album_metadata_load"
 declare -g          HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-c | --clean] <Source_Dir> <Target_Dir> <MetaData_File>"

--- a/bin/album_metadata_save
+++ b/bin/album_metadata_save
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g       VERSION="1.0.0"
+declare -g       VERSION="1.1.0"
 declare -g          NAME="album_metadata_save"
 declare -g          HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-f | --factoring] [-s | --standardising] <Source_Dir> <MetaData_File>"

--- a/bin/album_name_fix
+++ b/bin/album_name_fix
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g       VERSION="1.0.0"
+declare -g       VERSION="1.1.0"
 declare -g          NAME="album_name_fix "
 declare -g          HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-a <album_dir>] [-p|--music_pattern <music_pattern>] [-s|--sed_substitute_pattern <sed_substitue_pattern>]"

--- a/bin/album_rename
+++ b/bin/album_rename
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g    VERSION="1.0.0"
+declare -g    VERSION="1.1.0"
 declare -g       NAME="album_rename"
 declare -g       HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] <source_dir> <target_dir> <album_name>"

--- a/bin/album_renum
+++ b/bin/album_renum
@@ -38,7 +38,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g         VERSION="1.0.0"
+declare -g         VERSION="1.1.0"
 declare -g            NAME="album_renum"
 declare -g            HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-f | --first_number <first_number>] [-d | --number_of_digit <number_of_digit>] <source_dir> <target_dir>"

--- a/bin/album_retitle
+++ b/bin/album_retitle
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g    VERSION="1.0.0"
+declare -g    VERSION="1.1.0"
 declare -g       NAME="album_retitle"
 declare -g       HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] <source_dir> <target_dir> <title_file>"

--- a/bin/album_seekpoint
+++ b/bin/album_seekpoint
@@ -37,7 +37,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g          VERSION="1.0.0"
+declare -g          VERSION="1.1.0"
 declare -g             NAME="album_seekpoint"
 declare -g             HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] <source_dir> <target_dir> <seek_point_delay>"

--- a/bin/music-info
+++ b/bin/music-info
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g  VERSION="1.0.0"
+declare -g  VERSION="1.1.0"
 declare -g     NAME="music_info"
 declare -g     HELP="usage: [-h | --help] | [-V | --version] | [-l | --list] [-r | --root_dir <root_dir>]"

--- a/bin/music_check
+++ b/bin/music_check
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g    VERSION="1.0.0"
+declare -g    VERSION="1.1.0"
 declare -g       NAME="music_check"
 declare -g       HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] <source_dir>"

--- a/bin/music_folder_make
+++ b/bin/music_folder_make
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g         VERSION="1.0.0"
+declare -g         VERSION="1.1.0"
 declare -g            NAME="music_folder_make"
 declare -g            HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-p | --music_pattern <music_pattern>] [-r | --root_dir <music_root_dir>]"

--- a/bin/music_tag_cleanner
+++ b/bin/music_tag_cleanner
@@ -39,7 +39,7 @@
 # Global Variables
 #-----------------------------------------------------------------------------------------------------------------------------------

-declare -g          VERSION="1.0.0"
+declare -g          VERSION="1.1.0"
 declare -g             NAME="music_tag_cleaner"
 declare -g             HELP="usage: [-h | --help] | [-V | --version] | [-T | --test] [-v | --verbose] [-f | --fix_missing_album_artist] [-a | --default_artist <default_artist>] [-p | --music_pattern <music_pattern>] [-r | --root_dir <music_root_dir>]"

@@ -174,7 +174,9 @@ do
 	if [[ "$(mt_tag_exist "ALBUMARTIST")" == "" ]]
 	then
 	    echo_line "${track_file}: Copying 'ALBUM ARTIST' into 'ALBUMARTIST' Tag...\n" "${i}"
-	    mt_tag_write "${track_file}" "ALBUMARTIST" "${tagtab["0,ALBUM ARTIST"]}"
+            
+            mt_tag_get album_artist 0 "ALBUM ARTIST"
+	    mt_tag_write "${track_file}" "ALBUMARTIST" "${album_artist}"
 	fi

 	echo_line "${track_file}: Cleaning 'ALBUM ARTIST' Tag...\n" "${i}"
@@ -202,7 +204,7 @@ do
 			then
 			    echo_line "${track_file}: Warning: Missing 'ARTIST' Tag...\n" "${i}"
 			else
-			    artist="${tagtab["0,ARTIST"]}"
+                            mt_tag_get artist 0 "ARTIST"
 			fi
 		    fi
 		fi
@@ -228,7 +230,6 @@ do
    echo_line "${track_file}: OK\r" "${i}"

    i=$(( i + 1 ))
-
 done < <(find "${ROOT_DIR}" \( -name '*.flac' -o -name '*.mp3' \) | grep -e "${MUSIC_PATTERN}" | sort)

 echo_line ""
--- a/usr/lib/rx3/music_tools.bash
+++ b/usr/lib/rx3/music_tools.bash
@@ -193,10 +193,9 @@ mt_fix_file_name()
 mt_tagtab_alloc()
 {
    unset       TAGTAB
-    declare -Ag TAGTAB
+    declare -Ag TAGTAB=()

-    declare -g  TAGLIST
-    TAGLIST=":"
+    declare -g  TAGLIST=":"
 }


@@ -389,6 +388,8 @@ mt_tagtab_dump()
    local  track_id="$1"
    local dump_mode="$2"
    
+    local dump_list
+

    case "${dump_mode}" in
        "STANDARD")
@@ -403,6 +404,10 @@ mt_tagtab_dump()
 	    dump_list="$3"
 	;;

+        *)
+            error_echo "Invalid Dump_Mode: [$dump_mode]!"
+            return 1
+        ;;
    esac


@@ -425,9 +430,9 @@ mt_tagtab_dump()

 mt_tag_get()
 {
-    local declare -n   return=$1
-    local            track_id=$2
-    local                 tag=$3
+    declare -n   return="$1"
+    local            track_id="$2"
+    local                 tag="$3"

 		    
    return="${TAGTAB["${track_id},${tag}"]}"