Ticket #9813: 0001-Check-for-compilation-artist-in-cddb-daemon.patch

src/servers/cddb_daemon/cddb_server.cpp

@@ -256 +256 @@
 
                 trackData->trackNumber = track;
 
-                int32 pos = line.FindFirst(" / " );
+                int32 pos = line.FindFirst("Various / ");
                 if (pos != B_ERROR) {
-                    // We have track specific artist information.
+                    // We have compilation artist information.
                     BString artist;
-                    line.MoveInto(artist, 0, pos);
+                    line.MoveInto(artist, 0, pos + 7);
+                        // Move "Various" from line to artist
                     line.Remove(0, 3);
+                        // Remove " / " from line
                     trackData->artist = artist;
                 } else {
-                    trackData->artist = diskData->artist;
+                    // Check for track specific artist information.
+                    pos = line.FindFirst(" / ");
+                    if (pos != B_ERROR) {
+                        // We have track specific artist information.
+                        BString artist;
+                        line.MoveInto(artist, 0, pos);
+                            // Move the artist information from line to artist
+                        line.Remove(0, 3);
+                            // Remove " / " from line
+                        trackData->artist = artist;
+                    } else {
+                        trackData->artist = diskData->artist;
+                    }
                 }
 
                 trackData->title = line;