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/Entities/Folder.cs | 2 +- MediaBrowser.Controller/Entities/UserItemData.cs | 2 +- MediaBrowser.Controller/FFMpeg/FFProbe.cs | 2 +- MediaBrowser.Controller/IO/DirectoryWatchers.cs | 10 ++++------ MediaBrowser.Controller/IO/FileData.cs | 2 +- MediaBrowser.Controller/Kernel.cs | 6 +++--- MediaBrowser.Controller/Library/ItemController.cs | 12 +++++------- MediaBrowser.Controller/Properties/AssemblyInfo.cs | 1 - MediaBrowser.Controller/Providers/AudioInfoProvider.cs | 9 +++------ MediaBrowser.Controller/Providers/BaseItemXmlParser.cs | 8 ++++---- .../Providers/ImageFromMediaLocationProvider.cs | 6 ++---- .../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 ++++---- MediaBrowser.Controller/ServerApplicationPaths.cs | 12 ++++++------ MediaBrowser.Controller/Weather/WeatherClient.cs | 16 ++++++++-------- MediaBrowser.Controller/Xml/XmlExtensions.cs | 2 +- 18 files changed, 53 insertions(+), 65 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index c0f1604b1f..8d7fc40218 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -61,7 +61,7 @@ namespace MediaBrowser.Controller.Entities /// public ItemSpecialCounts GetSpecialCounts(User user) { - ItemSpecialCounts counts = new ItemSpecialCounts(); + var counts = new ItemSpecialCounts(); IEnumerable recursiveChildren = GetParentalAllowedRecursiveChildren(user); diff --git a/MediaBrowser.Controller/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs index 3eacdae5bc..271ecf5478 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 = null; + private float? _Rating; /// /// Gets or sets the users 0-10 rating /// diff --git a/MediaBrowser.Controller/FFMpeg/FFProbe.cs b/MediaBrowser.Controller/FFMpeg/FFProbe.cs index d4c07f07b0..db113bb8a3 100644 --- a/MediaBrowser.Controller/FFMpeg/FFProbe.cs +++ b/MediaBrowser.Controller/FFMpeg/FFProbe.cs @@ -61,7 +61,7 @@ namespace MediaBrowser.Controller.FFMpeg { try { - ProtobufSerializer.SerializeToFile(result, outputCachePath); + ProtobufSerializer.SerializeToFile(result, outputCachePath); } catch (Exception ex) { diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 837c02cb90..f8037984eb 100644 --- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs @@ -10,8 +10,8 @@ namespace MediaBrowser.Controller.IO { public class DirectoryWatchers { - private List FileSystemWatchers = new List(); - private Timer updateTimer = null; + private readonly List FileSystemWatchers = new List(); + private Timer updateTimer; private List affectedPaths = new List(); private const int TimerDelayInSeconds = 5; @@ -107,10 +107,8 @@ namespace MediaBrowser.Controller.IO { return Kernel.Instance.ReloadRoot(); } - else - { - return Task.WhenAll(itemsToRefresh.Select(i => Kernel.Instance.ReloadItem(i))); - } + + return Task.WhenAll(itemsToRefresh.Select(i => Kernel.Instance.ReloadItem(i))); } private BaseItem GetAffectedBaseItem(string path) diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs index b7a6579daf..4ae2ee72f3 100644 --- a/MediaBrowser.Controller/IO/FileData.cs +++ b/MediaBrowser.Controller/IO/FileData.cs @@ -149,7 +149,7 @@ namespace MediaBrowser.Controller.IO private static extern bool FindClose(IntPtr hFindFile); private const char SpaceChar = ' '; - private static char[] InvalidFileNameChars = Path.GetInvalidFileNameChars(); + private static readonly char[] InvalidFileNameChars = Path.GetInvalidFileNameChars(); /// /// Takes a filename and removes invalid characters diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 47a3773b34..0de57593b9 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -93,13 +93,13 @@ namespace MediaBrowser.Controller await base.Init(progress).ConfigureAwait(false); - progress.Report(new TaskProgress() { Description = "Loading Users", PercentComplete = 15 }); + progress.Report(new TaskProgress { Description = "Loading Users", PercentComplete = 15 }); ReloadUsers(); - progress.Report(new TaskProgress() { Description = "Loading Media Library", PercentComplete = 25 }); + progress.Report(new TaskProgress { Description = "Loading Media Library", PercentComplete = 25 }); await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false); - progress.Report(new TaskProgress() { Description = "Loading Complete", PercentComplete = 100 }); + progress.Report(new TaskProgress { Description = "Loading Complete", PercentComplete = 100 }); } protected override void OnComposablePartsLoaded() diff --git a/MediaBrowser.Controller/Library/ItemController.cs b/MediaBrowser.Controller/Library/ItemController.cs index 9e0c94b793..4115ea7b8b 100644 --- a/MediaBrowser.Controller/Library/ItemController.cs +++ b/MediaBrowser.Controller/Library/ItemController.cs @@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Library /// public async Task GetItem(string path, Folder parent = null, WIN32_FIND_DATA? fileInfo = null, bool allowInternetProviders = true) { - ItemResolveEventArgs args = new ItemResolveEventArgs() + var args = new ItemResolveEventArgs { FileInfo = fileInfo ?? FileData.GetFileData(path), Parent = parent, @@ -113,7 +113,7 @@ namespace MediaBrowser.Controller.Library if (item.IsFolder) { // If it's a folder look for child entities - (item as Folder).Children = (await Task.WhenAll(GetChildren(item as Folder, fileSystemChildren, allowInternetProviders)).ConfigureAwait(false)) + (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; @@ -193,10 +193,8 @@ namespace MediaBrowser.Controller.Library resolvedShortcuts.InsertRange(0, returnArray); return resolvedShortcuts.ToArray(); } - else - { - return returnArray; - } + + return returnArray; } /// @@ -231,7 +229,7 @@ namespace MediaBrowser.Controller.Library return GetImagesByNameItem(Kernel.Instance.ApplicationPaths.YearPath, value.ToString()); } - private ConcurrentDictionary ImagesByNameItemCache = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); + private readonly ConcurrentDictionary ImagesByNameItemCache = new ConcurrentDictionary(StringComparer.OrdinalIgnoreCase); /// /// Generically retrieves an IBN item diff --git a/MediaBrowser.Controller/Properties/AssemblyInfo.cs b/MediaBrowser.Controller/Properties/AssemblyInfo.cs index 350165b1c6..63cc65d7aa 100644 --- a/MediaBrowser.Controller/Properties/AssemblyInfo.cs +++ b/MediaBrowser.Controller/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs index 09cd80a210..f7242ce053 100644 --- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs @@ -26,9 +26,6 @@ namespace MediaBrowser.Controller.Providers { MediaStream stream = data.streams.First(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase)); - string bitrate = null; - string duration = null; - audio.Channels = stream.channels; if (!string.IsNullOrEmpty(stream.sample_rate)) @@ -36,8 +33,8 @@ namespace MediaBrowser.Controller.Providers audio.SampleRate = int.Parse(stream.sample_rate); } - bitrate = stream.bit_rate; - duration = stream.duration; + string bitrate = stream.bit_rate; + string duration = stream.duration; if (string.IsNullOrEmpty(bitrate)) { @@ -78,7 +75,7 @@ namespace MediaBrowser.Controller.Providers if (!string.IsNullOrEmpty(composer)) { - audio.AddPerson(new PersonInfo() { Name = composer, Type = "Composer" }); + audio.AddPerson(new PersonInfo { Name = composer, Type = "Composer" }); } audio.Album = GetDictionaryValue(tags, "album"); diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index a3b0d2c600..837e4c3884 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Providers item.DisplayMediaType = VideoType.BluRay.ToString(); break; case "dvd": - item.DisplayMediaType = VideoType.DVD.ToString(); + item.DisplayMediaType = VideoType.Dvd.ToString(); break; case "": item.DisplayMediaType = null; @@ -163,7 +163,7 @@ namespace MediaBrowser.Controller.Providers case "Director": { - foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo() { Name = v, Type = "Director" })) + foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo { Name = v, Type = "Director" })) { item.AddPerson(p); } @@ -171,7 +171,7 @@ namespace MediaBrowser.Controller.Providers } case "Writer": { - foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo() { Name = v, Type = "Writer" })) + foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo { Name = v, Type = "Writer" })) { item.AddPerson(p); } @@ -181,7 +181,7 @@ namespace MediaBrowser.Controller.Providers case "Actors": case "GuestStars": { - foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo() { Name = v, Type = "Actor" })) + foreach (PersonInfo p in GetSplitValues(reader.ReadElementContentAsString(), '|').Select(v => new PersonInfo { Name = v, Type = "Actor" })) { item.AddPerson(p); } diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs index 6ccb6df7c1..f556d671e3 100644 --- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs @@ -34,10 +34,8 @@ namespace MediaBrowser.Controller.Providers { return Task.Run(() => { PopulateBaseItemImages(baseItem, args); }); } - else - { - return Task.Run(() => { PopulateImages(item, args); }); - } + + return Task.Run(() => { PopulateImages(item, args); }); } return Task.FromResult(null); 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) diff --git a/MediaBrowser.Controller/ServerApplicationPaths.cs b/MediaBrowser.Controller/ServerApplicationPaths.cs index 0f4932fd04..f657ee259d 100644 --- a/MediaBrowser.Controller/ServerApplicationPaths.cs +++ b/MediaBrowser.Controller/ServerApplicationPaths.cs @@ -153,7 +153,7 @@ namespace MediaBrowser.Controller } } - private string _CacheDirectory = null; + private string _CacheDirectory; /// /// Gets the folder path to the cache directory /// @@ -175,7 +175,7 @@ namespace MediaBrowser.Controller } } - private string _FFProbeAudioCacheDirectory = null; + private string _FFProbeAudioCacheDirectory; /// /// Gets the folder path to the ffprobe audio cache directory /// @@ -197,7 +197,7 @@ namespace MediaBrowser.Controller } } - private string _FFProbeVideoCacheDirectory = null; + private string _FFProbeVideoCacheDirectory; /// /// Gets the folder path to the ffprobe video cache directory /// @@ -219,7 +219,7 @@ namespace MediaBrowser.Controller } } - private string _FFMpegDirectory = null; + private string _FFMpegDirectory; /// /// Gets the folder path to ffmpeg /// @@ -241,7 +241,7 @@ namespace MediaBrowser.Controller } } - private string _FFMpegPath = null; + private string _FFMpegPath; /// /// Gets the path to ffmpeg.exe /// @@ -258,7 +258,7 @@ namespace MediaBrowser.Controller } } - private string _FFProbePath = null; + private string _FFProbePath; /// /// Gets the path to ffprobe.exe /// diff --git a/MediaBrowser.Controller/Weather/WeatherClient.cs b/MediaBrowser.Controller/Weather/WeatherClient.cs index c4abdc171e..a16244820c 100644 --- a/MediaBrowser.Controller/Weather/WeatherClient.cs +++ b/MediaBrowser.Controller/Weather/WeatherClient.cs @@ -1,13 +1,13 @@ -using System; +using MediaBrowser.Common.Logging; +using MediaBrowser.Common.Serialization; +using MediaBrowser.Model.Weather; +using System; using System.IO; using System.Linq; using System.Net; using System.Net.Cache; using System.Net.Http; using System.Threading.Tasks; -using MediaBrowser.Common.Logging; -using MediaBrowser.Common.Serialization; -using MediaBrowser.Model.Weather; namespace MediaBrowser.Controller.Weather { @@ -36,8 +36,8 @@ namespace MediaBrowser.Controller.Weather return null; } - int numDays = 5; - string apiKey = "24902f60f1231941120109"; + const int numDays = 5; + const string apiKey = "24902f60f1231941120109"; string url = "http://free.worldweatheronline.com/feed/weather.ashx?q=" + zipCode + "&format=json&num_of_days=" + numDays + "&key=" + apiKey; @@ -95,7 +95,7 @@ namespace MediaBrowser.Controller.Weather public WeatherStatus ToWeatherStatus() { - return new WeatherStatus() + return new WeatherStatus { TemperatureCelsius = int.Parse(temp_C), TemperatureFahrenheit = int.Parse(temp_F), @@ -122,7 +122,7 @@ namespace MediaBrowser.Controller.Weather public WeatherForecast ToWeatherForecast() { - return new WeatherForecast() + return new WeatherForecast { Date = DateTime.Parse(date), HighTemperatureCelsius = int.Parse(tempMaxC), diff --git a/MediaBrowser.Controller/Xml/XmlExtensions.cs b/MediaBrowser.Controller/Xml/XmlExtensions.cs index e706baa614..d2e8e19832 100644 --- a/MediaBrowser.Controller/Xml/XmlExtensions.cs +++ b/MediaBrowser.Controller/Xml/XmlExtensions.cs @@ -5,7 +5,7 @@ namespace MediaBrowser.Controller.Xml { public static class XmlExtensions { - private static CultureInfo _usCulture = new CultureInfo("en-US"); + private static readonly CultureInfo _usCulture = new CultureInfo("en-US"); /// /// Reads a float from the current element of an XmlReader -- cgit v1.2.3