From 1774e5b1ac9f809fd97c1d95666fc563afa87914 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 20 May 2014 20:56:24 -0400
Subject: added upnp  ConnectionManager.cs

---
 .../Session/HttpSessionController.cs               | 32 ++++++++++++----------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Session/HttpSessionController.cs')

diff --git a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
index 0b0f21e2c..110f66476 100644
--- a/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Session/HttpSessionController.cs
@@ -63,17 +63,18 @@ namespace MediaBrowser.Server.Implementations.Session
 
         private Task SendMessage(string name, CancellationToken cancellationToken)
         {
-            return SendMessage(name, new NameValueCollection(), cancellationToken);
+            return SendMessage(name, new Dictionary<string, string>(), cancellationToken);
         }
 
-        private Task SendMessage(string name, NameValueCollection args, CancellationToken cancellationToken)
+        private Task SendMessage(string name, Dictionary<string, string> args, CancellationToken cancellationToken)
         {
-            return SendMessage(new WebSocketMessage<string>
-            {
-                MessageType = name,
-                Data = string.Empty
+            var url = _postUrl + "/" + name + ToQueryString(args);
 
-            }, cancellationToken);
+            return _httpClient.Post(new HttpRequestOptions
+            {
+                Url = url,
+                CancellationToken = cancellationToken
+            });
         }
 
         public Task SendSessionEndedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken)
@@ -141,12 +142,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
         public Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
-            return SendMessage(new WebSocketMessage<GeneralCommand>
-            {
-                MessageType = "GeneralCommand",
-                Data = command
-
-            }, cancellationToken);
+            return SendMessage(command.Name, command.Arguments, cancellationToken);
         }
 
         private string ToQueryString(Dictionary<string, string> nvc)
@@ -154,7 +150,15 @@ namespace MediaBrowser.Server.Implementations.Session
             var array = (from item in nvc
                          select string.Format("{0}={1}", WebUtility.UrlEncode(item.Key), WebUtility.UrlEncode(item.Value)))
                 .ToArray();
-            return "?" + string.Join("&", array);
+
+            var args = string.Join("&", array);
+
+            if (string.IsNullOrEmpty(args))
+            {
+                return args;
+            }
+
+            return "?" + args;
         }
     }
 }
-- 
cgit v1.2.3