From 88b1472f880169d7ea6291b23aec6a42cfc120e4 Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Thu, 8 Dec 2016 14:32:08 +0000 Subject: [PATCH] Tidied up the warnings --- PlexRequests.Helpers/Analytics/Analytics.cs | 3 +++ PlexRequests.Store/Repository/PlexUserRepository.cs | 7 ++++--- PlexRequests.Store/Repository/UserRepository.cs | 7 ++++--- PlexRequests.UI/Modules/Admin/AdminModule.cs | 12 ++++++------ PlexRequests.UI/Modules/CultureModule.cs | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/PlexRequests.Helpers/Analytics/Analytics.cs b/PlexRequests.Helpers/Analytics/Analytics.cs index b38daca12..ed7eed4fd 100644 --- a/PlexRequests.Helpers/Analytics/Analytics.cs +++ b/PlexRequests.Helpers/Analytics/Analytics.cs @@ -167,6 +167,8 @@ namespace PlexRequests.Helpers.Analytics } #endif } + +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously private async Task SendRequestAsync(string postDataString) { var request = (HttpWebRequest)WebRequest.Create(AnalyticsUri); @@ -195,6 +197,7 @@ namespace PlexRequests.Helpers.Analytics } #endif } +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously private Dictionary BuildRequestData(HitType type, string username, string category, string action, string clientId, string label, int? value, string exceptionDescription, int? fatal) { diff --git a/PlexRequests.Store/Repository/PlexUserRepository.cs b/PlexRequests.Store/Repository/PlexUserRepository.cs index 177dab2b5..b706ff201 100644 --- a/PlexRequests.Store/Repository/PlexUserRepository.cs +++ b/PlexRequests.Store/Repository/PlexUserRepository.cs @@ -41,11 +41,9 @@ namespace PlexRequests.Store.Repository public PlexUserRepository(ISqliteConfiguration config, ICacheProvider cache) : base(config,cache) { DbConfig = config; - Cache = cache; } private ISqliteConfiguration DbConfig { get; } - private ICacheProvider Cache { get; } private IDbConnection Db => DbConfig.DbConnection(); public PlexUsers GetUser(string userGuid) @@ -69,7 +67,9 @@ namespace PlexRequests.Store.Repository return await Db.QueryFirstOrDefaultAsync(sql, new {UserGuid = userguid}); } - #region abstract implimentation + #region abstract implementation + +#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member [Obsolete] public override PlexUsers Get(string id) { @@ -94,6 +94,7 @@ namespace PlexRequests.Store.Repository throw new System.NotImplementedException(); } +#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member #endregion } diff --git a/PlexRequests.Store/Repository/UserRepository.cs b/PlexRequests.Store/Repository/UserRepository.cs index d661a30ec..50a513e98 100644 --- a/PlexRequests.Store/Repository/UserRepository.cs +++ b/PlexRequests.Store/Repository/UserRepository.cs @@ -40,11 +40,9 @@ namespace PlexRequests.Store.Repository public UserRepository(ISqliteConfiguration config, ICacheProvider cache) : base(config,cache) { DbConfig = config; - Cache = cache; } private ISqliteConfiguration DbConfig { get; } - private ICacheProvider Cache { get; } private IDbConnection Db => DbConfig.DbConnection(); public UsersModel GetUser(string userGuid) @@ -68,7 +66,9 @@ namespace PlexRequests.Store.Repository return await Db.QueryFirstOrDefaultAsync(sql, new {UserGuid = userguid}); } - #region abstract implimentation + #region abstract implementation + +#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member [Obsolete] public override UsersModel Get(string id) { @@ -93,6 +93,7 @@ namespace PlexRequests.Store.Repository throw new System.NotImplementedException(); } +#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member #endregion } diff --git a/PlexRequests.UI/Modules/Admin/AdminModule.cs b/PlexRequests.UI/Modules/Admin/AdminModule.cs index 80b1ea66c..a9367c1bc 100644 --- a/PlexRequests.UI/Modules/Admin/AdminModule.cs +++ b/PlexRequests.UI/Modules/Admin/AdminModule.cs @@ -227,7 +227,7 @@ namespace PlexRequests.UI.Modules Post["/clearlogs", true] = async (x, ct) => await ClearLogs(); Get["/notificationsettings", true] = async (x, ct) => await NotificationSettings(); - Post["/notificationsettings", true] = async (x, ct) => await SaveNotificationSettings(); + Post["/notificationsettings"] = x => SaveNotificationSettings(); Post["/recentlyAddedTest"] = x => RecentlyAddedTest(); } @@ -287,7 +287,7 @@ namespace PlexRequests.UI.Modules { Analytics.TrackEventAsync(Category.Admin, Action.Save, "CollectAnalyticData turned off", Username, CookieHelper.GetAnalyticClientId(Cookies)); } - var result = PrService.SaveSettings(model); + var result = await PrService.SaveSettingsAsync(model); Analytics.TrackEventAsync(Category.Admin, Action.Save, "PlexRequestSettings", Username, CookieHelper.GetAnalyticClientId(Cookies)); return Response.AsJson(result @@ -520,7 +520,7 @@ namespace PlexRequests.UI.Modules { NotificationService.Subscribe(new EmailMessageNotification(EmailService)); settings.Enabled = true; - NotificationService.Publish(notificationModel, settings); + await NotificationService.Publish(notificationModel, settings); Log.Info("Sent email notification test"); } catch (Exception) @@ -620,7 +620,7 @@ namespace PlexRequests.UI.Modules { NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService)); settings.Enabled = true; - NotificationService.Publish(notificationModel, settings); + await NotificationService.Publish(notificationModel, settings); Log.Info("Sent pushbullet notification test"); } catch (Exception) @@ -686,7 +686,7 @@ namespace PlexRequests.UI.Modules { NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService)); settings.Enabled = true; - NotificationService.Publish(notificationModel, settings); + await NotificationService.Publish(notificationModel, settings); Log.Info("Sent pushover notification test"); } catch (Exception) @@ -1040,7 +1040,7 @@ namespace PlexRequests.UI.Modules return View["NotificationSettings", s]; } - private async Task SaveNotificationSettings() + private Negotiator SaveNotificationSettings() { var model = this.Bind(); return View["NotificationSettings", model]; diff --git a/PlexRequests.UI/Modules/CultureModule.cs b/PlexRequests.UI/Modules/CultureModule.cs index adf5c2348..75426f613 100644 --- a/PlexRequests.UI/Modules/CultureModule.cs +++ b/PlexRequests.UI/Modules/CultureModule.cs @@ -47,12 +47,12 @@ namespace PlexRequests.UI.Modules { Analytics = a; - Get["/", true] = async(x,c) => await SetCulture(); + Get["/"] = x => SetCulture(); } private IAnalytics Analytics { get; } - public async Task SetCulture() + private RedirectResponse SetCulture() { var culture = (string)Request.Query["l"]; var returnUrl = (string)Request.Query["u"];