[mb-commits] branch, beta, updated. Merge remote-tracking branch 'reosarevok/mbs-5440' into beta Added test, meh ...
MusicBrainz Git Server <[email protected]> Sun, 16 Dec 2012 18:24:45 +0000
| Newsgroups | gmane.comp.audio.musicbrainz.cvs |
|---|---|
| Message-ID | <E1TkItJ-0008MM-9u@wiley> |
The branch, beta has been updated
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ff802b95ff80248bb6640d14aec83be8727a42be (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=35fb793baf969adff7cc039bee765824514ea6a8 (commit)
via http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cf94719f12b21c5518c6d2d32ad6396d09e496f6 (commit)
from http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7b69f533d7fcea39ec8a73de5b0dfc7dc05e685a (commit)
Summary of changes:
lib/MusicBrainz/Server/Data/URL.pm | 1 +
.../Server/Entity/URL/{45cat.pm => Lieder.pm} | 4 ++--
root/components/common-macros.tt | 1 +
root/static/images/favicons/lieder-16.png | Bin 0 -> 155 bytes
root/static/scripts/edit/MB/Control/URLCleanup.js | 2 +-
root/static/scripts/tests/Control/URLCleanup.js | 4 ++++
root/static/styles/layout.css | 4 ++++
7 files changed, 13 insertions(+), 3 deletions(-)
copy lib/MusicBrainz/Server/Entity/URL/{45cat.pm => Lieder.pm} (91%)
create mode 100644 root/static/images/favicons/lieder-16.png
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ff802b95ff80248bb6640d14aec83be8727a42be
Merge: 7b69f53 35fb793
Author: Ian McEwen <[email protected]>
Date: Sun Dec 16 11:24:14 2012 -0700
Merge remote-tracking branch 'reosarevok/mbs-5440' into beta
* reosarevok/mbs-5440:
Added test, meh
Adding lieder.net to whitelist and sidebar
commit 35fb793baf969adff7cc039bee765824514ea6a8
Author: reosarevok <[email protected]>
Date: Thu Dec 13 21:16:05 2012 +0000
Added test, meh
diff --git a/root/static/scripts/tests/Control/URLCleanup.js b/root/static/scripts/tests/Control/URLCleanup.js
index 2c7d1bc..3a81b83 100644
--- a/root/static/scripts/tests/Control/URLCleanup.js
+++ b/root/static/scripts/tests/Control/URLCleanup.js
@@ -112,6 +112,10 @@ MB.tests.URLCleanup.GuessType = function() {
MB.constants.LINK_TYPES.lyrics.release
],
[
+ 'work', 'http://www.recmusic.org/lieder/get_text.html?TextId=6448',
+ MB.constants.LINK_TYPES.lyrics.work
+ ],
+ [
'recording', 'http://vimeo.com/1109226',
MB.constants.LINK_TYPES.streamingmusic.recording
],
commit cf94719f12b21c5518c6d2d32ad6396d09e496f6
Author: reosarevok <[email protected]>
Date: Thu Dec 13 21:01:05 2012 +0000
Adding lieder.net to whitelist and sidebar
diff --git a/lib/MusicBrainz/Server/Data/URL.pm b/lib/MusicBrainz/Server/Data/URL.pm
index ae59cff..13f7c56 100644
--- a/lib/MusicBrainz/Server/Data/URL.pm
+++ b/lib/MusicBrainz/Server/Data/URL.pm
@@ -35,6 +35,7 @@ my %URL_SPECIALIZATIONS = (
'ISRCTW' => qr{^https?://(?:www.)?isrc.ncl.edu.tw/}i,
'Jamendo' => qr{^https?://(?:www.)?jamendo.com/}i,
'LastFM' => qr{^https?://(?:www.)?last.fm/}i,
+ 'Lieder' => qr{^https?://(?:www.)?recmusic.org/lieder/}i,
'LyricWiki' => qr{^https?://lyrics.wikia.com/}i,
'MetalArchives' => qr{^https?://(?:www.)?metal-archives.com/}i,
'MusicMoz' => qr{^https?://(?:www.)?musicmoz.org/}i,
diff --git a/lib/MusicBrainz/Server/Entity/URL/Lieder.pm b/lib/MusicBrainz/Server/Entity/URL/Lieder.pm
new file mode 100644
index 0000000..1490167
--- /dev/null
+++ b/lib/MusicBrainz/Server/Entity/URL/Lieder.pm
@@ -0,0 +1,36 @@
+package MusicBrainz::Server::Entity::URL::Lieder;
+
+use Moose;
+
+extends 'MusicBrainz::Server::Entity::URL';
+with 'MusicBrainz::Server::Entity::URL::Sidebar';
+
+sub sidebar_name {
+ my $self = shift;
+
+ return "Lyrics at lieder.net";
+}
+
+__PACKAGE__->meta->make_immutable;
+no Moose;
+1;
+
+=head1 COPYRIGHT
+
+Copyright (C) 2012 MetaBrainz Foundation
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+=cut
diff --git a/root/components/common-macros.tt b/root/components/common-macros.tt
index 7bb1c98..452e661 100644
--- a/root/components/common-macros.tt
+++ b/root/components/common-macros.tt
@@ -716,6 +716,7 @@ END -%]
ELSIF url.url.host.search('trove.nla.gov.au'); 'trove';
ELSIF url.url.host.search('rockinchina.com'); 'ric';
ELSIF url.url.host.search('dhhu.dk'); 'dhhu';
+ ELSIF url.url.as_string.search('recmusic.org/lieder'); 'lieder';
ELSE; '';
END -%]
diff --git a/root/static/images/favicons/lieder-16.png b/root/static/images/favicons/lieder-16.png
new file mode 100644
index 0000000..57c567e
Binary files /dev/null and b/root/static/images/favicons/lieder-16.png differ
diff --git a/root/static/scripts/edit/MB/Control/URLCleanup.js b/root/static/scripts/edit/MB/Control/URLCleanup.js
index aaa2b29..74966f8 100644
--- a/root/static/scripts/edit/MB/Control/URLCleanup.js
+++ b/root/static/scripts/edit/MB/Control/URLCleanup.js
@@ -271,7 +271,7 @@ MB.constants.CLEANUPS = {
}
},
lyrics: {
- match: new RegExp("^(https?://)?([^/]+\\.)?(lyrics\\.wikia\\.com|directlyrics\\.com|lyricstatus\\.com|kasi-time\\.com|wikisource\\.org)", "i"),
+ match: new RegExp("^(https?://)?([^/]+\\.)?(lyrics\\.wikia\\.com|directlyrics\\.com|lyricstatus\\.com|kasi-time\\.com|wikisource\\.org|recmusic\\.org)", "i"),
type: MB.constants.LINK_TYPES.lyrics
},
bbcmusic: {
diff --git a/root/static/styles/layout.css b/root/static/styles/layout.css
index e8c244f..4b73fb4 100644
--- a/root/static/styles/layout.css
+++ b/root/static/styles/layout.css
@@ -563,6 +563,10 @@ div.warning img.warning {
background-image: url("../images/favicons/dhhu-16.png");
}
+#sidebar ul.external_links li.lieder {
+ background-image: url("../images/favicons/lieder-16.png");
+}
+
#sidebar .cover-art {
text-align: center;
}
-----------------------------------------------------------------------
hooks/post-receive
--
mb_server