tags 304744 + patch pending
found 304744 2.99.6-1
thanks

* era eriksson <[EMAIL PROTECTED]> [2005-04-15 09:15]:
>  Found inexact matches. Choose one:
>   1.) rock 7d0a5c0a The Rolling Stones / Their Satanic Majesties Request
>   2.) rock 870a680a The Rolling Stones / Their Satanic Majesties Request
>   0.) none of the above: 2
> 
> And then I get the following warnings:
> 
>  Warning: calculated id (870a660a) and id from freedb file
>       : ['870a680a']
>       : do not match, hopefully due to inexact match.
> 
> It would make an awful lot of sense to keep track of the fact that I
> selected an inexact match, and that the calculated id from the freedb
> file in fact matches what I selected, don't you think?

Yes, the patch below should work for you.

> Also, if these warnings are really useful in some context, I guess it
> would be useful to get the id from the actual CD somewhere in the
> output as well.

What's listed as "calculated id" is the ID of the CD.  Can you suggest
better wording to make this clearer?


--- jack_freedb.py~     2005-07-26 23:25:48.108852592 +0100
+++ jack_freedb.py      2005-07-26 23:27:52.488943944 +0100
@@ -34,6 +34,7 @@
 names_available = None          # freedb info is available
 dir_created = None              # dirs are only renamed if we have created them
 NUM, LEN, START, COPY, PRE, CH, RIP, RATE, NAME = range(9)
+freedb_inexact_match = -1
 
 freedb_servers = {
     'freedb': {
@@ -231,6 +232,8 @@
     buf = f.readline()
     if buf and buf[0:1] == "2":
         if buf[0:3] in ("210", "211"): # Found inexact or multiple exact 
matches, list follows
+            if buf[0:3] == "211":
+                freedb_inexact_match = 1
             print "Found the following matches. Choose one:"
             num = 1
             matches = []
@@ -382,7 +385,7 @@
         for i in read_ids:
             if i == cd_id:
                 id_matched = 1
-        if not id_matched and warn:
+        if not id_matched and warn and freedb_inexact_match < 1:
             print "Warning: calculated id (" + cd_id + ") and id from freedb 
file"
             print "       :", read_ids
             print "       : do not match, hopefully due to inexact match."

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to