Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Several little improvements and minor functionality extending #50

Merged
merged 9 commits into from
Oct 28, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions SpotifyAPI.Example/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
2 changes: 1 addition & 1 deletion SpotifyAPI.Example/ExampleForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public ExampleForm()
InitializeComponent();
}
}
}
}
22 changes: 11 additions & 11 deletions SpotifyAPI.Example/LocalControl.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System;
using SpotifyAPI.Local;
using SpotifyAPI.Local.Enums;
using SpotifyAPI.Local.Models;
using System;
using System.Diagnostics;
using System.Globalization;
using System.Windows.Forms;
using SpotifyAPI.Local;
using SpotifyAPI.Local.Enums;
using SpotifyAPI.Local.Models;

namespace SpotifyAPI.Example
{
Expand Down Expand Up @@ -102,23 +102,23 @@ public void UpdatePlayingStatus(bool playing)
isPlayingLabel.Text = playing.ToString();
}

void _spotify_OnVolumeChange(VolumeChangeEventArgs e)
private void _spotify_OnVolumeChange(VolumeChangeEventArgs e)
{
volumeLabel.Text = (e.NewVolume*100).ToString(CultureInfo.InvariantCulture);
volumeLabel.Text = (e.NewVolume * 100).ToString(CultureInfo.InvariantCulture);
}

void _spotify_OnTrackTimeChange(TrackTimeChangeEventArgs e)
private void _spotify_OnTrackTimeChange(TrackTimeChangeEventArgs e)
{
timeLabel.Text = FormatTime(e.TrackTime) + "/" + FormatTime(_currentTrack.Length);
timeProgressBar.Value = (int) e.TrackTime;
timeProgressBar.Value = (int)e.TrackTime;
}

void _spotify_OnTrackChange(TrackChangeEventArgs e)
private void _spotify_OnTrackChange(TrackChangeEventArgs e)
{
UpdateTrack(e.NewTrack);
}

void _spotify_OnPlayStateChange(PlayStateEventArgs e)
private void _spotify_OnPlayStateChange(PlayStateEventArgs e)
{
UpdatePlayingStatus(e.Playing);
}
Expand Down Expand Up @@ -162,4 +162,4 @@ private static String FormatTime(double sec)
return mins + ":" + secs;
}
}
}
}
9 changes: 3 additions & 6 deletions SpotifyAPI.Example/Program.cs
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace SpotifyAPI.Example
{
static class Program
internal static class Program
{
/// <summary>
/// Der Haupteinstiegspunkt für die Anwendung.
/// </summary>
[STAThread]
static void Main()
private static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new ExampleForm());
}
}
}
}
13 changes: 6 additions & 7 deletions SpotifyAPI.Example/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Allgemeine Informationen über eine Assembly werden über die folgenden
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("SpotifyAPI.Example")]
Expand All @@ -14,8 +13,8 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
[assembly: ComVisible(false)]

Expand All @@ -25,12 +24,12 @@
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
19 changes: 9 additions & 10 deletions SpotifyAPI.Example/WebControl.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
using System;
using SpotifyAPI.Web;
using SpotifyAPI.Web.Auth;
using SpotifyAPI.Web.Enums;
using SpotifyAPI.Web.Models;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Net;
using System.Windows.Forms;
using SpotifyAPI.Web;
using SpotifyAPI.Web.Auth;
using SpotifyAPI.Web.Enums;
using SpotifyAPI.Web.Models;
using Image = System.Drawing.Image;

namespace SpotifyAPI.Example
Expand All @@ -21,7 +20,7 @@ public partial class WebControl : UserControl
private PrivateProfile _profile;
private List<FullTrack> _savedTracks;
private List<SimplePlaylist> _playlists;

public WebControl()
{
InitializeComponent();
Expand All @@ -37,7 +36,7 @@ public WebControl()
_auth.OnResponseReceivedEvent += _auth_OnResponseReceivedEvent;
}

void _auth_OnResponseReceivedEvent(Token token, string state)
private void _auth_OnResponseReceivedEvent(Token token, string state)
{
_auth.StopHttpServer();

Expand Down Expand Up @@ -77,7 +76,7 @@ private async void InitialSetup()
_savedTracks.ForEach(track => savedTracksListView.Items.Add(new ListViewItem()
{
Text = track.Name,
SubItems = {string.Join(",", track.Artists.Select(source => source.Name)), track.Album.Name}
SubItems = { string.Join(",", track.Artists.Select(source => source.Name)), track.Album.Name }
}));

_playlists = GetPlaylists();
Expand Down Expand Up @@ -134,4 +133,4 @@ private void authButton_Click(object sender, EventArgs e)
_auth.DoAuth();
}
}
}
}
13 changes: 6 additions & 7 deletions SpotifyAPI.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Allgemeine Informationen über eine Assembly werden über die folgenden
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
[assembly: AssemblyTitle("SpotifyAPI.Tests")]
Expand All @@ -14,8 +13,8 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
[assembly: ComVisible(false)]

Expand All @@ -25,12 +24,12 @@
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Nebenversion
// Buildnummer
// Revision
//
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
10 changes: 5 additions & 5 deletions SpotifyAPI.Tests/TestClass.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System;
using System.IO;
using System.Linq;
using Moq;
using Moq;
using Newtonsoft.Json;
using NUnit.Framework;
using SpotifyAPI.Web;
using SpotifyAPI.Web.Models;
using System;
using System.IO;
using System.Linq;

namespace SpotifyAPI.Tests
{
Expand Down Expand Up @@ -67,4 +67,4 @@ public void ShouldGetPublicProfile()

//Will add more tests once I decided if this is worth the effort (propably not?)
}
}
}
9 changes: 6 additions & 3 deletions SpotifyAPI/Local/LocalEvents.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using SpotifyAPI.Local.Models;
using SpotifyAPI.Local.Models;
using System;

namespace SpotifyAPI.Local
{
Expand All @@ -11,13 +11,15 @@ public class TrackChangeEventArgs
public Track OldTrack { get; set; }
public Track NewTrack { get; set; }
}

/// <summary>
/// Event gets triggered, when the Playin-state is changed (e.g Play --> Pause)
/// </summary>
public class PlayStateEventArgs
{
public Boolean Playing { get; set; }
}

/// <summary>
/// Event gets triggered, when the volume changes
/// </summary>
Expand All @@ -26,11 +28,12 @@ public class VolumeChangeEventArgs
public double OldVolume { get; set; }
public double NewVolume { get; set; }
}

/// <summary>
/// Event gets triggered, when the tracktime changes
/// </summary>
public class TrackTimeChangeEventArgs
{
public double TrackTime { get; set; }
}
}
}
6 changes: 3 additions & 3 deletions SpotifyAPI/Local/Models/CFID.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace SpotifyAPI.Local.Models
/// <summary>
/// JSON Response, used internaly
/// </summary>
class Cfid
internal class Cfid
{
public Error Error { get; set; }
public String Token { get; set; }
Expand All @@ -17,9 +17,9 @@ class Cfid
/// <summary>
/// JSON Response, used internaly
/// </summary>
class Error
internal class Error
{
public String Type { get; set; }
public String Message { get; set; }
}
}
}
5 changes: 3 additions & 2 deletions SpotifyAPI/Local/Models/OpenGraphState.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using System;
using Newtonsoft.Json;
using Newtonsoft.Json;
using System;

namespace SpotifyAPI.Local.Models
{
public class OpenGraphState
{
[JsonProperty("private_session")]
public Boolean PrivateSession { get; set; }

[JsonProperty("posting_disabled")]
public Boolean PostingDisabled { get; set; }
}
Expand Down
8 changes: 5 additions & 3 deletions SpotifyAPI/Local/Models/SpotifyResource.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
using System;
using Newtonsoft.Json;
using Newtonsoft.Json;
using System;

namespace SpotifyAPI.Local.Models
{
public class SpotifyResource
{
[JsonProperty("name")]
public String Name { get; set; }

[JsonProperty("uri")]
public String Uri { get; set; }

[JsonProperty("location")]
public TrackResourceLocation Location { get; set; }
}
}
}
15 changes: 14 additions & 1 deletion SpotifyAPI/Local/Models/StatusResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,44 @@ public class StatusResponse
{
[JsonProperty("version")]
public int Version { get; set; }

[JsonProperty("client_version")]
public string ClientVersion { get; set; }

[JsonProperty("playing")]
public bool Playing { get; set; }

[JsonProperty("schuffle")]
public bool Shuffle { get; set; }

[JsonProperty("repeat")]
public bool Repeat { get; set; }

[JsonProperty("play_enabled")]
public bool PlayEnabled { get; set; }

[JsonProperty("prev_enabled")]
public bool PrevEnabled { get; set; }

[JsonProperty("next_enabled")]
public bool NextEnabled { get; set; }

[JsonProperty("track")]
public Track Track { get; set; }

[JsonProperty("playing_position")]
public double PlayingPosition { get; set; }

[JsonProperty("server_time")]
public int ServerTime { get; set; }

[JsonProperty("volume")]
public double Volume { get; set; }

[JsonProperty("online")]
public bool Online { get; set; }

[JsonProperty("running")]
public bool Running { get; set; }
}
}
}
Loading