From 670a53258ef79ee92f578335577df4f768c9d7d4 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Tue, 11 Sep 2012 14:20:12 -0400 Subject: Some minor code cleanups --- MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs | 2 +- MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs | 4 ++-- MediaBrowser.Controller/Resolvers/TV/TVUtils.cs | 14 ++++++-------- MediaBrowser.Controller/Resolvers/VideoResolver.cs | 8 ++++---- 4 files changed, 13 insertions(+), 15 deletions(-) (limited to 'MediaBrowser.Controller/Resolvers') diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index ae30a63872..a25968a943 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs @@ -46,7 +46,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies private void SetProviderIdFromPath(Movie item) { - string srch = "[tmdbid="; + const string srch = "[tmdbid="; int index = item.Path.IndexOf(srch, System.StringComparison.OrdinalIgnoreCase); if (index != -1) diff --git a/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs index 3c43e460c5..b8ff2c37be 100644 --- a/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs @@ -48,8 +48,8 @@ namespace MediaBrowser.Controller.Resolvers.TV private void SetProviderIdFromPath(Series item) { - string srch = "[tvdbid="; - int index = item.Path.IndexOf(srch, System.StringComparison.OrdinalIgnoreCase); + const string srch = "[tvdbid="; + int index = item.Path.IndexOf(srch, StringComparison.OrdinalIgnoreCase); if (index != -1) { diff --git a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs index ebfcda6028..c40f3fa63f 100644 --- a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs +++ b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs @@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.Resolvers.TV /// /// A season folder must contain one of these somewhere in the name /// - private static string[] SeasonFolderNames = new string[] { + private static readonly string[] SeasonFolderNames = new string[] { "season", "sæson", "temporada", @@ -118,14 +118,12 @@ namespace MediaBrowser.Controller.Resolvers.TV { return true; } - else - { - nonSeriesFolders++; - if (nonSeriesFolders >= 3) - { - return false; - } + nonSeriesFolders++; + + if (nonSeriesFolders >= 3) + { + return false; } } else diff --git a/MediaBrowser.Controller/Resolvers/VideoResolver.cs b/MediaBrowser.Controller/Resolvers/VideoResolver.cs index 316c7798a1..e162fa509d 100644 --- a/MediaBrowser.Controller/Resolvers/VideoResolver.cs +++ b/MediaBrowser.Controller/Resolvers/VideoResolver.cs @@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Resolvers { VideoType type = Path.GetExtension(args.Path).EndsWith("iso", System.StringComparison.OrdinalIgnoreCase) ? VideoType.Iso : VideoType.VideoFile; - return new T() + return new T { VideoType = type, Path = args.Path @@ -77,15 +77,15 @@ namespace MediaBrowser.Controller.Resolvers { if (folder.IndexOf("video_ts", System.StringComparison.OrdinalIgnoreCase) != -1) { - return new T() + return new T { - VideoType = VideoType.DVD, + VideoType = VideoType.Dvd, Path = Path.GetDirectoryName(folder) }; } if (folder.IndexOf("bdmv", System.StringComparison.OrdinalIgnoreCase) != -1) { - return new T() + return new T { VideoType = VideoType.BluRay, Path = Path.GetDirectoryName(folder) -- cgit v1.2.3