From 2d8c350dea1318ebb205280dd4f414bca50af61a Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Fri, 15 May 2020 14:12:36 +0200
Subject: [PATCH] Added a link to music brainz for releaseS/artists

---
 approot/artist.xml                 | 36 +++++++++++---------
 approot/artists.xml                | 18 ++++------
 approot/messages.xml               |  4 ++-
 approot/messages_fr.xml            |  6 ++--
 approot/playqueue.xml              |  8 ++---
 approot/release.xml                | 19 ++++++++---
 approot/releases.xml               | 54 +++++++++++++-----------------
 approot/search.xml                 | 42 ++++++++++++++---------
 approot/tracks.xml                 | 18 +++++-----
 src/lms/ui/explore/ArtistView.cpp  | 20 +++++++++--
 src/lms/ui/explore/ArtistView.hpp  |  1 +
 src/lms/ui/explore/ReleaseView.cpp | 37 ++++++++++++++------
 src/lms/ui/explore/ReleaseView.hpp |  1 +
 13 files changed, 157 insertions(+), 107 deletions(-)

diff --git a/approot/artist.xml b/approot/artist.xml
index e8e868dc..a6f13925 100644
--- a/approot/artist.xml
+++ b/approot/artist.xml
@@ -12,6 +12,14 @@
 			</div>
 			${releases class="Lms-explore-artist-entries-container"}
 		</div>
+		${<if-has-mbid>}
+		<div class="col-md-4">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.links}</h3>
+				${mbid-link class="text-muted"}
+			</div>
+		</div>
+		${</if-has-mbid>}
 		<div class="col-md-4">
 			<div class="well well-sm">
 				<h3>${tr:Lms.Explore.Artist.similar-artists}</h3>
@@ -22,23 +30,21 @@
 </message>
 
 <message id="Lms.Explore.Artist.template.entry">
-	<div class="row Lms-explore-artist-entry Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-medium">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4 class="media-heading">
-						${name class="Lms-releasename text-primary"}
-					</h4>
-					${<if-has-artist>}<h4><small>${artist class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
-					<h4><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h4>
-					${play-btn}${add-btn}
+	<div class="Lms-explore-artist-entry Lms-entry-hoverable">
+		<div class="media">
+			<div class="media-left media-middle">
+				<div class="media-object Lms-cover-container-medium">
+					${cover}
 				</div>
 			</div>
+			<div class="media-body media-middle">
+				<h4 class="media-heading">
+					${name class="Lms-releasename text-primary"}
+				</h4>
+				${<if-has-artist>}<h4><small>${artist class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
+				<h4><small><div class="text-muted">${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</div></small></h4>
+				${play-btn}${add-btn}
+			</div>
 		</div>
 	</div>
 </message>
diff --git a/approot/artists.xml b/approot/artists.xml
index 333e0ca8..b5ed55b3 100644
--- a/approot/artists.xml
+++ b/approot/artists.xml
@@ -13,26 +13,20 @@
 		</div>
 	</div>
 	${artists}
-	<div class="row">
-		<div class="col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
-		</div>
+	<div class="Lms-horizontal-center">
+		${show-more class="btn-primary Lms-show-more"}
 	</div>
 </message>
 
 <message id="Lms.Explore.Artists.template.entry">
-	<div class="row Lms-explore-artists-entry Lms-entry-hoverable Lms-vertical-align">
-		 <div class="col-xs-12">
-			 <h4>${name class="Lms-artistname text-primary"}</h4>
-		</div>
+	<div class="Lms-explore-artists-entry Lms-entry-hoverable Lms-vertical-align">
+		 <h4>${name class="Lms-artistname text-primary"}</h4>
 	</div>
 </message>
 
 <message id="Lms.Explore.Artists.template.entry-small">
-	<div class="row Lms-explore-artists-entry-small Lms-entry-hoverable Lms-vertical-align">
-		<div class="col-xs-12">
-			${name class="Lms-artistname text-primary"}
-		</div>
+	<div class="Lms-explore-artists-entry-small Lms-entry-hoverable Lms-vertical-align">
+		${name class="Lms-artistname text-primary"}
 	</div>
 </message>
 
diff --git a/approot/messages.xml b/approot/messages.xml
index 6098431f..9c63aee0 100644
--- a/approot/messages.xml
+++ b/approot/messages.xml
@@ -105,7 +105,10 @@
 <message id="Lms.Explore.artists">Artists</message>
 <message id="Lms.Explore.filter-added">Filter added</message>
 <message id="Lms.Explore.filters">Filters</message>
+<message id="Lms.Explore.links">Links</message>
 <message id="Lms.Explore.most-played">Most played</message>
+<message id="Lms.Explore.musicbrainz-artist">MusicBrainz Artist</message>
+<message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.random">Random</message>
 <message id="Lms.Explore.recently-added">Recently added</message>
 <message id="Lms.Explore.recently-played">Recently played</message>
@@ -193,4 +196,3 @@
 <message id="Lms.Settings.settings-saved">New settings saved!</message>
 
 </messages>
-
diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml
index e49d0fac..7b92c05b 100644
--- a/approot/messages_fr.xml
+++ b/approot/messages_fr.xml
@@ -105,7 +105,10 @@
 <message id="Lms.Explore.artists">Artistes</message>
 <message id="Lms.Explore.filter-added">Filtre ajouté</message>
 <message id="Lms.Explore.filters">Filtres</message>
-<message id="Lms.Explore.mostly-played">Plus joués</message>
+<message id="Lms.Explore.links">Liens</message>
+<message id="Lms.Explore.most-played">Plus joués</message>
+<message id="Lms.Explore.musicbrainz-artist">MusicBrainz Artist</message>
+<message id="Lms.Explore.musicbrainz-release">MusicBrainz Release</message>
 <message id="Lms.Explore.random">Aléatoire</message>
 <message id="Lms.Explore.recently-added">Ajoutés récemment</message>
 <message id="Lms.Explore.recently-played">Joués récemment</message>
@@ -190,7 +193,6 @@
 <message id="Lms.Settings.transcode-mode.always">Toujours</message>
 <message id="Lms.Settings.transcode-mode.if-format-not-supported">Seulement lorsque le format n'est pas pris en charge</message>
 <message id="Lms.Settings.transcode-mode.never">Jamais</message>
-<message id="Lms.Settings.settings">Paramètres</message>
 <message id="Lms.Settings.settings-saved">Paramètres sauvegardés !</message>
 
 <!--Wt-->
diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index ee9a9a10..97945c42 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -9,17 +9,15 @@
 
 <message id="Lms.PlayQueue.template">
 	<div class="row">
-		<div class="col-md-8">
+		<div class="col-lg-8">
 			<div class="Lms-header">
 				<h2>${tr:Lms.PlayQueue.playqueue}</h2>
 				${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}
 				<h4><small>${nb-tracks}</small></h4>
 			</div>
 			${entries}
-			<div class="row">
-				<div class="col-xs-12 Lms-horizontal-center">
-					${show-more class="btn-primary Lms-show-more"}
-				</div>
+			<div class="Lms-horizontal-center">
+				${show-more class="btn-primary Lms-show-more"}
 			</div>
 		</div>
 	</div>
diff --git a/approot/release.xml b/approot/release.xml
index b2b48c92..b275aa8c 100644
--- a/approot/release.xml
+++ b/approot/release.xml
@@ -21,13 +21,24 @@
 			</div>
 			${container class="Lms-explore-release-entries-container"}
 		</div>
+		${<if-has-copyright>}
 		<div class="col-md-4">
 			<div class="well well-sm">
-				${<if-has-copyright-or-copyright-url>}
 				<h3>${tr:Lms.Explore.Release.copyright}</h3>
-				${<if-has-copyright>}<small>${copyright}</small>${</if-has-copyright>}
-				${<if-has-copyright-url>}<small>${copyright-url}</small>${</if-has-copyright-url>}
-				${</if-has-copyright-or-copyright-url>}
+				${copyright class="text-muted"}
+			</div>
+		</div>
+		${</if-has-copyright>}
+		${<if-has-mbid>}
+		<div class="col-md-4">
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.links}</h3>
+				${mbid-link class="text-muted"}
+			</div>
+		</div>
+		${</if-has-mbid>}
+		<div class="col-md-4">
+			<div class="well well-sm">
 				<h3>${tr:Lms.Explore.Release.similar-releases}</h3>
 				${similar-releases}
 			</div>
diff --git a/approot/releases.xml b/approot/releases.xml
index 2be216d9..ab2b7094 100644
--- a/approot/releases.xml
+++ b/approot/releases.xml
@@ -9,49 +9,43 @@
 		${play-btn}${add-btn}
 	</div>
 	${releases}
-	<div class="row">
-		<div class="col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
-		</div>
+	<div class="Lms-horizontal-center">
+		${show-more class="btn-primary Lms-show-more"}
 	</div>
 </message>
 
 <message id="Lms.Explore.Releases.template.entry">
-	<div class="row Lms-explore-releases-entry Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-medium">
-						${cover}
-					</div>
-				</div>
-				<div class="media-body media-middle">
-					<h4 class="media-heading">
-						${release-name class="Lms-releasename text-primary"}
-					</h4>
-					${<if-has-artist>}<h4><small>${artist-name class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
-					${play-btn}${add-btn}
+	<div class="Lms-explore-releases-entry Lms-entry-hoverable">
+		<div class="media">
+			<div class="media-left media-middle">
+				<div class="media-object Lms-cover-container-medium">
+					${cover}
 				</div>
 			</div>
+			<div class="media-body media-middle">
+				<h4 class="media-heading">
+					${release-name class="Lms-releasename text-primary"}
+				</h4>
+				${<if-has-artist>}<h4><small>${artist-name class="Lms-artistname text-muted"}</small></h4>${</if-has-artist>}
+				${play-btn}${add-btn}
+			</div>
 		</div>
 	</div>
 </message>
 
 <message id="Lms.Explore.Releases.template.entry-small">
-	<div class="row Lms-explore-releaselink Lms-entry-hoverable">
-		<div class="col-xs-12">
-			<div class="media">
-				<div class="media-left media-middle">
-					<div class="media-object Lms-cover-container-smaller">
-						${cover}
-					</div>
+	<div class="Lms-explore-releaselink Lms-entry-hoverable">
+		<div class="media">
+			<div class="media-left media-middle">
+				<div class="media-object Lms-cover-container-smaller">
+					${cover}
 				</div>
-				<div class="media-body media-middle">
-					<div class="media-heading">
-						${release-name class="Lms-releasename text-primary"}
-					</div>
-					${<if-has-artist>}<small>${artist-name class="Lms-artistname text-muted"}</small>${</if-has-artist>}
+			</div>
+			<div class="media-body media-middle">
+				<div class="media-heading">
+					${release-name class="Lms-releasename text-primary"}
 				</div>
+				${<if-has-artist>}<small>${artist-name class="Lms-artistname text-muted"}</small>${</if-has-artist>}
 			</div>
 		</div>
 	</div>
diff --git a/approot/search.xml b/approot/search.xml
index 8c3fff06..1ecc8380 100644
--- a/approot/search.xml
+++ b/approot/search.xml
@@ -3,26 +3,36 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Search.template">
-	<div class="Lms-header">
-		<h2>${tr:Lms.Explore.Search.search}</h2>
+	<div class="row">
+		<div class="col-lg-8">
+			<div class="Lms-header">
+				<h2>${tr:Lms.Explore.Search.search}</h2>
+			</div>
+			${<if-artists>}
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.artists}</h3>
+				${artists}
+			</div>
+			${</if-artists>}
+			${<if-releases>}
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.releases}</h3>
+				${releases}
+			</div>
+			${</if-releases>}
+			${<if-tracks>}
+			<div class="well well-sm">
+				<h3>${tr:Lms.Explore.tracks}</h3>
+				${tracks}
+			</div>
+			${</if-tracks>}
+		</div>
 	</div>
-	${<if-artists>}
-		<h3>${tr:Lms.Explore.artists}</h3>
-		${artists}
-	${</if-artists>}
-	${<if-releases>}
-		<h3>${tr:Lms.Explore.releases}</h3>
-		${releases}
-	${</if-releases>}
-	${<if-tracks>}
-		<h3>${tr:Lms.Explore.tracks}</h3>
-		${tracks}
-	${</if-tracks>}
 </message>
 
 <message id="Lms.Explore.Search.template.track-entry">
-	<div class="row Lms-explore-tracks-entry Lms-entry-hoverable Lms-vertical-align">
-		<div class="col-xs-12 Lms-explore-tracks-entry-name">
+	<div class="Lms-explore-tracks-entry Lms-entry-hoverable Lms-vertical-align">
+		<div class="Lms-explore-tracks-entry-name">
 			<div class="media">
 				<div class="media-left media-middle hidden-xs">
 					<div class="media-object Lms-cover-container-small">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index fb0c26ac..58fa1545 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -4,19 +4,17 @@
 <!--FORMS message blocks-->
 
 <message id="Lms.Explore.Tracks.template">
-	<div class="Lms-header">
-		<h2>${tr:Lms.Explore.tracks}</h2>
-		${mode class="nav nav-pills Lms-explore-mode-container"}
-		${play-btn}${add-btn}
-	</div>
 	<div class="row">
 		<div class="col-lg-8">
+			<div class="Lms-header">
+				<h2>${tr:Lms.Explore.tracks}</h2>
+				${mode class="nav nav-pills Lms-explore-mode-container"}
+				${play-btn}${add-btn}
+			</div>
 			${tracks}
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-lg-8 col-xs-12 Lms-horizontal-center">
-			${show-more class="btn-primary Lms-show-more"}
+			<div class="Lms-horizontal-center">
+				${show-more class="btn-primary Lms-show-more"}
+			</div>
 		</div>
 	</div>
 </message>
diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp
index 8323ace1..613b1abf 100644
--- a/src/lms/ui/explore/ArtistView.cpp
+++ b/src/lms/ui/explore/ArtistView.cpp
@@ -77,10 +77,11 @@ Artist::refreshView()
 
     auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
-	const Database::Artist::pointer artist = Database::Artist::getById(LmsApp->getDbSession(), *artistId);
+	const Database::Artist::pointer artist {Database::Artist::getById(LmsApp->getDbSession(), *artistId)};
 	if (!artist)
 		throw ArtistNotFoundException {*artistId};
 
+	refreshLinks(artist);
 	refreshSimilarArtists(similarArtistIds);
 
 	Wt::WContainerWidget* clusterContainers = bindNew<Wt::WContainerWidget>("clusters");
@@ -199,7 +200,7 @@ Artist::createRelease(const Database::Artist::pointer& artist, const Release::po
 void
 Artist::refreshSimilarArtists(const std::vector<Database::IdType>& similarArtistsId)
 {
-	auto* similarArtistsContainer {bindNew<Wt::WContainerWidget>("similar-artists")};
+	Wt::WContainerWidget* similarArtistsContainer {bindNew<Wt::WContainerWidget>("similar-artists")};
 
 	for (Database::IdType artistId : similarArtistsId)
 	{
@@ -211,5 +212,20 @@ Artist::refreshSimilarArtists(const std::vector<Database::IdType>& similarArtist
 	}
 }
 
+void
+Artist::refreshLinks(const Database::Artist::pointer& artist)
+{
+	const auto mbid {artist->getMBID()};
+	if (mbid)
+	{
+		setCondition("if-has-mbid", true);
+
+		Wt::WLink link {"https://musicbrainz.org/artist/" + std::string {mbid->getAsString()}};
+		link.setTarget(Wt::LinkTarget::NewWindow);
+
+		bindNew<Wt::WAnchor>("mbid-link", link, Wt::WString::tr("Lms.Explore.musicbrainz-artist"));
+	}
+}
+
 } // namespace UserInterface
 
diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp
index cfad36d6..465e8f9d 100644
--- a/src/lms/ui/explore/ArtistView.hpp
+++ b/src/lms/ui/explore/ArtistView.hpp
@@ -50,6 +50,7 @@ class Artist : public Wt::WTemplate
 	private:
 		void refreshView();
 		void refreshSimilarArtists(const std::vector<Database::IdType>& similarArtistsId);
+		void refreshLinks(const Wt::Dbo::ptr<Database::Artist>& artist);
 
 		std::unique_ptr<Wt::WTemplate> createRelease(const Wt::Dbo::ptr<Database::Artist>& artist, const Wt::Dbo::ptr<Database::Release>& release);
 
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp
index 44504b07..dd54043a 100644
--- a/src/lms/ui/explore/ReleaseView.cpp
+++ b/src/lms/ui/explore/ReleaseView.cpp
@@ -84,6 +84,7 @@ Release::refreshView()
 		throw ReleaseNotFoundException {*releaseId};
 
 	refreshCopyright(release);
+	refreshLinks(release);
 	refreshSimilarReleases(similarReleasesIds);
 
 	bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain);
@@ -261,24 +262,40 @@ Release::refreshCopyright(const Database::Release::pointer& release)
 	std::optional<std::string> copyright {release->getCopyright()};
 	std::optional<std::string> copyrightURL {release->getCopyrightURL()};
 
-	setCondition("if-has-copyright-or-copyright-url", copyright || copyrightURL);
+	if (!copyright && !copyrightURL)
+		return;
+
+	setCondition("if-has-copyright", true);
+
+	std::string copyrightText {copyright ? *copyright : ""};
+	if (copyrightText.empty() && copyrightURL)
+		copyrightText = *copyrightURL;
 
 	if (copyrightURL)
 	{
-		setCondition("if-has-copyright-url", true);
-
 		Wt::WLink link {*copyrightURL};
 		link.setTarget(Wt::LinkTarget::NewWindow);
 
-		Wt::WAnchor* anchor {bindNew<Wt::WAnchor>("copyright-url", link)};
-		anchor->setTextFormat(Wt::TextFormat::XHTML);
-		anchor->setText(Wt::WString::tr("Lms.Explore.Release.template.link-btn"));
+		Wt::WAnchor* anchor {bindNew<Wt::WAnchor>("copyright", link)};
+		anchor->setTextFormat(Wt::TextFormat::Plain);
+		anchor->setText(Wt::WString::fromUTF8(copyrightText));
 	}
-
-	if (copyright)
-	{
-		setCondition("if-has-copyright", true);
+	else
 		bindString("copyright", Wt::WString::fromUTF8(*copyright), Wt::TextFormat::Plain);
+}
+
+void
+Release::refreshLinks(const Database::Release::pointer& release)
+{
+	const auto mbid {release->getMBID()};
+	if (mbid)
+	{
+		setCondition("if-has-mbid", true);
+
+		Wt::WLink link {"https://musicbrainz.org/release/" + std::string {mbid->getAsString()}};
+		link.setTarget(Wt::LinkTarget::NewWindow);
+
+		bindNew<Wt::WAnchor>("mbid-link", link, Wt::WString::tr("Lms.Explore.musicbrainz-release"));
 	}
 }
 
diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp
index 3d84ee14..ca31408c 100644
--- a/src/lms/ui/explore/ReleaseView.hpp
+++ b/src/lms/ui/explore/ReleaseView.hpp
@@ -47,6 +47,7 @@ namespace UserInterface
 		private:
 			void refreshView();
 			void refreshCopyright(const Wt::Dbo::ptr<Database::Release>& release);
+			void refreshLinks(const Wt::Dbo::ptr<Database::Release>& release);
 			void refreshSimilarReleases(const std::vector<Database::IdType>& similarReleasesId);
 
 			Filters* _filters {};