diff --git a/TODO b/TODO index 6ffa3b3..ac54f47 100644 --- a/TODO +++ b/TODO @@ -73,8 +73,8 @@ OLD - burn ripped images - use a temp dir, until the whole rip is good don't move it, so we easily find half done rips - Compare http://www.musicbrainz.org/cdtoc/MAj3xXf6QMy7G.BIFOyHyq4MySE- - with http://www.musicbrainz.org/cdtoc/USC1utCZbTLZy80aHvQzJw4FASk- + Compare https://musicbrainz.org/cdtoc/MAj3xXf6QMy7G.BIFOyHyq4MySE- + with https://musicbrainz.org/cdtoc/USC1utCZbTLZy80aHvQzJw4FASk- Almost same, but second is 2 seconds longer on last track, suggesting it was calculated wrong (150 frame offset done wrong ?) Can't find it in edit history though diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py index 31a8883..bbbb3c7 100644 --- a/morituri/common/mbngs.py +++ b/morituri/common/mbngs.py @@ -187,7 +187,7 @@ def _getMetadata(releaseShort, release, discid): discMD.mbid = release['id'] discMD.mbidArtist = discCredit.getIds() - discMD.url = 'http://musicbrainz.org/release/' + release['id'] + discMD.url = 'https://musicbrainz.org/release/' + release['id'] discMD.barcode = release.get('barcode', None) lil = release.get('label-info-list', [{}]) diff --git a/morituri/image/table.py b/morituri/image/table.py index 868183c..1c7e7c3 100644 --- a/morituri/image/table.py +++ b/morituri/image/table.py @@ -395,7 +395,7 @@ class Table(object, log.Loggable): }) return urlparse.urlunparse(( - 'http', host, '/bare/cdlookup.html', '', query, '')) + 'https', host, '/bare/cdlookup.html', '', query, '')) def getFrameLength(self, data=False): """ diff --git a/morituri/test/test_image_table.py b/morituri/test/test_image_table.py index 3e1d2b2..0f8642c 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: - # http://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+ + # https://musicbrainz.org/bare/cdlookup.html?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 @@ -73,7 +73,7 @@ class LadyhawkeTestCase(tcommon.TestCase): class MusicBrainzTestCase(tcommon.TestCase): - # example taken from http://musicbrainz.org/doc/DiscIDCalculation + # example taken from https://musicbrainz.org/doc/DiscIDCalculation # disc is Ettella Diamant def setUp(self): diff --git a/morituri/test/test_image_toc.py b/morituri/test/test_image_toc.py index 9c27abc..4a82c47 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(), - "http://musicbrainz.org/bare/cdlookup.html?toc=" + "https://musicbrainz.org/bare/cdlookup.html?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: http://musicbrainz.org/bare/cdlookup.html?toc=1+11+ + # URL to submit: https://musicbrainz.org/bare/cdlookup.html?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(),