[sound-juicer] libjuicer: Fix empty fallback titles with some CDs

[Bastien Nocera <hadess src gnome org>]

commit 765eeb2e2236bde3d2508f4ddc9aa8fb9becdd1d
Author: Bastien Nocera <hadess hadess net>
Date:   Sat May 10 15:05:14 2014 +0200

    libjuicer: Fix empty fallback titles with some CDs
    
    My CD of "A Movie for Daddy" has some CD-Text information, but
    simply empty ones. Tracks 4 and 10 have " " as track titles, which
    we should ignore.
    
    Rework the setting of metadata to ignore strings that are full of
    spaces. This also fixes a small memory leak if the string contained
    a '\0' instead of simply being NULL.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=729916

 libjuicer/sj-metadata-gvfs.c |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/libjuicer/sj-metadata-gvfs.c b/libjuicer/sj-metadata-gvfs.c
index 7f825c5..f80480b 100644
--- a/libjuicer/sj-metadata-gvfs.c
+++ b/libjuicer/sj-metadata-gvfs.c
@@ -29,6 +29,7 @@
 
 #include "sj-metadata-gvfs.h"
 #include "sj-structures.h"
+#include "sj-util.h"
 #include "sj-error.h"
 
 struct SjMetadataGvfsPrivate {
@@ -84,6 +85,7 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
   GFileInfo *info;
   GFileEnumerator *e;
   guint i = 1;
+  const char *str;
 
   g_return_val_if_fail (SJ_IS_METADATA_GVFS (metadata), NULL);
 
@@ -104,15 +106,18 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
   album = g_new0(AlbumDetails, 1);
 
   /* Get the album metadata */
-  if (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title") != NULL) {
+  str = g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title");
+  if (!sj_str_is_empty (str)) {
     album->metadata_source = SOURCE_CDTEXT;
-    album->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
+    album->title = g_strdup (str);
   } else {
     album->metadata_source = SOURCE_FALLBACK;
     album->title = g_strdup (_("Unknown Title"));
   }
-  album->artist = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.artist"));
-  if (album->artist == NULL)
+  str = g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.artist");
+  if (!sj_str_is_empty (str))
+    album->artist = g_strdup (str);
+  else
     album->artist = g_strdup (_("Unknown Artist"));
   album->genre = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.genre"));
 
@@ -133,11 +138,15 @@ gvfs_list_albums (SjMetadata *metadata, char **url, GError **error)
     track = g_new0 (TrackDetails, 1);
     track->number = i;
     track->album = album;
-    track->title = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title"));
-    if (track->title == NULL)
+    str = g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.title");
+    if (!sj_str_is_empty (str))
+      track->title = g_strdup (str);
+    else
       track->title = g_strdup_printf (_("Track %d"), i);
-    track->artist = g_strdup (g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.artist"));
-    if (track->artist == NULL || track->artist[0] == '\0') {
+    str = g_file_info_get_attribute_string (info, "xattr::org.gnome.audio.artist");
+    if (!sj_str_is_empty (str)) {
+      track->artist = g_strdup (str);
+    } else {
       if (album->artist == NULL)
         track->artist = g_strdup (_("Unknown Artist"));
       else