From fdafa596832eae13cebcf5bbe5fa867f7ba068f0 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Feb 2013 20:26:35 -0500 Subject: Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy. --- MediaBrowser.Controller/Drawing/ImageHeader.cs | 3 +- MediaBrowser.Controller/Drawing/ImageManager.cs | 17 ++++++++-- MediaBrowser.Controller/Entities/BaseItem.cs | 5 ++- .../Entities/CollectionFolder.cs | 1 - MediaBrowser.Controller/Entities/Folder.cs | 3 +- MediaBrowser.Controller/Entities/Movies/Movie.cs | 1 - MediaBrowser.Controller/Entities/User.cs | 1 - MediaBrowser.Controller/IO/DirectoryWatchers.cs | 1 - MediaBrowser.Controller/IO/FileData.cs | 1 - MediaBrowser.Controller/Kernel.cs | 20 ++++++++++-- MediaBrowser.Controller/Library/DtoBuilder.cs | 36 ++++++++++++---------- MediaBrowser.Controller/Library/Profiler.cs | 5 ++- MediaBrowser.Controller/Library/UserManager.cs | 2 +- .../Localization/LocalizedStrings.cs | 3 +- MediaBrowser.Controller/Localization/Ratings.cs | 5 +-- .../MediaBrowser.Controller.csproj | 2 +- .../Providers/BaseImageEnhancer.cs | 25 ++------------- .../Providers/BaseMetadataProvider.cs | 4 +-- .../MediaInfo/FFProbeAudioInfoProvider.cs | 1 - .../Providers/TV/RemoteSeasonProvider.cs | 3 +- MediaBrowser.Controller/Resolvers/TV/TVUtils.cs | 5 ++- 21 files changed, 71 insertions(+), 73 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Drawing/ImageHeader.cs b/MediaBrowser.Controller/Drawing/ImageHeader.cs index 7fec7d4c5..91b4b93e9 100644 --- a/MediaBrowser.Controller/Drawing/ImageHeader.cs +++ b/MediaBrowser.Controller/Drawing/ImageHeader.cs @@ -1,10 +1,9 @@ -using MediaBrowser.Common.Logging; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; -using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.Drawing { diff --git a/MediaBrowser.Controller/Drawing/ImageManager.cs b/MediaBrowser.Controller/Drawing/ImageManager.cs index 2077525a3..16fd4a5b8 100644 --- a/MediaBrowser.Controller/Drawing/ImageManager.cs +++ b/MediaBrowser.Controller/Drawing/ImageManager.cs @@ -6,6 +6,7 @@ using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Drawing; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -15,7 +16,6 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; using System.Threading.Tasks; -using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.Drawing { @@ -581,7 +581,20 @@ namespace MediaBrowser.Controller.Drawing // Run the enhancers sequentially in order of priority foreach (var enhancer in imageEnhancers) { - result = await enhancer.EnhanceImageAsync(item, result, imageType, imageIndex).ConfigureAwait(false); + var typeName = enhancer.GetType().Name; + + _logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--"); + + try + { + result = await enhancer.EnhanceImageAsync(item, result, imageType, imageIndex).ConfigureAwait(false); + } + catch (Exception ex) + { + _logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name); + + throw; + } } return result; diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 888963c9d..023a79ee9 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1,6 +1,5 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Common.Win32; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; @@ -8,6 +7,7 @@ using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.IO; @@ -16,7 +16,6 @@ using System.Runtime.Serialization; using System.Text; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.Entities { @@ -97,7 +96,7 @@ namespace MediaBrowser.Controller.Entities /// /// The logger /// - protected static ILogger Logger = LogManager.GetLogger("BaseItem"); + protected static internal ILogger Logger { get; internal set; } /// /// Returns a that represents this instance. diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 3f212a314..33e9f291d 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.Logging; using MediaBrowser.Model.Tasks; using System; using System.Collections.Concurrent; diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 843a84c3a..f67934f5d 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1,11 +1,11 @@ using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.Logging; using MediaBrowser.Common.Win32; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Sorting; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Tasks; using System; using System.Collections.Concurrent; using System.Collections.Generic; @@ -14,7 +14,6 @@ using System.Linq; using System.Runtime.Serialization; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.Tasks; using SortOrder = MediaBrowser.Controller.Sorting.SortOrder; namespace MediaBrowser.Controller.Entities diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs index 3ac4f60f5..6a76e2125 100644 --- a/MediaBrowser.Controller/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -1,6 +1,5 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Common.Win32; using MediaBrowser.Model.Entities; using System; diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index 1d9e6c4d1..ee9815e62 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -1,6 +1,5 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Common.Serialization; using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Tasks; diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 4eaa6e7d3..62e1a6a36 100644 --- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.ScheduledTasks; diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs index 3ccf8add6..130f08625 100644 --- a/MediaBrowser.Controller/IO/FileData.cs +++ b/MediaBrowser.Controller/IO/FileData.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Common.Win32; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Logging; diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index 992809c2f..a8cfb8dd7 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -5,6 +5,7 @@ using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.MediaInfo; using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Playback; @@ -312,12 +313,18 @@ namespace MediaBrowser.Controller /// /// The bluray examiner. private IBlurayExaminer BlurayExaminer { get; set; } - + /// /// Creates a kernel based on a Data path, which is akin to our current programdata path /// - public Kernel(IIsoManager isoManager, IZipClient zipClient, IBlurayExaminer blurayExaminer, ILogger logger) - : base(isoManager, logger) + /// The app host. + /// The iso manager. + /// The zip client. + /// The bluray examiner. + /// The logger. + /// isoManager + public Kernel(IApplicationHost appHost, IIsoManager isoManager, IZipClient zipClient, IBlurayExaminer blurayExaminer, ILogger logger) + : base(appHost, isoManager, logger) { if (isoManager == null) { @@ -337,6 +344,13 @@ namespace MediaBrowser.Controller Instance = this; ZipClient = zipClient; BlurayExaminer = blurayExaminer; + + // For now there's no real way to inject this properly + BaseItem.Logger = logger; + Ratings.Logger = logger; + LocalizedStrings.Logger = logger; + // For now, until this can become an interface + BaseMetadataProvider.Logger = logger; } /// diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 6e0735a54..8cf9d5b57 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; @@ -18,14 +17,19 @@ namespace MediaBrowser.Controller.Library /// /// Generates DTO's from domain entities /// - public static class DtoBuilder + public class DtoBuilder { /// /// The index folder delimeter /// const string IndexFolderDelimeter = "-index-"; - private static ILogger Logger = LogManager.GetLogger("DtoBuilder"); + private ILogger Logger; + + public DtoBuilder(ILogger logger) + { + Logger = logger; + } /// /// Gets the dto base item. @@ -34,7 +38,7 @@ namespace MediaBrowser.Controller.Library /// The fields. /// Task{DtoBaseItem}. /// item - public async static Task GetDtoBaseItem(BaseItem item, List fields) + public async Task GetDtoBaseItem(BaseItem item, List fields) { if (item == null) { @@ -91,7 +95,7 @@ namespace MediaBrowser.Controller.Library /// The fields. /// Task{DtoBaseItem}. /// - public async static Task GetDtoBaseItem(BaseItem item, User user, List fields) + public async Task GetDtoBaseItem(BaseItem item, User user, List fields) { if (item == null) { @@ -153,7 +157,7 @@ namespace MediaBrowser.Controller.Library /// The item. /// The user. /// The fields. - private static void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List fields) + private void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List fields) { dto.IsNew = item.IsRecentlyAdded(user); @@ -192,7 +196,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// Task. - private static async Task AttachPrimaryImageAspectRatio(BaseItemDto dto, BaseItem item) + private async Task AttachPrimaryImageAspectRatio(BaseItemDto dto, BaseItem item) { var path = item.PrimaryImagePath; @@ -234,7 +238,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// The fields. - private static void AttachBasicFields(BaseItemDto dto, BaseItem item, List fields) + private void AttachBasicFields(BaseItemDto dto, BaseItem item, List fields) { if (fields.Contains(ItemFields.DateCreated)) { @@ -555,7 +559,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// Task. - private static async Task AttachPeople(BaseItemDto dto, BaseItem item) + private async Task AttachPeople(BaseItemDto dto, BaseItem item) { if (item.People == null) { @@ -614,7 +618,7 @@ namespace MediaBrowser.Controller.Library /// /// The item. /// BaseItem. - private static BaseItem GetParentBackdropItem(BaseItem item) + private BaseItem GetParentBackdropItem(BaseItem item) { var parent = item.Parent; @@ -636,7 +640,7 @@ namespace MediaBrowser.Controller.Library /// /// The item. /// BaseItem. - private static BaseItem GetParentLogoItem(BaseItem item) + private BaseItem GetParentLogoItem(BaseItem item) { var parent = item.Parent; @@ -675,7 +679,7 @@ namespace MediaBrowser.Controller.Library /// The data. /// DtoUserItemData. /// - public static UserItemDataDto GetDtoUserItemData(UserItemData data) + public UserItemDataDto GetDtoUserItemData(UserItemData data) { if (data == null) { @@ -699,7 +703,7 @@ namespace MediaBrowser.Controller.Library /// The chapter info. /// The item. /// ChapterInfoDto. - private static ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item) + private ChapterInfoDto GetChapterInfoDto(ChapterInfo chapterInfo, BaseItem item) { var dto = new ChapterInfoDto { @@ -786,7 +790,7 @@ namespace MediaBrowser.Controller.Library /// The user. /// DtoUser. /// user - public static UserDto GetDtoUser(User user) + public UserDto GetDtoUser(User user) { if (user == null) { @@ -924,7 +928,7 @@ namespace MediaBrowser.Controller.Library /// /// The item. /// List{System.String}. - private static List GetBackdropImageTags(BaseItem item) + private List GetBackdropImageTags(BaseItem item) { if (item.BackdropImagePaths == null) { diff --git a/MediaBrowser.Controller/Library/Profiler.cs b/MediaBrowser.Controller/Library/Profiler.cs index 3ac53f62a..469d8ef18 100644 --- a/MediaBrowser.Controller/Library/Profiler.cs +++ b/MediaBrowser.Controller/Library/Profiler.cs @@ -1,7 +1,6 @@ -using System; +using MediaBrowser.Model.Logging; +using System; using System.Diagnostics; -using MediaBrowser.Common.Logging; -using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.Library { diff --git a/MediaBrowser.Controller/Library/UserManager.cs b/MediaBrowser.Controller/Library/UserManager.cs index f9593db0c..8084366b7 100644 --- a/MediaBrowser.Controller/Library/UserManager.cs +++ b/MediaBrowser.Controller/Library/UserManager.cs @@ -73,7 +73,7 @@ namespace MediaBrowser.Controller.Library EventHelper.QueueEventIfNotNull(UserUpdated, this, new GenericEventArgs { Argument = user }, _logger); // Notify connected ui's - Kernel.TcpManager.SendWebSocketMessage("UserUpdated", DtoBuilder.GetDtoUser(user)); + Kernel.TcpManager.SendWebSocketMessage("UserUpdated", new DtoBuilder(_logger).GetDtoUser(user)); } #endregion diff --git a/MediaBrowser.Controller/Localization/LocalizedStrings.cs b/MediaBrowser.Controller/Localization/LocalizedStrings.cs index aa651e181..01b259591 100644 --- a/MediaBrowser.Controller/Localization/LocalizedStrings.cs +++ b/MediaBrowser.Controller/Localization/LocalizedStrings.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Localization; -using MediaBrowser.Common.Logging; using MediaBrowser.Model.Logging; using System; using System.Collections.Concurrent; @@ -19,7 +18,7 @@ namespace MediaBrowser.Controller.Localization /// /// The logger /// - private static readonly ILogger Logger = LogManager.GetLogger("LocalizedStrings"); + static internal ILogger Logger { get; set; } /// /// The base prefix /// diff --git a/MediaBrowser.Controller/Localization/Ratings.cs b/MediaBrowser.Controller/Localization/Ratings.cs index 2f7188a9b..46368a250 100644 --- a/MediaBrowser.Controller/Localization/Ratings.cs +++ b/MediaBrowser.Controller/Localization/Ratings.cs @@ -1,8 +1,8 @@ using MediaBrowser.Common.Extensions; +using MediaBrowser.Model.Logging; using System.Collections.Generic; using System.IO; using System.Linq; -using MediaBrowser.Common.Logging; namespace MediaBrowser.Controller.Localization { @@ -11,6 +11,7 @@ namespace MediaBrowser.Controller.Localization /// public static class Ratings { + static internal ILogger Logger { get; set; } /// /// The ratings def /// @@ -40,7 +41,7 @@ namespace MediaBrowser.Controller.Localization public static Dictionary Initialize(bool blockUnrated) { //build our ratings dictionary from the combined local one and us one - ratingsDef = new RatingsDefinition(Path.Combine(Kernel.Instance.ApplicationPaths.LocalizationPath, "Ratings-" + Kernel.Instance.Configuration.MetadataCountryCode + ".txt"), LogManager.GetLogger("RatingsDefinition")); + ratingsDef = new RatingsDefinition(Path.Combine(Kernel.Instance.ApplicationPaths.LocalizationPath, "Ratings-" + Kernel.Instance.Configuration.MetadataCountryCode + ".txt"), Logger); //global value of None var dict = new Dictionary {{"None", -1}}; foreach (var pair in ratingsDef.RatingsDict) diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index f592466a6..c2b11ae32 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -130,8 +130,8 @@ - + diff --git a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs index 0bcfff183..aeceeaf5f 100644 --- a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs +++ b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs @@ -1,8 +1,6 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Drawing; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Logging; using System; using System.Drawing; using System.Threading.Tasks; @@ -14,10 +12,6 @@ namespace MediaBrowser.Controller.Providers /// public abstract class BaseImageEnhancer : IDisposable { - /// - /// The logger - /// - private static readonly ILogger Logger = LogManager.GetLogger("ImageEnhancer"); /// /// Return true only if the given image for the given item will be enhanced by this enhancer. /// @@ -92,27 +86,14 @@ namespace MediaBrowser.Controller.Providers /// Index of the image. /// Task{Image}. /// - public async Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex) + public Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex) { if (item == null || originalImage == null) { throw new ArgumentNullException(); } - var typeName = GetType().Name; - - Logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--"); - - try - { - return await EnhanceImageAsyncInternal(item, originalImage, imageType, imageIndex).ConfigureAwait(false); - } - catch (Exception ex) - { - Logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name); - - throw; - } + return EnhanceImageAsyncInternal(item, originalImage, imageType, imageIndex); } } } diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 3916c0f54..e16519864 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.Logging; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Logging; using System; @@ -17,7 +16,7 @@ namespace MediaBrowser.Controller.Providers /// Gets the logger. /// /// The logger. - protected ILogger Logger { get; private set; } + protected static internal ILogger Logger { get; internal set; } // Cache these since they will be used a lot /// @@ -113,7 +112,6 @@ namespace MediaBrowser.Controller.Providers /// protected virtual void Initialize() { - Logger = LogManager.GetLogger(GetType().Name); } /// diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index d8fd76805..49c829fff 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.MediaInfo; diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs index 0d6cc41b8..277b6d891 100644 --- a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Resolvers.TV; using MediaBrowser.Model.Entities; diff --git a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs index db85ae4f7..cfb402456 100644 --- a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs +++ b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs @@ -1,9 +1,8 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Common.Win32; +using MediaBrowser.Common.Win32; using System; using System.Collections.Generic; -using System.Text.RegularExpressions; using System.Linq; +using System.Text.RegularExpressions; namespace MediaBrowser.Controller.Resolvers.TV { -- cgit v1.2.3