More code cleanups

20 files changed, 56 insertions, 67 deletions

diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs
index 271ecf5478..bb4950046b 100644
--- a/MediaBrowser.Controller/Entities/UserItemData.cs
+++ b/MediaBrowser.Controller/Entities/UserItemData.cs
@@ -5,7 +5,7 @@ namespace MediaBrowser.Controller.Entities
 {

     public class UserItemData

     {

-        private float? _Rating;

+        private float? _rating;

         /// <summary>

         /// Gets or sets the users 0-10 rating

         /// </summary>

@@ -13,7 +13,7 @@ namespace MediaBrowser.Controller.Entities
         {

             get

             {

-                return _Rating;

+                return _rating;

             }

             set

             {

@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Entities
                     }

                 }

 

-                _Rating = value;

+                _rating = value;

             }

         }

 

diff --git a/MediaBrowser.Controller/FFMpeg/FFProbe.cs b/MediaBrowser.Controller/FFMpeg/FFProbe.cs
index db113bb8a3..f16f0142d6 100644
--- a/MediaBrowser.Controller/FFMpeg/FFProbe.cs
+++ b/MediaBrowser.Controller/FFMpeg/FFProbe.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Controller.FFMpeg
         /// </summary>

         public static FFProbeResult Run(BaseItem item, string cacheDirectory)

         {

-            string cachePath = GetFFProbeCachePath(item, cacheDirectory);

+            string cachePath = GetFfProbeCachePath(item, cacheDirectory);

 

             // Use try catch to avoid having to use File.Exists

             try

@@ -72,7 +72,7 @@ namespace MediaBrowser.Controller.FFMpeg
 

         private static FFProbeResult Run(string input)

         {

-            ProcessStartInfo startInfo = new ProcessStartInfo();

+            var startInfo = new ProcessStartInfo { };

 

             startInfo.CreateNoWindow = true;

 

@@ -88,12 +88,12 @@ namespace MediaBrowser.Controller.FFMpeg
 

             //Logger.LogInfo(startInfo.FileName + " " + startInfo.Arguments);

 

-            Process process = new Process();

+            var process = new Process { };

             process.StartInfo = startInfo;

 

             process.EnableRaisingEvents = true;

 

-            process.Exited += process_Exited;

+            process.Exited += ProcessExited;

 

             try

             {

@@ -122,12 +122,12 @@ namespace MediaBrowser.Controller.FFMpeg
             }

         }

 

-        static void process_Exited(object sender, EventArgs e)

+        static void ProcessExited(object sender, EventArgs e)

         {

             (sender as Process).Dispose();

         }

 

-        private static string GetFFProbeCachePath(BaseItem item, string cacheDirectory)

+        private static string GetFfProbeCachePath(BaseItem item, string cacheDirectory)

         {

             string outputDirectory = Path.Combine(cacheDirectory, item.Id.ToString().Substring(0, 1));

 

diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs
index f8037984eb..ce7f65d392 100644
--- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs
+++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Controller.IO
 

         public void Start()

         {

-            List<string> pathsToWatch = new List<string>();

+            var pathsToWatch = new List<string>();

 

             var rootFolder = Kernel.Instance.RootFolder;

 

@@ -42,7 +42,7 @@ namespace MediaBrowser.Controller.IO
 

             foreach (string path in pathsToWatch)

             {

-                FileSystemWatcher watcher = new FileSystemWatcher(path, "*");

+                var watcher = new FileSystemWatcher(path, "*") { };

 

                 watcher.IncludeSubdirectories = true;

 

@@ -88,7 +88,7 @@ namespace MediaBrowser.Controller.IO
 

         private Task ProcessPathChanges(IEnumerable<string> paths)

         {

-            List<BaseItem> itemsToRefresh = new List<BaseItem>();

+            var itemsToRefresh = new List<BaseItem>();

 

             foreach (BaseItem item in paths.Select(p => GetAffectedBaseItem(p)))

             {

diff --git a/MediaBrowser.Controller/IO/Shortcut.cs b/MediaBrowser.Controller/IO/Shortcut.cs
index 83e2c0eda3..683f445738 100644
--- a/MediaBrowser.Controller/IO/Shortcut.cs
+++ b/MediaBrowser.Controller/IO/Shortcut.cs
@@ -167,12 +167,12 @@ namespace MediaBrowser.Controller.IO
 

         public static string ResolveShortcut(string filename)

         {

-            ShellLink link = new ShellLink();

+            var link = new ShellLink();

             ((IPersistFile)link).Load(filename, STGM_READ);

             // TODO: if I can get hold of the hwnd call resolve first. This handles moved and renamed files.  

             // ((IShellLinkW)link).Resolve(hwnd, 0) 

-            StringBuilder sb = new StringBuilder(MAX_PATH);

-            WIN32_FIND_DATAW data = new WIN32_FIND_DATAW();

+            var sb = new StringBuilder(MAX_PATH);

+            var data = new WIN32_FIND_DATAW();

             ((IShellLinkW)link).GetPath(sb, sb.Capacity, out data, 0);

             return sb.ToString();

         }

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 0de57593b9..122660c96a 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -209,7 +209,7 @@ namespace MediaBrowser.Controller
         /// </summary>

         public AuthenticationResult AuthenticateUser(User user, string password)

         {

-            AuthenticationResult result = new AuthenticationResult();

+            var result = new AuthenticationResult();

 

             // When EnableUserProfiles is false, only the default User can login

             if (!Configuration.EnableUserProfiles)

@@ -237,7 +237,7 @@ namespace MediaBrowser.Controller
 

         public async Task ReloadItem(BaseItem item)

         {

-            Folder folder = item as Folder;

+            var folder = item as Folder;

 

             if (folder != null && folder.IsRoot)

             {

@@ -283,16 +283,16 @@ namespace MediaBrowser.Controller
         /// </summary>

         private IEnumerable<User> GetAllUsers()

         {

-            List<User> list = new List<User>();

+            var list = new List<User>();

 

             // Return a dummy user for now since all calls to get items requre a userId

-            User user = new User();

+            var user = new User { };

 

             user.Name = "Default User";

             user.Id = Guid.Parse("5d1cf7fce25943b790d140095457a42b");

             list.Add(user);

 

-            user = new User();

+            user = new User { };

             user.Name = "Abobader";

             user.Id = Guid.NewGuid();

             user.LastLoginDate = DateTime.UtcNow.AddDays(-1);

@@ -300,12 +300,12 @@ namespace MediaBrowser.Controller
             user.Password = GetMD5("1234").ToString();

             list.Add(user);

 

-            user = new User();

+            user = new User { };

             user.Name = "Scottisafool";

             user.Id = Guid.NewGuid();

             list.Add(user);

 

-            user = new User();

+            user = new User { };

             user.Name = "Redshirt";

             user.Id = Guid.NewGuid();

             list.Add(user);

@@ -381,7 +381,7 @@ namespace MediaBrowser.Controller
             // Extract exe

             using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Controller.FFMpeg." + Path.GetFileName(exe)))

             {

-                using (FileStream fileStream = new FileStream(exe, FileMode.Create))

+                using (var fileStream = new FileStream(exe, FileMode.Create))

                 {

                     stream.CopyTo(fileStream);

                 }

diff --git a/MediaBrowser.Controller/Library/ItemController.cs b/MediaBrowser.Controller/Library/ItemController.cs
index 4115ea7b8b..d077785270 100644
--- a/MediaBrowser.Controller/Library/ItemController.cs
+++ b/MediaBrowser.Controller/Library/ItemController.cs
@@ -114,11 +114,7 @@ namespace MediaBrowser.Controller.Library
                 {

                     // If it's a folder look for child entities

                     (item as Folder).Children = (await Task.WhenAll(GetChildren(item as Folder, fileSystemChildren, allowInternetProviders)).ConfigureAwait(false))

-                        .Where(i => i != null).OrderBy(f =>

-                        {

-                            return string.IsNullOrEmpty(f.SortName) ? f.Name : f.SortName;

-

-                        });

+                        .Where(i => i != null).OrderBy(f => (string.IsNullOrEmpty(f.SortName) ? f.Name : f.SortName));

                 }

             }

 

@@ -130,7 +126,7 @@ namespace MediaBrowser.Controller.Library
         /// </summary>

         private Task<BaseItem>[] GetChildren(Folder folder, WIN32_FIND_DATA[] fileSystemChildren, bool allowInternetProviders)

         {

-            Task<BaseItem>[] tasks = new Task<BaseItem>[fileSystemChildren.Length];

+            var tasks = new Task<BaseItem>[fileSystemChildren.Length];

 

             for (int i = 0; i < fileSystemChildren.Length; i++)

             {

@@ -147,8 +143,8 @@ namespace MediaBrowser.Controller.Library
         /// </summary>

         private WIN32_FIND_DATA[] FilterChildFileSystemEntries(WIN32_FIND_DATA[] fileSystemChildren, bool flattenShortcuts)

         {

-            WIN32_FIND_DATA[] returnArray = new WIN32_FIND_DATA[fileSystemChildren.Length];

-            List<WIN32_FIND_DATA> resolvedShortcuts = new List<WIN32_FIND_DATA>();

+            var returnArray = new WIN32_FIND_DATA[fileSystemChildren.Length];

+            var resolvedShortcuts = new List<WIN32_FIND_DATA>();

 

             for (int i = 0; i < fileSystemChildren.Length; i++)

             {

@@ -256,7 +252,7 @@ namespace MediaBrowser.Controller.Library
         private async Task<T> CreateImagesByNameItem<T>(string path, string name)

             where T : BaseEntity, new()

         {

-            T item = new T();

+            var item = new T { };

 

             item.Name = name;

             item.Id = Kernel.GetMD5(path);

@@ -269,7 +265,7 @@ namespace MediaBrowser.Controller.Library
             item.DateCreated = Directory.GetCreationTimeUtc(path);

             item.DateModified = Directory.GetLastWriteTimeUtc(path);

 

-            ItemResolveEventArgs args = new ItemResolveEventArgs();

+            var args = new ItemResolveEventArgs { };

             args.FileInfo = FileData.GetFileData(path);

             args.FileSystemChildren = FileData.GetFileSystemEntries(path, "*").ToArray();

 

diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
index f7242ce053..302902646e 100644
--- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
@@ -249,7 +249,7 @@ namespace MediaBrowser.Controller.Providers
         

         private Dictionary<string, string> ConvertDictionaryToCaseInSensitive(Dictionary<string, string> dict)

         {

-            Dictionary<string, string> newDict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

+            var newDict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

 

             foreach (string key in dict.Keys)

             {

diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 837e4c3884..1cb2e2af34 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -347,7 +347,7 @@ namespace MediaBrowser.Controller.Providers
 

         private AudioStream FetchMediaInfoAudio(XmlReader reader)

         {

-            AudioStream stream = new AudioStream();

+            var stream = new AudioStream();

 

             reader.MoveToContent();

 

@@ -466,7 +466,7 @@ namespace MediaBrowser.Controller.Providers
 

         private SubtitleStream FetchMediaInfoSubtitles(XmlReader reader)

         {

-            SubtitleStream stream = new SubtitleStream();

+            var stream = new SubtitleStream();

 

             reader.MoveToContent();

 

@@ -681,7 +681,7 @@ namespace MediaBrowser.Controller.Providers
 

         private PersonInfo GetPersonFromXmlNode(XmlReader reader)

         {

-            PersonInfo person = new PersonInfo();

+            var person = new PersonInfo();

 

             reader.MoveToContent();

 

diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
index 0f655cf0b9..b7d9b71893 100644
--- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
@@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.Providers
         {

             if (args.ContainsFile("folder.xml"))

             {

-                await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+                await Task.Run(() => Fetch(item, args)).ConfigureAwait(false);

             }

         }

 

diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index f556d671e3..d6fd26d1c4 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -32,10 +32,10 @@ namespace MediaBrowser.Controller.Providers
 

                 if (baseItem != null)

                 {

-                    return Task.Run(() => { PopulateBaseItemImages(baseItem, args); });

+                    return Task.Run(() => PopulateBaseItemImages(baseItem, args));

                 }

 

-                return Task.Run(() => { PopulateImages(item, args); });

+                return Task.Run(() => PopulateImages(item, args));

             }

 

             return Task.FromResult<object>(null);

@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Providers
         /// </summary>

         private void PopulateBaseItemImages(BaseItem item, ItemResolveEventArgs args)

         {

-            List<string> backdropFiles = new List<string>();

+            var backdropFiles = new List<string>();

 

             for (int i = 0; i < args.FileSystemChildren.Length; i++)

             {

diff --git a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
index 4e6bcdef87..8823da6911 100644
--- a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
+++ b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs
@@ -28,11 +28,11 @@ namespace MediaBrowser.Controller.Providers
         {

             if (args.ContainsFolder("trailers"))

             {

-                List<Video> items = new List<Video>();

+                var items = new List<Video>();

 

                 foreach (WIN32_FIND_DATA file in FileData.GetFileSystemEntries(Path.Combine(args.Path, "trailers"), "*"))

                 {

-                    Video video = await Kernel.Instance.ItemController.GetItem(file.Path, fileInfo: file).ConfigureAwait(false) as Video;

+                    var video = await Kernel.Instance.ItemController.GetItem(file.Path, fileInfo: file).ConfigureAwait(false) as Video;

 

                     if (video != null)

                     {

diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
index 4f18cd5f91..f1d625aeb8 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 

         public override async Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

         {

-            await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+            await Task.Run(() => Fetch(item, args)).ConfigureAwait(false);

         }

 

         private void Fetch(BaseEntity item, ItemResolveEventArgs args)

diff --git a/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs
index 2fb5caf8e2..b6b856d292 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs
@@ -26,11 +26,11 @@ namespace MediaBrowser.Controller.Providers.Movies
         {

             if (args.ContainsFolder("specials"))

             {

-                List<Video> items = new List<Video>();

+                var items = new List<Video>();

 

                 foreach (WIN32_FIND_DATA file in FileData.GetFileSystemEntries(Path.Combine(args.Path, "specials"), "*"))

                 {

-                    Video video = await Kernel.Instance.ItemController.GetItem(file.Path, fileInfo: file).ConfigureAwait(false) as Video;

+                    var video = await Kernel.Instance.ItemController.GetItem(file.Path, fileInfo: file).ConfigureAwait(false) as Video;

 

                     if (video != null)

                     {

diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
index 8533d19d9e..0b9cf85ebe 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs
@@ -25,13 +25,13 @@ namespace MediaBrowser.Controller.Providers.TV
         {

             return Task.Run(() =>

             {

-                Episode episode = item as Episode;

+                var episode = item as Episode;

 

                 string metadataFolder = Path.Combine(args.Parent.Path, "metadata");

 

                 string episodeFileName = Path.GetFileName(episode.Path);

 

-                Season season = args.Parent as Season;

+                var season = args.Parent as Season;

 

                 SetPrimaryImagePath(episode, season, metadataFolder, episodeFileName);

             });

@@ -40,7 +40,7 @@ namespace MediaBrowser.Controller.Providers.TV
         private void SetPrimaryImagePath(Episode item, Season season, string metadataFolder, string episodeFileName)

         {

             // Look for the image file in the metadata folder, and if found, set PrimaryImagePath

-            string[] imageFiles = new string[] {

+            var imageFiles = new string[] {

                 Path.Combine(metadataFolder, Path.ChangeExtension(episodeFileName, ".jpg")),

                 Path.Combine(metadataFolder, Path.ChangeExtension(episodeFileName, ".png"))

             };

diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
index 953eb1ec42..f3c19a7048 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Providers.TV
 

         public override async Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

         {

-            await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+            await Task.Run(() => Fetch(item, args)).ConfigureAwait(false);

         }

 

         private void Fetch(BaseEntity item, ItemResolveEventArgs args)

diff --git a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
index 95f4f9adca..76d7e7ac11 100644
--- a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Providers.TV
 

         public override async Task FetchAsync(BaseEntity item, ItemResolveEventArgs args)

         {

-            await Task.Run(() => { Fetch(item, args); }).ConfigureAwait(false);

+            await Task.Run(() => Fetch(item, args)).ConfigureAwait(false);

         }

 

         private void Fetch(BaseEntity item, ItemResolveEventArgs args)

diff --git a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
index 640d1b27f1..264825fe08 100644
--- a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs
@@ -87,7 +87,7 @@ namespace MediaBrowser.Controller.Providers
 

         private void FetchFromAudioStream(Video video, MediaStream stream)

         {

-            AudioStream audio = new AudioStream();

+            var audio = new AudioStream{};

 

             audio.Codec = stream.codec_name;

 

@@ -112,7 +112,7 @@ namespace MediaBrowser.Controller.Providers
 

         private void FetchFromSubtitleStream(Video video, MediaStream stream)

         {

-            SubtitleStream subtitle = new SubtitleStream();

+            var subtitle = new SubtitleStream{};

 

             subtitle.Language = GetDictionaryValue(stream.tags, "language");

 

@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.Providers
                 return false;

             }

 

-            if (video.FrameRate == 0 || video.Height == 0 || video.Width == 0 || video.BitRate == 0)

+            if (Convert.ToInt32(video.FrameRate) == 0 || video.Height == 0 || video.Width == 0 || video.BitRate == 0)

             {

                 return false;

             }

diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs
index a25968a943..184cc3db44 100644
--- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
             {

                 var child = args.FileSystemChildren[i];

 

-                ItemResolveEventArgs childArgs = new ItemResolveEventArgs()

+                var childArgs = new ItemResolveEventArgs

                 {

                     FileInfo = child,

                     FileSystemChildren = new WIN32_FIND_DATA[] { },

@@ -77,7 +77,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies
 

                 if (item != null)

                 {

-                    return new Movie()

+                    return new Movie

                     {

                         Path = item.Path,

                         VideoType = item.VideoType

diff --git a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs
index 3b54a1aff8..528a55ae4c 100644
--- a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs
@@ -12,19 +12,12 @@ namespace MediaBrowser.Controller.Resolvers.TV
         {

             if (args.Parent is Series && args.IsDirectory)

             {

-                Season season = new Season();

+                var season = new Season { };

 

                 season.IndexNumber = TVUtils.GetSeasonNumberFromPath(args.Path);

 

                 // Gather these now so that the episode provider classes can utilize them instead of having to make their own file system calls

-                if (args.ContainsFolder("metadata"))

-                {

-                    season.MetadataFiles = Directory.GetFiles(Path.Combine(args.Path, "metadata"), "*", SearchOption.TopDirectoryOnly);

-                }

-                else

-                {

-                    season.MetadataFiles = new string[] { };

-                }

+                season.MetadataFiles = args.ContainsFolder("metadata") ? Directory.GetFiles(Path.Combine(args.Path, "metadata"), "*", SearchOption.TopDirectoryOnly) : new string[] { };

 

                 return season;

             }

diff --git a/MediaBrowser.Controller/Weather/WeatherClient.cs b/MediaBrowser.Controller/Weather/WeatherClient.cs
index a16244820c..c6692b87bf 100644
--- a/MediaBrowser.Controller/Weather/WeatherClient.cs
+++ b/MediaBrowser.Controller/Weather/WeatherClient.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Weather
 

         public WeatherClient()

         {

-            WebRequestHandler handler = new WebRequestHandler();

+            var handler = new WebRequestHandler { };

 

             handler.AutomaticDecompression = DecompressionMethods.Deflate;

             handler.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate);

@@ -56,7 +56,7 @@ namespace MediaBrowser.Controller.Weather
         /// </summary>

         private WeatherInfo GetWeatherInfo(WeatherData data)

         {

-            WeatherInfo info = new WeatherInfo();

+            var info = new WeatherInfo();

 

             if (data.current_condition != null)

             {