Tidied up command framework.

IF.Lastfm.Core/Api/Commands/AlbumApi/GetAbumInfoCommand.cs

@@ -25,7 +25,7 @@ public GetAlbumInfoCommand(IAuth auth, string artistname, string albumname) : ba
             AlbumName = albumname;
         }
 
-        public async override Task<LastResponse<Album>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                 {
@@ -35,9 +35,7 @@ public async override Task<LastResponse<Album>> ExecuteAsync()
                 };
 
             var apiUrl = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(apiUrl, UriKind.Absolute);
+            return new Uri(apiUrl, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<LastResponse<Album>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/Api/Commands/ArtistApi/GetArtistInfoCommand.cs

@@ -25,7 +25,7 @@ public GetArtistInfoCommand(IAuth auth, string artistname)
             ArtistName = artistname;
         }
 
-        public async override Task<LastResponse<Artist>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                 {
@@ -34,9 +34,7 @@ public async override Task<LastResponse<Artist>> ExecuteAsync()
                 };
 
             var apiUrl = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(apiUrl, UriKind.Absolute);
+            return new Uri(apiUrl, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<LastResponse<Artist>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/Api/Commands/GetAsyncCommandBase.cs

@@ -5,7 +5,7 @@
 
 namespace IF.Lastfm.Core.Api.Commands
 {
-    internal abstract class GetAsyncCommandBase<T> : IAsyncLastCommand<T>
+    internal abstract class GetAsyncCommandBase<T> : IAsyncCommand<T>
     {
         public string Method { get; protected set; }
         public Uri Url { get; protected set; }
@@ -19,9 +19,9 @@ protected GetAsyncCommandBase(IAuth auth)
             Auth = auth;
         }
 
-        public abstract Task<T> ExecuteAsync();
+        public abstract Uri BuildRequestUrl();
 
-        protected async Task<T> ExecuteInternal()
+        public async Task<T> ExecuteAsync()
         {
             var httpClient = new HttpClient();
             var response = await httpClient.GetAsync(Url);

IF.Lastfm.Core/Api/Commands/IAsyncCommand.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace IF.Lastfm.Core.Api.Commands
+{
+    internal interface IAsyncCommand<T>
+    {
+        Uri BuildRequestUrl();
+        Task<T> ExecuteAsync();
+        Task<T> HandleResponse(HttpResponseMessage response);
+    }
+}

IF.Lastfm.Core/Api/Commands/IAsyncLastCommand.cs

@@ -1,13 +0,0 @@
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IF.Lastfm.Core.Api.Commands
-{
-    internal interface IAsyncLastCommand
-    {
-    }
-
-    internal interface IAsyncLastCommand<T>
-    {
-    }
-}

IF.Lastfm.Core/Api/Commands/PostAsyncCommandBase.cs

@@ -5,10 +5,10 @@
 
 namespace IF.Lastfm.Core.Api.Commands
 {
-    internal abstract class PostAsyncCommandBase<T>
+    internal abstract class PostAsyncCommandBase<T> : IAsyncCommand<T>
     {
         public string Method { get; protected set; }
-        public Uri Url { get; protected set; }
+        public Uri Url { get; private set; }
         public IAuth Auth { get; protected set; }
 
         public int Page { get; set; }
@@ -17,13 +17,19 @@ internal abstract class PostAsyncCommandBase<T>
         protected PostAsyncCommandBase(IAuth auth)
         {
             Auth = auth;
-            Url = new Uri(LastFm.ApiRoot, UriKind.Absolute);
+        }
+
+        public Uri BuildRequestUrl()
+        {
+            return new Uri(LastFm.ApiRoot, UriKind.Absolute);
         }
 
         public abstract Task<T> ExecuteAsync();
 
         protected async Task<T> ExecuteInternal(Dictionary<string, string> parameters)
         {
+            Url = BuildRequestUrl();
+
             var apisig = Auth.GenerateMethodSignature(Method, parameters);
 
             var postContent = LastFm.CreatePostBody(Method,

IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackInfoCommand.cs

@@ -27,7 +27,7 @@ public GetTrackInfoCommand(IAuth auth, string trackname, string artistname)
             ArtistName = artistname;
         }
 
-        public async override Task<LastResponse<Track>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                 {
@@ -42,9 +42,7 @@ public async override Task<LastResponse<Track>> ExecuteAsync()
             }
 
             var apiUrl = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(apiUrl, UriKind.Absolute);
+            return new Uri(apiUrl, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<LastResponse<Track>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/Api/Commands/TrackApi/GetTrackShoutsCommand.cs

@@ -25,7 +25,7 @@ public GetTrackShoutsCommand(IAuth auth, string trackname, string artistname) :
             ArtistName = artistname;
         }
 
-        public async override Task<PageResponse<Shout>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                 {
@@ -37,9 +37,7 @@ public async override Task<PageResponse<Shout>> ExecuteAsync()
             base.AddPagingParameters(parameters);
 
             var apiUrl = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(apiUrl, UriKind.Absolute);
+            return new Uri(apiUrl, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<PageResponse<Shout>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/Api/Commands/UserApi/GetRecentScrobblesCommand.cs

@@ -22,7 +22,7 @@ public GetRecentScrobblesCommand(IAuth auth, string username, DateTime from) : b
             From = from;
         }
 
-        public async override Task<PageResponse<Track>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                              {
@@ -33,9 +33,7 @@ public async override Task<PageResponse<Track>> ExecuteAsync()
             base.AddPagingParameters(parameters);
 
             var uristring = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(uristring, UriKind.Absolute);
+            return new Uri(uristring, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<PageResponse<Track>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/Api/Commands/UserApi/GetTopAlbumsCommand.cs

@@ -23,7 +23,7 @@ public GetTopAlbumsCommand(IAuth auth, string username, LastStatsTimeSpan span)
             TimeSpan = span;
         }
 
-        public async override Task<PageResponse<Album>> ExecuteAsync()
+        public override Uri BuildRequestUrl()
         {
             var parameters = new Dictionary<string, string>
                              {
@@ -34,9 +34,7 @@ public async override Task<PageResponse<Album>> ExecuteAsync()
             base.AddPagingParameters(parameters);
 
             var uristring = LastFm.FormatApiUrl(Method, Auth.ApiKey, parameters);
-            Url = new Uri(uristring, UriKind.Absolute);
+            return new Uri(uristring, UriKind.Absolute);
-
-            return await ExecuteInternal();
         }
 
         public async override Task<PageResponse<Album>> HandleResponse(HttpResponseMessage response)

IF.Lastfm.Core/IF.Lastfm.Core.csproj

@@ -53,7 +53,7 @@
     <Compile Include="Api\Helpers\ApiExtensions.cs" />
     <Compile Include="Api\Helpers\ApiNameAttribute.cs" />
     <Compile Include="Api\Auth.cs" />
-    <Compile Include="Api\Commands\IAsyncLastCommand.cs" />
+    <Compile Include="Api\Commands\IAsyncCommand.cs" />
     <Compile Include="Api\Helpers\LastResponse.cs" />
     <Compile Include="Api\Helpers\PageResponse.cs" />
     <Compile Include="Api\IAlbumApi.cs" />