diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 319289f94..b0044745c 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -110,6 +110,8 @@
+
+
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
new file mode 100644
index 000000000..0819ea6ed
--- /dev/null
+++ b/MediaBrowser.Controller/Providers/Music/LastfmArtistProvider.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Controller.Providers.Music
+{
+ public class LastfmArtistProvider : LastfmBaseArtistProvider
+ {
+ public LastfmArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
+ : base(jsonSerializer, httpClient, logManager)
+ {
+ }
+
+ protected override Task FetchLastfmData(BaseItem item, string id, CancellationToken cancellationToken)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
new file mode 100644
index 000000000..9e1ff2188
--- /dev/null
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseArtistProvider.cs
@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Controller.Providers.Music
+{
+ public abstract class LastfmBaseArtistProvider : LastfmBaseProvider
+ {
+ protected LastfmBaseArtistProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogManager logManager)
+ : base(jsonSerializer, httpClient, logManager)
+ {
+ LocalMetaFileName = "MBArtist.json";
+ }
+
+ public override bool Supports(Entities.BaseItem item)
+ {
+ return item is MusicArtist;
+ }
+
+ protected override async Task FindId(Entities.BaseItem item, System.Threading.CancellationToken cancellationToken)
+ {
+ //Execute the Artist search against our name and assume first one is the one we want
+ var url = RootUrl + string.Format("method=artist.search&artist={0}&api_key={1}&format=json", UrlEncode(item.Name), ApiKey);
+
+ LastfmArtistSearchResults searchResult = null;
+
+ try
+ {
+ using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+ {
+ searchResult = JsonSerializer.DeserializeFromStream(json);
+ }
+ }
+ catch (HttpException e)
+ {
+ if (e.StatusCode == HttpStatusCode.NotFound)
+ {
+ return null;
+ }
+ throw;
+ }
+
+ if (searchResult != null && searchResult.results != null && searchResult.results.artistmatches != null && searchResult.results.artistmatches.artist.Any())
+ {
+ return searchResult.results.artistmatches.artist.First().mbid;
+ }
+
+ return null;
+ }
+ }
+
+ #region Result Objects
+
+ public class LastfmStats
+ {
+ public string listeners { get; set; }
+ public string playcount { get; set; }
+ }
+
+ public class LastfmTag
+ {
+ public string name { get; set; }
+ public string url { get; set; }
+ }
+
+ public class LastfmFormationInfo
+ {
+ public string yearfrom { get; set; }
+ public string yearto { get; set; }
+ }
+
+ public class LastFmBio
+ {
+ public string published { get; set; }
+ public string summary { get; set; }
+ public string content { get; set; }
+ public string placeformed { get; set; }
+ public string yearformed { get; set; }
+ public List formationlist { get; set; }
+ }
+
+ public class LastfmArtist
+ {
+ public string name { get; set; }
+ public string mbid { get; set; }
+ public string url { get; set; }
+ public string streamable { get; set; }
+ public string ontour { get; set; }
+ public LastfmStats stats { get; set; }
+ public List similar { get; set; }
+ public List tags { get; set; }
+ public LastFmBio bio { get; set; }
+ }
+
+ public class LastfmGetArtistResult
+ {
+ public LastfmArtist artist { get; set; }
+ }
+
+ public class Artistmatches
+ {
+ public List artist { get; set; }
+ }
+
+ public class LastfmArtistSearchResult
+ {
+ public Artistmatches artistmatches { get; set; }
+ }
+
+ public class LastfmArtistSearchResults
+ {
+ public LastfmArtistSearchResult results { get; set; }
+ }
+
+ #endregion
+}
diff --git a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
index 364986130..54792932e 100644
--- a/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/Music/LastfmBaseProvider.cs
@@ -94,7 +94,7 @@ namespace MediaBrowser.Controller.Providers.Music
}
}
- protected const string RootUrl = @"http://ws.audioscrobbler.com/2.0/";
+ protected const string RootUrl = @"http://ws.audioscrobbler.com/2.0/?";
protected static string ApiKey = "7b76553c3eb1d341d642755aecc40a33";
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
@@ -186,7 +186,27 @@ namespace MediaBrowser.Controller.Providers.Music
/// The item.
///
/// Task.
- protected abstract Task FetchData(BaseItem item, CancellationToken cancellationToken);
+ protected async Task FetchData(BaseItem item, CancellationToken cancellationToken)
+ {
+ var id = item.GetProviderId(MetadataProviders.Musicbrainz) ?? await FindId(item, cancellationToken).ConfigureAwait(false);
+ if (id != null)
+ {
+ Logger.Debug("LastfmProvider - getting info with id: " + id);
+
+ cancellationToken.ThrowIfCancellationRequested();
+
+ await FetchLastfmData(item, id, cancellationToken).ConfigureAwait(false);
+ }
+ else
+ {
+ Logger.Info("LastfmProvider could not find " + item.Name + ". Check name on Last.fm.");
+ }
+
+ }
+
+ protected abstract Task FindId(BaseItem item, CancellationToken cancellationToken);
+
+ protected abstract Task FetchLastfmData(BaseItem item, string id, CancellationToken cancellationToken);
///
/// Encodes an URL.