Naim Matching, better parsing of filename when named as a multi-disc album

Naim Matching, better parsing of filename when named as a multi-disc album

e.g we had an example where cddbinfo.txt was a single 25 track cd but the users files were divided into cd1, cd2

e.g
Bing Crosby & Frank Sinatra - White Christmas - 02 - 05 - The Snowman

and this was making it harder for songkong to match the mapping because not expecting this it was using discno as trackno.