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());