Merge pull request #543 from tidusjar/dev

Dev

PlexRequests.Core/UserMapper.cs

@@ -151,7 +151,7 @@ namespace PlexRequests.Core
             var passwordMatch = PasswordHasher.VerifyPassword(oldPassword, userToChange.Salt, userToChange.Hash);
             if (!passwordMatch)
             {
-                throw new SecurityException("Password does not match");
+                throw new SecurityException("Incorrect password.");
             }
 
             var newSalt = PasswordHasher.GenerateSalt();

PlexRequests.Helpers.Tests/StringHasherTests.cs

@@ -46,6 +46,7 @@ namespace PlexRequests.Helpers.Tests
             {
                 yield return new TestCaseData("hello!").Returns("5a8dd3ad0756a93ded72b823b19dd877").SetName("Hello");
                 yield return new TestCaseData("0111111").Returns("9549d400a68633435918290085f06293").SetName("Number");
+                yield return new TestCaseData("tidusjar").Returns("f47201e0103fa37ca82ce5243cebb9c7").SetName("tidusjar");
                 yield return new TestCaseData("hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!hello!").Returns("26d0d126918fbecfc0fa4a63070d314c")
                     .SetName("Long string");
             }

PlexRequests.Helpers.Tests/TypeHelperTests.cs

@@ -65,7 +65,7 @@ namespace PlexRequests.Helpers.Tests
                         "ProviderId", "ImdbId", "TvDbId", "Overview", "Title", "PosterPath", "ReleaseDate", "Type",
                          "Status", "Approved", "RequestedBy", "RequestedDate", "Available", "Issues", "OtherMessage", "AdminNote",
                          "SeasonList", "SeasonCount", "SeasonsRequested", "MusicBrainzId", "RequestedUsers","ArtistName",
-                         "ArtistId","IssueId","Episodes","AllUsers","CanApprove","Id"
+                         "ArtistId","IssueId","Episodes", "Denied", "DeniedReason", "AllUsers","CanApprove","Id",
                     }).SetName("Requested Model");
             }
         }

PlexRequests.Helpers/StringHasher.cs

@@ -35,7 +35,7 @@ namespace PlexRequests.Helpers
         {
             using (var md5 = MD5.Create())
             {
-                var inputBytes = Encoding.ASCII.GetBytes(input);
+                var inputBytes = Encoding.UTF8.GetBytes(input);
                 var hash = md5.ComputeHash(inputBytes);
 
                 var sb = new StringBuilder();

PlexRequests.Services/Jobs/CouchPotatoCacher.cs

@@ -92,8 +92,12 @@ namespace PlexRequests.Services.Jobs
             {
                 var movies = Cache.Get<CouchPotatoMovies>(CacheKeys.CouchPotatoQueued);
 
-                var items = movies?.movies?.Select(x => x.info?.tmdb_id).Cast<int>().ToArray();
-                return items ?? new int[] { };
+                var items = movies?.movies?.Select(x => x.info?.tmdb_id);
+                if(items != null)
+                {
+                    return items.Cast<int>().ToArray();
+                }
+                return new int[] { };
             }
             catch (Exception e)
             {
@@ -107,4 +111,4 @@ namespace PlexRequests.Services.Jobs
             Queued();
         }
     }
-}
+}

PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs

@@ -195,9 +195,18 @@ namespace PlexRequests.Services.Jobs
 
         public PlexMovie GetMovie(PlexMovie[] plexMovies, string title, string year, string providerId = null)
         {
+            if (plexMovies.Length == 0)
+            {
+                return null;
+            }
             var advanced = !string.IsNullOrEmpty(providerId);
             foreach (var movie in plexMovies)
             {
+                if (string.IsNullOrEmpty(movie.Title) || string.IsNullOrEmpty(movie.ReleaseYear))
+                {
+                    continue;
+                }
+
                 if (advanced)
                 {
                     if (!string.IsNullOrEmpty(movie.ProviderId) &&

PlexRequests.Store/RequestedModel.cs

@@ -27,7 +27,7 @@ namespace PlexRequests.Store
         public string Status { get; set; }
         public bool Approved { get; set; }
 
-        [Obsolete("Use RequestedUsers")]
+        [Obsolete("Use RequestedUsers")] //TODO remove this obsolete property
         public string RequestedBy { get; set; }
 
         public DateTime RequestedDate { get; set; }
@@ -44,6 +44,8 @@ namespace PlexRequests.Store
         public string ArtistId { get; set; }
         public int IssueId { get; set; }
         public List<EpisodesModel> Episodes { get; set; }
+        public bool Denied { get; set; }
+        public string DeniedReason { get; set; }
 
         [JsonIgnore]
         public List<string> AllUsers

PlexRequests.UI/Content/requests.js

@@ -373,6 +373,17 @@ $('#noteModal').on('show.bs.modal', function (event) {
     requestField.val(id);  // Add ID to the hidden field
 });
 
+// Update deny reason modal
+$('#denyReasonModal').on('show.bs.modal', function (event) {
+    var button = $(event.relatedTarget); // Button that triggered the modal
+    var id = button.data('identifier'); // Extract info from data-* attributes
+
+    var modal = $(this);
+    modal.find('.denySaveReason').val(id); // Add ID to the button
+    var requestField = modal.find('input');
+    requestField.val(id);  // Add ID to the hidden field
+});
+
 // Delete
 $(document).on("click", ".delete", function (e) {
     e.preventDefault();
@@ -403,28 +414,85 @@ $(document).on("click", ".delete", function (e) {
 // Approve single request
 $(document).on("click", ".approve", function (e) {
     e.preventDefault();
-    var $this = $(this);
-    var $form = $this.parents('form').first();
+    var $self = $(this);
+    var $form = $self.parents('form').first();
 
-    if ($this.text() === " Loading...") {
+    if ($self.text() === " Loading...") {
         return;
     }
 
-    loadingButton($this.attr('id'), "success");
+    loadingButton($self.attr('id'), "success");
 
     approveRequest($form, null, function () {
-        $("#" + $this.attr('id') + "notapproved").prop("class", "fa fa-check");
+        $("#" + $self.attr('id') + "notapproved").prop("class", "fa fa-check");
+
         
-        var $group = $this.parent('.btn-split');
+        var $group = $self.parent('.btn-split');
         if ($group.length > 0) {
             $group.remove();
         }
         else {
-            $this.remove();
+            $self.remove();
         }              
     });
 });
 
+// Deny single request
+$(document).on("click", ".deny", function (e) {
+    e.preventDefault();
+    var $self = $(this);
+    var $form = $self.parents('form').first();
+
+    if ($self.text() === " Loading...") {
+        return;
+    }
+    loadingButton($self.attr('id')+"deny", "success");
+
+    denyRequest($form, function () {
+        // Remove the form
+        $("#" + "deny" + $self.attr('id')).remove();
+        // remove the approve button
+        var id = $self.attr("custom-button");
+        $("#" + id).remove();
+
+        var $group = $self.parent('.btn-split');
+        if ($group.length > 0) {
+            $group.remove();
+        }
+        else {
+            $self.remove();
+        }
+    });
+});
+
+// Deny single request with reason (modal)
+$(document).on("click", ".denySaveReason", function (e) {
+    var comment = $("#denyReason").val();
+    e.preventDefault();
+
+    var $form = $("#denyReasonForm");
+    var data = $form.serialize();
+    data = data + "&reason=" + comment;
+
+    $.ajax({
+        type: $form.prop("method"),
+        url: $form.prop("action"),
+        data: data,
+        dataType: "json",
+        success: function (response) {
+            if (checkJsonResponse(response)) {
+                generateNotify(response.message, "success");
+                $("#denyReasonModal").modal("hide");
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        }
+    });
+});
+
+
 $(document).on("click", ".approve-with-quality", function (e) {
     e.preventDefault();
     var $this = $(this);
@@ -524,6 +592,35 @@ function approveRequest($form, qualityId, successCallback) {
     });
 }
 
+function denyRequest($form, successCallback) {
+
+    var formData = $form.serialize();
+    $.ajax({
+        type: $form.prop('method'),
+        url: $form.prop('action'),
+        data: formData,
+        dataType: "json",
+        success: function (response) {
+
+            if (checkJsonResponse(response)) {
+                if (response.message) {
+                    generateNotify(response.message, "success");
+                } else {
+                    generateNotify("Success! Request Approved.", "success");
+                }
+
+                if (successCallback) {
+                    successCallback();
+                }
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        }
+    });
+}
+
 function mixItUpConfig(activeState) {
     var conf = mixItUpDefault;
 
@@ -556,6 +653,11 @@ function movieLoad() {
                 var html = searchTemplate(context);
                 $ml.append(html);
             });
+
+
+            $('.customTooltip').tooltipster({
+                contentCloning: true
+            });
         }
         else {
             $ml.html(noResultsHtml.format("movie"));
@@ -658,6 +760,8 @@ function buildRequestContext(result, type) {
         hasQualities: result.qualities && result.qualities.length > 0,
         artist: result.artistName,
         musicBrainzId: result.musicBrainzId,
+        denied: result.denied,
+        deniedReason: result.deniedReason,
     };
 
     return context;

PlexRequests.UI/Content/search.js

@@ -467,7 +467,8 @@ $(function () {
             available: result.available,
             episodes: result.episodes,
             tvFullyAvailable: result.tvFullyAvailable,
-            url: result.plexUrl
+            url: result.plexUrl,
+            tvPartialAvailable : result.tvPartialAvailable
         };
         return context;
     }

PlexRequests.UI/Helpers/TvSender.cs

@@ -35,6 +35,7 @@ using PlexRequests.Api.Models.Sonarr;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Store;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Threading.Tasks;
 
 using PlexRequests.Helpers.Exceptions;
@@ -70,7 +71,7 @@ namespace PlexRequests.UI.Helpers
             {
                 int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
             }
-            
+
             var series = await GetSonarrSeries(sonarrSettings, model.ProviderId);
 
             if (episodeRequest)
@@ -81,7 +82,7 @@ namespace PlexRequests.UI.Helpers
                     // Series Exists
                     // Request the episodes in the existing series
                     await RequestEpisodesWithExistingSeries(model, series, sonarrSettings);
-                    return new SonarrAddSeries {title = series.title};
+                    return new SonarrAddSeries { title = series.title };
                 }
 
 
@@ -93,7 +94,7 @@ namespace PlexRequests.UI.Helpers
 
                 // Get the series that was just added
                 series = await GetSonarrSeries(sonarrSettings, model.ProviderId);
-                series.monitored = false; // Un-monitor the series
+                series.monitored = true; // We want to make sure we are monitoring the series
 
                 // Un-monitor all seasons
                 foreach (var season in series.seasons)
@@ -113,15 +114,44 @@ namespace PlexRequests.UI.Helpers
 
             if (series != null)
             {
-                // Monitor the seasons that we have chosen
-                foreach (var season in series.seasons)
+                var requestAll = model.SeasonsRequested.Equals("All", StringComparison.CurrentCultureIgnoreCase);
+                var first = model.SeasonsRequested.Equals("First", StringComparison.CurrentCultureIgnoreCase);
+                var latest = model.SeasonsRequested.Equals("Latest", StringComparison.CurrentCultureIgnoreCase);
+
+                if (model.SeasonList.Any())
                 {
-                    if (model.SeasonList.Contains(season.seasonNumber))
+                    // Monitor the seasons that we have chosen
+                    foreach (var season in series.seasons)
+                    {
+                        if (model.SeasonList.Contains(season.seasonNumber))
+                        {
+                            season.monitored = true;
+                        }
+                    }
+                }
+
+                if (requestAll)
+                {
+                    // Monitor all seasons
+                    foreach (var season in series.seasons)
                     {
                         season.monitored = true;
                     }
                 }
 
+                if (first)
+                {
+                    var firstSeries = series?.seasons?.OrderBy(x => x.seasonNumber)?.FirstOrDefault() ?? new Season();
+                    firstSeries.monitored = true;
+                }
+
+                if (latest)
+                {
+                    var lastSeries = series?.seasons?.OrderByDescending(x => x.seasonNumber)?.FirstOrDefault() ?? new Season();
+                    lastSeries.monitored = true;
+                }
+
+
                 // Update the series in sonarr with the new monitored status
                 SonarrApi.UpdateSeries(series, sonarrSettings.ApiKey, sonarrSettings.FullUri);
                 await RequestAllEpisodesInASeasonWithExistingSeries(model, series, sonarrSettings);
@@ -201,7 +231,7 @@ namespace PlexRequests.UI.Helpers
             var tasks = new List<Task>();
             foreach (var r in episodes)
             {
-                if(r.monitored || r.hasFile) // If it's already montiored or has the file, there is no point in updating it
+                if (r.monitored || r.hasFile) // If it's already montiored or has the file, there is no point in updating it
                 {
                     continue;
                 }
@@ -230,9 +260,22 @@ namespace PlexRequests.UI.Helpers
 
             var internalEpisodeIds = new List<int>();
             var tasks = new List<Task>();
+
+            var requestedEpisodes = model.Episodes;
+            
             foreach (var r in episodes)
             {
-                if (r.hasFile || !model.SeasonList.Contains(r.seasonNumber)) // If it already has the file, there is no point in updating it
+                if (r.hasFile) // If it already has the file, there is no point in updating it
+                {
+                    continue;
+                }
+                var epComparison = new EpisodesModel
+                {
+                    EpisodeNumber = r.episodeNumber,
+                    SeasonNumber = r.seasonNumber
+                };
+                // Make sure we are looking for the right episode and season
+                if (!requestedEpisodes.Contains(epComparison))
                 {
                     continue;
                 }

PlexRequests.UI/Models/RequestViewModel.cs

@@ -55,5 +55,7 @@ namespace PlexRequests.UI.Models
         public QualityModel[] Qualities { get; set; }
         public string ArtistName { get; set; }
         public Store.EpisodesModel[] Episodes { get; set; }
+        public bool Denied { get; set; }
+        public string DeniedReason { get; set; }
     }
 }

PlexRequests.UI/Modules/AdminModule.cs

@@ -175,16 +175,16 @@ namespace PlexRequests.UI.Modules
 
             Get["/emailnotification"] = _ => EmailNotifications();
             Post["/emailnotification"] = _ => SaveEmailNotifications();
-            Post["/testemailnotification"] = _ => TestEmailNotifications();
+            Post["/testemailnotification", true] = async (x, ct) => await TestEmailNotifications();
             Get["/status", true] = async (x, ct) => await Status();
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
             Post["/pushbulletnotification"] = _ => SavePushbulletNotifications();
-            Post["/testpushbulletnotification"] = _ => TestPushbulletNotifications();
+            Post["/testpushbulletnotification", true] = async (x, ct) => await TestPushbulletNotifications();
 
             Get["/pushovernotification"] = _ => PushoverNotifications();
             Post["/pushovernotification"] = _ => SavePushoverNotifications();
-            Post["/testpushovernotification"] = _ => TestPushoverNotifications();
+            Post["/testpushovernotification", true] = async (x, ct) => await TestPushoverNotifications();
 
             Get["/logs"] = _ => Logs();
             Get["/loglevel"] = _ => GetLogLevels();
@@ -198,7 +198,7 @@ namespace PlexRequests.UI.Modules
 
             Post["/autoupdate"] = x => AutoUpdate();
 
-            Post["/testslacknotification"] = _ => TestSlackNotification();
+            Post["/testslacknotification", true] = async (x,ct) => await TestSlackNotification();
 
             Get["/slacknotification"] = _ => SlackNotifications();
             Post["/slacknotification"] = _ => SaveSlackNotifications();
@@ -477,7 +477,7 @@ namespace PlexRequests.UI.Modules
             return View["EmailNotifications", settings];
         }
 
-        private Response TestEmailNotifications()
+        private async Task<Response> TestEmailNotifications()
         {
             var settings = this.Bind<EmailNotificationSettings>();
             var valid = this.Validate(settings);
@@ -485,6 +485,7 @@ namespace PlexRequests.UI.Modules
             {
                 return Response.AsJson(valid.SendJsonError());
             }
+            var currentSettings = await EmailService.GetSettingsAsync();
             var notificationModel = new NotificationModel
             {
                 NotificationType = NotificationType.Test,
@@ -503,7 +504,10 @@ namespace PlexRequests.UI.Modules
             }
             finally
             {
-                NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
+                if (!currentSettings.Enabled)
+                {
+                    NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
+                }
             }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
         }
@@ -595,7 +599,7 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
-        private Response TestPushbulletNotifications()
+        private async Task<Response> TestPushbulletNotifications()
         {
             var settings = this.Bind<PushbulletNotificationSettings>();
             var valid = this.Validate(settings);
@@ -608,6 +612,7 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
+            var currentSettings = await PushbulletService.GetSettingsAsync();
             try
             {
                 NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
@@ -621,7 +626,10 @@ namespace PlexRequests.UI.Modules
             }
             finally
             {
-                NotificationService.UnSubscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+                if (!currentSettings.Enabled)
+                {
+                    NotificationService.UnSubscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+                }
             }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushbullet Notification!" });
         }
@@ -657,7 +665,7 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
-        private Response TestPushoverNotifications()
+        private async Task<Response> TestPushoverNotifications()
         {
             var settings = this.Bind<PushoverNotificationSettings>();
             var valid = this.Validate(settings);
@@ -670,6 +678,7 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
+            var currentSettings = await PushbulletService.GetSettingsAsync();
             try
             {
                 NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
@@ -683,7 +692,10 @@ namespace PlexRequests.UI.Modules
             }
             finally
             {
-                NotificationService.UnSubscribe(new PushoverNotification(PushoverApi, PushoverService));
+                if (!currentSettings.Enabled)
+                {
+                    NotificationService.UnSubscribe(new PushoverNotification(PushoverApi, PushoverService));
+                }
             }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushover Notification!" });
         }
@@ -803,7 +815,7 @@ namespace PlexRequests.UI.Modules
             return Response.AsJson(apiKey);
         }
 
-        private Response TestSlackNotification()
+        private async Task<Response> TestSlackNotification()
         {
             var settings = this.BindAndValidate<SlackNotificationSettings>();
             if (!ModelValidationResult.IsValid)
@@ -815,11 +827,13 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
+
+            var currentSlackSettings = await SlackSettings.GetSettingsAsync();
             try
             {
                 NotificationService.Subscribe(new SlackNotification(SlackApi, SlackSettings));
                 settings.Enabled = true;
-                NotificationService.Publish(notificationModel, settings);
+                await NotificationService.Publish(notificationModel, settings);
                 Log.Info("Sent slack notification test");
             }
             catch (Exception e)
@@ -828,7 +842,10 @@ namespace PlexRequests.UI.Modules
             }
             finally
             {
-                NotificationService.UnSubscribe(new SlackNotification(SlackApi, SlackSettings));
+                if (!currentSlackSettings.Enabled)
+                {
+                    NotificationService.UnSubscribe(new SlackNotification(SlackApi, SlackSettings));
+                }
             }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Slack Notification! If you do not receive it please check the logs." });
         }

PlexRequests.UI/Modules/ApiSettingsModule.cs

@@ -36,6 +36,7 @@ using Newtonsoft.Json;
 
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
 
 namespace PlexRequests.UI.Modules
 {
@@ -45,6 +46,9 @@ namespace PlexRequests.UI.Modules
             ISettingsService<PlexSettings> plexSettings, ISettingsService<CouchPotatoSettings> cp,
             ISettingsService<SonarrSettings> sonarr, ISettingsService<SickRageSettings> sr, ISettingsService<HeadphonesSettings> hp) : base("api", pr)
         {
+            Get["GetVersion", "/version"] = x => GetVersion();
+
+
             Get["GetAuthSettings", "/settings/authentication"] = x => GetAuthSettings();
             Post["PostAuthSettings", "/settings/authentication"] = x => PostAuthSettings();
 
@@ -83,6 +87,12 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<SickRageSettings> SickRageSettings { get; }
         private ISettingsService<HeadphonesSettings> HeadphonesSettings { get; }
 
+        private Response GetVersion()
+        {
+            return ReturnReponse(AssemblyHelper.GetProductVersion());
+        }
+
+
         private Response GetPrSettings()
         {
             var model = new ApiModel<PlexRequestSettings>();

PlexRequests.UI/Modules/ApprovalModule.cs

@@ -65,6 +65,7 @@ namespace PlexRequests.UI.Modules
             HeadphoneApi = hpApi;
 
             Post["/approve", true] = async (x, ct) => await Approve((int)Request.Form.requestid, (string)Request.Form.qualityId);
+            Post["/deny", true] = async (x, ct) => await DenyRequest((int)Request.Form.requestid, (string)Request.Form.reason);
             Post["/approveall", true] = async (x, ct) => await ApproveAll();
             Post["/approveallmovies", true] = async (x, ct) => await ApproveAllMovies();
             Post["/approvealltvshows", true] = async (x, ct) => await ApproveAllTVShows();
@@ -262,7 +263,7 @@ namespace PlexRequests.UI.Modules
         {
 
             var requests = await Service.GetAllAsync();
-                requests = requests.Where(x => x.CanApprove && x.Type == RequestType.Movie);
+            requests = requests.Where(x => x.CanApprove && x.Type == RequestType.Movie);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {
@@ -491,6 +492,24 @@ namespace PlexRequests.UI.Modules
             }
         }
 
+        private async Task<Response> DenyRequest(int requestId, string reason)
+        {
+            // Get the request from the DB
+            var request = await Service.GetAsync(requestId);
+
+            // Deny it
+            request.Denied = true;
+            request.DeniedReason = reason;
+
+            // Update the new value
+            var result = await Service.UpdateRequestAsync(request);
+
+            return result
+                ? Response.AsJson(new JsonResponseModel { Result = true, Message = "Request has been denied" })
+                : Response.AsJson(new JsonResponseModel { Result = false, Message = "An error happened, could not update the DB" });
+
+        }
+
         private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
         {
             Log.Info("Adding movie to CP : {0}", r.Title);

PlexRequests.UI/Modules/BaseAuthModule.cs

@@ -53,14 +53,15 @@ namespace PlexRequests.UI.Modules
         private Response CheckAuth()
         {
             var settings = PlexRequestSettings.GetSettings();
+            
+            var baseUrl = settings.BaseUrl;
+            
             // Have we been through the wizard?
             if (!settings.Wizard)
             {
-                return Context.GetRedirect("~/wizard");
+                return Context.GetRedirect(string.IsNullOrEmpty(baseUrl) ? "~/wizard" : $"~/{baseUrl}/wizard");
             }
 
-            var baseUrl = settings.BaseUrl;
-
             var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin";
 
             return Session[SessionKeys.UsernameKey] == null
@@ -68,4 +69,4 @@ namespace PlexRequests.UI.Modules
                 : null;
         }
     }
-}
+}

PlexRequests.UI/Modules/LoginModule.cs

@@ -1,4 +1,5 @@
 #region Copyright
+
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
 //    File: LoginModule.cs
@@ -23,10 +24,12 @@
 //    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
+
 #endregion
+
 using System;
 using System.Dynamic;
-
+using System.Security;
 using Nancy;
 using Nancy.Authentication.Forms;
 using Nancy.Extensions;
@@ -43,7 +46,8 @@ namespace PlexRequests.UI.Modules
 {
     public class LoginModule : BaseModule
     {
-        public LoginModule(ISettingsService<PlexRequestSettings> pr, ICustomUserMapper m, IResourceLinker linker) : base(pr)
+        public LoginModule(ISettingsService<PlexRequestSettings> pr, ICustomUserMapper m, IResourceLinker linker)
+            : base(pr)
         {
             UserMapper = m;
             Get["/login"] = _ =>
@@ -61,7 +65,14 @@ namespace PlexRequests.UI.Modules
                 return View["Index", model];
             };
 
-            Get["/logout"] = x => this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/");
+            Get["/logout"] = x =>
+            {
+                if (Session[SessionKeys.UsernameKey] != null)
+                {
+                    Session.Delete(SessionKeys.UsernameKey);
+                }
+                return this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/");
+            };
 
             Post["/login"] = x =>
             {
@@ -74,7 +85,10 @@ namespace PlexRequests.UI.Modules
 
                 if (userId == null)
                 {
-                    return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/login?error=true&username=" + username : "~/login?error=true&username=" + username);
+                    return
+                        Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl)
+                            ? $"~/{BaseUrl}/login?error=true&username=" + username
+                            : "~/login?error=true&username=" + username);
                 }
                 DateTime? expiry = null;
                 if (Request.Form.RememberMe.HasValue)
@@ -106,7 +120,10 @@ namespace PlexRequests.UI.Modules
                 var exists = UserMapper.DoUsersExist();
                 if (exists)
                 {
-                    return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/register?error=true" : "~/register?error=true");
+                    return
+                        Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl)
+                            ? $"~/{BaseUrl}/register?error=true"
+                            : "~/register?error=true");
                 }
                 var userId = UserMapper.CreateAdmin(username, Request.Form.Password);
                 Session[SessionKeys.UsernameKey] = username;
@@ -116,6 +133,7 @@ namespace PlexRequests.UI.Modules
             Get["/changepassword"] = _ => ChangePassword();
             Post["/changepassword"] = _ => ChangePasswordPost();
         }
+
         private ICustomUserMapper UserMapper { get; }
 
         private Negotiator ChangePassword()
@@ -141,14 +159,20 @@ namespace PlexRequests.UI.Modules
             {
                 return Response.AsJson(new JsonResponseModel { Message = "The passwords do not match", Result = false });
             }
+            try
+            {
+                var result = UserMapper.UpdatePassword(username, oldPass, newPassword);
+                if (result)
+                {
+                    return Response.AsJson(new JsonResponseModel { Message = "Password has been changed!", Result = true });
+                }
 
-            var result = UserMapper.UpdatePassword(username, oldPass, newPassword);
-            if (result)
+                return Response.AsJson(new JsonResponseModel { Message = "Could not update the password in the database", Result = false });
+            }
+            catch (SecurityException e)
             {
-                return Response.AsJson(new JsonResponseModel { Message = "Password has been changed!", Result = true });
+                return Response.AsJson(new JsonResponseModel { Message = e.ToString(), Result = false });
             }
-
-            return Response.AsJson(new JsonResponseModel { Message = "Could not update the password in the database", Result = false });
         }
     }
 }

PlexRequests.UI/Modules/RequestsModule.cs

@@ -178,6 +178,8 @@ namespace PlexRequests.UI.Modules
                 Available = movie.Available,
                 Admin = IsAdmin,
                 IssueId = movie.IssueId,
+                Denied = movie.Denied,
+                DeniedReason = movie.DeniedReason,
                 Qualities = qualities.ToArray()
             }).ToList();
 
@@ -249,6 +251,8 @@ namespace PlexRequests.UI.Modules
                 Available = tv.Available,
                 Admin = IsAdmin,
                 IssueId = tv.IssueId,
+                Denied = tv.Denied,
+                DeniedReason = tv.DeniedReason,
                 TvSeriesRequestType = tv.SeasonsRequested,
                 Qualities = qualities.ToArray(),
                 Episodes = tv.Episodes.ToArray(),
@@ -290,6 +294,8 @@ namespace PlexRequests.UI.Modules
                     Available = album.Available,
                     Admin = IsAdmin,
                     IssueId = album.IssueId,
+                    Denied = album.Denied,
+                    DeniedReason = album.DeniedReason,
                     TvSeriesRequestType = album.SeasonsRequested,
                     MusicBrainzId = album.MusicBrainzId,
                     ArtistName = album.ArtistName

PlexRequests.UI/Modules/SearchModule.cs

@@ -369,7 +369,7 @@ namespace PlexRequests.UI.Modules
                         viewT.Requested = true;
                     }
                 }
-                
+
                 viewTv.Add(viewT);
             }
 
@@ -657,7 +657,11 @@ namespace PlexRequests.UI.Modules
 
                         return await AddUserToRequest(existingRequest, settings, fullShowName, true);
                     }
-                    // We have an episode that has not yet been requested, let's continue
+                    else
+                    {
+                        // We no episodes to approve
+                        return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullShowName} {Resources.UI.Search_AlreadyInPlex}" });
+                    }
                 }
                 else if (model.SeasonList.Except(existingRequest.SeasonList).Any())
                 {
@@ -765,7 +769,7 @@ namespace PlexRequests.UI.Modules
                         UpdateRequest(existingRequest, settings,
                             $"{fullShowName} {Resources.UI.Search_SuccessfullyAdded}");
             }
-            
+
             return await UpdateRequest(existingRequest, settings, $"{fullShowName} {Resources.UI.Search_AlreadyRequested}");
         }
 
@@ -1033,7 +1037,8 @@ namespace PlexRequests.UI.Modules
                     Name = ep.name,
                     EpisodeId = ep.id
                 });
-            }return model;
+            }
+            return model;
 
         }
 

PlexRequests.UI/Modules/UserLoginModule.cs

@@ -216,7 +216,7 @@ namespace PlexRequests.UI.Modules
 
         private bool IsUserInDeniedList(string username, AuthenticationSettings settings)
         {
-            return settings.DeniedUserList.Any(x => x.Equals(username));
+            return settings.DeniedUserList.Any(x => x.Equals(username, StringComparison.CurrentCultureIgnoreCase));
         }
     }
 }

PlexRequests.UI/Modules/UserWizardModule.cs

@@ -64,6 +64,7 @@ namespace PlexRequests.UI.Modules
                 a.TrackEventAsync(Category.Wizard, Action.Start, "Started the wizard", Username, CookieHelper.GetAnalyticClientId(Cookies));
 
                 var settings = await PlexRequestSettings.GetSettingsAsync();
+
                 if (settings.Wizard)
                 {
                     return Context.GetRedirect("~/search");

PlexRequests.UI/Views/Admin/CouchPotato.cshtml

@@ -171,7 +171,7 @@
                         generateNotify("Success!", "success");
                         $('#ApiKey').val(response.apiKey);
                     } else {
-                        generateNotify(response.message, "warning");
+                        generateNotify("Could not automatically get the API key", "warning");
                     }
                 },
                 error: function (e) {

PlexRequests.UI/Views/Admin/LandingPage.cshtml

@@ -54,7 +54,7 @@
             <p class="form-group">Notice Message</p>
             <div class="form-group">
                 <div>
-                    <input type="text" class="form-control-custom form-control " id="NoticeMessage" name="NoticeMessage" placeholder="e.g. Plex will be down for maintaince" value="@Model.NoticeMessage">
+                    <textarea rows="4" type="text" class="form-control-custom form-control " id="NoticeMessage" name="NoticeMessage" placeholder="e.g. Plex will be down for maintaince (HTML is allowed)" value="@Model.NoticeMessage"></textarea>
                 </div>
             </div>
 

PlexRequests.UI/Views/Requests/Index.cshtml

@@ -1,4 +1,5 @@
 @using Nancy.Security
+@using Nancy.Security
 @using PlexRequests.UI.Helpers
 @using PlexRequests.UI.Resources
 @{
@@ -136,13 +137,13 @@
         {{#if episodes}}
         <div id="{{requestId}}toolTipContent">
             {{#each episodes}}
-                Season: {{this.seasonNumber}}
-                <br />
-                Episodes Requested:
-                {{#each this.episodes}}
-                    {{this}}
-                {{/each}}
-                <hr />
+            Season: {{this.seasonNumber}}
+            <br />
+            Episodes Requested:
+            {{#each this.episodes}}
+            {{this}}
+            {{/each}}
+            <hr />
             {{/each}}
         </div>
         {{/if}}
@@ -170,12 +171,21 @@
                     <span class="label label-success">{{status}}</span>
                 </div>
                 <br />
+                {{#if denied}}
+                <div>
+                    Denied: <i  style="color:red;" class="fa fa-check"></i>
+                    {{#if deniedReason}}
+                    <span class="customTooltip" title="{{deniedReason}}"><i class="fa fa-info-circle"></i></span>
+                    {{/if}}
+                </div>
+                      
+                {{/if}}
                 {{#if_eq releaseDate "01/01/0001 00:00:00"}} <!--TheTVDB didn't provide any premier info-->
                 <div>@UI.Requests_ReleaseDate: {{releaseDate}}</div>
                 {{else}}
                 <div>@UI.Requests_ReleaseDate: {{releaseDate}}</div>
                 {{/if_eq}}
-
+                {{#unless denied}}
                 <div>
                     @UI.Common_Approved:
                     {{#if_eq approved false}}
@@ -185,6 +195,7 @@
                     <i class="fa fa-check"></i>
                     {{/if_eq}}
                 </div>
+                {{/unless}}
                 <div>
                     @UI.Requests_Available
                     {{#if_eq available false}}
@@ -216,6 +227,7 @@
             </div>
             <div class="col-sm-3 col-sm-push-3">
                 {{#if_eq admin true}}
+
                 {{#if_eq approved false}}
                 <form method="POST" action="@formAction/approval/approve" id="approve{{requestId}}">
                     <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
@@ -236,6 +248,22 @@
                     <button id="{{requestId}}" custom-button="{{requestId}}" style="text-align: right" class="btn btn-sm btn-success-outline approve" type="submit"><i class="fa fa-plus"></i> @UI.Common_Approve</button>
                     {{/if_eq}}
                 </form>
+                {{#unless denied}}
+                <form method="POST" action="@formAction/approval/deny" id="deny{{requestId}}">
+                    <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
+                    <input name="reason" type="text" hidden="hidden" />
+                    <div class="btn-group btn-split">
+                        <button type="button" class="btn btn-sm btn-danger-outline deny" id="{{requestId}}deny" custom-button="{{requestId}}"><i class="fa fa-times"></i> Deny</button>
+                        <button type="button" class="btn btn-danger-outline dropdown-toggle"  id="{{requestId}}denyToggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="caret"></span>
+                            <span class="sr-only">@UI.Requests_ToggleDropdown</span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a class="deny-with-reason" id="denyReason{{requestId}}" href="#" data-toggle="modal" data-identifier="{{requestId}}" data-target="#denyReasonModal">Deny with a reason</a></li>
+                        </ul>
+                    </div>
+                </form>
+                {{/unless}}
                 {{/if_eq}}
                 <form method="POST" action="@formAction/requests/delete" id="delete{{requestId}}">
                     <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
@@ -324,6 +352,12 @@
                 <div>@UI.Requests_RequestedBy: {{requestedUsers}}</div>
                 {{/if}}
                 <div>@UI.Requests_RequestedDate: {{requestedDate}}</div>
+                {{#if denied}}
+                <div>Denied: <i class="fa fa-times"></i></div>
+                {{#if deniedReason}}
+                <div>Reason: {{deniedReason}}</div>
+                {{/if}}
+                {{/if}}
             </div>
             <div class="col-sm-2 col-sm-push-3">
                 {{#if_eq admin true}}
@@ -332,6 +366,20 @@
                     <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
                     <button id="{{requestId}}" custom-button="{{requestId}}" style="text-align: right" class="btn btn-sm btn-success-outline approve" type="submit"><i class="fa fa-plus"></i> @UI.Common_Approve</button>
                 </form>
+                <form method="POST" action="@formAction/approval/deny" id="deny{{requestId}}">
+                    <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
+                    <input name="reason" type="text" hidden="hidden" />
+                    <div class="btn-group btn-split">
+                        <button type="button" class="btn btn-sm btn-danger-outline deny" id="{{requestId}}deny" custom-button="{{requestId}}"><i class="fa fa-times"></i> Deny</button>
+                        <button type="button" class="btn btn-danger-outline dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            <span class="caret"></span>
+                            <span class="sr-only">@UI.Requests_ToggleDropdown</span>
+                        </button>
+                        <ul class="dropdown-menu">
+                            <li><a class="deny-with-reason" id="denyReason{{requestId}}" href="#" data-toggle="modal" data-identifier="{{requestId}}" data-target="#denyReasonModal">Deny with a reason</a></li>
+                        </ul>
+                    </div>
+                </form>
                 {{/if_eq}}
                 <form method="POST" action="@formAction/requests/delete" id="delete{{requestId}}">
                     <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
@@ -393,6 +441,27 @@
     </div>
 </div>
 
+<div class="modal fade" id="denyReasonModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-times"></i></button>
+                <h4 class="modal-title">Deny with a reason</h4>
+            </div>
+            <form method="POST" action="@formAction/approval/deny" id="denyReasonForm">
+                <div class="modal-body">
+                    <input name="requestId" class="requestId" type="text" hidden="hidden" value="" />
+                    <textarea class="form-control form-control-custom" rows="3" id="denyReason" name="denyReason"></textarea>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger-outline" data-dismiss="modal">@UI.Common_Close</button>
+                    <button type="button" class="btn btn-primary-outline denySaveReason" data-dismiss="modal">@UI.Common_Save</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
 @Html.LoadRequestAssets()
 
 

PlexRequests.UI/Views/Search/Index.cshtml

@@ -166,6 +166,18 @@
                     <h4>{{title}} ({{year}})</h4>
                 </a>
                 {{/if_eq}}
+                {{#if_eq type "tv"}}
+                {{#if available}}
+                <span class="label label-success">Available</span>
+                {{else}}
+                <span class="label label-danger">Not Available</span>
+                {{/if}}
+                {{#if requested}}
+                <span class="label label-success">Requested</span>
+                {{/if}}
+                <br />
+                <br />
+                {{/if_eq}}
             </div>
             <p>{{overview}}</p>
         </div>
@@ -176,6 +188,7 @@
                 {{#if_eq available true}}
                 <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button>
                 <br />
+                <br />
                 <a style="text-align: right" class="btn btn-sm btn-primary-outline" href="{{url}}" target="_blank"><i class="fa fa-eye"></i> @UI.Search_ViewInPlex</a>
                 {{else}}
                 {{#if_eq requested true}}
@@ -189,7 +202,6 @@
                     {{#if_eq tvFullyAvailable true}}
                         @*//TODO Not used yet*@
                         <button style="text-align: right" class="btn btn-success-outline disabled" disabled><i class="fa fa-check"></i> @UI.Search_Available</button><br />
-                <a style="text-align: right" class="btn btn-sm btn-primary-outline" href="{{url}}" target="_blank"><i class="fa fa-eye"></i> @UI.Search_ViewInPlex</a>
                     {{else}}
                         <div class="dropdown">
                             <button id="{{id}}" class="btn btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@@ -204,6 +216,10 @@
                                 <li><a id="EpisodeSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#episodesModal" href="#">@UI.Search_SelectEpisode...</a></li>
                             </ul>
                         </div>
+                {{#if available}}
+                <br />
+                <a style="text-align: right" class="btn btn-sm btn-primary-outline" href="{{url}}" target="_blank"><i class="fa fa-eye"></i> @UI.Search_ViewInPlex</a>
+                {{/if}}
                     {{/if_eq}}
                 {{/if_eq}}
 

appveyor.yml

@@ -3,9 +3,9 @@ configuration: Release
 assembly_info:
   patch: true
   file: '**\AssemblyInfo.*'
-  assembly_version: '1.9.1'
+  assembly_version: '1.9.2'
   assembly_file_version: '{version}'
-  assembly_informational_version: '1.9.1' 
+  assembly_informational_version: '1.9.2' 
 before_build:
 - cmd: appveyor-retry nuget restore
 build: