sarsoo/Spotify.NET
1
0
Fork 0
mirror of https://github.com/Sarsoo/Spotify.NET.git synced 2024-12-24 06:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from JimmyAppelt/master

Browse Source 
Track Length check to confirm video ad is playing and crash related artist tab
This commit is contained in:
Jonas Dellinger 2015-10-04 23:55:20 +02:00
commit be0e9684f8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SpotifyAPI/Local/Models/Track.cs
View File

@ -24,10 +24,14 @@ namespace SpotifyAPI.Local.Models
/// <summary> /// <summary>
/// Checks if the track is an advert /// Checks if the track is an advert
/// </summary> /// </summary>
/// <returns>true if the track is an advert, fals otherwise</returns> /// <returns>true if the track is an advert, false otherwise</returns>
public bool IsAd() public bool IsAd()
{ {
return TrackType == "ad"; if (TrackType == "ad")
return true;
if (Length == 0)
return true;
return false;
} }
/// <summary> /// <summary>
@ -37,7 +41,7 @@ namespace SpotifyAPI.Local.Models
/// <returns>A String, which is the URL to the Albumart</returns> /// <returns>A String, which is the URL to the Albumart</returns>
public String GetAlbumArtUrl(AlbumArtSize size) public String GetAlbumArtUrl(AlbumArtSize size)
{ {
if (AlbumResource.Uri == null || AlbumResource.Uri.Contains("local") || AlbumResource.Uri.Contains("spotify:album:0000000000000000000000")) if (AlbumResource.Uri == null || !AlbumResource.Uri.Contains("spotify:album:") || AlbumResource.Uri.Contains("spotify:album:0000000000000000000000"))
return ""; return "";
int albumsize = 0; int albumsize = 0;
@ -54,7 +58,7 @@ namespace SpotifyAPI.Local.Models
break; break;
} }
String raw; String raw;
using(WebClient wc = new WebClient()) using (WebClient wc = new WebClient())
{ {
wc.Proxy = null; wc.Proxy = null;
raw = wc.DownloadString("http://open.spotify.com/album/" + AlbumResource.Uri.Split(new[] { ":" }, StringSplitOptions.None)[2]); raw = wc.DownloadString("http://open.spotify.com/album/" + AlbumResource.Uri.Split(new[] { ":" }, StringSplitOptions.None)[2]);
@ -98,7 +102,7 @@ namespace SpotifyAPI.Local.Models
/// <returns>A Bitmap, which is the albumart</returns> /// <returns>A Bitmap, which is the albumart</returns>
public Bitmap GetAlbumArt(AlbumArtSize size) public Bitmap GetAlbumArt(AlbumArtSize size)
{ {
using(WebClient wc = new WebClient()) using (WebClient wc = new WebClient())
{ {
wc.Proxy = null; wc.Proxy = null;
String url = GetAlbumArtUrl(size); String url = GetAlbumArtUrl(size);
@ -112,6 +116,4 @@ namespace SpotifyAPI.Local.Models
} }
} }
} }
} }