From bbf1eba0e44a743a30e07b445a9a77e5deac9451 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Tue, 31 Mar 2020 13:22:21 +0000 Subject: [PATCH] Replace 'freedb.freedb.org' CDDB server with a mirror 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 --- whipper/common/program.py | 12 ++++++++++-- whipper/test/test_image_table.py | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/whipper/common/program.py b/whipper/common/program.py index 9269c9d..c7fa90f 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -256,14 +256,22 @@ class Program: @staticmethod 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 :rtype: str """ # FIXME: convert to nonblocking? 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) return [item['DTITLE'] for item in md if 'DTITLE' in item] or None diff --git a/whipper/test/test_image_table.py b/whipper/test/test_image_table.py index 5715508..9fca1de 100644 --- a/whipper/test/test_image_table.py +++ b/whipper/test/test_image_table.py @@ -28,8 +28,8 @@ class LadyhawkeTestCase(tcommon.TestCase): # Ladyhawke - Ladyhawke - 0602517818866 # contains 12 audio tracks and one data track # CDDB has been verified against freedb: - # http://www.freedb.org/freedb/misc/c60af50d - # http://www.freedb.org/freedb/jazz/c60af50d + # https://web.archive.org/web/20200331130804/http://www.freedb.org/freedb/misc/c60af50d + # https://web.archive.org/web/20200331130829/http://www.freedb.org/freedb/jazz/c60af50d # AccurateRip URL has been verified against EAC's, using wireshark def setUp(self):