- Updated. (Changelog-date: November 11th, 2014)

Johnny @PC · Johnny @PC · commit cbd248a2fee1 · 2014-12-04T18:18:11.000+01:00
- Improved HTTPServer
- Ordered methods in SpotifyWebApiCass
- Added various models for the new endpoints
diff --git a/SpotifyAPI/SpotifyAPI.csproj b/SpotifyAPI/SpotifyAPI.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{EBBE35E2-7B91-4D7D-B8FC-3A0472F5119D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SpotifyAPI.SpotifyLocalAPI</RootNamespace>
+    <RootNamespace>SpotifyAPI</RootNamespace>
     <AssemblyName>SpotifyAPI</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -65,9 +65,11 @@
     <Compile Include="SpotifyWebAPI\ClientCredentialsAuth.cs" />
     <Compile Include="SpotifyWebAPI\ImplicitGrantAuth.cs" />
     <Compile Include="SpotifyWebAPI\Models\BasicModel.cs" />
+    <Compile Include="SpotifyWebAPI\Models\FeaturedPlaylists.cs" />
     <Compile Include="SpotifyWebAPI\Models\FullAlbum.cs" />
     <Compile Include="SpotifyWebAPI\Models\FullArtist.cs" />
     <Compile Include="SpotifyWebAPI\Models\FullTrack.cs" />
+    <Compile Include="SpotifyWebAPI\Models\NewAlbumReleases.cs" />
     <Compile Include="SpotifyWebAPI\Models\SearchItem.cs" />
     <Compile Include="SpotifyWebAPI\Models\PrivateProfile.cs" />
     <Compile Include="SpotifyWebAPI\Models\GeneralModels.cs" />
diff --git a/SpotifyAPI/SpotifyWebAPI/ImplicitGrantAuth.cs b/SpotifyAPI/SpotifyWebAPI/ImplicitGrantAuth.cs
@@ -58,13 +58,7 @@ public void SetResponse(String accessToken, String tokenType, int expiresIn,Stri
         }
         public void StopHttpServer()
         {
-            try
-            {
-                httpThread.Abort();
-            }catch(ThreadAbortException e)
-            {
-
-            }
+            httpServer.Dispose();
             httpServer = null;
         }
     }
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/BasicModel.cs b/SpotifyAPI/SpotifyWebAPI/Models/BasicModel.cs
@@ -10,11 +10,11 @@ namespace SpotifyAPI.SpotifyWebAPI.Models
     public abstract class BasicModel
     {
         [JsonProperty("error")]
-        public Error Error { get; set; }
+        public Error ErrorResponse { get; set; }
 
         public Boolean HasError()
         {
-            return Error != null;
+            return ErrorResponse != null;
         }
     }
 }
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/FeaturedPlaylists.cs b/SpotifyAPI/SpotifyWebAPI/Models/FeaturedPlaylists.cs
@@ -0,0 +1,17 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace SpotifyAPI.SpotifyWebAPI.Models
+{
+    public class FeaturedPlaylists : BasicModel
+    {
+        [JsonProperty("message")]
+        public String Message { get; set; }
+        [JsonProperty("playlists")]
+        public Paging<SimplePlaylist> Playlists { get; set; }
+    }
+}
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/FullAlbum.cs b/SpotifyAPI/SpotifyWebAPI/Models/FullAlbum.cs
@@ -15,6 +15,8 @@ public class FullAlbum : BasicModel
         public List<SimpleArtist> Artists { get; set; }
         [JsonProperty("available_markets")]
         public List<String> AvailableMarkets { get; set; }
+        [JsonProperty("copyrights")]
+        public List<Copyright> Copyrights { get; set; }
         [JsonProperty("external_ids")]
         public Dictionary<String, String> ExternalIds { get; set; }
         [JsonProperty("external_urls")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/FullArtist.cs b/SpotifyAPI/SpotifyWebAPI/Models/FullArtist.cs
@@ -11,6 +11,8 @@ public class FullArtist : BasicModel
     {
         [JsonProperty("external_urls")]
         public Dictionary<String, String> ExternalUrls { get; set; }
+        [JsonProperty("followers")]
+        public Followers Followers { get; set; }
         [JsonProperty("genres")]
         public List<String> Genres { get; set; }
         [JsonProperty("href")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/FullTrack.cs b/SpotifyAPI/SpotifyWebAPI/Models/FullTrack.cs
@@ -14,8 +14,8 @@ public class FullTrack : BasicModel
         /// </summary>
         [JsonProperty("album")]
         public SimpleAlbum Album { get; set; }
-        [JsonProperty("artist")]
-        public SimpleArtist Artist { get; set; }
+        [JsonProperty("artists")]
+        public List<SimpleArtist> Artists { get; set; }
         [JsonProperty("available_markets")]
         public List<String> AvailableMarkets { get; set; }
         [JsonProperty("disc_number")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/GeneralModels.cs b/SpotifyAPI/SpotifyWebAPI/Models/GeneralModels.cs
@@ -16,6 +16,12 @@ public class Image
         [JsonProperty("height")]
         public int Height { get; set; }
     }
+    public class ErrorResponse
+    {
+        [JsonProperty("error")]
+        public Error Error { get; set; }
+    }
+
     public class Error
     {
         [JsonProperty("status")]
@@ -46,13 +52,31 @@ public class PlaylistTrack
         [JsonProperty("track")]
         public FullTrack Track { get; set; }
     }
-    internal class CreatePlaylistArgs
+    public class CreatePlaylistArgs
     {
         [JsonProperty("name")]
         public String Name { get; set; }
         [JsonProperty("public")]
         public Boolean Public { get; set; }
     }
+    public class DeleteTrackArg
+    {
+        [JsonProperty("uri")]
+        public String Uri { get; set; }
+        [JsonProperty("positions")]
+        public List<int> Positions { get; set; }
+
+        public DeleteTrackArg(String uri, params int[] positions)
+        {
+            this.Positions = positions.ToList();
+            this.Uri = uri;
+        }
+        public bool ShouldSerializePositions()
+        {
+            // don't serialize the Manager property if an employee is their own manager
+            return (Positions.Count > 0);
+        }
+    }
     public class SeveralTracks
     {
         [JsonProperty("tracks")]
@@ -68,4 +92,16 @@ public class SeveralAlbums
         [JsonProperty("albums")]
         public List<FullAlbum> Albums { get; set; }
     }
+    public class Copyright
+    {
+        [JsonProperty("text")]
+        public String Text { get; set; }
+        [JsonProperty("type")]
+        public String Type { get; set; }
+    }
+
+    public class CheckUserTracks : BasicModel
+    {
+        public List<Boolean> Checked { get; set; }
+    }
 }
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/NewAlbumReleases.cs b/SpotifyAPI/SpotifyWebAPI/Models/NewAlbumReleases.cs
@@ -0,0 +1,15 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace SpotifyAPI.SpotifyWebAPI.Models
+{
+    public class NewAlbumReleases : BasicModel
+    {
+        [JsonProperty("albums")]
+        public Paging<SimpleAlbum> Albums { get; set; }
+    }
+}
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/PrivateProfile.cs b/SpotifyAPI/SpotifyWebAPI/Models/PrivateProfile.cs
@@ -15,6 +15,8 @@ public class PrivateProfile : BasicModel
         public String DisplayName { get; set; }
         [JsonProperty("external_urls")]
         public Dictionary<string, string> ExternalUrls { get; set; }
+        [JsonProperty("followers")]
+        public Followers Followers { get; set; }
         [JsonProperty("href")]
         public String Href { get; set; }
         [JsonProperty("id")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/PublicProfile.cs b/SpotifyAPI/SpotifyWebAPI/Models/PublicProfile.cs
@@ -9,12 +9,18 @@ namespace SpotifyAPI.SpotifyWebAPI.Models
 {
     public class PublicProfile : BasicModel
     {
+        [JsonProperty("display_name")]
+        public String DisplayName { get; set; }
         [JsonProperty("external_urls")]
         public Dictionary<string, string> ExternalUrls { get; set; }
+        [JsonProperty("followers")]
+        public Followers Followers { get; set; }
         [JsonProperty("href")]
         public String Href { get; set; }
         [JsonProperty("id")]
         public String Id { get; set; }
+        [JsonProperty("images")]
+        public List<Image> Images { get; set; }
         [JsonProperty("type")]
         public String Type { get; set; }
         [JsonProperty("uri")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/SimplePlaylist.cs b/SpotifyAPI/SpotifyWebAPI/Models/SimplePlaylist.cs
@@ -17,6 +17,8 @@ public class SimplePlaylist : BasicModel
         public String Href { get; set; }
         [JsonProperty("id")]
         public String Id { get; set; }
+        [JsonProperty("images")]
+        public List<Image> Images { get; set; }
         [JsonProperty("name")]
         public String Name { get; set; }
         [JsonProperty("owner")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Models/SimpleTrack.cs b/SpotifyAPI/SpotifyWebAPI/Models/SimpleTrack.cs
@@ -11,6 +11,8 @@ public class SimpleTrack : BasicModel
     {
         [JsonProperty("artist")]
         public SimpleArtist Artist { get; set; }
+        [JsonProperty("available_markets")]
+        public List<String> AvailableMarkets { get; set; }
         [JsonProperty("disc_number")]
         public int DiscNumber { get; set; }
         [JsonProperty("duration_ms")]
diff --git a/SpotifyAPI/SpotifyWebAPI/Scope.cs b/SpotifyAPI/SpotifyWebAPI/Scope.cs
@@ -11,8 +11,8 @@ public enum Scope
     {
         [StringAttribute("")]
         NONE = 1,
-        [StringAttribute("playlist-modify")]
-        PLAYLIST_MODIFY = 2,
+        [StringAttribute("playlist-modify-public")]
+        PLAYLIST_MODIFY_PUBLIC = 2,
         [StringAttribute("playlist-modify-private")]
         PLAYLIST_MODIFY_PRIVATE = 4, 
         [StringAttribute("playlist-read-private")]
@@ -22,6 +22,10 @@ public enum Scope
         [StringAttribute("user-read-private")]
         USER_READ_PRIVATE = 32,
         [StringAttribute("user-read-email")]
-        USER_READ_EMAIL = 64
+        USER_READ_EMAIL = 64,
+        [StringAttribute("user-library-read")]
+        USER_LIBRARAY_READ = 128,
+        [StringAttribute("user-library-modify")]
+        USER_LIBRARY_MODIFY = 256
     }
 }
diff --git a/SpotifyAPI/SpotifyWebAPI/SimpleHttpServer.cs b/SpotifyAPI/SpotifyWebAPI/SimpleHttpServer.cs
@@ -162,32 +162,49 @@ public void writeFailure() {
         }
     }
 
-    public abstract class HttpServer {
+    public abstract class HttpServer : IDisposable {
 
         protected int port;
         TcpListener listener;
-        bool is_active = true;
+        public bool IsActive { get; set; }
        
-        public HttpServer(int port) {
+        public HttpServer(int port) 
+        {
+            this.IsActive = true;
             this.port = port;
         }
 
         public void listen()
         {
-            listener = new TcpListener(port);
-            listener.Start();
-            while (is_active) {                
-                TcpClient s = listener.AcceptTcpClient();
-                HttpProcessor processor = new HttpProcessor(s, this);
-                Thread thread = new Thread(new ThreadStart(processor.process));
-                thread.Start();
-                Thread.Sleep(1);
+            try
+            {
+                listener = new TcpListener(port);
+                listener.Start();
+                while (IsActive)
+                {
+                    TcpClient s = listener.AcceptTcpClient();
+                    HttpProcessor processor = new HttpProcessor(s, this);
+                    Thread thread = new Thread(new ThreadStart(processor.process));
+                    thread.Start();
+                    Thread.Sleep(1);
+                }
+            }catch(Exception)
+            {
+                
             }
         }
 
+        public void Dispose()
+        {
+            IsActive = false;
+            listener.Stop();
+        }
+
         public abstract void handleGETRequest(HttpProcessor p);
         public abstract void handlePOSTRequest(HttpProcessor p, StreamReader inputData);
-    }
+    
+
+}
 
     public class SimpleHttpServer : HttpServer {
 
diff --git a/SpotifyAPI/SpotifyWebAPI/SpotifyWebAPIClass.cs b/SpotifyAPI/SpotifyWebAPI/SpotifyWebAPIClass.cs
diff --git a/SpotifyWebAPIExample/Program.cs b/SpotifyWebAPIExample/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,7 @@ public void SetResponse(String accessToken, String tokenType, int expiresIn,Stri`
`58`	`58`	`}`
`59`	`59`	`public void StopHttpServer()`
`60`	`60`	`{`
`61`		`- try`
`62`		`- {`
`63`		`- httpThread.Abort();`
`64`		`- }catch(ThreadAbortException e)`
`65`		`- {`
`66`		`-`
`67`		`- }`
	`61`	`+ httpServer.Dispose();`
`68`	`62`	`httpServer = null;`
`69`	`63`	`}`
`70`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ namespace SpotifyAPI.SpotifyWebAPI.Models`
`10`	`10`	`public abstract class BasicModel`
`11`	`11`	`{`
`12`	`12`	`[JsonProperty("error")]`
`13`		`- public Error Error { get; set; }`
	`13`	`+ public Error ErrorResponse { get; set; }`
`14`	`14`
`15`	`15`	`public Boolean HasError()`
`16`	`16`	`{`
`17`		`- return Error != null;`
	`17`	`+ return ErrorResponse != null;`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ public class FullArtist : BasicModel`
`11`	`11`	`{`
`12`	`12`	`[JsonProperty("external_urls")]`
`13`	`13`	`public Dictionary<String, String> ExternalUrls { get; set; }`
	`14`	`+ [JsonProperty("followers")]`
	`15`	`+ public Followers Followers { get; set; }`
`14`	`16`	`[JsonProperty("genres")]`
`15`	`17`	`public List<String> Genres { get; set; }`
`16`	`18`	`[JsonProperty("href")]`