1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Don't print a warning that the calculated ID and that from FreeDB don't
match when we had an inexact match. Debian #304744.
diff -urN a/jack_freedb.py jack-3.1.1+cvs20050801/jack_freedb.py
--- a/jack_freedb.py 2006-02-05 15:54:03.000000000 +0000
+++ jack-3.1.1+cvs20050801/jack_freedb.py 2006-02-05 16:51:59.000000000 +0000
@@ -37,6 +37,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': {
@@ -234,6 +235,9 @@
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":
+ global freedb_inexact_match
+ freedb_inexact_match = 1
print "Found the following matches. Choose one:"
num = 1
matches = []
@@ -385,10 +389,10 @@
for i in read_ids:
if i == cd_id:
id_matched = 1
- if not id_matched and warn:
- print "Warning: calculated id (" + cd_id + ") and id from freedb file"
- print " :", read_ids
- print " : do not match, hopefully due to inexact match."
+ if not id_matched and warn and freedb_inexact_match < 1:
+ print "Warning: CD signature ID and ID from FreeDB file do not match."
+ print " CD signature: " + cd_id
+ print " FreeDB ID: " + ",".join(read_ids)
for i in read_ids:
for j in i:
if j not in "0123456789abcdef":
|
