From 6acb6ecd7a3187d54c553a58c858f4900ad8e719 Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Thu, 15 Oct 2015 14:11:16 +0200 Subject: [PATCH 1/3] Bugfixes --- MusicPlayer/MusicPlayer/MusicPlayer.csproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj index fd24d57..359d999 100644 --- a/MusicPlayer/MusicPlayer/MusicPlayer.csproj +++ b/MusicPlayer/MusicPlayer/MusicPlayer.csproj @@ -1,4 +1,4 @@ - + @@ -46,12 +46,12 @@ - + + Form + - Form - MainForm.cs @@ -91,4 +91,4 @@ --> - \ No newline at end of file + From bdf6366dc024374766271eb17fa826c727dd07b9 Mon Sep 17 00:00:00 2001 From: Yorick Rommers Date: Thu, 15 Oct 2015 14:36:51 +0200 Subject: [PATCH 2/3] Werkt nog niet --- MusicPlayer/MusicPlayer/Form1.Designer.cs | 11 ++++++++- MusicPlayer/MusicPlayer/Form1.cs | 8 +++++-- MusicPlayer/MusicPlayer/MusicPlayer.csproj | 3 +++ MusicPlayer/MusicPlayer/NetworkHandler.cs | 28 +++++++++++++++------- MusicPlayer/MusicPlayer/Program.cs | 3 +++ 5 files changed, 42 insertions(+), 11 deletions(-) diff --git a/MusicPlayer/MusicPlayer/Form1.Designer.cs b/MusicPlayer/MusicPlayer/Form1.Designer.cs index a88eefc..397e6d1 100644 --- a/MusicPlayer/MusicPlayer/Form1.Designer.cs +++ b/MusicPlayer/MusicPlayer/Form1.Designer.cs @@ -28,9 +28,18 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + this.SuspendLayout(); + // + // Form1 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(284, 261); + this.Name = "Form1"; this.Text = "Form1"; + this.Load += new System.EventHandler(this.Form1_Load); + this.ResumeLayout(false); + } #endregion diff --git a/MusicPlayer/MusicPlayer/Form1.cs b/MusicPlayer/MusicPlayer/Form1.cs index 8c520e3..95b1daa 100644 --- a/MusicPlayer/MusicPlayer/Form1.cs +++ b/MusicPlayer/MusicPlayer/Form1.cs @@ -16,8 +16,12 @@ namespace MusicPlayer public Form1() { InitializeComponent(); - APIHandler api = new APIHandler(); - NetworkHandler nw = new NetworkHandler("83.128.250.123", api); +// nw.SendString("GET / HTTP/1.1"); + + } + + private void Form1_Load(object sender, EventArgs e) + { } } diff --git a/MusicPlayer/MusicPlayer/MusicPlayer.csproj b/MusicPlayer/MusicPlayer/MusicPlayer.csproj index 10a36ec..6d954a9 100644 --- a/MusicPlayer/MusicPlayer/MusicPlayer.csproj +++ b/MusicPlayer/MusicPlayer/MusicPlayer.csproj @@ -58,6 +58,9 @@ + + Form1.cs + ResXFileCodeGenerator Resources.Designer.cs diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index 2ac9dcf..71a7884 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -1,4 +1,5 @@ -using System.Text; +using System; +using System.Text; using System.Net.Sockets; using System.Threading; @@ -7,13 +8,16 @@ namespace MusicPlayer class NetworkHandler { private int port = 8585; - private Socket s; + private TcpClient s; + private NetworkStream serverStream; private APIHandler api; public NetworkHandler(string ip, APIHandler apihandler) { - s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + Console.WriteLine("Hello"); + s = new TcpClient(); s.Connect(ip, port); + serverStream = s.GetStream(); ThreadStart thread = new ThreadStart(ReceiveData); Thread childThread = new Thread(thread); childThread.Start(); @@ -21,17 +25,25 @@ namespace MusicPlayer } public void SendString(string m) - { - byte[] req_as_bytes = Encoding.UTF8.GetBytes(m); - s.Send(req_as_bytes); + { + byte[] b = Encoding.UTF8.GetBytes(m); + serverStream.Write(b, 0, b.Length); + serverStream.Flush(); } public void ReceiveData() { + Console.WriteLine("Hello2"); while (s.Connected) { - byte[] data = new byte[1024 * 200]; - s.Receive(data); + Console.WriteLine("Hello3"); + byte[] data = new byte[512]; + Console.WriteLine("Hang je hier?"); + int bytesRec = serverStream.Read(data, 0, data.Length); + Console.WriteLine("ën hier? "); + Console.WriteLine("Echoed test = {0}",Encoding.ASCII.GetString(data, 0, bytesRec)); + + string message = Encoding.ASCII.GetString(data); System.Console.WriteLine(message); //Iets doen met api calls diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs index 3ce5ccb..54e8133 100644 --- a/MusicPlayer/MusicPlayer/Program.cs +++ b/MusicPlayer/MusicPlayer/Program.cs @@ -14,6 +14,9 @@ namespace MusicPlayer [STAThread] static void Main() { + APIHandler api = new APIHandler(); + NetworkHandler nw = new NetworkHandler("www.imegumii.nl", api); + nw.SendString("GET /getsongbyid?id=102 HTTP/1.1"); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1()); From 8b6efac7384cf6893a4bae06d7ad1ac4c83b9101 Mon Sep 17 00:00:00 2001 From: jancoow Date: Thu, 15 Oct 2015 14:57:59 +0200 Subject: [PATCH 3/3] Added a working server connector --- MusicPlayer/MusicPlayer/NetworkHandler.cs | 51 ++++++++++------------- MusicPlayer/MusicPlayer/Program.cs | 4 +- 2 files changed, 23 insertions(+), 32 deletions(-) diff --git a/MusicPlayer/MusicPlayer/NetworkHandler.cs b/MusicPlayer/MusicPlayer/NetworkHandler.cs index 71a7884..9ea31a4 100644 --- a/MusicPlayer/MusicPlayer/NetworkHandler.cs +++ b/MusicPlayer/MusicPlayer/NetworkHandler.cs @@ -2,52 +2,43 @@ using System.Text; using System.Net.Sockets; using System.Threading; +using System.Net; +using System.IO; namespace MusicPlayer { class NetworkHandler { private int port = 8585; - private TcpClient s; - private NetworkStream serverStream; + private string ip; private APIHandler api; public NetworkHandler(string ip, APIHandler apihandler) { - Console.WriteLine("Hello"); - s = new TcpClient(); - s.Connect(ip, port); - serverStream = s.GetStream(); - ThreadStart thread = new ThreadStart(ReceiveData); - Thread childThread = new Thread(thread); - childThread.Start(); - api = apihandler; + this.ip = ip; + this.api = apihandler; } public void SendString(string m) - { - byte[] b = Encoding.UTF8.GetBytes(m); - serverStream.Write(b, 0, b.Length); - serverStream.Flush(); - } - - public void ReceiveData() { - Console.WriteLine("Hello2"); - while (s.Connected) + HttpWebRequest server = (HttpWebRequest)WebRequest.Create(ip+":"+port+"/"+m); + server.KeepAlive = false; + HttpWebResponse respond = (HttpWebResponse)server.GetResponse(); + Stream streamResponse = respond.GetResponseStream(); + StreamReader streamRead = new StreamReader(streamResponse); + Char[] readBuff = new Char[256]; + int count = streamRead.Read(readBuff, 0, 256); + string data = ""; + while (count > 0) { - Console.WriteLine("Hello3"); - byte[] data = new byte[512]; - Console.WriteLine("Hang je hier?"); - int bytesRec = serverStream.Read(data, 0, data.Length); - Console.WriteLine("ën hier? "); - Console.WriteLine("Echoed test = {0}",Encoding.ASCII.GetString(data, 0, bytesRec)); - - - string message = Encoding.ASCII.GetString(data); - System.Console.WriteLine(message); - //Iets doen met api calls + String outputData = new String(readBuff, 0, count); + data +=outputData; + count = streamRead.Read(readBuff, 0, 256); } + System.Console.WriteLine(data); + respond.Close(); + streamResponse.Close(); + streamRead.Close(); } } } diff --git a/MusicPlayer/MusicPlayer/Program.cs b/MusicPlayer/MusicPlayer/Program.cs index 54e8133..490c4be 100644 --- a/MusicPlayer/MusicPlayer/Program.cs +++ b/MusicPlayer/MusicPlayer/Program.cs @@ -15,8 +15,8 @@ namespace MusicPlayer static void Main() { APIHandler api = new APIHandler(); - NetworkHandler nw = new NetworkHandler("www.imegumii.nl", api); - nw.SendString("GET /getsongbyid?id=102 HTTP/1.1"); + NetworkHandler nw = new NetworkHandler("http://www.imegumii.nl", api); + nw.SendString("getsongbyid?id=102"); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new Form1());