Ticket #4103: 0001-cddb_daemon-Various-fixes.patch

src/servers/cddb_daemon/cddb_daemon.cpp

@@ -162 +162 @@
     if (directory.ReadAttr("CD:do_lookup", B_BOOL_TYPE, 0, (void *)&doLookup,
         sizeof(bool)) < B_OK || !doLookup)
         return false;
-    
+
     // Does it have the CD:cddbid attribute?
     if (directory.ReadAttr("CD:cddbid", B_UINT32_TYPE, 0, (void *)cddbId,
         sizeof(uint32)) < B_OK)
@@ -237 +237 @@
         name = data->title;
         name.ReplaceSet("/", " ");
         
+        // Add track number to the beginning of the string.
+        int trackNum = index + 1; // index=0 is actually Track 1
+        char trackNumString[3]; // 2 digits + '\0'
+        snprintf(trackNumString, 3, "%02d", trackNum);
+        name.Prepend(" ");
+        name.Prepend(trackNumString, 3);
+        name.Append(".wav");
+
         if ((result = entry.Rename(name.String())) != B_OK) {
             printf("Failed renaming entry at index %d to \"%s\".\n", index,
                 name.String());
@@ -252 +260 @@
         node.WriteAttr("Audio:Album", B_STRING_TYPE, 0,
             (readResponse->title).String(),
             (readResponse->title).Length());
-        node.WriteAttr("Media:Genre", B_STRING_TYPE, 0,
-            (readResponse->genre).String(),
-            (readResponse->genre).Length());
-        node.WriteAttr("Media:Year", B_INT32_TYPE, 0, &(readResponse->year),
-            sizeof(int32));
+        if (readResponse->genre.Length() != 0) {
+            node.WriteAttr("Media:Genre", B_STRING_TYPE, 0,
+                (readResponse->genre).String(),
+                (readResponse->genre).Length());
+        }
+        if (readResponse->year != 0) {
+            node.WriteAttr("Media:Year", B_INT32_TYPE, 0,
+                &(readResponse->year), sizeof(int32));
+        }
 
         if (data->artist == "") {
             node.WriteAttr("Audio:Artist", B_STRING_TYPE, 0,

src/servers/cddb_daemon/cddb_server.cpp

@@ -217 +217 @@
                     || (errno != 0 && year == 0)) {
                     // Year out of range.
                     printf("Year out of range: %s\n", line.String());
-                    return B_ERROR;
+                    year = 0;
                 }
                 
                 if (firstInvalid == line.String()) {
                     printf("Invalid year: %s\n", line.String());
-                    return B_ERROR;
+                    year = 0;
                 }
                             
                 readResponse->year = year;