[Easytag-mailing] Patch for EasyTAG 0.28 ( -> 0.28a )

[Jérôme Couderc <j couderc ifrance com>]

Hi,

    Here is a patch to fix a bug when applying CDDB results to the files
excepted for the filename.

Jerome

--
EasyTAG - Tag editor for MP3 and Ogg Vorbis files
http://easytag.sourceforge.net
--
Jerome COUDERC <j couderc ifrance com>

diff -ruN easytag-0.28/configure easytag-0.28a/configure
--- easytag-0.28/configure	Sat May 31 22:20:13 2003
+++ easytag-0.28a/configure	Mon Jun 23 23:45:37 2003
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for easytag 0.28.
+# Generated by GNU Autoconf 2.53 for easytag 0.28a.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -412,8 +412,8 @@
 # Identity of this package.
 PACKAGE_NAME='easytag'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='0.28'
-PACKAGE_STRING='easytag 0.28'
+PACKAGE_VERSION='0.28a'
+PACKAGE_STRING='easytag 0.28a'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/easytag.h"
@@ -918,7 +918,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures easytag 0.28 to adapt to many kinds of systems.
+\`configure' configures easytag 0.28a to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -984,7 +984,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of easytag 0.28:";;
+     short | recursive ) echo "Configuration of easytag 0.28a:";;
    esac
   cat <<\_ACEOF
 
@@ -1092,7 +1092,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-easytag configure 0.28
+easytag configure 0.28a
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1107,7 +1107,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by easytag $as_me 0.28, which was
+It was created by easytag $as_me 0.28a, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1639,7 +1639,7 @@
 
 # Define the identity of the package.
  PACKAGE=easytag
- VERSION=0.28
+ VERSION=0.28a
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12595,7 +12595,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by easytag $as_me 0.28, which was
+This file was extended by easytag $as_me 0.28a, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12657,7 +12657,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-easytag config.status 0.28
+easytag config.status 0.28a
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -ruN easytag-0.28/configure.in easytag-0.28a/configure.in
--- easytag-0.28/configure.in	Sat May 31 21:42:29 2003
+++ easytag-0.28a/configure.in	Mon Jun 23 23:44:54 2003
@@ -6,7 +6,7 @@
 dnl VERSION=0.28
 
 AC_PREREQ(2.53)
-AC_INIT(easytag, 0.28) dnl defines ($PACKAGE, $VERSION)
+AC_INIT(easytag, 0.28a) dnl defines ($PACKAGE, $VERSION)
 AC_CONFIG_SRCDIR(src/easytag.h)
 dnl -------------------------------
 dnl Init automake
diff -ruN easytag-0.28/easytag.spec easytag-0.28a/easytag.spec
--- easytag-0.28/easytag.spec	Sat May 31 22:21:15 2003
+++ easytag-0.28a/easytag.spec	Mon Jun 23 23:46:00 2003
@@ -1,5 +1,5 @@
 %define    name      easytag
-%define    version   0.28
+%define    version   0.28a
 %define    release   1
 %define    prefix    /usr
 
diff -ruN easytag-0.28/src/cddb.c easytag-0.28a/src/cddb.c
--- easytag-0.28/src/cddb.c	Sat May 31 21:59:28 2003
+++ easytag-0.28a/src/cddb.c	Mon Jun 23 23:44:18 2003
@@ -1788,13 +1788,33 @@
             if (cddbtrackalbum && etfilelist)
             {
                 ET_File   *etfile   = (ET_File *)etfilelist->data;
-                File_Name *FileName = ET_File_Name_Item_New();
-                File_Tag  *FileTag  = ET_File_Tag_Item_New();
-                ET_Copy_File_Tag_Item(etfilelist->data,FileTag);
+                File_Name *FileName = NULL;
+                File_Tag  *FileTag  = NULL;
 
+                /*
+                 * Tag fields
+                 */
+                if (cddbsettoallfields || cddbsettotitle      || cddbsettotitle
+                ||  cddbsettoartist    || cddbsettoalbum      || cddbsettoyear
+                ||  cddbsettotrack     || cddbsettotracktotal || cddbsettogenre)
+                {
+                    // Allocation of a new FileTag
+                    FileTag = ET_File_Tag_Item_New();
+                    ET_Copy_File_Tag_Item(etfilelist->data,FileTag);
+                }
+                
                 if (cddbsettoallfields || cddbsettotitle)
                     ET_Set_Field_File_Tag_Item(&FileTag->title,cddbtrackalbum->track_name);
 
+                if ( (cddbsettoallfields || cddbsettoartist) && cddbtrackalbum->cddbalbum->artist)
+                    ET_Set_Field_File_Tag_Item(&FileTag->artist,cddbtrackalbum->cddbalbum->artist);
+
+                if ( (cddbsettoallfields || cddbsettoalbum) && cddbtrackalbum->cddbalbum->album)
+                    ET_Set_Field_File_Tag_Item(&FileTag->album, cddbtrackalbum->cddbalbum->album);
+
+                if ( (cddbsettoallfields || cddbsettoyear) && cddbtrackalbum->cddbalbum->year)
+                    ET_Set_Field_File_Tag_Item(&FileTag->year,  cddbtrackalbum->cddbalbum->year);
+
                 if (cddbsettoallfields || cddbsettotrack)
                 {
                     if (NUMBER_TRACK_FORMATED) snprintf(buffer,sizeof(buffer),"%.2d",cddbtrackalbum->track_number);
@@ -1809,22 +1829,20 @@
                     ET_Set_Field_File_Tag_Item(&FileTag->track_total,buffer);
                 }
             
-                if ( (cddbsettoallfields || cddbsettoalbum) && cddbtrackalbum->cddbalbum->album)
-                    ET_Set_Field_File_Tag_Item(&FileTag->album, cddbtrackalbum->cddbalbum->album);
-
-                if ( (cddbsettoallfields || cddbsettoartist) && cddbtrackalbum->cddbalbum->artist)
-                    ET_Set_Field_File_Tag_Item(&FileTag->artist,cddbtrackalbum->cddbalbum->artist);
-
                 if ( (cddbsettoallfields || cddbsettogenre) && cddbtrackalbum->cddbalbum->genre)
                     ET_Set_Field_File_Tag_Item(&FileTag->genre, cddbtrackalbum->cddbalbum->genre);
 
-                if ( (cddbsettoallfields || cddbsettoyear) && cddbtrackalbum->cddbalbum->year)
-                    ET_Set_Field_File_Tag_Item(&FileTag->year,  cddbtrackalbum->cddbalbum->year);
-
+                /*
+                 * Filename field
+                 */
                 if ( (cddbsettoallfields || cddbsettofilename) )
                 {
-                    // Build the filename with the path
                     gchar *filename_generated, *filename_new = NULL;
+
+                    // Allocation of a new FileName
+                    FileName = ET_File_Name_Item_New();
+                    
+                    // Build the filename with the path
                     if (NUMBER_TRACK_FORMATED) snprintf(buffer,sizeof(buffer),"%.2d",cddbtrackalbum->track_number);
                     else                       snprintf(buffer,sizeof(buffer),"%d",  cddbtrackalbum->track_number);
                     filename_generated = g_strconcat(buffer," - ",cddbtrackalbum->track_name,NULL);
@@ -1835,6 +1853,7 @@
                     if (filename_new) g_free(filename_new);
                 }
 
+
                 ET_Manage_Changes_Of_File_Data(etfile,FileName,FileTag);
 
                 // Then run current scanner if asked...