From 189618a75159d604e425c9318984dc2d8a9cc3f9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 23 Jun 2013 11:02:53 -0400
Subject: fixes #358 - Weather validation in Server configuration

---
 MediaBrowser.Controller/Dto/DtoBuilder.cs            | 11 ++++++++---
 MediaBrowser.Controller/Kernel.cs                    |  8 --------
 .../MediaBrowser.Controller.csproj                   |  1 -
 MediaBrowser.Controller/Weather/IWeatherProvider.cs  | 20 --------------------
 4 files changed, 8 insertions(+), 32 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Weather/IWeatherProvider.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 17a5995b8f..5868e34cd0 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -514,15 +514,20 @@ namespace MediaBrowser.Controller.Dto
                 }
             }
 
-            var game = item as BaseGame;
+            var game = item as Game;
 
             if (game != null)
             {
-                dto.Players = game.PlayersSupported;
-                dto.GameSystem = game.GameSystem;
+                SetGameProperties(dto, game);
             }
         }
 
+        private void SetGameProperties(BaseItemDto dto, Game item)
+        {
+            dto.Players = item.PlayersSupported;
+            dto.GameSystem = item.GameSystem;
+        }
+
         /// <summary>
         /// Since it can be slow to make all of these calculations independently, this method will provide a way to do them all at once
         /// </summary>
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index d7b24a0cc7..5bf485229b 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -1,7 +1,5 @@
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.MediaInfo;
-using MediaBrowser.Controller.Weather;
-using System.Collections.Generic;
 
 namespace MediaBrowser.Controller
 {
@@ -28,12 +26,6 @@ namespace MediaBrowser.Controller
         /// <value>The FFMPEG controller.</value>
         public FFMpegManager FFMpegManager { get; set; }
 
-        /// <summary>
-        /// Gets the list of currently registered weather prvoiders
-        /// </summary>
-        /// <value>The weather providers.</value>
-        public IEnumerable<IWeatherProvider> WeatherProviders { get; set; }
-
         /// <summary>
         /// Creates a kernel based on a Data path, which is akin to our current programdata path
         /// </summary>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 0fa04adcc1..0bd82eaa7c 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -161,7 +161,6 @@
     <Compile Include="Sorting\IBaseItemComparer.cs" />
     <Compile Include="Sorting\IUserBaseItemComparer.cs" />
     <Compile Include="Updates\IInstallationManager.cs" />
-    <Compile Include="Weather\IWeatherProvider.cs" />
     <Compile Include="Providers\BaseItemXmlParser.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Controller/Weather/IWeatherProvider.cs b/MediaBrowser.Controller/Weather/IWeatherProvider.cs
deleted file mode 100644
index 9060e5b9cd..0000000000
--- a/MediaBrowser.Controller/Weather/IWeatherProvider.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using MediaBrowser.Model.Weather;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Controller.Weather
-{
-    /// <summary>
-    /// Interface IWeatherProvider
-    /// </summary>
-    public interface IWeatherProvider
-    {
-        /// <summary>
-        /// Gets the weather info async.
-        /// </summary>
-        /// <param name="location">The location.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{WeatherInfo}.</returns>
-        Task<WeatherInfo> GetWeatherInfoAsync(string location, CancellationToken cancellationToken);
-    }
-}
-- 
cgit v1.2.3