From 66624293ac2208020d25456801664d10ddd2450a Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 9 Jul 2013 12:11:16 -0400
Subject: Display client version in the dashboard

---
 .../Configuration/IServerConfigurationManager.cs   | 23 --------------------
 MediaBrowser.Controller/Dto/DtoBuilder.cs          |  4 ++--
 .../Dto/SessionInfoDtoBuilder.cs                   |  3 ++-
 .../MediaBrowser.Controller.csproj                 |  2 +-
 .../Configuration/IServerConfigurationManager.cs   | 23 ++++++++++++++++++++
 MediaBrowser.Controller/Session/ISessionManager.cs | 25 ++++++++--------------
 MediaBrowser.Controller/Session/SessionInfo.cs     |  6 ++++++
 7 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
 create mode 100644 MediaBrowser.Controller/Notifications/Configuration/IServerConfigurationManager.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
deleted file mode 100644
index 810376f6c6..0000000000
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-
-namespace MediaBrowser.Controller.Configuration
-{
-    /// <summary>
-    /// Interface IServerConfigurationManager
-    /// </summary>
-    public interface IServerConfigurationManager : IConfigurationManager
-    {
-        /// <summary>
-        /// Gets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        IServerApplicationPaths ApplicationPaths { get; }
-
-        /// <summary>
-        /// Gets the configuration.
-        /// </summary>
-        /// <value>The configuration.</value>
-        ServerConfiguration Configuration { get; }
-    }
-}
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index d1a0465cd3..7167447e40 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -381,9 +381,9 @@ namespace MediaBrowser.Controller.Dto
 
                 if (parentWithImage != null)
                 {
-                    dto.ParentLogoItemId = GetClientItemId(parentWithImage);
+                    dto.ParentArtItemId = GetClientItemId(parentWithImage);
 
-                    dto.ParentLogoImageTag = GetImageCacheTag(parentWithImage, ImageType.Art, parentWithImage.GetImage(ImageType.Art));
+                    dto.ParentArtImageTag = GetImageCacheTag(parentWithImage, ImageType.Art, parentWithImage.GetImage(ImageType.Art));
                 }
             }
 
diff --git a/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
index 27e6a8d95d..b2ce4a6bad 100644
--- a/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/SessionInfoDtoBuilder.cs
@@ -28,7 +28,8 @@ namespace MediaBrowser.Controller.Dto
                 NowViewingContext = session.NowViewingContext,
                 NowViewingItemId = session.NowViewingItemId,
                 NowViewingItemName = session.NowViewingItemName,
-                NowViewingItemType = session.NowViewingItemType
+                NowViewingItemType = session.NowViewingItemType,
+                ApplicationVersion = session.ApplicationVersion
             };
 
             if (session.NowPlayingItem != null)
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 3d2b46712f..814f6d5a11 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -70,7 +70,7 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="Configuration\IServerConfigurationManager.cs" />
+    <Compile Include="Notifications\Configuration\IServerConfigurationManager.cs" />
     <Compile Include="Dto\SessionInfoDtoBuilder.cs" />
     <Compile Include="Entities\Audio\MusicAlbumDisc.cs" />
     <Compile Include="Entities\Audio\MusicGenre.cs" />
diff --git a/MediaBrowser.Controller/Notifications/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Notifications/Configuration/IServerConfigurationManager.cs
new file mode 100644
index 0000000000..810376f6c6
--- /dev/null
+++ b/MediaBrowser.Controller/Notifications/Configuration/IServerConfigurationManager.cs
@@ -0,0 +1,23 @@
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Controller.Configuration
+{
+    /// <summary>
+    /// Interface IServerConfigurationManager
+    /// </summary>
+    public interface IServerConfigurationManager : IConfigurationManager
+    {
+        /// <summary>
+        /// Gets the application paths.
+        /// </summary>
+        /// <value>The application paths.</value>
+        IServerApplicationPaths ApplicationPaths { get; }
+
+        /// <summary>
+        /// Gets the configuration.
+        /// </summary>
+        /// <value>The configuration.</value>
+        ServerConfiguration Configuration { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index f28721f5ff..2af2bbec90 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -36,49 +36,42 @@ namespace MediaBrowser.Controller.Session
         /// Logs the user activity.
         /// </summary>
         /// <param name="clientType">Type of the client.</param>
+        /// <param name="appVersion">The app version.</param>
         /// <param name="deviceId">The device id.</param>
         /// <param name="deviceName">Name of the device.</param>
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException">user</exception>
-        Task LogConnectionActivity(string clientType, string deviceId, string deviceName, User user);
+        Task<SessionInfo> LogConnectionActivity(string clientType, string appVersion, string deviceId, string deviceName, User user);
 
         /// <summary>
         /// Used to report that playback has started for an item
         /// </summary>
-        /// <param name="user">The user.</param>
         /// <param name="item">The item.</param>
-        /// <param name="clientType">Type of the client.</param>
-        /// <param name="deviceId">The device id.</param>
-        /// <param name="deviceName">Name of the device.</param>
+        /// <param name="sessionId">The session id.</param>
+        /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        Task OnPlaybackStart(User user, BaseItem item, string clientType, string deviceId, string deviceName);
+        Task OnPlaybackStart(BaseItem item, Guid sessionId);
 
         /// <summary>
         /// Used to report playback progress for an item
         /// </summary>
-        /// <param name="user">The user.</param>
         /// <param name="item">The item.</param>
         /// <param name="positionTicks">The position ticks.</param>
         /// <param name="isPaused">if set to <c>true</c> [is paused].</param>
-        /// <param name="clientType">Type of the client.</param>
-        /// <param name="deviceId">The device id.</param>
-        /// <param name="deviceName">Name of the device.</param>
+        /// <param name="sessionId">The session id.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        Task OnPlaybackProgress(User user, BaseItem item, long? positionTicks, bool isPaused, string clientType, string deviceId, string deviceName);
+        Task OnPlaybackProgress(BaseItem item, long? positionTicks, bool isPaused, Guid sessionId);
 
         /// <summary>
         /// Used to report that playback has ended for an item
         /// </summary>
-        /// <param name="user">The user.</param>
         /// <param name="item">The item.</param>
         /// <param name="positionTicks">The position ticks.</param>
-        /// <param name="clientType">Type of the client.</param>
-        /// <param name="deviceId">The device id.</param>
-        /// <param name="deviceName">Name of the device.</param>
+        /// <param name="sessionId">The session id.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException"></exception>
-        Task OnPlaybackStopped(User user, BaseItem item, long? positionTicks, string clientType, string deviceId, string deviceName);
+        Task OnPlaybackStopped(BaseItem item, long? positionTicks, Guid sessionId);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index e49b526241..177573de6a 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -101,6 +101,12 @@ namespace MediaBrowser.Controller.Session
         /// <value>The web socket.</value>
         public List<IWebSocketConnection> WebSockets { get; set; }
 
+        /// <summary>
+        /// Gets or sets the application version.
+        /// </summary>
+        /// <value>The application version.</value>
+        public string ApplicationVersion { get; set; }
+
         /// <summary>
         /// Gets a value indicating whether this instance is active.
         /// </summary>
-- 
cgit v1.2.3