I've been using a programme called CATraxx to catalogue all my vinyl/cd's & mp3's for a few years now and have found it to be an absolutely invaluable piece of software. Version 6.0 has just been released and from first looks it seems to everything that any music lover could ask for?
Check the following link out:
CATraxx 6
If you already own V5 it's only a tenner to upgrade. Believe me it is well worth getting, definitely one of the best pieces of software I have ever purchased.