From d81dd339c18cbe4d1dbbebf39dcc1f639aff3dfc Mon Sep 17 00:00:00 2001 From: "Frederik \"Freso\" S. Olesen" Date: Sun, 2 Nov 2014 11:17:51 +0100 Subject: [PATCH] Resolve musicbrainz.org/{bare/cdlookup.html -> cdtoc/attach} redirect. --- morituri/image/table.py | 2 +- morituri/test/test_image_table.py | 2 +- morituri/test/test_image_toc.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/morituri/image/table.py b/morituri/image/table.py index 1c7e7c3..a22a41f 100644 --- a/morituri/image/table.py +++ b/morituri/image/table.py @@ -395,7 +395,7 @@ class Table(object, log.Loggable): }) return urlparse.urlunparse(( - 'https', host, '/bare/cdlookup.html', '', query, '')) + 'https', host, '/cdtoc/attach', '', query, '')) def getFrameLength(self, data=False): """ diff --git a/morituri/test/test_image_table.py b/morituri/test/test_image_table.py index 0f8642c..4f9eb58 100644 --- a/morituri/test/test_image_table.py +++ b/morituri/test/test_image_table.py @@ -53,7 +53,7 @@ class LadyhawkeTestCase(tcommon.TestCase): def testMusicBrainz(self): # output from mb-submit-disc: - # https://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+ + # https://musicbrainz.org/cdtoc/attach?toc=1+12+195856+150+ # 15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+ # 177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4- # however, not (yet) in musicbrainz database diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py index 4a82c47..04285d2 100644 --- a/morituri/test/test_image_toc.py +++ b/morituri/test/test_image_toc.py @@ -230,7 +230,7 @@ class LadyhawkeTestCase(common.TestCase): self.assertEquals(self.toc.table.getMusicBrainzDiscId(), "KnpGsLhvH.lPrNc1PBL21lb9Bg4-") self.assertEquals(self.toc.table.getMusicBrainzSubmitURL(), - "https://musicbrainz.org/bare/cdlookup.html?toc=" + "https://musicbrainz.org/cdtoc/attach?toc=" "1+12+195856+150+15687+31841+51016+66616+81352+99559+" "116070+133243+149997+161710+177832&" "tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-") @@ -276,7 +276,7 @@ class CapitalMergeTestCase(common.TestCase): # 164487 181780 209250 4440 def testMusicBrainz(self): - # URL to submit: https://musicbrainz.org/bare/cdlookup.html?toc=1+11+ + # URL to submit: https://musicbrainz.org/cdtoc/attach?toc=1+11+ # 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+ # 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE- self.assertEquals(self.table.getMusicBrainzDiscId(),