benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 'freedb.freedb.org' CDDB server with a mirror

Browse Source 
This is motivated by the imminent shut down of freedb.org which will happen on 2020-03-31.

More details here: https://web.archive.org/web/20200331093822/http://www.freedb.org/
And here: https://hydrogenaud.io/index.php?topic=118682

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
This commit is contained in:
JoeLametta
2020-03-31 13:22:21 +00:00
parent 6b7fc81189
commit bbf1eba0e4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
whipper/common/program.py
View File

@@ -256,14 +256,22 @@ class Program:
@staticmethod @staticmethod
def getCDDB(cddbdiscid): def getCDDB(cddbdiscid):
""" """
Fetch basic metadata from freedb's CDDB. Fetch basic metadata from dBpoweramp's mirror of freedb's CDDB.
Freedb's official CDDB isn't used anymore because it's going to be
shut down on 31/03/2020.
See: https://web.archive.org/web/20200331093822/http://www.freedb.org/
See: https://hydrogenaud.io/index.php?topic=118682
:param cddbdiscid: list of id, tracks, offsets, seconds :param cddbdiscid: list of id, tracks, offsets, seconds
:rtype: str :rtype: str
""" """
# FIXME: convert to nonblocking? # FIXME: convert to nonblocking?
try: try:
md = freedb.perform_lookup(cddbdiscid, 'freedb.freedb.org', 80) md = freedb.perform_lookup(
cddbdiscid, 'freedb.dbpoweramp.com', 80
)
logger.debug('CDDB query result: %r', md) logger.debug('CDDB query result: %r', md)
return [item['DTITLE'] for item in md if 'DTITLE' in item] or None return [item['DTITLE'] for item in md if 'DTITLE' in item] or None

4
whipper/test/test_image_table.py
View File

@@ -28,8 +28,8 @@ class LadyhawkeTestCase(tcommon.TestCase):
# Ladyhawke - Ladyhawke - 0602517818866 # Ladyhawke - Ladyhawke - 0602517818866
# contains 12 audio tracks and one data track # contains 12 audio tracks and one data track
# CDDB has been verified against freedb: # CDDB has been verified against freedb:
# http://www.freedb.org/freedb/misc/c60af50d # https://web.archive.org/web/20200331130804/http://www.freedb.org/freedb/misc/c60af50d
# http://www.freedb.org/freedb/jazz/c60af50d # https://web.archive.org/web/20200331130829/http://www.freedb.org/freedb/jazz/c60af50d
# AccurateRip URL has been verified against EAC's, using wireshark # AccurateRip URL has been verified against EAC's, using wireshark
def setUp(self): def setUp(self):