From 3d944b32a8fb6e6bad4c3688586007dd80b17a32 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 16:54:54 -0500
Subject: [PATCH 01/57] fix up sorting on the request page

---
 PlexRequests.UI/Content/requests.js         | 79 +++++++++++----------
 PlexRequests.UI/Models/RequestViewModel.cs  |  2 +
 PlexRequests.UI/Modules/RequestsModule.cs   |  4 ++
 PlexRequests.UI/Views/Requests/Index.cshtml |  7 +-
 4 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 3872da2c2..bbca674af 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -9,6 +9,16 @@ var searchSource = $("#search-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
 var movieTimer = 0;
 var tvimer = 0;
+var mixItUpDefault = {
+    animation: { enable: true },
+    load: {
+        filter: 'all',
+        sort: 'default:asc'
+    },
+    layout: {
+        display: 'block'
+    }
+};
 
 movieLoad();
 tvLoad();
@@ -17,40 +27,26 @@ tvLoad();
 $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
     var target = $(e.target).attr('href');
     var activeState = "";
-    if (target === "#TvShowTab") {
-        if ($('#movieList').mixItUp('isLoaded')) {
-            activeState = $('#movieList').mixItUp('getState');
-            $('#movieList').mixItUp('destroy');
-        }
-        if (!$('#tvList').mixItUp('isLoaded')) {
-            $('#tvList').mixItUp({
-                load: {
-                    filter: activeState.activeFilter || 'all',
-                    sort: activeState.activeSort || 'default:asc'
-                },
-                layout: {
-                display: 'block'
-            }
 
-            });
+    var $ml = $('#movieList');
+    var $tvl = $('#tvList');
+
+    if (target === "#TvShowTab") {
+        
+        if ($ml.mixItUp('isLoaded')) {
+            activeState = $ml.mixItUp('getState');
+            $ml.mixItUp('destroy');
         }
+        if ($tvl.mixItUp('isLoaded')) $tvl.mixItUp('destroy');
+        $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
     if (target === "#MoviesTab") {
-        if ($('#tvList').mixItUp('isLoaded')) {
-            activeState = $('#tvList').mixItUp('getState');
-            $('#tvList').mixItUp('destroy');
-        }
-        if (!$('#movieList').mixItUp('isLoaded')) {
-            $('#movieList').mixItUp({
-                load: {
-                    filter: activeState.activeFilter || 'all',
-                    sort: activeState.activeSort || 'default:asc'
-                },
-                layout: {
-                    display: 'block'
-                }
-            });
+        if ($tvl.mixItUp('isLoaded')) {
+            activeState = $tvl.mixItUp('getState');
+            $tvl.mixItUp('destroy');
         }
+        if ($ml.mixItUp('isLoaded')) $ml.mixItUp('destroy');
+        $ml.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
 });
 
@@ -315,24 +311,26 @@ $(document).on("click", ".change", function (e) {
 
 });
 
+function mixItUpConfig(activeState) {
+    var conf = mixItUpDefault;
+
+    if (activeState) {
+        if (activeState.activeFilter) conf['load']['filter'] = activeState.activeFilter;
+        if (activeState.activeSort) conf['load']['sort'] = activeState.activeSort;
+    }
+    return conf;
+};
+
 function movieLoad() {
     $("#movieList").html("");
 
     $.ajax("/requests/movies/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "movie");
-
             var html = searchTemplate(context);
             $("#movieList").append(html);
         });
-        $('#movieList').mixItUp({
-            layout: {
-                display: 'block'
-            },
-            load: {
-                filter: 'all'
-            }
-        });
+        $('#movieList').mixItUp(mixItUpConfig());
     });
 };
 
@@ -345,6 +343,7 @@ function tvLoad() {
             var html = searchTemplate(context);
             $("#tvList").append(html);
         });
+        $('#tvList').mixItUp(mixItUpConfig());
     });
 };
 
@@ -359,9 +358,11 @@ function buildRequestContext(result, type) {
         type: type,
         status: result.status,
         releaseDate: result.releaseDate,
+        releaseDateTicks: result.releaseDateTicks,
         approved: result.approved,
         requestedBy: result.requestedBy,
         requestedDate: result.requestedDate,
+        requestedDateTicks: result.requestedDateTicks,
         available: result.available,
         admin: result.admin,
         issues: result.issues,
@@ -376,7 +377,7 @@ function buildRequestContext(result, type) {
 }
 
 function startFilter(elementId) {
-    $('#'+element).mixItUp({
+    $('#' + element).mixItUp({
         load: {
             filter: activeState.activeFilter || 'all',
             sort: activeState.activeSort || 'default:asc'
diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs
index 011b9977d..5ee389be9 100644
--- a/PlexRequests.UI/Models/RequestViewModel.cs
+++ b/PlexRequests.UI/Models/RequestViewModel.cs
@@ -37,11 +37,13 @@ namespace PlexRequests.UI.Models
         public string Title { get; set; }
         public string PosterPath { get; set; }
         public string ReleaseDate { get; set; }
+        public long ReleaseDateTicks { get; set; }
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
         public string RequestedBy { get; set; }
         public string RequestedDate { get; set; }
+        public long RequestedDateTicks { get; set; }
         public string ReleaseYear { get; set; }
         public bool Available { get; set; }
         public bool Admin { get; set; }
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index a951e0db8..47dcf3369 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -90,7 +90,9 @@ namespace PlexRequests.UI.Modules
                 Id = movie.Id,
                 PosterPath = movie.PosterPath,
                 ReleaseDate = movie.ReleaseDate.Humanize(),
+                ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
+                RequestedDateTicks = movie.RequestedDate.Ticks,
                 Approved = movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
@@ -119,7 +121,9 @@ namespace PlexRequests.UI.Modules
                 Id = tv.Id,
                 PosterPath = tv.PosterPath,
                 ReleaseDate = tv.ReleaseDate.Humanize(),
+                ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
+                RequestedDateTicks = tv.RequestedDate.Ticks,
                 Approved = tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index cd73d64d9..bf79ac7dd 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -43,7 +43,10 @@
             </a>
             <ul class="dropdown-menu">
                 <li><a href="#" class="sort" data-sort="default">Default</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date (asc)</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:desc">Requested Date (desc)</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:asc">Release Date (asc)</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:desc">Release Date (desc)</a></li>
             </ul>
         </div>
         @if (Model.SearchForMovies)
@@ -78,7 +81,7 @@
 
 
 <script id="search-template" type="text/x-handlebars-template">
-    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}">
+    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestedDateTicks}}" data-releaseorder="{{releaseDateTicks}}">
         <div class="row">
             <div class="col-sm-2">
                 {{#if_eq type "movie"}}

From e1b8293fdd70167cedc351abf6b22253c1547051 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 18:10:20 -0500
Subject: [PATCH 02/57] allow approving all requests by category

---
 PlexRequests.UI/Content/requests.js         | 118 ++++++++++++++++----
 PlexRequests.UI/Modules/ApprovalModule.cs   |  94 ++++++++++++----
 PlexRequests.UI/Views/Requests/Index.cshtml |   2 +
 3 files changed, 173 insertions(+), 41 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index bbca674af..46154ac6e 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -20,8 +20,7 @@ var mixItUpDefault = {
     }
 };
 
-movieLoad();
-tvLoad();
+initLoad();
 
 
 $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
@@ -51,7 +50,17 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 });
 
 // Approve all
-$('#approveAll').click(function () {
+$('#approveAll').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
     $.ajax({
         type: 'post',
         url: '/approval/approveall',
@@ -59,11 +68,75 @@ $('#approveAll').click(function () {
         success: function (response) {
             if (checkJsonResponse(response)) {
                 generateNotify("Success! All requests approved!", "success");
+                initLoad();
             }
         },
         error: function (e) {
             console.log(e);
             generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
+        }
+    });
+});
+$('#approveMovies').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
+    $.ajax({
+        type: 'post',
+        url: '/approval/approveallmovies',
+        dataType: "json",
+        success: function (response) {
+            if (checkJsonResponse(response)) {
+                generateNotify("Success! All Movie requests approved!", "success");
+                movieLoad();
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
+        }
+    });
+});
+$('#approveTVShows').click(function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    var origHtml = $(this).html();
+
+    if ($('#' + buttonId).text() === " Loading...") {
+        return;
+    }
+
+    loadingButton(buttonId, "success");
+
+    $.ajax({
+        type: 'post',
+        url: '/approval/approvealltvshows',
+        dataType: "json",
+        success: function (response) {
+            if (checkJsonResponse(response)) {
+                generateNotify("Success! All TV Show requests approved!", "success");
+                tvLoad();
+            }
+        },
+        error: function (e) {
+            console.log(e);
+            generateNotify("Something went wrong!", "danger");
+        },
+        complete: function (e) {
+            finishLoading(buttonId, "success", origHtml)
         }
     });
 });
@@ -321,29 +394,44 @@ function mixItUpConfig(activeState) {
     return conf;
 };
 
+function initLoad() {
+    movieLoad();
+    tvLoad();
+}
+
 function movieLoad() {
-    $("#movieList").html("");
+    var $ml = $('#movieList');
+    if ($ml.mixItUp('isLoaded')) {
+        activeState = $ml.mixItUp('getState');
+        $ml.mixItUp('destroy');
+    }
+    $ml.html("");
 
     $.ajax("/requests/movies/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "movie");
             var html = searchTemplate(context);
-            $("#movieList").append(html);
+            $ml.append(html);
         });
-        $('#movieList').mixItUp(mixItUpConfig());
+        $ml.mixItUp(mixItUpConfig());
     });
 };
 
 function tvLoad() {
-    $("#tvList").html("");
+    var $tvl = $('#tvList');
+    if ($tvl.mixItUp('isLoaded')) {
+        activeState = $tvl.mixItUp('getState');
+        $tvl.mixItUp('destroy');
+    }
+    $tvl.html("");
 
     $.ajax("/requests/tvshows/").success(function (results) {
         results.forEach(function (result) {
             var context = buildRequestContext(result, "tv");
             var html = searchTemplate(context);
-            $("#tvList").append(html);
+            $tvl.append(html);
         });
-        $('#tvList').mixItUp(mixItUpConfig());
+        $tvl.mixItUp(mixItUpConfig());
     });
 };
 
@@ -374,16 +462,4 @@ function buildRequestContext(result, type) {
     };
 
     return context;
-}
-
-function startFilter(elementId) {
-    $('#' + element).mixItUp({
-        load: {
-            filter: activeState.activeFilter || 'all',
-            sort: activeState.activeSort || 'default:asc'
-        },
-        layout: {
-            display: 'block'
-        }
-    });
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index b2c6217bb..dd036965e 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -61,6 +61,8 @@ namespace PlexRequests.UI.Modules
 
             Post["/approve"] = parameters => Approve((int)Request.Form.requestid);
             Post["/approveall"] = x => ApproveAll();
+            Post["/approveallmovies"] = x => ApproveAllMovies();
+            Post["/approvealltvshows"] = x => ApproveAllTVShows();
         }
 
         private IRequestService Service { get; }
@@ -216,6 +218,56 @@ namespace PlexRequests.UI.Modules
                     });
         }
 
+        private Response ApproveAllMovies()
+        {
+            if (!Context.CurrentUser.IsAuthenticated())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
+            }
+
+            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.Movie);
+            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            if (!requestedModels.Any())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no movie requests to approve. Please refresh." });
+            }
+
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
+        }
+
+        private Response ApproveAllTVShows()
+        {
+            if (!Context.CurrentUser.IsAuthenticated())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
+            }
+
+            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.TvShow);
+            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            if (!requestedModels.Any())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no tv show requests to approve. Please refresh." });
+            }
+
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
+        }
+
         /// <summary>
         /// Approves all.
         /// </summary>
@@ -234,16 +286,28 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "There are no requests to approve. Please refresh." });
             }
 
-            var cpSettings = CpService.GetSettings();
+            try
+            {
+                return UpdateRequests(requestedModels);
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
+            }
 
+        }
 
+        private Response UpdateRequests(RequestedModel[] requestedModels)
+        {
+            var cpSettings = CpService.GetSettings();
             var updatedRequests = new List<RequestedModel>();
             foreach (var r in requestedModels)
             {
                 if (r.Type == RequestType.Movie)
                 {
-                    var result = SendMovie(cpSettings, r, CpApi);
-                    if (result)
+                    var res = SendMovie(cpSettings, r, CpApi);
+                    if (res)
                     {
                         r.Approved = true;
                         updatedRequests.Add(r);
@@ -260,8 +324,8 @@ namespace PlexRequests.UI.Modules
                     var sonarr = SonarrSettings.GetSettings();
                     if (sr.Enabled)
                     {
-                        var result = sender.SendToSickRage(sr, r);
-                        if (result?.result == "success")
+                        var res = sender.SendToSickRage(sr, r);
+                        if (res?.result == "success")
                         {
                             r.Approved = true;
                             updatedRequests.Add(r);
@@ -269,14 +333,14 @@ namespace PlexRequests.UI.Modules
                         else
                         {
                             Log.Error("Could not approve and send the TV {0} to SickRage!", r.Title);
-                            Log.Error("SickRage Message: {0}", result?.message);
+                            Log.Error("SickRage Message: {0}", res?.message);
                         }
                     }
 
                     if (sonarr.Enabled)
                     {
-                        var result = sender.SendToSonarr(sonarr, r);
-                        if (result != null)
+                        var res = sender.SendToSonarr(sonarr, r);
+                        if (res != null)
                         {
                             r.Approved = true;
                             updatedRequests.Add(r);
@@ -288,20 +352,10 @@ namespace PlexRequests.UI.Modules
                     }
                 }
             }
-            try
-            {
-
-                var result = Service.BatchUpdate(updatedRequests); return Response.AsJson(result
+             var result = Service.BatchUpdate(updatedRequests);
+             return Response.AsJson(result
                  ? new JsonResponseModel { Result = true }
                  : new JsonResponseModel { Result = false, Message = "We could not approve all of the requests. Please try again or check the logs." });
-
-            }
-            catch (Exception e)
-            {
-                Log.Fatal(e);
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something bad happened, please check the logs!" });
-            }
-
         }
 
         private bool SendMovie(CouchPotatoSettings settings, RequestedModel r, ICouchPotatoApi cp)
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index bf79ac7dd..67ed20378 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -5,6 +5,8 @@
     @if (Context.CurrentUser.IsAuthenticated())
     {
         <button id="approveAll" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve All</button>
+        <button id="approveMovies" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+        <button id="approveTVShows" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve TV Shows</button>
         <br />
         <br />
     }

From 07b02d90e68b34f770db45289d8bbeea8cd58c6c Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 18:46:35 -0500
Subject: [PATCH 03/57] move approve buttons to the tab content

---
 PlexRequests.UI/Content/requests.js         |  6 ++--
 PlexRequests.UI/Views/Requests/Index.cshtml | 36 ++++++++++++++-------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 46154ac6e..f035b5e05 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -29,9 +29,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 
     var $ml = $('#movieList');
     var $tvl = $('#tvList');
-
-    if (target === "#TvShowTab") {
         
+    $('.approve-category').hide();
+    if (target === "#TvShowTab") {
+        $('#approveTVShows').show();
         if ($ml.mixItUp('isLoaded')) {
             activeState = $ml.mixItUp('getState');
             $ml.mixItUp('destroy');
@@ -40,6 +41,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
     if (target === "#MoviesTab") {
+        $('#approveMovies').show();
         if ($tvl.mixItUp('isLoaded')) {
             activeState = $tvl.mixItUp('getState');
             $tvl.mixItUp('destroy');
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 67ed20378..fcc14d237 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -5,8 +5,7 @@
     @if (Context.CurrentUser.IsAuthenticated())
     {
         <button id="approveAll" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve All</button>
-        <button id="approveMovies" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
-        <button id="approveTVShows" class="btn btn-success-outline" type="submit"><i class="fa fa-plus"></i> Approve TV Shows</button>
+
         <br />
         <br />
     }
@@ -22,10 +21,25 @@
         }
 
     </ul>
+    <br />
+
 
     <!-- Tab panes -->
     <div class="tab-content contentList">
-        <div class="btn-group col-sm-push-10">
+        <div class="btn-group col-sm-2">
+            @if (Context.CurrentUser.IsAuthenticated())
+            {
+                @if (Model.SearchForMovies)
+                {
+                    <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+                }
+                @if (Model.SearchForTvShows)
+                {
+                    <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
+                }
+            }
+        </div>
+        <div class="btn-group col-sm-push-8">
             <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                 Filter
                 <i class="fa fa-filter"></i>
@@ -38,7 +52,7 @@
                 <li><a href="#" class="filter" data-filter=".available-false">Not Available</a></li>
             </ul>
         </div>
-        <div class="btn-group col-sm-push-10">
+        <div class="btn-group col-sm-push-8">
             <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                 Order
                 <i class="fa fa-sort"></i>
@@ -52,13 +66,13 @@
             </ul>
         </div>
         @if (Model.SearchForMovies)
-        {
+            {
 
             <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
 
-                <br/>
-                <br/>
+                <br />
+                <br />
                 <!-- Movie content -->
                 <div id="movieList">
                 </div>
@@ -66,12 +80,12 @@
         }
 
         @if (Model.SearchForTvShows)
-        {
+            {
             <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
 
-                <br/>
-                <br/>
+                <br />
+                <br />
                 <!-- TV content -->
                 <div id="tvList">
                 </div>
@@ -186,7 +200,7 @@
                             <li><a id="{{requestId}}" issue-select="4" class="dropdownIssue" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#myModal">Other</a></li>
 
                             {{#if_eq admin true}}
-                                <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
+                            <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
                             {{/if_eq}}
                         </ul>
                     </div>

From bee4d2dc4c7eef69d5539f13c9e78c64e81ff6e0 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 19:33:22 -0500
Subject: [PATCH 04/57] fix up the animations. seems to be related to the
 data-bound attribute causing the animtions not to fire on each .mix object.

---
 PlexRequests.UI/Content/requests.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index f035b5e05..4af792e87 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -17,6 +17,11 @@ var mixItUpDefault = {
     },
     layout: {
         display: 'block'
+    },
+    callbacks: {
+        onMixStart: function (state, futureState) {
+            $('.mix', this).removeAttr('data-bound').removeData('bound'); // fix for animation issues in other tabs
+        }
     }
 };
 
@@ -29,7 +34,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
 
     var $ml = $('#movieList');
     var $tvl = $('#tvList');
-        
+
     $('.approve-category').hide();
     if (target === "#TvShowTab") {
         $('#approveTVShows').show();
@@ -49,6 +54,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
         if ($ml.mixItUp('isLoaded')) $ml.mixItUp('destroy');
         $ml.mixItUp(mixItUpConfig(activeState)); // init or reinit
     }
+    //$('.mix[data-bound]').removeAttr('data-bound');
 });
 
 // Approve all

From 63e4e29051735cc1ae9d2dfb1b3d57b164d3b07f Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 21:41:26 -0500
Subject: [PATCH 05/57] clean up the sorting option names. add a way to see
 which filter/sort is currently applied.

---
 PlexRequests.UI/Content/requests.js         |  9 ++++++++-
 PlexRequests.UI/Views/Requests/Index.cshtml | 19 +++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 4af792e87..9c448a9de 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -13,7 +13,7 @@ var mixItUpDefault = {
     animation: { enable: true },
     load: {
         filter: 'all',
-        sort: 'default:asc'
+        sort: 'requestorder:desc'
     },
     layout: {
         display: 'block'
@@ -149,6 +149,13 @@ $('#approveTVShows').click(function (e) {
     });
 });
 
+// filtering/sorting
+$('.filter,.sort', '.dropdown-menu').click(function (e) {
+    var $this = $(this);
+    $('.fa-square', $this.parents('.dropdown-menu:first')).removeClass('fa-square').addClass('fa-square-o');
+    $this.children('.fa').first().removeClass('fa-square-o').addClass('fa-square');
+});
+
 
 // Report Issue
 $(document).on("click", ".dropdownIssue", function (e) {
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index fcc14d237..705aa4c79 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -45,11 +45,11 @@
                 <i class="fa fa-filter"></i>
             </a>
             <ul class="dropdown-menu">
-                <li><a href="#" class="filter" data-filter="all">All</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-true">Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-false">Not Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".available-true">Available</a></li>
-                <li><a href="#" class="filter" data-filter=".available-false">Not Available</a></li>
+                <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
+                <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
+                <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
             </ul>
         </div>
         <div class="btn-group col-sm-push-8">
@@ -58,11 +58,10 @@
                 <i class="fa fa-sort"></i>
             </a>
             <ul class="dropdown-menu">
-                <li><a href="#" class="sort" data-sort="default">Default</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc">Requested Date (asc)</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:desc">Requested Date (desc)</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:asc">Release Date (asc)</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:desc">Release Date (desc)</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
+                <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
+                <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
             </ul>
         </div>
         @if (Model.SearchForMovies)

From fff267db3779e344454b45e242e53903cda6db08 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 22:19:02 -0500
Subject: [PATCH 06/57] #54 comma separated list of users who don't require
 approval + fix a couple request messages (include show title)

---
 .../SettingModels/PlexRequestSettings.cs      | 26 +++++++++++++++++++
 PlexRequests.UI/Modules/SearchModule.cs       |  8 +++---
 PlexRequests.UI/Views/Admin/Settings.cshtml   |  9 +++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 51a6413fd..5dfe7cf76 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -24,6 +24,10 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
 namespace PlexRequests.Core.SettingModels
 {
     public class PlexRequestSettings : Settings
@@ -35,5 +39,27 @@ namespace PlexRequests.Core.SettingModels
         public bool RequireMovieApproval { get; set; }
         public bool RequireTvShowApproval { get; set; }
         public int WeeklyRequestLimit { get; set; }
+        public string NoApprovalUsers { get; set; }
+
+        [JsonIgnore]
+        public List<string> NoApprovalUserList
+        {
+            get
+            {
+                var users = new List<string>();
+                if (string.IsNullOrEmpty(NoApprovalUsers))
+                {
+                    return users;
+                }
+
+                var splitUsers = NoApprovalUsers.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var user in splitUsers)
+                {
+                    if (!string.IsNullOrWhiteSpace(user))
+                        users.Add(user.Trim());
+                }
+                return users;
+            }
+        }
     }
 }
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 2a98e8933..49f2d6446 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -220,7 +220,7 @@ namespace PlexRequests.UI.Modules
 
             var settings = PrService.GetSettings();
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireMovieApproval)
+            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -247,7 +247,7 @@ namespace PlexRequests.UI.Modules
                         };
                         NotificationService.Publish(notificationModel);
 
-                        return Response.AsJson(new JsonResponseModel {Result = true});
+                        return Response.AsJson(new JsonResponseModel {Result = true, Message = $"{fullMovieName} was successfully added!" });
                     }
                     return
                         Response.AsJson(new JsonResponseModel
@@ -272,7 +272,7 @@ namespace PlexRequests.UI.Modules
                     };
                     NotificationService.Publish(notificationModel);
 
-                    return Response.AsJson(new JsonResponseModel { Result = true });
+                    return Response.AsJson(new JsonResponseModel { Result = true, Message = $"{fullMovieName} was successfully added!" });
                 }
             }
 
@@ -364,7 +364,7 @@ namespace PlexRequests.UI.Modules
             model.SeasonList = seasonsList.ToArray();
 
             var settings = PrService.GetSettings();
-            if (!settings.RequireTvShowApproval)
+            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
index edbe6009c..078171cda 100644
--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -83,6 +83,15 @@
                 </div>
             </div>
 
+            <p class="form-group">A comma separated list of users whose requests do not require approval.</p>
+            <div class="form-group">
+                <label for="noApprovalUsers" class="control-label">Users</label>
+                <div>
+                    <input type="text" class="form-control-custom form-control " id="NoApprovalUsers" name="NoApprovalUsers" placeholder="e.g. John, Bobby" value="@Model.NoApprovalUsers">
+                </div>
+            </div>
+            <br />
+
             @*<div class="form-group">
                 <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
                 <div>

From f5ecb630718981e3955c0db3202aa9a5a9d6faa7 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 22:39:59 -0500
Subject: [PATCH 07/57] #84 provide an option in settings to resttrict users
 from viewing requests other than their own.

---
 .../SettingModels/PlexRequestSettings.cs      |  1 +
 PlexRequests.UI/Modules/RequestsModule.cs     | 12 ++++++++
 PlexRequests.UI/Views/Admin/Settings.cshtml   | 28 ++++++++++++++-----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 5dfe7cf76..aebb720af 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -38,6 +38,7 @@ namespace PlexRequests.Core.SettingModels
         public bool SearchForTvShows { get; set; }
         public bool RequireMovieApproval { get; set; }
         public bool RequireTvShowApproval { get; set; }
+        public bool UsersCanViewOnlyOwnRequests { get; set; }
         public int WeeklyRequestLimit { get; set; }
         public string NoApprovalUsers { get; set; }
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 47dcf3369..b49acd013 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -79,8 +79,14 @@ namespace PlexRequests.UI.Modules
 
         private Response GetMovies()
         {
+            var settings = PrSettings.GetSettings();
             var isAdmin = Context.CurrentUser.IsAuthenticated();
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
+            if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
+            {
+                dbMovies = dbMovies.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+            }
+
             var viewModel = dbMovies.Select(movie => new RequestViewModel
             {
                 ProviderId = movie.ProviderId,
@@ -110,8 +116,14 @@ namespace PlexRequests.UI.Modules
 
         private Response GetTvShows()
         {
+            var settings = PrSettings.GetSettings();
             var isAdmin = Context.CurrentUser.IsAuthenticated();
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
+            if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
+            {
+                dbTv = dbTv.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+            }
+
             var viewModel = dbTv.Select(tv => new RequestViewModel
             {
                 ProviderId = tv.ProviderId,
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
index 078171cda..1f3257c49 100644
--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -90,16 +90,31 @@
                     <input type="text" class="form-control-custom form-control " id="NoApprovalUsers" name="NoApprovalUsers" placeholder="e.g. John, Bobby" value="@Model.NoApprovalUsers">
                 </div>
             </div>
-            <br />
 
-            @*<div class="form-group">
-                <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
-                <div>
+            <div class="form-group">
+                <div class="checkbox">
                     <label>
-                        <input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
+                        @if (Model.UsersCanViewOnlyOwnRequests)
+                        {
+                            <input type="checkbox" id="UsersCanViewOnlyOwnRequests" name="UsersCanViewOnlyOwnRequests" checked="checked"><text>Users can view their own requests only</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="UsersCanViewOnlyOwnRequests" name="UsersCanViewOnlyOwnRequests"><text>Users can view their own requests only</text>
+                        }
                     </label>
+
                 </div>
-            </div> //TODO: Need to implement this*@
+            </div>
+
+            @*<div class="form-group">
+                    <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
+                    <div>
+                        <label>
+                            <input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
+                        </label>
+                    </div>
+                </div> //TODO: Need to implement this*@
 
             <div>
             </div>
@@ -111,4 +126,3 @@
         </fieldset>
     </form>
 </div>
-

From 085c46ce43b9fb6af03b8a41dfc86ebf03a600f1 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 23:00:26 -0500
Subject: [PATCH 08/57] minor UI adjustments

---
 PlexRequests.UI/Content/custom.css          | 5 +++++
 PlexRequests.UI/Content/custom.min.css      | 2 +-
 PlexRequests.UI/Content/custom.scss         | 6 ++++++
 PlexRequests.UI/Views/Login/Index.cshtml    | 2 +-
 PlexRequests.UI/Views/Shared/_Layout.cshtml | 2 +-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index a517cc508..7ff72e7f4 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -40,6 +40,11 @@ label {
   margin-bottom: 0.5rem !important;
   font-size: 16px !important; }
 
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  background: #4e5d6c; }
+
 .btn-danger-outline {
   color: #d9534f !important;
   background-color: transparent;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 45dc19440..2a046eb7d 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index df29fcfc8..029748ecd 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -65,6 +65,12 @@ label {
     font-size: 16px $i;
 }
 
+.nav-tabs > li.active > a, 
+.nav-tabs > li.active > a:hover, 
+.nav-tabs > li.active > a:focus {
+    background: #4e5d6c;
+}
+
 .btn-danger-outline {
     color: $danger-colour $i;
     background-color: transparent;
diff --git a/PlexRequests.UI/Views/Login/Index.cshtml b/PlexRequests.UI/Views/Login/Index.cshtml
index 6ca2e444c..85597f544 100644
--- a/PlexRequests.UI/Views/Login/Index.cshtml
+++ b/PlexRequests.UI/Views/Login/Index.cshtml
@@ -4,7 +4,7 @@
     Password <input class="form-control form-control-custom" name="Password" type="password"/>
     <br/>
     Remember Me <input name="RememberMe" type="checkbox" value="True"/>
-    <br/>
+    <br/><br/>
     <input class="btn btn-success-outline" type="submit" value="Login"/>
 </form>
 @if (!Model.AdminExists)
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 5245bdbdd..154477934 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -7,8 +7,8 @@
     <title>Plex Requests</title>
     <!-- Styles -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="~/Content/custom.min.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/bootstrap.css" type="text/css"/>
+    <link rel="stylesheet" href="~/Content/custom.min.css" type="text/css" />
     <link rel="stylesheet" href="~/Content/font-awesome.css" type="text/css"/>
     <link rel="stylesheet" href="~/Content/pace.min.css" type="text/css"/>
 

From 4b3f79b4a8c8a642a5f363d1a227d2bc14021383 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Sun, 27 Mar 2016 23:45:52 -0500
Subject: [PATCH 09/57] #96 Email notification test button (others to come)

---
 .../Interfaces/INotification.cs               |  3 +
 .../Interfaces/INotificationService.cs        |  2 +
 .../Notification/EmailMessageNotification.cs  | 72 ++++++++++++++-----
 .../Notification/NotificationService.cs       | 17 ++++-
 .../Notification/NotificationType.cs          |  1 +
 .../Notification/PushbulletNotification.cs    |  5 ++
 .../Notification/PushoverNotification.cs      |  5 ++
 PlexRequests.UI/Modules/AdminModule.cs        | 15 ++++
 .../Views/Admin/EmailNotifications.cshtml     | 32 ++++++++-
 9 files changed, 134 insertions(+), 18 deletions(-)

diff --git a/PlexRequests.Services/Interfaces/INotification.cs b/PlexRequests.Services/Interfaces/INotification.cs
index 14b09f0e9..2ee0b4f35 100644
--- a/PlexRequests.Services/Interfaces/INotification.cs
+++ b/PlexRequests.Services/Interfaces/INotification.cs
@@ -27,6 +27,7 @@
 using System.Threading.Tasks;
 
 using PlexRequests.Services.Notification;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Interfaces
 {
@@ -35,5 +36,7 @@ namespace PlexRequests.Services.Interfaces
         string NotificationName { get; }
 
         Task NotifyAsync(NotificationModel model);
+
+        Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Interfaces/INotificationService.cs b/PlexRequests.Services/Interfaces/INotificationService.cs
index 59db3b509..14408b031 100644
--- a/PlexRequests.Services/Interfaces/INotificationService.cs
+++ b/PlexRequests.Services/Interfaces/INotificationService.cs
@@ -27,12 +27,14 @@
 using System.Threading.Tasks;
 
 using PlexRequests.Services.Notification;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Interfaces
 {
     public interface INotificationService
     {
         Task Publish(NotificationModel model);
+        Task Publish(NotificationModel model, EmailNotificationSettings settings);
         void Subscribe(INotification notification);
         void UnSubscribe(INotification notification);
 
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index 472b6a069..c247eed0a 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -46,13 +46,19 @@ namespace PlexRequests.Services.Notification
 
         private static readonly Logger Log = LogManager.GetCurrentClassLogger();
         private ISettingsService<EmailNotificationSettings> EmailNotificationSettings { get; }
-        private EmailNotificationSettings Settings => GetConfiguration();
         public string NotificationName => "EmailMessageNotification";
 
         public async Task NotifyAsync(NotificationModel model)
         {
             var configuration = GetConfiguration();
-            if (!ValidateConfiguration(configuration))
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            if (!ValidateConfiguration(settings))
             {
                 return;
             }
@@ -60,10 +66,10 @@ namespace PlexRequests.Services.Notification
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await EmailNewRequest(model);
+                    await EmailNewRequest(model, settings);
                     break;
                 case NotificationType.Issue:
-                    await EmailIssue(model);
+                    await EmailIssue(model, settings);
                     break;
                 case NotificationType.RequestAvailable:
                     throw new NotImplementedException();
@@ -74,6 +80,10 @@ namespace PlexRequests.Services.Notification
                 case NotificationType.AdminNote:
                     throw new NotImplementedException();
 
+                case NotificationType.Test:
+                    await EmailTest(model, settings);
+                    break;
+
                 default:
                     throw new ArgumentOutOfRangeException();
             }
@@ -100,23 +110,23 @@ namespace PlexRequests.Services.Notification
             return true;
         }
 
-        private async Task EmailNewRequest(NotificationModel model)
+        private async Task EmailNewRequest(NotificationModel model, EmailNotificationSettings settings)
         {
             var message = new MailMessage
             {
                 IsBodyHtml = true,
-                To = { new MailAddress(Settings.RecipientEmail) },
+                To = { new MailAddress(settings.RecipientEmail) },
                 Body = $"Hello! The user '{model.User}' has requested {model.Title}! Please log in to approve this request. Request Date: {model.DateTime.ToString("f")}",
-                From = new MailAddress(Settings.EmailSender),
+                From = new MailAddress(settings.EmailSender),
                 Subject = $"Plex Requests: New request for {model.Title}!"
             };
 
             try
             {
-                using (var smtp = new SmtpClient(Settings.EmailHost, Settings.EmailPort))
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
                 {
-                    smtp.Credentials = new NetworkCredential(Settings.EmailUsername, Settings.EmailPassword);
-                    smtp.EnableSsl = Settings.Ssl;
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
                     await smtp.SendMailAsync(message).ConfigureAwait(false);
                 }
             }
@@ -130,23 +140,53 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task EmailIssue(NotificationModel model)
+        private async Task EmailIssue(NotificationModel model, EmailNotificationSettings settings)
         {
             var message = new MailMessage
             {
                 IsBodyHtml = true,
-                To = { new MailAddress(Settings.RecipientEmail) },
+                To = { new MailAddress(settings.RecipientEmail) },
                 Body = $"Hello! The user '{model.User}' has reported a new issue {model.Body} for the title {model.Title}!",
-                From = new MailAddress(Settings.RecipientEmail),
+                From = new MailAddress(settings.RecipientEmail),
                 Subject = $"Plex Requests: New issue for {model.Title}!"
             };
 
             try
             {
-                using (var smtp = new SmtpClient(Settings.EmailHost, Settings.EmailPort))
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
+                {
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
+                    await smtp.SendMailAsync(message).ConfigureAwait(false);
+                }
+            }
+            catch (SmtpException smtp)
+            {
+                Log.Error(smtp);
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
+        }
+
+        private async Task EmailTest(NotificationModel model, EmailNotificationSettings settings)
+        {
+            var message = new MailMessage
+            {
+                IsBodyHtml = true,
+                To = { new MailAddress(settings.RecipientEmail) },
+                Body = "This is just a test! Success!",
+                From = new MailAddress(settings.RecipientEmail),
+                Subject = "Plex Requests: Test Message!"
+            };
+
+            try
+            {
+                using (var smtp = new SmtpClient(settings.EmailHost, settings.EmailPort))
                 {
-                    smtp.Credentials = new NetworkCredential(Settings.EmailUsername, Settings.EmailPassword);
-                    smtp.EnableSsl = Settings.Ssl;
+                    smtp.Credentials = new NetworkCredential(settings.EmailUsername, settings.EmailPassword);
+                    smtp.EnableSsl = settings.Ssl;
                     await smtp.SendMailAsync(message).ConfigureAwait(false);
                 }
             }
diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index 116f5aef9..c65ad8a1d 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -32,6 +32,7 @@ using System.Threading.Tasks;
 using NLog;
 
 using PlexRequests.Services.Interfaces;
+using PlexRequests.Core.SettingModels;
 
 namespace PlexRequests.Services.Notification
 {
@@ -47,6 +48,13 @@ namespace PlexRequests.Services.Notification
             await Task.WhenAll(notificationTasks).ConfigureAwait(false);
         }
 
+        public async Task Publish(NotificationModel model, EmailNotificationSettings settings)
+        {
+            var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
+
+            await Task.WhenAll(notificationTasks).ConfigureAwait(false);
+        }
+
         public void Subscribe(INotification notification)
         {
             Observers.TryAdd(notification.NotificationName, notification);
@@ -58,10 +66,17 @@ namespace PlexRequests.Services.Notification
         }
 
         private static async Task NotifyAsync(INotification notification, NotificationModel model)
+        {
+
+            await NotifyAsync(notification, model, null);
+
+        }
+
+        private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings)
         {
             try
             {
-                await notification.NotifyAsync(model).ConfigureAwait(false);
+                await notification.NotifyAsync(model, settings).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
diff --git a/PlexRequests.Services/Notification/NotificationType.cs b/PlexRequests.Services/Notification/NotificationType.cs
index bf919fe39..22d0d29b1 100644
--- a/PlexRequests.Services/Notification/NotificationType.cs
+++ b/PlexRequests.Services/Notification/NotificationType.cs
@@ -33,5 +33,6 @@ namespace PlexRequests.Services.Notification
         RequestAvailable,
         RequestApproved,
         AdminNote,
+        Test
     }
 }
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index 4e2f02144..f71d6d5e0 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -128,5 +128,10 @@ namespace PlexRequests.Services.Notification
                 Log.Error(e);
             }
         }
+
+        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index bca0b2c90..5e3cc3944 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -126,5 +126,10 @@ namespace PlexRequests.Services.Notification
                 Log.Error(e);
             }
         }
+
+        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index e8cd8961f..084e6fdc4 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -51,6 +51,7 @@ using PlexRequests.Store.Models;
 using PlexRequests.Store.Repository;
 using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
+using System;
 
 namespace PlexRequests.UI.Modules
 {
@@ -139,6 +140,7 @@ namespace PlexRequests.UI.Modules
 
             Get["/emailnotification"] = _ => EmailNotifications();
             Post["/emailnotification"] = _ => SaveEmailNotifications();
+            Post["/testemailnotification"] = _ => TestEmailNotifications();
             Get["/status"] = _ => Status();
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
@@ -372,6 +374,19 @@ namespace PlexRequests.UI.Modules
             return View["EmailNotifications", settings];
         }
 
+        private Response TestEmailNotifications()
+        {
+            var settings = this.Bind<EmailNotificationSettings>();
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent email notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
+        }
+
         private Response SaveEmailNotifications()
         {
             var settings = this.Bind<EmailNotificationSettings>();
diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
index 41a667e51..86f5e2322 100644
--- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml
@@ -88,6 +88,11 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testEmail" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
 
             <div class="form-group">
                 <div>
@@ -128,7 +133,32 @@
             });
         });
 
-
+        $('#testEmail').click(function (e) {
+            e.preventDefault();
+            var port = $('#EmailPort').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a valid Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testemailnotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
 
 
     });

From 45208e528f19887c8fc85401bdba59685b4f722b Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 13:27:10 -0500
Subject: [PATCH 10/57] #96 modify notifications interface/service to accept a
 non-type specific settings object.

---
 PlexRequests.Services/Interfaces/INotification.cs    |  2 +-
 .../Interfaces/INotificationService.cs               |  2 +-
 .../Notification/EmailMessageNotification.cs         | 12 +++++++-----
 .../Notification/NotificationService.cs              |  4 ++--
 .../Notification/PushbulletNotification.cs           |  2 +-
 .../Notification/PushoverNotification.cs             |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.Services/Interfaces/INotification.cs b/PlexRequests.Services/Interfaces/INotification.cs
index 2ee0b4f35..2e4e55ea4 100644
--- a/PlexRequests.Services/Interfaces/INotification.cs
+++ b/PlexRequests.Services/Interfaces/INotification.cs
@@ -37,6 +37,6 @@ namespace PlexRequests.Services.Interfaces
 
         Task NotifyAsync(NotificationModel model);
 
-        Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings);
+        Task NotifyAsync(NotificationModel model, Settings settings);
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Interfaces/INotificationService.cs b/PlexRequests.Services/Interfaces/INotificationService.cs
index 14408b031..91563c6de 100644
--- a/PlexRequests.Services/Interfaces/INotificationService.cs
+++ b/PlexRequests.Services/Interfaces/INotificationService.cs
@@ -34,7 +34,7 @@ namespace PlexRequests.Services.Interfaces
     public interface INotificationService
     {
         Task Publish(NotificationModel model);
-        Task Publish(NotificationModel model, EmailNotificationSettings settings);
+        Task Publish(NotificationModel model, Settings settings);
         void Subscribe(INotification notification);
         void UnSubscribe(INotification notification);
 
diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index c247eed0a..ca0d581cd 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -54,11 +54,13 @@ namespace PlexRequests.Services.Notification
             await NotifyAsync(model, configuration);
         }
 
-        public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
         {
             if (settings == null) await NotifyAsync(model);
 
-            if (!ValidateConfiguration(settings))
+            var emailSettings = (EmailNotificationSettings)settings;
+
+            if (!ValidateConfiguration(emailSettings))
             {
                 return;
             }
@@ -66,10 +68,10 @@ namespace PlexRequests.Services.Notification
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await EmailNewRequest(model, settings);
+                    await EmailNewRequest(model, emailSettings);
                     break;
                 case NotificationType.Issue:
-                    await EmailIssue(model, settings);
+                    await EmailIssue(model, emailSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     throw new NotImplementedException();
@@ -81,7 +83,7 @@ namespace PlexRequests.Services.Notification
                     throw new NotImplementedException();
 
                 case NotificationType.Test:
-                    await EmailTest(model, settings);
+                    await EmailTest(model, emailSettings);
                     break;
 
                 default:
diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index c65ad8a1d..8477a2159 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -48,7 +48,7 @@ namespace PlexRequests.Services.Notification
             await Task.WhenAll(notificationTasks).ConfigureAwait(false);
         }
 
-        public async Task Publish(NotificationModel model, EmailNotificationSettings settings)
+        public async Task Publish(NotificationModel model, Settings settings)
         {
             var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
 
@@ -72,7 +72,7 @@ namespace PlexRequests.Services.Notification
 
         }
 
-        private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings)
+        private static async Task NotifyAsync(INotification notification, NotificationModel model, Settings settings)
         {
             try
             {
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index f71d6d5e0..aed796fc1 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -129,7 +129,7 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public Task NotifyAsync(NotificationModel model, Settings settings)
         {
             throw new NotImplementedException();
         }
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index 5e3cc3944..ef3671014 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -127,7 +127,7 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
+        public Task NotifyAsync(NotificationModel model, Settings settings)
         {
             throw new NotImplementedException();
         }

From 9742b42fdf634a3400c6a29c0f5e149f55c7688c Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 13:44:11 -0500
Subject: [PATCH 11/57] #96 add the necessary back-end code to produce a test
 message for all notification types (still have to add the test buttons for
 pushbullet/pushover)

---
 .../Notification/EmailMessageNotification.cs  |  5 +-
 .../Notification/PushbulletNotification.cs    | 53 +++++++++++++------
 .../Notification/PushoverNotification.cs      | 52 ++++++++++++------
 3 files changed, 76 insertions(+), 34 deletions(-)

diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs
index ca0d581cd..4a359fb23 100644
--- a/PlexRequests.Services/Notification/EmailMessageNotification.cs
+++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs
@@ -60,10 +60,7 @@ namespace PlexRequests.Services.Notification
 
             var emailSettings = (EmailNotificationSettings)settings;
 
-            if (!ValidateConfiguration(emailSettings))
-            {
-                return;
-            }
+            if (!ValidateConfiguration(emailSettings)) return;
 
             switch (model.NotificationType)
             {
diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs
index aed796fc1..521855dca 100644
--- a/PlexRequests.Services/Notification/PushbulletNotification.cs
+++ b/PlexRequests.Services/Notification/PushbulletNotification.cs
@@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
         public string NotificationName => "PushbulletNotification";
         public async Task NotifyAsync(NotificationModel model)
         {
-            if (!ValidateConfiguration())
-            {
-                return;
-            }
+            var configuration = GetSettings();
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            var pushSettings = (PushbulletNotificationSettings)settings;
+
+            if (!ValidateConfiguration(pushSettings)) return;
 
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await PushNewRequestAsync(model);
+                    await PushNewRequestAsync(model, pushSettings);
                     break;
                 case NotificationType.Issue:
-                    await PushIssueAsync(model);
+                    await PushIssueAsync(model, pushSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     break;
@@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
                     break;
                 case NotificationType.AdminNote:
                     break;
+                case NotificationType.Test:
+                    await PushTestAsync(model, pushSettings);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private bool ValidateConfiguration()
+        private bool ValidateConfiguration(PushbulletNotificationSettings settings)
         {
-            if (!Settings.Enabled)
+            if (!settings.Enabled)
             {
                 return false;
             }
-            if (string.IsNullOrEmpty(Settings.AccessToken))
+            if (string.IsNullOrEmpty(settings.AccessToken))
             {
                 return false;
             }
@@ -93,13 +103,13 @@ namespace PlexRequests.Services.Notification
             return SettingsService.GetSettings();
         }
 
-        private async Task PushNewRequestAsync(NotificationModel model)
+        private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
             var message = $"{model.Title} has been requested by user: {model.User}";
             var pushTitle = $"Plex Requests: {model.Title} has been requested!";
             try
             {
-                var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
                 if (result == null)
                 {
                     Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@@ -111,13 +121,13 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task PushIssueAsync(NotificationModel model)
+        private async Task PushIssueAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
             var message = $"A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
             var pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}";
             try
             {
-                var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
                 if (result != null)
                 {
                     Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@@ -129,9 +139,22 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, Settings settings)
+        private async Task PushTestAsync(NotificationModel model, PushbulletNotificationSettings settings)
         {
-            throw new NotImplementedException();
+            var message = "This is just a test! Success!";
+            var pushTitle = "Plex Requests: Test Message!";
+            try
+            {
+                var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
+                if (result != null)
+                {
+                    Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs
index ef3671014..47854b1d5 100644
--- a/PlexRequests.Services/Notification/PushoverNotification.cs
+++ b/PlexRequests.Services/Notification/PushoverNotification.cs
@@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
         public string NotificationName => "PushoverNotification";
         public async Task NotifyAsync(NotificationModel model)
         {
-            if (!ValidateConfiguration())
-            {
-                return;
-            }
+            var configuration = GetSettings();
+            await NotifyAsync(model, configuration);
+        }
+
+        public async Task NotifyAsync(NotificationModel model, Settings settings)
+        {
+            if (settings == null) await NotifyAsync(model);
+
+            var pushSettings = (PushoverNotificationSettings)settings;
+
+            if (!ValidateConfiguration(pushSettings)) return;
 
             switch (model.NotificationType)
             {
                 case NotificationType.NewRequest:
-                    await PushNewRequestAsync(model);
+                    await PushNewRequestAsync(model, pushSettings);
                     break;
                 case NotificationType.Issue:
-                    await PushIssueAsync(model);
+                    await PushIssueAsync(model, pushSettings);
                     break;
                 case NotificationType.RequestAvailable:
                     break;
@@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
                     break;
                 case NotificationType.AdminNote:
                     break;
+                case NotificationType.Test:
+                    await PushTestAsync(model, pushSettings);
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private bool ValidateConfiguration()
+        private bool ValidateConfiguration(PushoverNotificationSettings settings)
         {
-            if (!Settings.Enabled)
+            if (!settings.Enabled)
             {
                 return false;
             }
-            if (string.IsNullOrEmpty(Settings.AccessToken) || string.IsNullOrEmpty(Settings.UserToken))
+            if (string.IsNullOrEmpty(settings.AccessToken) || string.IsNullOrEmpty(settings.UserToken))
             {
                 return false;
             }
@@ -93,12 +103,12 @@ namespace PlexRequests.Services.Notification
             return SettingsService.GetSettings();
         }
 
-        private async Task PushNewRequestAsync(NotificationModel model)
+        private async Task PushNewRequestAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
             var message = $"Plex Requests: {model.Title} has been requested by user: {model.User}";
             try
             {
-                var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken);
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
                 if (result?.status != 1)
                 {
                     Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@@ -110,12 +120,12 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        private async Task PushIssueAsync(NotificationModel model)
+        private async Task PushIssueAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
             var message = $"Plex Requests: A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
             try
             {
-                var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken);
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
                 if (result?.status != 1)
                 {
                     Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@@ -127,9 +137,21 @@ namespace PlexRequests.Services.Notification
             }
         }
 
-        public Task NotifyAsync(NotificationModel model, Settings settings)
+        private async Task PushTestAsync(NotificationModel model, PushoverNotificationSettings settings)
         {
-            throw new NotImplementedException();
+            var message = $"Plex Requests: Test Message!";
+            try
+            {
+                var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
+                if (result?.status != 1)
+                {
+                    Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
+                }
+            }
+            catch (Exception e)
+            {
+                Log.Error(e);
+            }
         }
     }
 }
\ No newline at end of file

From 3d41445f6fb92a82c8d6f9e8ac58abc428780dad Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 14:42:25 -0500
Subject: [PATCH 12/57] #96 Finished adding test functionality to notifications

---
 PlexRequests.UI/Modules/AdminModule.cs        | 43 +++++++++++++++++++
 .../Admin/PushbulletNotifications.cshtml      | 29 +++++++++++++
 .../Views/Admin/PushoverNotifications.cshtml  | 29 +++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index 084e6fdc4..6aea85bbb 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -145,9 +145,11 @@ namespace PlexRequests.UI.Modules
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
             Post["/pushbulletnotification"] = _ => SavePushbulletNotifications();
+            Post["/testpushbulletnotification"] = _ => TestPushbulletNotifications();
 
             Get["/pushovernotification"] = _ => PushoverNotifications();
             Post["/pushovernotification"] = _ => SavePushoverNotifications();
+            Post["/testpushovernotification"] = _ => TestPushoverNotifications();
 
             Get["/logs"] = _ => Logs();
             Get["/loglevel"] = _ => GetLogLevels();
@@ -377,6 +379,11 @@ namespace PlexRequests.UI.Modules
         private Response TestEmailNotifications()
         {
             var settings = this.Bind<EmailNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
             var notificationModel = new NotificationModel
             {
                 NotificationType = NotificationType.Test,
@@ -455,6 +462,24 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Response TestPushbulletNotifications()
+        {
+            var settings = this.Bind<PushbulletNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent pushbullet notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushbullet Notification!" });
+        }
+
         private Negotiator PushoverNotifications()
         {
             var settings = PushoverService.GetSettings();
@@ -487,6 +512,24 @@ namespace PlexRequests.UI.Modules
                 : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
+        private Response TestPushoverNotifications()
+        {
+            var settings = this.Bind<PushoverNotificationSettings>();
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+            var notificationModel = new NotificationModel
+            {
+                NotificationType = NotificationType.Test,
+                DateTime = DateTime.Now
+            };
+            NotificationService.Publish(notificationModel, settings);
+            Log.Info("Sent pushover notification test");
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushover Notification!" });
+        }
+
         private Response GetCpProfiles()
         {
             var settings = this.Bind<CouchPotatoSettings>();
diff --git a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
index 4f658da53..73d28d87c 100644
--- a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml
@@ -36,6 +36,12 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testPushbullet" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
+
             <div class="form-group">
                 <div>
                     <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
@@ -70,5 +76,28 @@
                 }
             });
         });
+
+        $('#testPushbullet').click(function (e) {
+            e.preventDefault();
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testpushbulletnotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
     });
 </script>
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
index 0877739d0..b5fcab7f5 100644
--- a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
+++ b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml
@@ -36,6 +36,12 @@
                 </div>
             </div>
 
+            <div class="form-group">
+                <div>
+                    <button id="testPushover" type="submit" class="btn btn-primary-outline">Test</button>
+                </div>
+            </div>
+
             <div class="form-group">
                 <div>
                     <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
@@ -70,5 +76,28 @@
                 }
             });
         });
+
+        $('#testPushover').click(function (e) {
+            e.preventDefault();
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                url: '/admin/testpushovernotification',
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
     });
 </script>
\ No newline at end of file

From eddce77ff5347ad91a243a260e65359d6afa6401 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 14:53:35 -0500
Subject: [PATCH 13/57] UI - increase icon size of nav menu (they were too
 small before)

---
 PlexRequests.UI/Content/custom.css     | 7 +++++++
 PlexRequests.UI/Content/custom.min.css | 2 +-
 PlexRequests.UI/Content/custom.scss    | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 7ff72e7f4..cb9a400b5 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -45,6 +45,13 @@ label {
 .nav-tabs > li.active > a:focus {
   background: #4e5d6c; }
 
+.navbar .nav a .fa {
+  font-size: 130%;
+  top: 1px;
+  position: relative;
+  display: inline-block;
+  margin-right: 5px; }
+
 .btn-danger-outline {
   color: #d9534f !important;
   background-color: transparent;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 2a046eb7d..2966b6610 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 029748ecd..96afda8e8 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -71,6 +71,14 @@ label {
     background: #4e5d6c;
 }
 
+.navbar .nav a .fa {
+    font-size: 130%;
+    top: 1px;
+    position: relative;
+    display: inline-block;
+    margin-right: 5px;
+}
+
 .btn-danger-outline {
     color: $danger-colour $i;
     background-color: transparent;

From a2cbcaa4f1f02eaae761021da3c628a8eceb6a2a Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 20:50:18 -0500
Subject: [PATCH 14/57] fix notification tests

---
 .../Notification/NotificationService.cs                | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs
index 8477a2159..35e52fd7d 100644
--- a/PlexRequests.Services/Notification/NotificationService.cs
+++ b/PlexRequests.Services/Notification/NotificationService.cs
@@ -67,8 +67,14 @@ namespace PlexRequests.Services.Notification
 
         private static async Task NotifyAsync(INotification notification, NotificationModel model)
         {
-
-            await NotifyAsync(notification, model, null);
+            try
+            {
+                await notification.NotifyAsync(model).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex, $"Notification '{notification.NotificationName}' failed with exception");
+            }
 
         }
 

From 855689d0b95a60245fd4ff976a96b9f7df22e13a Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Mon, 28 Mar 2016 21:51:48 -0500
Subject: [PATCH 15/57] add some "no results" feedback to the searching + minor
 UI improvements

---
 PlexRequests.UI/Content/custom.css        | 15 +++++++++-
 PlexRequests.UI/Content/custom.min.css    |  2 +-
 PlexRequests.UI/Content/custom.scss       | 35 +++++++++++++++++------
 PlexRequests.UI/Content/search.js         |  8 ++++++
 PlexRequests.UI/Views/Search/Index.cshtml |  2 +-
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index cb9a400b5..51130e9e9 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -22,7 +22,9 @@
 
 .form-control-custom {
   background-color: #4e5d6c !important;
-  color: white !important; }
+  color: white !important;
+  border-radius: 0;
+  box-shadow: 0 0 0 !important; }
 
 h1 {
   font-size: 3.5rem !important;
@@ -138,3 +140,14 @@ label {
 #tvList .mix {
   display: none; }
 
+.no-search-results {
+  text-align: center; }
+
+.no-search-results .no-search-results-icon {
+  font-size: 10em;
+  color: #4e5d6c; }
+
+.no-search-results .no-search-results-text {
+  margin: 20px 0;
+  color: #ccc; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 2966b6610..9e3d7e793 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 96afda8e8..f2703ee4a 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -5,7 +5,9 @@ $info-colour: #5bc0de;
 $warning-colour: #f0ad4e;
 $danger-colour: #d9534f;
 $success-colour: #5cb85c;
-$i:!important;
+$i:
+!important
+;
 
 @media (min-width: 768px ) {
     .row {
@@ -42,6 +44,8 @@ $i:!important;
 .form-control-custom {
     background-color: $form-color $i;
     color: white $i;
+    border-radius: 0;
+    box-shadow: 0 0 0 !important;
 }
 
 
@@ -65,8 +69,8 @@ label {
     font-size: 16px $i;
 }
 
-.nav-tabs > li.active > a, 
-.nav-tabs > li.active > a:hover, 
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus {
     background: #4e5d6c;
 }
@@ -170,9 +174,24 @@ label {
     border-color: $success-colour $i;
 }
 
-#movieList .mix{
-	display: none;
+#movieList .mix {
+    display: none;
+}
+
+#tvList .mix {
+    display: none;
+}
+
+.no-search-results {
+    text-align: center;
+}
+
+.no-search-results .no-search-results-icon {
+    font-size: 10em;
+    color: $form-color;
+}
+
+.no-search-results .no-search-results-text {
+    margin: 20px 0;
+    color: #ccc;
 }
-#tvList .mix{
-	display: none;
-}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index cea4eca66..4d7b001bb 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -7,6 +7,8 @@
 
 var searchSource = $("#search-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
+var noResultsHtml = "<div class='no-search-results'>" +
+    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
 var movieTimer = 0;
 var tvimer = 0;
 
@@ -124,6 +126,9 @@ function movieSearch() {
                 $("#movieList").append(html);
             });
         }
+        else {
+            $("#movieList").html(noResultsHtml);
+        }
         $('#movieSearchButton').attr("class","fa fa-search");
     });
 };
@@ -140,6 +145,9 @@ function tvSearch() {
                 $("#tvList").append(html);
             });
         }
+        else {
+            $("#tvList").html(noResultsHtml);
+        }
         $('#tvSearchButton').attr("class", "fa fa-search");
     });
 };
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 4356c069a..5006a58c2 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -1,6 +1,7 @@
 <div>
     <h1>Search</h1>
     <h4>Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!</h4>
+    <br />
     <!-- Nav tabs -->
     <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
         @if (Model.SearchForMovies)
@@ -57,7 +58,6 @@
 
 </div>
 
-
 <script id="search-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">

From c7826003bc89d1f25989f51deb8f816383f48a0a Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 08:52:01 +0100
Subject: [PATCH 16/57] An attempt to fix #108

---
 PlexRequests.Services/PlexAvailabilityChecker.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index bc1cfb8e7..9b9f651ba 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -24,6 +24,7 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -97,17 +98,16 @@ namespace PlexRequests.Services
             {
                 throw new ApplicationSettingsException("The settings are not configured for Plex or Authentication");
             }
+            var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
             if (!string.IsNullOrEmpty(year))
             {
-                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-                var result = results.Video?.FirstOrDefault(x => x.Title.Contains(title) && x.Year == year);
+                var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase) && x.Year == year);
                 var directoryTitle = results.Directory?.Title == title && results.Directory?.Year == year;
                 return result?.Title != null || directoryTitle;
             }
             else
             {
-                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
-                var result = results.Video?.FirstOrDefault(x => x.Title.Contains(title));
+                var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase));
                 var directoryTitle = results.Directory?.Title == title;
                 return result?.Title != null || directoryTitle;
             }

From 5843dee2a5f919025e6b92cef1cb8d7f35a35a79 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 09:58:23 +0100
Subject: [PATCH 17/57] Added the settings page for #32

---
 PlexRequests.Core/PlexRequests.Core.csproj    |   1 +
 .../SettingModels/HeadphonesSettings.cs       |  58 +++++++
 PlexRequests.UI/Bootstrapper.cs               |   1 +
 PlexRequests.UI/Modules/AdminModule.cs        |  37 +++-
 .../Modules/ApplicationTesterModule.cs        |   6 +
 PlexRequests.UI/PlexRequests.UI.csproj        |   3 +
 PlexRequests.UI/Views/Admin/Headphones.cshtml | 162 ++++++++++++++++++
 PlexRequests.UI/Views/Admin/_Sidebar.cshtml   |   8 +
 8 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 PlexRequests.Core/SettingModels/HeadphonesSettings.cs
 create mode 100644 PlexRequests.UI/Views/Admin/Headphones.cshtml

diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj
index a1e0538f7..13a1e74ec 100644
--- a/PlexRequests.Core/PlexRequests.Core.csproj
+++ b/PlexRequests.Core/PlexRequests.Core.csproj
@@ -74,6 +74,7 @@
     <Compile Include="Models\StatusModel.cs" />
     <Compile Include="Models\UserProperties.cs" />
     <Compile Include="SettingModels\AuthenticationSettings.cs" />
+    <Compile Include="SettingModels\HeadphonesSettings.cs" />
     <Compile Include="SettingModels\PushoverNotificationSettings.cs" />
     <Compile Include="SettingModels\PushBulletNotificationSettings.cs" />
     <Compile Include="SettingModels\EmailNotificationSettings.cs" />
diff --git a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
new file mode 100644
index 000000000..0da4971d7
--- /dev/null
+++ b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
@@ -0,0 +1,58 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: CouchPotatoSettings.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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 Newtonsoft.Json;
+using PlexRequests.Helpers;
+
+namespace PlexRequests.Core.SettingModels
+{
+    public class HeadphonesSettings : Settings
+    {
+        public string Enabled { get; set; }
+        public string Ip { get; set; }
+        public int Port { get; set; }
+        public int ApiKey { get; set; }
+        public bool Ssl { get; set; }
+        public string SubDir { get; set; }
+       
+        [JsonIgnore]
+        public Uri FullUri
+        {
+            get
+            {
+                if (!string.IsNullOrEmpty(SubDir))
+                {
+                    var formattedSubDir = Ip.ReturnUriWithSubDir(Port, Ssl, SubDir);
+                    return formattedSubDir;
+                }
+                var formatted = Ip.ReturnUri(Port, Ssl);
+                return formatted;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 5e4f24343..e65ea82bd 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -76,6 +76,7 @@ namespace PlexRequests.UI
             container.Register<ISettingsService<EmailNotificationSettings>, SettingsServiceV2<EmailNotificationSettings>>();
             container.Register<ISettingsService<PushbulletNotificationSettings>, SettingsServiceV2<PushbulletNotificationSettings>>();
             container.Register<ISettingsService<PushoverNotificationSettings>, SettingsServiceV2<PushoverNotificationSettings>>();
+            container.Register<ISettingsService<HeadphonesSettings>, SettingsServiceV2<HeadphonesSettings>>();
 
             // Repo's
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index e8cd8961f..4009f1b5e 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -28,6 +28,8 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Linq;
+using System.Web.UI.HtmlControls;
+
 using Humanizer;
 using MarkdownSharp;
 
@@ -65,6 +67,7 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<EmailNotificationSettings> EmailService { get; }
         private ISettingsService<PushbulletNotificationSettings> PushbulletService { get; }
         private ISettingsService<PushoverNotificationSettings> PushoverService { get; }
+        private ISettingsService<HeadphonesSettings> HeadphonesSerivce { get; }
         private IPlexApi PlexApi { get; }
         private ISonarrApi SonarrApi { get; }
         private IPushbulletApi PushbulletApi { get; }
@@ -89,7 +92,8 @@ namespace PlexRequests.UI.Modules
             ISettingsService<PushoverNotificationSettings> pushoverSettings,
             IPushoverApi pushoverApi,
             IRepository<LogEntity> logsRepo,
-            INotificationService notify) : base("admin")
+            INotificationService notify,
+            ISettingsService<HeadphonesSettings> headphones) : base("admin")
         {
             RpService = rpService;
             CpService = cpService;
@@ -107,6 +111,7 @@ namespace PlexRequests.UI.Modules
             PushoverService = pushoverSettings;
             PushoverApi = pushoverApi;
             NotificationService = notify;
+            HeadphonesSerivce = headphones;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -151,6 +156,9 @@ namespace PlexRequests.UI.Modules
             Get["/loglevel"] = _ => GetLogLevels();
             Post["/loglevel"] = _ => UpdateLogLevels(Request.Form.level);
             Get["/loadlogs"] = _ => LoadLogs();
+
+            Get["/headphones"] = _ => Headphones();
+            Post["/headphones"] = _ => SaveHeadphones();
         }
 
         private Negotiator Authentication()
@@ -509,5 +517,32 @@ namespace PlexRequests.UI.Modules
             LoggingHelper.ReconfigureLogLevel(newLevel);
             return Response.AsJson(new JsonResponseModel { Result = true, Message = $"The new log level is now {newLevel}"});
         }
+
+        private Negotiator Headphones()
+        {
+            var settings = HeadphonesSerivce.GetSettings();
+            return View["Headphones", settings];
+        }
+
+        private Response SaveHeadphones()
+        {
+            var settings = this.Bind<HeadphonesSettings>();
+
+            var valid = this.Validate(settings);
+            if (!valid.IsValid)
+            {
+                var error = valid.SendJsonError();
+                Log.Info("Error validating Headphones settings, message: {0}", error.Message);
+                return Response.AsJson(error);
+            }
+            Log.Trace(settings.DumpJson());
+
+            var result = HeadphonesSerivce.SaveSettings(settings);
+            
+            Log.Info("Saved headphones settings, result: {0}", result);
+            return Response.AsJson(result
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Headphones!" }
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs
index 98d2bd591..98884d2f1 100644
--- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs
+++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs
@@ -57,6 +57,7 @@ namespace PlexRequests.UI.Modules
             Post["/sonarr"] = _ => SonarrTest();
             Post["/plex"] = _ => PlexTest();
             Post["/sickrage"] = _ => SickRageTest();
+            Post["/headphones"] = _ => HeadphonesTest();
 
         }
         
@@ -168,5 +169,10 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = message });
             }
         }
+
+        private Response HeadphonesTest()
+        {
+            throw new NotImplementedException(); //TODO
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index b561ad36b..9a32ef2b3 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -371,6 +371,9 @@
     <Content Include="Views\Admin\PushoverNotifications.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Views\Admin\Headphones.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>
diff --git a/PlexRequests.UI/Views/Admin/Headphones.cshtml b/PlexRequests.UI/Views/Admin/Headphones.cshtml
new file mode 100644
index 000000000..30f45985f
--- /dev/null
+++ b/PlexRequests.UI/Views/Admin/Headphones.cshtml
@@ -0,0 +1,162 @@
+@Html.Partial("_Sidebar")
+@{
+    int port;
+    if (Model.Port == 0)
+    {
+        port = 8081;
+    }
+    else
+    {
+        port = Model.Port;
+    }
+}
+<div class="col-sm-8 col-sm-push-1">
+    <form class="form-horizontal" method="POST" id="mainForm">
+        <fieldset>
+            <legend>Headphones Settings</legend>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Enabled)
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled" checked="checked"><text>Enabled</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Enabled" name="Enabled"><text>Enabled</text>
+                        }
+                    </label>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.Ssl)
+                        {
+                            <input type="checkbox" id="Ssl" name="Ssl" checked="checked"><text>SSL</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="Ssl" name="Ssl"><text>SSL</text>
+                        }
+                    </label>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="Ip" class="control-label">Headphones Hostname or IP</label>
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="Ip" name="Ip" placeholder="localhost" value="@Model.Ip">
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label for="portNumber" class="control-label">Port</label>
+
+                <div class="">
+                    <input type="text" class="form-control form-control-custom " id="portNumber" name="Port" placeholder="Port Number" value="@port">
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <label for="ApiKey" class="control-label">Headphones API Key</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="ApiKey" name="ApiKey" value="@Model.ApiKey">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="SubDir" class="control-label">Headphones SubDirectory</label>
+                <div>
+                    <input type="text" class="form-control form-control-custom " id="SubDir" name="SubDir" value="@Model.SubDir">
+                </div>
+            </div>
+
+
+            <div class="form-group">
+                <div>
+                    <button type="submit" id="getProfiles" class="btn btn-primary-outline">Get Quality Profiles</button>
+                </div>
+            </div>
+            
+
+            <div class="form-group">
+                <div>
+                    <button id="testHeadphones" type="submit" class="btn btn-primary-outline">Test Connectivity</button>
+                </div>
+            </div>
+
+
+
+
+            <div class="form-group">
+                <div>
+                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
+                </div>
+            </div>
+        </fieldset>
+    </form>
+</div>
+
+
+
+<script>
+    $(function() {
+
+        $('#testHeadphones').click(function (e) {
+            e.preventDefault();
+            var $form = $("#mainForm");
+
+            $.ajax({
+                type: $form.prop("method"),
+                url: "/test/headphones",
+                data: $form.serialize(),
+                dataType: "json",
+                success: function (response) {
+                    console.log(response);
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                        $('#authToken').val(response.authToken);
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+        $('#save').click(function (e) {
+            e.preventDefault();
+            var port = $('#portNumber').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            var qualityProfile = $("#profiles option:selected").val();
+            var data = $form.serialize();
+            data = data + "&profileId=" + qualityProfile;
+
+            $.ajax({
+                type: $form.prop("method"),
+                data: data,
+                url: $form.prop("action"),
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+    });
+</script>
\ No newline at end of file
diff --git a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
index efb8ce36b..e6d21e3fc 100644
--- a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
+++ b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml
@@ -52,6 +52,14 @@
         {
             <a class="list-group-item" href="/admin/sickrage">SickRage</a>
         }
+        @if (Context.Request.Path == "/admin/headphones")
+        {
+            <a class="list-group-item active" href="/admin/headphones">Headphones</a>
+        }
+        else
+        {
+            <a class="list-group-item" href="/admin/headphones">Headphones</a>
+        }
 
         @if (Context.Request.Path == "/admin/emailnotification")
         {

From fe0f6873e5af6ae8e17d1dcdd1b1b030cae6a392 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 10:34:20 +0100
Subject: [PATCH 18/57] Made the feedback from Sonarr better when Sonarr
 already has the series #85

---
 .../PlexRequests.Api.Models.csproj            |  1 +
 .../Sonarr/SonarrAddSeries.cs                 |  4 +++
 PlexRequests.Api.Models/Sonarr/SonarrError.cs | 36 +++++++++++++++++++
 PlexRequests.Api/ApiRequest.cs                | 11 +++---
 PlexRequests.Api/SonarrApi.cs                 | 15 ++++++--
 PlexRequests.UI/Helpers/TvSender.cs           |  4 ---
 PlexRequests.UI/Modules/ApprovalModule.cs     |  5 +--
 PlexRequests.UI/Modules/SearchModule.cs       |  9 ++---
 8 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Sonarr/SonarrError.cs

diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 1ec1a67ae..d67958e0d 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -64,6 +64,7 @@
     <Compile Include="SickRage\SickRageStatus.cs" />
     <Compile Include="SickRage\SickRageTvAdd.cs" />
     <Compile Include="Sonarr\SonarrAddSeries.cs" />
+    <Compile Include="Sonarr\SonarrError.cs" />
     <Compile Include="Sonarr\SonarrProfile.cs" />
     <Compile Include="Sonarr\SystemStatus.cs" />
     <Compile Include="Tv\Authentication.cs" />
diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs
index 534f3068f..23540521f 100644
--- a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs
+++ b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 
+using Newtonsoft.Json;
+
 namespace PlexRequests.Api.Models.Sonarr
 {
     public class Season
@@ -23,6 +25,8 @@ namespace PlexRequests.Api.Models.Sonarr
         public string imdbId { get; set; }
         public string titleSlug { get; set; }
         public int id { get; set; }
+        [JsonIgnore]
+        public string ErrorMessage { get; set; }
     }
 
     public class AddOptions
diff --git a/PlexRequests.Api.Models/Sonarr/SonarrError.cs b/PlexRequests.Api.Models/Sonarr/SonarrError.cs
new file mode 100644
index 000000000..ae3fbdfca
--- /dev/null
+++ b/PlexRequests.Api.Models/Sonarr/SonarrError.cs
@@ -0,0 +1,36 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrError.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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
+namespace PlexRequests.Api.Models.Sonarr
+{
+    public class SonarrError
+    {
+        public string propertyName { get; set; }
+        public string errorMessage { get; set; }
+        public string attemptedValue { get; set; }
+        public string[] formattedMessageArguments { get; set; } 
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs
index 62391386b..ad056fbfe 100644
--- a/PlexRequests.Api/ApiRequest.cs
+++ b/PlexRequests.Api/ApiRequest.cs
@@ -26,13 +26,9 @@
 #endregion
 using System;
 using System.IO;
-using System.Net;
-using System.Text;
-using System.Xml;
 using System.Xml.Serialization;
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 using NLog;
 
@@ -99,17 +95,18 @@ namespace PlexRequests.Api
             try
             {
                 var json = JsonConvert.DeserializeObject<T>(response.Content);
+
                 return json;
             }
             catch (Exception e)
             {
-                Log.Fatal(e);
-                Log.Info(response.Content);
+                Log.Error(e);
+                Log.Error(response.Content);
                 throw;
             }
         }
 
-        public T DeserializeXml<T>(string input)
+        private T DeserializeXml<T>(string input)
              where T : class
         {
             var ser = new XmlSerializer(typeof(T));
diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs
index 1d1a57f34..d70ba2eef 100644
--- a/PlexRequests.Api/SonarrApi.cs
+++ b/PlexRequests.Api/SonarrApi.cs
@@ -30,6 +30,8 @@ using System.Linq;
 using NLog;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Sonarr;
+using PlexRequests.Helpers;
+
 using RestSharp;
 
 namespace PlexRequests.Api
@@ -56,7 +58,8 @@ namespace PlexRequests.Api
 
         public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFolders, string rootPath, int seasonCount, int[] seasons, string apiKey, Uri baseUrl)
         {
-
+            Log.Debug("Adding series {0}", title);
+            Log.Debug("Seasons = {0}, out of {1} seasons", seasons.DumpJson(), seasonCount);
             var request = new RestRequest
             {
                 Resource = "/api/Series?",
@@ -74,7 +77,6 @@ namespace PlexRequests.Api
                 rootFolderPath = rootPath
             };
 
-
             for (var i = 1; i <= seasonCount; i++)
             {
                 var season = new Season
@@ -85,11 +87,20 @@ namespace PlexRequests.Api
                 options.seasons.Add(season);
             }
 
+            Log.Debug("Sonarr API Options:");
+            Log.Debug(options.DumpJson());
+
             request.AddHeader("X-Api-Key", apiKey);
             request.AddJsonBody(options);
 
             var obj = Api.ExecuteJson<SonarrAddSeries>(request, baseUrl);
 
+            if (obj == null)
+            {
+                var error = Api.ExecuteJson<SonarrError>(request, baseUrl);
+                obj = new SonarrAddSeries { ErrorMessage = error.errorMessage };
+            }
+
             return obj;
         }
 
diff --git a/PlexRequests.UI/Helpers/TvSender.cs b/PlexRequests.UI/Helpers/TvSender.cs
index d26611321..703c813fd 100644
--- a/PlexRequests.UI/Helpers/TvSender.cs
+++ b/PlexRequests.UI/Helpers/TvSender.cs
@@ -24,17 +24,13 @@
 //    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //  ************************************************************************/
 #endregion
-
-using Nancy;
 using NLog;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.SickRage;
 using PlexRequests.Api.Models.Sonarr;
-using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Store;
-using PlexRequests.UI.Models;
 
 namespace PlexRequests.UI.Helpers
 {
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index b2c6217bb..1e129e3b3 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -131,7 +131,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel
                 {
                     Result = false,
-                    Message = "Could not add the series to Sonarr"
+                    Message = result.ErrorMessage ?? "Could not add the series to Sonarr"
                 });
             }
 
@@ -276,7 +276,7 @@ namespace PlexRequests.UI.Modules
                     if (sonarr.Enabled)
                     {
                         var result = sender.SendToSonarr(sonarr, r);
-                        if (result != null)
+                        if (!string.IsNullOrEmpty(result?.title))
                         {
                             r.Approved = true;
                             updatedRequests.Add(r);
@@ -284,6 +284,7 @@ namespace PlexRequests.UI.Modules
                         else
                         {
                             Log.Error("Could not approve and send the TV {0} to Sonarr!", r.Title);
+                            Log.Error("Error message: {0}", result?.ErrorMessage);
                         }
                     }
                 }
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 2a98e8933..9b307f983 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -371,18 +371,19 @@ namespace PlexRequests.UI.Modules
                 if (sonarrSettings.Enabled)
                 {
                     var result = sender.SendToSonarr(sonarrSettings, model);
-                    if (result != null)
+                    if (result != null && !string.IsNullOrEmpty(result.title))
                     {
                         model.Approved = true;
                         Log.Debug("Adding tv to database requests (No approval required & Sonarr)");
                         RequestService.AddRequest(model);
+                        var notify1 = new NotificationModel { Title = model.Title, User = model.RequestedBy, DateTime = DateTime.Now, NotificationType = NotificationType.NewRequest };
+                        NotificationService.Publish(notify1);
 
                         return Response.AsJson(new JsonResponseModel { Result = true, Message = $"{fullShowName} was successfully added!" });
                     }
-                    var notify1 = new NotificationModel { Title = model.Title, User = model.RequestedBy, DateTime = DateTime.Now, NotificationType = NotificationType.NewRequest };
-                    NotificationService.Publish(notify1);
 
-                    return Response.AsJson(new JsonResponseModel { Result = false, Message = "Something went wrong adding the movie to Sonarr! Please check your settings." });
+
+                    return Response.AsJson(new JsonResponseModel { Result = false, Message = result?.ErrorMessage ?? "Something went wrong adding the movie to Sonarr! Please check your settings." });
 
                 }
 

From 7349f78b80596e16eefa1586e70925e212d99926 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 10:44:23 +0100
Subject: [PATCH 19/57] Fixed the tests

---
 PlexRequests.UI.Tests/AdminModuleTests.cs | 3 +++
 PlexRequests.UI/Modules/AdminModule.cs    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs
index fc8686086..34b2af4a7 100644
--- a/PlexRequests.UI.Tests/AdminModuleTests.cs
+++ b/PlexRequests.UI.Tests/AdminModuleTests.cs
@@ -59,6 +59,7 @@ namespace PlexRequests.UI.Tests
         private Mock<ISettingsService<EmailNotificationSettings>> EmailMock { get; set; }
         private Mock<ISettingsService<PushbulletNotificationSettings>> PushbulletSettings { get; set; }
         private Mock<ISettingsService<PushoverNotificationSettings>> PushoverSettings { get; set; }
+        private Mock<ISettingsService<HeadphonesSettings>> HeadphonesSettings { get; set; }
         private Mock<IPlexApi> PlexMock { get; set; }
         private Mock<ISonarrApi> SonarrApiMock { get; set; }
         private Mock<IPushbulletApi> PushbulletApi { get; set; }
@@ -94,6 +95,7 @@ namespace PlexRequests.UI.Tests
             PushoverSettings = new Mock<ISettingsService<PushoverNotificationSettings>>();
             PushoverApi = new Mock<IPushoverApi>();
             NotificationService = new Mock<INotificationService>();
+            HeadphonesSettings = new Mock<ISettingsService<HeadphonesSettings>>();
 
             Bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -114,6 +116,7 @@ namespace PlexRequests.UI.Tests
                 with.Dependency(PushoverSettings.Object);
                 with.Dependency(PushoverApi.Object);
                 with.Dependency(NotificationService.Object);
+                with.Dependency(HeadphonesSettings.Object);
                 with.RootPathProvider<TestRootPathProvider>();
                 with.RequestStartup((container, pipelines, context) =>
                 {
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index 4009f1b5e..e62b8b97b 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -67,7 +67,7 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<EmailNotificationSettings> EmailService { get; }
         private ISettingsService<PushbulletNotificationSettings> PushbulletService { get; }
         private ISettingsService<PushoverNotificationSettings> PushoverService { get; }
-        private ISettingsService<HeadphonesSettings> HeadphonesSerivce { get; }
+        private ISettingsService<HeadphonesSettings> HeadphonesService { get; }
         private IPlexApi PlexApi { get; }
         private ISonarrApi SonarrApi { get; }
         private IPushbulletApi PushbulletApi { get; }
@@ -111,7 +111,7 @@ namespace PlexRequests.UI.Modules
             PushoverService = pushoverSettings;
             PushoverApi = pushoverApi;
             NotificationService = notify;
-            HeadphonesSerivce = headphones;
+            HeadphonesService = headphones;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -520,7 +520,7 @@ namespace PlexRequests.UI.Modules
 
         private Negotiator Headphones()
         {
-            var settings = HeadphonesSerivce.GetSettings();
+            var settings = HeadphonesService.GetSettings();
             return View["Headphones", settings];
         }
 
@@ -537,7 +537,7 @@ namespace PlexRequests.UI.Modules
             }
             Log.Trace(settings.DumpJson());
 
-            var result = HeadphonesSerivce.SaveSettings(settings);
+            var result = HeadphonesService.SaveSettings(settings);
             
             Log.Info("Saved headphones settings, result: {0}", result);
             return Response.AsJson(result

From 1f9ed51320459fe7f0ec0d5c3f45e3d54c1b0f6e Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 10:49:30 +0100
Subject: [PATCH 20/57] Made #85 better

---
 PlexRequests.Api/ApiRequest.cs | 14 +++-----------
 PlexRequests.Api/SonarrApi.cs  | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs
index ad056fbfe..1b7975462 100644
--- a/PlexRequests.Api/ApiRequest.cs
+++ b/PlexRequests.Api/ApiRequest.cs
@@ -92,18 +92,10 @@ namespace PlexRequests.Api
                 throw new ApplicationException(message, response.ErrorException);
             }
 
-            try
-            {
-                var json = JsonConvert.DeserializeObject<T>(response.Content);
 
-                return json;
-            }
-            catch (Exception e)
-            {
-                Log.Error(e);
-                Log.Error(response.Content);
-                throw;
-            }
+            var json = JsonConvert.DeserializeObject<T>(response.Content);
+
+            return json;
         }
 
         private T DeserializeXml<T>(string input)
diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs
index d70ba2eef..f9d68da31 100644
--- a/PlexRequests.Api/SonarrApi.cs
+++ b/PlexRequests.Api/SonarrApi.cs
@@ -27,6 +27,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+
+using Newtonsoft.Json;
+
 using NLog;
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Sonarr;
@@ -93,15 +96,19 @@ namespace PlexRequests.Api
             request.AddHeader("X-Api-Key", apiKey);
             request.AddJsonBody(options);
 
-            var obj = Api.ExecuteJson<SonarrAddSeries>(request, baseUrl);
-
-            if (obj == null)
+            SonarrAddSeries result;
+            try
             {
+                result = Api.ExecuteJson<SonarrAddSeries>(request, baseUrl);
+            }
+            catch (JsonSerializationException jse)
+            {
+                Log.Error(jse);
                 var error = Api.ExecuteJson<SonarrError>(request, baseUrl);
-                obj = new SonarrAddSeries { ErrorMessage = error.errorMessage };
+                result = new SonarrAddSeries { ErrorMessage = error.errorMessage };
             }
 
-            return obj;
+            return result;
         }
 
         public SystemStatus SystemStatus(string apiKey, Uri baseUrl)

From e2aa4016a8f3fc93c35233492f47e9b12f75ed65 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 14:13:13 +0100
Subject: [PATCH 21/57] Added some tests and fixed the issue where the DB would
 get created in the wrong place depending on how you launched the application

---
 PlexRequests.Core/JsonRequestService.cs       |   4 +
 .../PlexAvailabilityCheckerTests.cs           | 200 +++++++++++++++++-
 .../PlexRequests.Services.Tests.csproj        |   4 +
 .../PlexAvailabilityChecker.cs                |  19 +-
 PlexRequests.Store/DbConfiguration.cs         |  15 +-
 PlexRequests.Store/PlexRequests.Store.csproj  |   1 +
 PlexRequests.UI/Bootstrapper.cs               |   9 +-
 PlexRequests.UI/Jobs/PlexTaskFactory.cs       |   4 +-
 8 files changed, 221 insertions(+), 35 deletions(-)

diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 1504faed6..64033b50c 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -79,6 +79,10 @@ namespace PlexRequests.Core
         public RequestedModel Get(int id)
         {
             var blob = Repo.Get(id);
+            if (blob == null)
+            {
+                return new RequestedModel();
+            }
             var model = ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content);
             return model;
         }
diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
index 8e641181e..d9c3f1881 100644
--- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
+++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
@@ -32,12 +32,12 @@ using Moq;
 using NUnit.Framework;
 
 using PlexRequests.Api.Interfaces;
-using PlexRequests.Api.Models;
 using PlexRequests.Api.Models.Plex;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers.Exceptions;
 using PlexRequests.Services.Interfaces;
+using PlexRequests.Store;
 
 namespace PlexRequests.Services.Tests
 {
@@ -66,7 +66,7 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch {Video = new List<Video> {new Video {Title = "title", Year = "2011"} } };
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "title", Year = "2011" } } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -87,7 +87,7 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Directory = new Directory1 {Title = "title", Year = "2013"} };
+            var searchResult = new PlexSearch { Directory = new Directory1 { Title = "title", Year = "2013" } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -100,6 +100,27 @@ namespace PlexRequests.Services.Tests
             Assert.That(result, Is.True);
         }
 
+        [Test]
+        public void IsAvailableDirectoryTitleWithoutYearTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Directory = new Directory1 { Title = "title", } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title", null);
+
+            Assert.That(result, Is.True);
+        }
+
         [Test]
         public void IsNotAvailableTest()
         {
@@ -108,7 +129,7 @@ namespace PlexRequests.Services.Tests
             var requestMock = new Mock<IRequestService>();
             var plexMock = new Mock<IPlexApi>();
 
-            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong tistle", Year = "2011"} } };
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title", Year = "2011" } } };
 
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
@@ -121,6 +142,27 @@ namespace PlexRequests.Services.Tests
             Assert.That(result, Is.False);
         }
 
+        [Test]
+        public void IsNotAvailableTestWihtoutYear()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "wrong title" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title", null);
+
+            Assert.That(result, Is.False);
+        }
+
         [Test]
         public void IsYearDoesNotMatchTest()
         {
@@ -141,5 +183,155 @@ namespace PlexRequests.Services.Tests
 
             Assert.That(result, Is.False);
         }
+
+        [Test]
+        public void TitleDoesNotMatchTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "title23", Year = "2019" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title", "2019");
+
+            Assert.That(result, Is.False);
+        }
+
+        [Test]
+        public void TitleDoesNotMatchWithoutYearTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+
+            var searchResult = new PlexSearch { Video = new List<Video> { new Video { Title = "title23" } } };
+
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(searchResult);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            var result = Checker.IsAvailable("title", null);
+
+            Assert.That(result, Is.False);
+        }
+
+
+        [Test]
+        public void CheckAndUpdateNoPlexSettingsTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Checker.CheckAndUpdateAll(1);
+
+            requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Never);
+            requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Never);
+        }
+
+        [Test]
+        public void CheckAndUpdateNoAuthSettingsTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "123" });
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Checker.CheckAndUpdateAll(1);
+
+            requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Never);
+            requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Never);
+        }
+
+        [Test]
+        public void CheckAndUpdateNoRequestsTest()
+        {
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "192.168.1.1" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            requestMock.Setup(x => x.GetAll()).Returns(new List<RequestedModel>());
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Checker.CheckAndUpdateAll(1);
+
+            requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Never);
+            requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Never);
+        }
+
+
+        [Test]
+        [Ignore("Need to work out Plex Directory vs Video objects")]
+        public void CheckAndUpdateRequestsTest()
+        {
+
+            var requests = new List<RequestedModel> {
+                new RequestedModel
+                {
+                    Id = 123,
+                    Title = "title1",
+                    Available = false,
+                },
+                new RequestedModel
+                {
+                    Id=222,
+                    Title = "title3",
+                    Available = false
+                },
+                new RequestedModel
+                {
+                    Id = 333,
+                    Title= "missingTitle",
+                    Available = false
+                },
+                new RequestedModel
+                {
+                    Id= 444,
+                    Title = "already found",
+                    Available = true
+                }
+            };
+
+            var search = new PlexSearch { };
+
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "192.168.1.1" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            requestMock.Setup(x => x.GetAll()).Returns(requests);
+
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Checker.CheckAndUpdateAll(1);
+
+            requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Never);
+            requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Never);
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj b/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj
index 5fc159440..3ce2fa126 100644
--- a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj
+++ b/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj
@@ -84,6 +84,10 @@
       <Project>{566EFA49-68F8-4716-9693-A6B3F2624DEA}</Project>
       <Name>PlexRequests.Services</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Store\PlexRequests.Store.csproj">
+      <Project>{92433867-2B7B-477B-A566-96C382427525}</Project>
+      <Name>PlexRequests.Store</Name>
+    </ProjectReference>
   </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index 9b9f651ba..915cbda28 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -53,7 +53,7 @@ namespace PlexRequests.Services
         private ISettingsService<AuthenticationSettings> Auth { get; }
         private IRequestService RequestService { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
-        private IPlexApi PlexApi { get; set; }
+        private IPlexApi PlexApi { get; }
 
 
         public void CheckAndUpdateAll(long check)
@@ -63,7 +63,7 @@ namespace PlexRequests.Services
             var requests = RequestService.GetAll();
 
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
-            if (!ValidateSettings(plexSettings, authSettings, requestedModels))
+            if (!ValidateSettings(plexSettings, authSettings) || !requestedModels.Any())
             {
                 return;
             }
@@ -114,21 +114,6 @@ namespace PlexRequests.Services
 
         }
 
-        private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth, IEnumerable<RequestedModel> requests)
-        {
-            if (plex.Ip == null || auth.PlexAuthToken == null || requests == null)
-            {
-                Log.Warn("A setting is null, Ensure Plex is configured correctly, and we have a Plex Auth token.");
-                return false;
-            }
-            if (!requests.Any())
-            {
-                Log.Info("We have no requests to check if they are available on Plex.");
-                return false;
-            }
-            return true;
-        }
-
         private bool ValidateSettings(PlexSettings plex, AuthenticationSettings auth)
         {
             if (plex?.Ip == null || auth?.PlexAuthToken == null)
diff --git a/PlexRequests.Store/DbConfiguration.cs b/PlexRequests.Store/DbConfiguration.cs
index 7b6c6c244..467f01ab5 100644
--- a/PlexRequests.Store/DbConfiguration.cs
+++ b/PlexRequests.Store/DbConfiguration.cs
@@ -27,12 +27,11 @@
 using System;
 using System.Data;
 using System.IO;
+using System.Windows.Forms;
 
 using Mono.Data.Sqlite;
 
 using NLog;
-using PlexRequests.Helpers;
-using PlexRequests.Store.Repository;
 
 namespace PlexRequests.Store
 {
@@ -44,12 +43,14 @@ namespace PlexRequests.Store
             Factory = provider;
         }
 
-        private SqliteFactory Factory { get; set; }
+        private SqliteFactory Factory { get; }
+        private string CurrentPath =>Path.Combine(Path.GetDirectoryName(Application.ExecutablePath) ?? string.Empty, DbFile);
 
         public virtual bool CheckDb()
         {
             Log.Trace("Checking DB");
-            if (!File.Exists(DbFile))
+            Console.WriteLine(CurrentPath);
+            if (!File.Exists(CurrentPath))
             {
                 Log.Trace("DB doesn't exist, creating a new one");
                 CreateDatabase();
@@ -59,7 +60,7 @@ namespace PlexRequests.Store
         }
 
         public string DbFile = "PlexRequests.sqlite";
-        
+
         /// <summary>
         /// Gets the database connection.
         /// </summary>
@@ -72,7 +73,7 @@ namespace PlexRequests.Store
             {
                 throw new SqliteException("Factory returned null");
             }
-            fact.ConnectionString = "Data Source=" + DbFile;
+            fact.ConnectionString = "Data Source=" + CurrentPath;
             return fact;
         }
 
@@ -83,7 +84,7 @@ namespace PlexRequests.Store
         {
             try
             {
-                using (File.Create(DbFile))
+                using (File.Create(CurrentPath))
                 {
                 }
             }
diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/PlexRequests.Store.csproj
index 2175ebc06..a896a0ee6 100644
--- a/PlexRequests.Store/PlexRequests.Store.csproj
+++ b/PlexRequests.Store/PlexRequests.Store.csproj
@@ -52,6 +52,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index e65ea82bd..79d884d99 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -79,7 +79,6 @@ namespace PlexRequests.UI
             container.Register<ISettingsService<HeadphonesSettings>, SettingsServiceV2<HeadphonesSettings>>();
 
             // Repo's
-            container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
             container.Register<IRepository<LogEntity>, GenericRepository<LogEntity>>();
             container.Register<IRequestService, JsonRequestService>();
             container.Register<ISettingsRepository, SettingsJsonRepository>();
@@ -102,13 +101,13 @@ namespace PlexRequests.UI
 
             SubscribeAllObservers(container);
             base.ConfigureRequestContainer(container, context);
-        }
 
-        protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
-        {
             TaskManager.TaskFactory = new PlexTaskFactory();
             TaskManager.Initialize(new PlexRegistry());
+        }
 
+        protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines)
+        {
             CookieBasedSessions.Enable(pipelines, CryptographyConfiguration.Default);
 
             StaticConfiguration.DisableErrorTraces = false;
@@ -128,7 +127,7 @@ namespace PlexRequests.UI
                  (sender, certificate, chain, sslPolicyErrors) => true;
 
         }
-
+        
 
         protected override DiagnosticsConfiguration DiagnosticsConfiguration => new DiagnosticsConfiguration { Password = @"password" };
 
diff --git a/PlexRequests.UI/Jobs/PlexTaskFactory.cs b/PlexRequests.UI/Jobs/PlexTaskFactory.cs
index e2e51e637..5f5b88b89 100644
--- a/PlexRequests.UI/Jobs/PlexTaskFactory.cs
+++ b/PlexRequests.UI/Jobs/PlexTaskFactory.cs
@@ -12,12 +12,12 @@ namespace PlexRequests.UI.Jobs
             //typeof(AvailabilityUpdateService);
             var container = TinyIoCContainer.Current;
 
-            var a= container.ResolveAll(typeof(T));
+            var a= container.Resolve(typeof(T));
 
             object outT;
             container.TryResolve(typeof(T), out outT);
 
-            return (T)outT;
+            return (T)a;
         }
     }
 }
\ No newline at end of file

From 453b3f237faf07c43a431695e99a6c325d309b4c Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 14:27:23 +0100
Subject: [PATCH 22/57] Specify a protocol type of TLS12. Looks like CP doesn't
 seem to like SSL3 (it is quite old now so understandable) #119

---
 PlexRequests.UI/Bootstrapper.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 79d884d99..940226674 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -123,6 +123,7 @@ namespace PlexRequests.UI
 
             FormsAuthentication.Enable(pipelines, formsAuthConfiguration);
 
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
             ServicePointManager.ServerCertificateValidationCallback +=
                  (sender, certificate, chain, sslPolicyErrors) => true;
 

From 0429530bf38c00e6396b99f77bc27958842da743 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Tue, 29 Mar 2016 14:31:39 +0100
Subject: [PATCH 23/57] Mono doesn't seem to have Tls1.2. Let's try TLS 1 #119

---
 PlexRequests.UI/Bootstrapper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index 940226674..dd1daaec0 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -123,7 +123,7 @@ namespace PlexRequests.UI
 
             FormsAuthentication.Enable(pipelines, formsAuthConfiguration);
 
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls;
             ServicePointManager.ServerCertificateValidationCallback +=
                  (sender, certificate, chain, sslPolicyErrors) => true;
 

From 591385ae3439465246d5d60ff797546b0a6b8e31 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 10:11:06 -0500
Subject: [PATCH 24/57] when pulling requests, set each to approved that is
 already available (so the UI avoids showing the approve option for already
 available content)

---
 PlexRequests.UI/Modules/RequestsModule.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index b49acd013..d6f565f27 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -99,7 +99,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
                 RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Approved,
+                Approved = movie.Available ? true : movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
                 RequestedBy = movie.RequestedBy,
@@ -136,7 +136,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
                 RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Approved,
+                Approved = tv.Available ? true : tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
                 RequestedBy = tv.RequestedBy,

From 6fc4cbf9a4930bedc6400849f232370e21df4a1d Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 10:54:15 -0500
Subject: [PATCH 25/57] fix the request page sort/approve button alignment

---
 PlexRequests.UI/Modules/RequestsModule.cs   |  4 +-
 PlexRequests.UI/Views/Requests/Index.cshtml | 80 +++++++++++----------
 2 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index d6f565f27..6651b1c8a 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -99,7 +99,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = movie.ReleaseDate.Ticks,
                 RequestedDate = movie.RequestedDate.Humanize(),
                 RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Available ? true : movie.Approved,
+                Approved = movie.Available || movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
                 RequestedBy = movie.RequestedBy,
@@ -136,7 +136,7 @@ namespace PlexRequests.UI.Modules
                 ReleaseDateTicks = tv.ReleaseDate.Ticks,
                 RequestedDate = tv.RequestedDate.Humanize(),
                 RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Available ? true : tv.Approved,
+                Approved = tv.Available || tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
                 RequestedBy = tv.RequestedBy,
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index c641126bb..11d8dd33e 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -20,43 +20,49 @@
 
     <!-- Tab panes -->
     <div class="tab-content contentList">
-        <div class="btn-group col-sm-push-8">
-            @if (Context.CurrentUser.IsAuthenticated())
-            {
-                @if (Model.SearchForMovies)
-                {
-                    <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
-                }
-                @if (Model.SearchForTvShows)
-                {
-                    <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
-                }
-            }
-        </div>
-        <div class="btn-group col-sm-push-8">
-            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                Filter
-                <i class="fa fa-filter"></i>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
-                <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
-                <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
-            </ul>
-        </div>
-        <div class="btn-group col-sm-push-8">
-            <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                Order
-                <i class="fa fa-sort"></i>
-            </a>
-            <ul class="dropdown-menu">
-                <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
-                <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
-                <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
-            </ul>
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="pull-right">
+                    <div class="btn-group">
+                        @if (Context.CurrentUser.IsAuthenticated())
+                        {
+                            @if (Model.SearchForMovies)
+                            {
+                                <button id="approveMovies" class="btn btn-success-outline approve-category" type="submit"><i class="fa fa-plus"></i> Approve Movies</button>
+                            }
+                            @if (Model.SearchForTvShows)
+                            {
+                                <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
+                            }
+                        }
+                    </div>
+                    <div class="btn-group">
+                        <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            Filter
+                            <i class="fa fa-filter"></i>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
+                            <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
+                            <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
+                            <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
+                            <li><a href="#" class="filter" data-filter=".available-false"><i class="fa fa-square-o"></i>  Not Available</a></li>
+                        </ul>
+                    </div>
+                    <div class="btn-group">
+                        <a href="#" class="btn btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            Order
+                            <i class="fa fa-sort"></i>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
         </div>
         @if (Model.SearchForMovies)
             {

From 5a5512a1cd34aad163201a82be3db89e3bfe193e Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 11:38:22 -0500
Subject: [PATCH 26/57] #96 fix up notification test feature

---
 PlexRequests.UI/Modules/AdminModule.cs | 51 +++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index df9bfef0d..87bc29da9 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -397,8 +397,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent email notification test");
+            try
+            {
+                NotificationService.Subscribe(new EmailMessageNotification(EmailService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent email notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Email Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
+            } 
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
         }
 
@@ -483,8 +496,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent pushbullet notification test");
+            try
+            {
+                NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent pushbullet notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Pushbullet Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
+            }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushbullet Notification!" });
         }
 
@@ -533,8 +559,21 @@ namespace PlexRequests.UI.Modules
                 NotificationType = NotificationType.Test,
                 DateTime = DateTime.Now
             };
-            NotificationService.Publish(notificationModel, settings);
-            Log.Info("Sent pushover notification test");
+            try
+            {
+                NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
+                settings.Enabled = true;
+                NotificationService.Publish(notificationModel, settings);
+                Log.Info("Sent pushover notification test");
+            }
+            catch (Exception)
+            {
+                Log.Error("Failed to subscribe and publish test Pushover Notification");
+            }
+            finally
+            {
+                NotificationService.UnSubscribe(new PushoverNotification(PushoverApi, PushoverService));
+            }
             return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Pushover Notification!" });
         }
 

From b8a01b62b9ece14402b1c0071655a023a5c6e916 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 13:41:39 -0500
Subject: [PATCH 27/57] only show requested by users to admins + start
 maintaining a list of users with each request

---
 PlexRequests.Core/IRequestService.cs        |  2 +-
 PlexRequests.Core/JsonRequestService.cs     |  5 +--
 PlexRequests.Store/RequestedModel.cs        | 16 +++++++++
 PlexRequests.UI/Content/requests.js         |  2 +-
 PlexRequests.UI/Models/RequestViewModel.cs  |  2 +-
 PlexRequests.UI/Modules/RequestsModule.cs   |  8 ++---
 PlexRequests.UI/Modules/SearchModule.cs     | 37 +++++++++++++++------
 PlexRequests.UI/Views/Requests/Index.cshtml |  2 +-
 8 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs
index fb68fab37..fc5187aed 100644
--- a/PlexRequests.Core/IRequestService.cs
+++ b/PlexRequests.Core/IRequestService.cs
@@ -33,7 +33,7 @@ namespace PlexRequests.Core
     public interface IRequestService
     {
         long AddRequest(RequestedModel model);
-        bool CheckRequest(int providerId);
+        RequestedModel CheckRequest(int providerId);
         void DeleteRequest(RequestedModel request);
         bool UpdateRequest(RequestedModel model);
         RequestedModel Get(int id);
diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 64033b50c..45eccb51e 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -58,10 +58,11 @@ namespace PlexRequests.Core
             return result ? id : -1;
         }
 
-        public bool CheckRequest(int providerId)
+        public RequestedModel CheckRequest(int providerId)
         {
             var blobs = Repo.GetAll();
-            return blobs.Any(x => x.ProviderId == providerId);
+            var blob = blobs.FirstOrDefault(x => x.ProviderId == providerId);
+            return blob != null ? ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content) : null;
         }
 
         public void DeleteRequest(RequestedModel request)
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 18ef216af..34a9f181c 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -2,6 +2,8 @@
 using System.Security.Cryptography;
 
 using Dapper.Contrib.Extensions;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace PlexRequests.Store
 {
@@ -18,7 +20,10 @@ namespace PlexRequests.Store
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
+
+        [Obsolete("Use RequestedUsers")]
         public string RequestedBy { get; set; }
+
         public DateTime RequestedDate { get; set; }
         public bool Available { get; set; }
         public IssueState Issues { get; set; }
@@ -27,6 +32,17 @@ namespace PlexRequests.Store
         public int[] SeasonList { get; set; }
         public int SeasonCount { get; set; }
         public string SeasonsRequested { get; set; }
+        public List<string> RequestedUsers { get; set; }
+
+        public bool UserHasRequested(string username)
+        {
+            bool alreadyRequested = !string.IsNullOrEmpty(RequestedBy) && RequestedBy.Equals(username, StringComparison.OrdinalIgnoreCase);
+            if (!alreadyRequested && RequestedUsers != null && RequestedUsers.Count > 0)
+            {
+                alreadyRequested = RequestedUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase)); 
+            }
+            return alreadyRequested;
+        }
     }
 
     public enum RequestType
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 22fba0978..6b6d00572 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -433,7 +433,7 @@ function buildRequestContext(result, type) {
         releaseDate: result.releaseDate,
         releaseDateTicks: result.releaseDateTicks,
         approved: result.approved,
-        requestedBy: result.requestedBy,
+        requestedUsers: result.requestedUsers ? result.requestedUsers.join(', ') : '',
         requestedDate: result.requestedDate,
         requestedDateTicks: result.requestedDateTicks,
         available: result.available,
diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs
index 5ee389be9..292bc39df 100644
--- a/PlexRequests.UI/Models/RequestViewModel.cs
+++ b/PlexRequests.UI/Models/RequestViewModel.cs
@@ -41,7 +41,7 @@ namespace PlexRequests.UI.Models
         public RequestType Type { get; set; }
         public string Status { get; set; }
         public bool Approved { get; set; }
-        public string RequestedBy { get; set; }
+        public string[] RequestedUsers { get; set; }
         public string RequestedDate { get; set; }
         public long RequestedDateTicks { get; set; }
         public string ReleaseYear { get; set; }
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 6651b1c8a..9d43b34a7 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -84,7 +84,7 @@ namespace PlexRequests.UI.Modules
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbMovies = dbMovies.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+                dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
             var viewModel = dbMovies.Select(movie => new RequestViewModel
@@ -102,7 +102,7 @@ namespace PlexRequests.UI.Modules
                 Approved = movie.Available || movie.Approved,
                 Title = movie.Title,
                 Overview = movie.Overview,
-                RequestedBy = movie.RequestedBy,
+                RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
                 ReleaseYear = movie.ReleaseDate.Year.ToString(),
                 Available = movie.Available,
                 Admin = isAdmin,
@@ -121,7 +121,7 @@ namespace PlexRequests.UI.Modules
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbTv = dbTv.Where(x => x.RequestedBy.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase));
+                dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
             var viewModel = dbTv.Select(tv => new RequestViewModel
@@ -139,7 +139,7 @@ namespace PlexRequests.UI.Modules
                 Approved = tv.Available || tv.Approved,
                 Title = tv.Title,
                 Overview = tv.Overview,
-                RequestedBy = tv.RequestedBy,
+                RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
                 ReleaseYear = tv.ReleaseDate.Year.ToString(),
                 Available = tv.Available,
                 Admin = isAdmin,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index a57bd307b..59614a0c2 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -179,11 +179,20 @@ namespace PlexRequests.UI.Modules
             Log.Trace(movieInfo.DumpJson);
             //#if !DEBUG
 
+            var settings = PrService.GetSettings();
+
+            // check if the movie has already been requested
             Log.Info("Requesting movie with id {0}", movieId);
-            if (RequestService.CheckRequest(movieId))
+            var existingRequest = RequestService.CheckRequest(movieId);
+            if (existingRequest != null)
             {
-                Log.Trace("movie with id {0} exists", movieId);
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullMovieName} has already been requested!" });
+                // check if the current user is already marked as a requester for this movie, if not, add them
+                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                {
+                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    RequestService.UpdateRequest(existingRequest);
+                }
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
             }
 
             Log.Debug("movie with id {0} doesnt exists", movieId);
@@ -213,12 +222,10 @@ namespace PlexRequests.UI.Modules
                 Status = movieInfo.Status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedBy = Session[SessionKeys.UsernameKey].ToString(),
+                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
                 Issues = IssueState.None,
             };
 
-
-            var settings = PrService.GetSettings();
             Log.Trace(settings.DumpJson());
             if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
@@ -310,9 +317,20 @@ namespace PlexRequests.UI.Modules
             string fullShowName = $"{showInfo.name} ({firstAir.Year})";
             //#if !DEBUG
 
-            if (RequestService.CheckRequest(showId))
+            var settings = PrService.GetSettings();
+
+            // check if the show has already been requested
+            Log.Info("Requesting tv show with id {0}", showId);
+            var existingRequest = RequestService.CheckRequest(showId);
+            if (existingRequest != null)
             {
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullShowName} has already been requested!" });
+                // check if the current user is already marked as a requester for this show, if not, add them
+                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                {
+                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    RequestService.UpdateRequest(existingRequest);
+                }
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
             }
 
             try
@@ -340,7 +358,7 @@ namespace PlexRequests.UI.Modules
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedBy = Session[SessionKeys.UsernameKey].ToString(),
+                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
                 Issues = IssueState.None,
                 ImdbId = showInfo.externals?.imdb ?? string.Empty,
                 SeasonCount = showInfo.seasonCount
@@ -363,7 +381,6 @@ namespace PlexRequests.UI.Modules
 
             model.SeasonList = seasonsList.ToArray();
 
-            var settings = PrService.GetSettings();
             if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 11d8dd33e..a206b383c 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -140,7 +140,7 @@
                 {{#if_eq type "tv"}}
                 <div>Series Requested: {{seriesRequested}}</div>
                 {{/if_eq}}
-                <div>Requested By: {{requestedBy}}</div>
+                <div>Requested By: {{requestedUsers}}</div>
                 <div>Requested Date: {{requestedDate}}</div>
                 <div id="issueArea{{requestId}}">
                     {{#if otherMessage}}

From cee7bee0249cf1bff71923a0ee611f09c02ea959 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Tue, 29 Mar 2016 13:52:44 -0500
Subject: [PATCH 28/57] show the requested by user from legacy request models

---
 PlexRequests.UI/Modules/RequestsModule.cs | 102 ++++++++++++----------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 9d43b34a7..f1cda331f 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -87,28 +87,34 @@ namespace PlexRequests.UI.Modules
                 dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
-            var viewModel = dbMovies.Select(movie => new RequestViewModel
-            {
-                ProviderId = movie.ProviderId,
-                Type = movie.Type,
-                Status = movie.Status,
-                ImdbId = movie.ImdbId,
-                Id = movie.Id,
-                PosterPath = movie.PosterPath,
-                ReleaseDate = movie.ReleaseDate.Humanize(),
-                ReleaseDateTicks = movie.ReleaseDate.Ticks,
-                RequestedDate = movie.RequestedDate.Humanize(),
-                RequestedDateTicks = movie.RequestedDate.Ticks,
-                Approved = movie.Available || movie.Approved,
-                Title = movie.Title,
-                Overview = movie.Overview,
-                RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
-                ReleaseYear = movie.ReleaseDate.Year.ToString(),
-                Available = movie.Available,
-                Admin = isAdmin,
-                Issues = movie.Issues.Humanize(LetterCasing.Title),
-                OtherMessage = movie.OtherMessage,
-                AdminNotes = movie.AdminNote
+            var viewModel = dbMovies.Select(movie => {
+                if (!string.IsNullOrEmpty(movie.RequestedBy) && !movie.RequestedUsers.Any(x => x.Equals(movie.RequestedBy, StringComparison.OrdinalIgnoreCase)))
+                {
+                    movie.RequestedUsers.Add(movie.RequestedBy);
+                }
+                return new RequestViewModel
+                {
+                    ProviderId = movie.ProviderId,
+                    Type = movie.Type,
+                    Status = movie.Status,
+                    ImdbId = movie.ImdbId,
+                    Id = movie.Id,
+                    PosterPath = movie.PosterPath,
+                    ReleaseDate = movie.ReleaseDate.Humanize(),
+                    ReleaseDateTicks = movie.ReleaseDate.Ticks,
+                    RequestedDate = movie.RequestedDate.Humanize(),
+                    RequestedDateTicks = movie.RequestedDate.Ticks,
+                    Approved = movie.Available || movie.Approved,
+                    Title = movie.Title,
+                    Overview = movie.Overview,
+                    RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
+                    ReleaseYear = movie.ReleaseDate.Year.ToString(),
+                    Available = movie.Available,
+                    Admin = isAdmin,
+                    Issues = movie.Issues.Humanize(LetterCasing.Title),
+                    OtherMessage = movie.OtherMessage,
+                    AdminNotes = movie.AdminNote
+                };
             }).ToList();
 
             return Response.AsJson(viewModel);
@@ -124,29 +130,35 @@ namespace PlexRequests.UI.Modules
                 dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
             }
 
-            var viewModel = dbTv.Select(tv => new RequestViewModel
-            {
-                ProviderId = tv.ProviderId,
-                Type = tv.Type,
-                Status = tv.Status,
-                ImdbId = tv.ImdbId,
-                Id = tv.Id,
-                PosterPath = tv.PosterPath,
-                ReleaseDate = tv.ReleaseDate.Humanize(),
-                ReleaseDateTicks = tv.ReleaseDate.Ticks,
-                RequestedDate = tv.RequestedDate.Humanize(),
-                RequestedDateTicks = tv.RequestedDate.Ticks,
-                Approved = tv.Available || tv.Approved,
-                Title = tv.Title,
-                Overview = tv.Overview,
-                RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
-                ReleaseYear = tv.ReleaseDate.Year.ToString(),
-                Available = tv.Available,
-                Admin = isAdmin,
-                Issues = tv.Issues.Humanize(LetterCasing.Title),
-                OtherMessage = tv.OtherMessage,
-                AdminNotes = tv.AdminNote,
-                TvSeriesRequestType = tv.SeasonsRequested
+            var viewModel = dbTv.Select(tv => {
+                if (!string.IsNullOrEmpty(tv.RequestedBy) && !tv.RequestedUsers.Any(x => x.Equals(tv.RequestedBy, StringComparison.OrdinalIgnoreCase)))
+                {
+                    tv.RequestedUsers.Add(tv.RequestedBy);
+                }
+                return new RequestViewModel
+                {
+                    ProviderId = tv.ProviderId,
+                    Type = tv.Type,
+                    Status = tv.Status,
+                    ImdbId = tv.ImdbId,
+                    Id = tv.Id,
+                    PosterPath = tv.PosterPath,
+                    ReleaseDate = tv.ReleaseDate.Humanize(),
+                    ReleaseDateTicks = tv.ReleaseDate.Ticks,
+                    RequestedDate = tv.RequestedDate.Humanize(),
+                    RequestedDateTicks = tv.RequestedDate.Ticks,
+                    Approved = tv.Available || tv.Approved,
+                    Title = tv.Title,
+                    Overview = tv.Overview,
+                    RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
+                    ReleaseYear = tv.ReleaseDate.Year.ToString(),
+                    Available = tv.Available,
+                    Admin = isAdmin,
+                    Issues = tv.Issues.Humanize(LetterCasing.Title),
+                    OtherMessage = tv.OtherMessage,
+                    AdminNotes = tv.AdminNote,
+                    TvSeriesRequestType = tv.SeasonsRequested
+                };
             }).ToList();
 
             return Response.AsJson(viewModel);

From f7c33d48f4ab9856a951dbb497edca95fb7c35df Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Wed, 30 Mar 2016 13:59:13 +0100
Subject: [PATCH 29/57] Added a scroll to the top thingy and a bit more work on
 headphones

---
 .../SettingModels/HeadphonesSettings.cs       |  2 +-
 .../SettingModels/PlexRequestSettings.cs      |  2 +
 PlexRequests.Store/RequestedModel.cs          |  3 +-
 PlexRequests.UI/Content/custom.css            | 36 ++++++++++++++++
 PlexRequests.UI/Content/custom.min.css        |  2 +-
 PlexRequests.UI/Content/custom.scss           | 43 ++++++++++++++++++-
 PlexRequests.UI/Modules/AdminModule.cs        | 10 ++---
 PlexRequests.UI/Modules/UserLoginModule.cs    |  2 +-
 PlexRequests.UI/Program.cs                    |  2 +-
 PlexRequests.UI/Views/Admin/Settings.cshtml   | 29 +++++++++++++
 PlexRequests.UI/Views/Shared/_Layout.cshtml   | 33 +++++++++++++-
 11 files changed, 151 insertions(+), 13 deletions(-)

diff --git a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
index 0da4971d7..e77abca47 100644
--- a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
+++ b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
@@ -33,7 +33,7 @@ namespace PlexRequests.Core.SettingModels
 {
     public class HeadphonesSettings : Settings
     {
-        public string Enabled { get; set; }
+        public bool Enabled { get; set; }
         public string Ip { get; set; }
         public int Port { get; set; }
         public int ApiKey { get; set; }
diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 51a6413fd..9c2811d0d 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -32,8 +32,10 @@ namespace PlexRequests.Core.SettingModels
        
         public bool SearchForMovies { get; set; }
         public bool SearchForTvShows { get; set; }
+        public bool SearchForMusic { get; set; }
         public bool RequireMovieApproval { get; set; }
         public bool RequireTvShowApproval { get; set; }
+        public bool RequireMusicApproval { get; set; }
         public int WeeklyRequestLimit { get; set; }
     }
 }
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 18ef216af..836a2abfa 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -32,7 +32,8 @@ namespace PlexRequests.Store
     public enum RequestType
     {
         Movie,
-        TvShow
+        TvShow,
+        Album
     }
 
     public enum IssueState
diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index a517cc508..b7f9c9f33 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -126,3 +126,39 @@ label {
 #tvList .mix {
   display: none; }
 
+.scroll-top-wrapper {
+  position: fixed;
+  opacity: 0;
+  visibility: hidden;
+  overflow: hidden;
+  text-align: center;
+  z-index: 99999999;
+  background-color: #4e5d6c;
+  color: #eeeeee;
+  width: 50px;
+  height: 48px;
+  line-height: 48px;
+  right: 30px;
+  bottom: 30px;
+  padding-top: 2px;
+  border-top-left-radius: 10px;
+  border-top-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  border-bottom-left-radius: 10px;
+  -webkit-transition: all 0.5s ease-in-out;
+  -moz-transition: all 0.5s ease-in-out;
+  -ms-transition: all 0.5s ease-in-out;
+  -o-transition: all 0.5s ease-in-out;
+  transition: all 0.5s ease-in-out; }
+
+.scroll-top-wrapper:hover {
+  background-color: #637689; }
+
+.scroll-top-wrapper.show {
+  visibility: visible;
+  cursor: pointer;
+  opacity: 1.0; }
+
+.scroll-top-wrapper i.fa {
+  line-height: inherit; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 45dc19440..72cc0ebe2 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index df29fcfc8..2f6593c23 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -1,4 +1,5 @@
 $form-color: #4e5d6c;
+$form-color-lighter: #637689;
 $primary-colour: #df691a;
 $primary-colour-outline: #ff761b;
 $info-colour: #5bc0de;
@@ -161,4 +162,44 @@ label {
 }
 #tvList .mix{
 	display: none;
-}
\ No newline at end of file
+}
+
+$border-radius: 10px;
+
+.scroll-top-wrapper {
+    position: fixed;
+	opacity: 0;
+	visibility: hidden;
+	overflow: hidden;
+	text-align: center;
+	z-index: 99999999;
+    background-color: $form-color;
+	color: #eeeeee;
+	width: 50px;
+	height: 48px;
+	line-height: 48px;
+	right: 30px;
+	bottom: 30px;
+	padding-top: 2px;
+	border-top-left-radius: $border-radius;
+	border-top-right-radius: $border-radius;
+	border-bottom-right-radius: $border-radius;
+	border-bottom-left-radius: $border-radius;
+	-webkit-transition: all 0.5s ease-in-out;
+	-moz-transition: all 0.5s ease-in-out;
+	-ms-transition: all 0.5s ease-in-out;
+	-o-transition: all 0.5s ease-in-out;
+	transition: all 0.5s ease-in-out;
+}
+.scroll-top-wrapper:hover {
+	background-color: $form-color-lighter;
+}
+.scroll-top-wrapper.show {
+    visibility:visible;
+    cursor:pointer;
+	opacity: 1.0;
+}
+.scroll-top-wrapper i.fa {
+	line-height: inherit;
+}
+ 
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs
index e62b8b97b..9d5a21c99 100644
--- a/PlexRequests.UI/Modules/AdminModule.cs
+++ b/PlexRequests.UI/Modules/AdminModule.cs
@@ -58,7 +58,7 @@ namespace PlexRequests.UI.Modules
 {
     public class AdminModule : NancyModule
     {
-        private ISettingsService<PlexRequestSettings> RpService { get; }
+        private ISettingsService<PlexRequestSettings> PrService { get; }
         private ISettingsService<CouchPotatoSettings> CpService { get; }
         private ISettingsService<AuthenticationSettings> AuthService { get; }
         private ISettingsService<PlexSettings> PlexService { get; }
@@ -77,7 +77,7 @@ namespace PlexRequests.UI.Modules
         private INotificationService NotificationService { get; }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
-        public AdminModule(ISettingsService<PlexRequestSettings> rpService,
+        public AdminModule(ISettingsService<PlexRequestSettings> prService,
             ISettingsService<CouchPotatoSettings> cpService,
             ISettingsService<AuthenticationSettings> auth,
             ISettingsService<PlexSettings> plex,
@@ -95,7 +95,7 @@ namespace PlexRequests.UI.Modules
             INotificationService notify,
             ISettingsService<HeadphonesSettings> headphones) : base("admin")
         {
-            RpService = rpService;
+            PrService = prService;
             CpService = cpService;
             AuthService = auth;
             PlexService = plex;
@@ -182,7 +182,7 @@ namespace PlexRequests.UI.Modules
 
         private Negotiator Admin()
         {
-            var settings = RpService.GetSettings();
+            var settings = PrService.GetSettings();
             Log.Trace("Getting Settings:");
             Log.Trace(settings.DumpJson());
 
@@ -193,7 +193,7 @@ namespace PlexRequests.UI.Modules
         {
             var model = this.Bind<PlexRequestSettings>();
 
-            RpService.SaveSettings(model);
+            PrService.SaveSettings(model);
 
 
             return Context.GetRedirect("~/admin");
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index cfadd2b8f..bd6643071 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -170,7 +170,7 @@ namespace PlexRequests.UI.Modules
             var users = Api.GetUsers(authToken);
             Log.Debug("Plex Users: ");
             Log.Debug(users.DumpJson());
-            var allUsers = users.User?.Where(x => !string.IsNullOrEmpty(x.Username));
+            var allUsers = users?.User?.Where(x => !string.IsNullOrEmpty(x.Username));
             return allUsers != null && allUsers.Any(x => x.Username.Equals(username, StringComparison.CurrentCultureIgnoreCase));
         }
 
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index c8f863f40..5f07f7436 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -69,7 +69,7 @@ namespace PlexRequests.UI
             if (port == -1)
                 port = GetStartupPort();
 
-            var options = new StartOptions(Debugger.IsAttached ? $"http://localhost:{port}" : $"http://+:{port}")
+            var options = new StartOptions( $"http://+:{port}")
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml
index edbe6009c..a7ed52268 100644
--- a/PlexRequests.UI/Views/Admin/Settings.cshtml
+++ b/PlexRequests.UI/Views/Admin/Settings.cshtml
@@ -52,6 +52,20 @@
                     </label>
                 </div>
             </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.SearchForMusic)
+                        {
+                            <input type="checkbox" id="SearchForMusic" name="SearchForMusic" checked="checked"><text>Search for Music</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="SearchForMusic" name="SearchForMusic"><text>Search for Music</text>
+}
+                    </label>
+                </div>
+            </div>
             <div class="form-group">
                 <div class="checkbox">
                     <label>
@@ -82,7 +96,22 @@
 
                 </div>
             </div>
+            <div class="form-group">
+                <div class="checkbox">
+                    <label>
+                        @if (Model.RequireMusicApproval)
+                        {
+                            <input type="checkbox" id="RequireMusicApproval" name="RequireMusicApproval" checked="checked"><text>Require approval of Music requests</text>
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="RequireMusicApproval" name="RequireMusicApproval"><text>Require approval of Music requests</text>
+                        }
+                    </label>
 
+                </div>
+            </div>
+            
             @*<div class="form-group">
                 <label for="WeeklyRequestLimit" class="control-label">Weekly Request Limit</label>
                 <div>
diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml
index 5245bdbdd..6b133fb86 100644
--- a/PlexRequests.UI/Views/Shared/_Layout.cshtml
+++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml
@@ -87,8 +87,37 @@
         </div>
     </nav>
 
-    <div class="container">
-        @RenderBody()
+<div class="container">
+    @RenderBody()
+</div>
+    <div class="scroll-top-wrapper ">
+        <span class="scroll-top-inner">
+            <i class="fa fa-2x fa-arrow-circle-up"></i>
+        </span>
     </div>
 </body>
 </html>
+<script>
+
+    $(function () {
+
+        $(document).on('scroll', function () {
+
+            if ($(window).scrollTop() > 100) {
+                $('.scroll-top-wrapper').addClass('show');
+            } else {
+                $('.scroll-top-wrapper').removeClass('show');
+            }
+        });
+
+        $('.scroll-top-wrapper').on('click', scrollToTop);
+    });
+
+    function scrollToTop() {
+        verticalOffset = typeof (verticalOffset) != 'undefined' ? verticalOffset : 0;
+        element = $('body');
+        offset = element.offset();
+        offsetTop = offset.top;
+        $('html, body').animate({ scrollTop: offsetTop }, 500, 'linear');
+    }
+</script>
\ No newline at end of file

From a668ea04ecf2dbd73cccb7f7e06af9ff104001df Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 11:06:35 -0500
Subject: [PATCH 30/57] don't query the session as much in the modules, rely on
 a variable from the base class and store the username as needed

---
 PlexRequests.UI/Modules/BaseModule.cs     | 18 ++++++++++++++++--
 PlexRequests.UI/Modules/RequestsModule.cs |  8 ++++----
 PlexRequests.UI/Modules/SearchModule.cs   | 16 ++++++++--------
 PlexRequests.UI/Program.cs                |  2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs
index 67dc1b553..f34c46f17 100644
--- a/PlexRequests.UI/Modules/BaseModule.cs
+++ b/PlexRequests.UI/Modules/BaseModule.cs
@@ -33,16 +33,30 @@ namespace PlexRequests.UI.Modules
 {
     public class BaseModule : NancyModule
     {
+        private string _username;
+
+        protected string Username
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(_username))
+                {
+                    _username = Session[SessionKeys.UsernameKey].ToString();
+                }
+                return _username;
+            }
+        }
+
         public BaseModule()
         {
-            Before += (ctx)=> CheckAuth();
+            Before += (ctx) => CheckAuth();
         }
 
         public BaseModule(string modulePath) : base(modulePath)
         {
             Before += (ctx) => CheckAuth();
         }
-        
+
 
         private Response CheckAuth()
         {
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index b1bfd1dcf..631cfbfea 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -84,7 +84,7 @@ namespace PlexRequests.UI.Modules
             var dbMovies = Service.GetAll().Where(x => x.Type == RequestType.Movie);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbMovies = dbMovies.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
+                dbMovies = dbMovies.Where(x => x.UserHasRequested(Username));
             }
 
             var viewModel = dbMovies.Select(movie => {
@@ -127,7 +127,7 @@ namespace PlexRequests.UI.Modules
             var dbTv = Service.GetAll().Where(x => x.Type == RequestType.TvShow);
             if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
             {
-                dbTv = dbTv.Where(x => x.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()));
+                dbTv = dbTv.Where(x => x.UserHasRequested(Username));
             }
 
             var viewModel = dbTv.Select(tv => {
@@ -194,7 +194,7 @@ namespace PlexRequests.UI.Modules
             }
             originalRequest.Issues = issue;
             originalRequest.OtherMessage = !string.IsNullOrEmpty(comment)
-                ? $"{Session[SessionKeys.UsernameKey]} - {comment}"
+                ? $"{Username} - {comment}"
                 : string.Empty;
 
 
@@ -202,7 +202,7 @@ namespace PlexRequests.UI.Modules
 
             var model = new NotificationModel
             {
-                User = Session[SessionKeys.UsernameKey].ToString(),
+                User = Username,
                 NotificationType = NotificationType.Issue,
                 Title = originalRequest.Title,
                 DateTime = DateTime.Now,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 59614a0c2..6f566217a 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -187,9 +187,9 @@ namespace PlexRequests.UI.Modules
             if (existingRequest != null)
             {
                 // check if the current user is already marked as a requester for this movie, if not, add them
-                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                if (!existingRequest.UserHasRequested(Username))
                 {
-                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
@@ -222,12 +222,12 @@ namespace PlexRequests.UI.Modules
                 Status = movieInfo.Status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
+                RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
             };
 
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -325,9 +325,9 @@ namespace PlexRequests.UI.Modules
             if (existingRequest != null)
             {
                 // check if the current user is already marked as a requester for this show, if not, add them
-                if (!existingRequest.UserHasRequested(Session[SessionKeys.UsernameKey].ToString()))
+                if (!existingRequest.UserHasRequested(Username))
                 {
-                    existingRequest.RequestedUsers.Add(Session[SessionKeys.UsernameKey].ToString());
+                    existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
@@ -358,7 +358,7 @@ namespace PlexRequests.UI.Modules
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
                 Approved = false,
-                RequestedUsers = new List<string>() { Session[SessionKeys.UsernameKey].ToString() },
+                RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
                 ImdbId = showInfo.externals?.imdb ?? string.Empty,
                 SeasonCount = showInfo.seasonCount
@@ -381,7 +381,7 @@ namespace PlexRequests.UI.Modules
 
             model.SeasonList = seasonsList.ToArray();
 
-            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Session[SessionKeys.UsernameKey].ToString(), StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 5f07f7436..c8f863f40 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -69,7 +69,7 @@ namespace PlexRequests.UI
             if (port == -1)
                 port = GetStartupPort();
 
-            var options = new StartOptions( $"http://+:{port}")
+            var options = new StartOptions(Debugger.IsAttached ? $"http://localhost:{port}" : $"http://+:{port}")
             {
                 ServerFactory = "Microsoft.Owin.Host.HttpListener"
             };

From 1ca3e0532b6f2ed777431416e2b89095c468c9b4 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 13:59:03 -0500
Subject: [PATCH 31/57] add a better way to merge RequestedBy and
 RequestedUsers to avoid code duplication and simplify checks

---
 PlexRequests.Store/RequestedModel.cs      | 25 ++++++++++++++++++-----
 PlexRequests.UI/Modules/RequestsModule.cs | 13 ++----------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 839968cd0..81c087ae6 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -4,6 +4,7 @@ using System.Security.Cryptography;
 using Dapper.Contrib.Extensions;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 
 namespace PlexRequests.Store
 {
@@ -39,14 +40,28 @@ namespace PlexRequests.Store
         public string SeasonsRequested { get; set; }
         public List<string> RequestedUsers { get; set; }
 
-        public bool UserHasRequested(string username)
+        [JsonIgnore]
+        public List<string> AllUsers
         {
-            bool alreadyRequested = !string.IsNullOrEmpty(RequestedBy) && RequestedBy.Equals(username, StringComparison.OrdinalIgnoreCase);
-            if (!alreadyRequested && RequestedUsers != null && RequestedUsers.Count > 0)
+            get
             {
-                alreadyRequested = RequestedUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase)); 
+                var u = new List<string>();
+                if (!string.IsNullOrEmpty(RequestedBy))
+                {
+                    u.Add(RequestedBy);
+                }
+
+                if (RequestedUsers.Any())
+                {
+                    u.AddRange(RequestedUsers.Where(requestedUser => requestedUser != RequestedBy));
+                }
+                return u;
             }
-            return alreadyRequested;
+        }
+
+        public bool UserHasRequested(string username)
+        {
+            return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
         }
     }
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 631cfbfea..b52e81475 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -88,10 +88,6 @@ namespace PlexRequests.UI.Modules
             }
 
             var viewModel = dbMovies.Select(movie => {
-                if (!string.IsNullOrEmpty(movie.RequestedBy) && !movie.RequestedUsers.Any(x => x.Equals(movie.RequestedBy, StringComparison.OrdinalIgnoreCase)))
-                {
-                    movie.RequestedUsers.Add(movie.RequestedBy);
-                }
                 return new RequestViewModel
                 {
                     ProviderId = movie.ProviderId,
@@ -107,7 +103,7 @@ namespace PlexRequests.UI.Modules
                     Approved = movie.Available || movie.Approved,
                     Title = movie.Title,
                     Overview = movie.Overview,
-                    RequestedUsers = isAdmin ? movie.RequestedUsers.ToArray() : new string[] { },
+                    RequestedUsers = isAdmin ? movie.AllUsers.ToArray() : new string[] { },
                     ReleaseYear = movie.ReleaseDate.Year.ToString(),
                     Available = movie.Available,
                     Admin = isAdmin,
@@ -131,11 +127,6 @@ namespace PlexRequests.UI.Modules
             }
 
             var viewModel = dbTv.Select(tv => {
-                if (!string.IsNullOrEmpty(tv.RequestedBy) && 
-                    !tv.RequestedUsers.Any(x => x.Equals(tv.RequestedBy, StringComparison.OrdinalIgnoreCase)))
-                {
-                    tv.RequestedUsers.Add(tv.RequestedBy);
-                }
                 return new RequestViewModel
                 {
                     ProviderId = tv.ProviderId,
@@ -151,7 +142,7 @@ namespace PlexRequests.UI.Modules
                     Approved = tv.Available || tv.Approved,
                     Title = tv.Title,
                     Overview = tv.Overview,
-                    RequestedUsers = isAdmin ? tv.RequestedUsers.ToArray() : new string[] { },
+                    RequestedUsers = isAdmin ? tv.AllUsers.ToArray() : new string[] { },
                     ReleaseYear = tv.ReleaseDate.Year.ToString(),
                     Available = tv.Available,
                     Admin = isAdmin,

From 934425a0c5a94a87df485e2cc92ac9ef75f77f09 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 14:35:22 -0500
Subject: [PATCH 32/57] ignore items that are already available when approving
 in bulk, and simplify the checking + compile css

---
 PlexRequests.Store/RequestedModel.cs      | 9 +++++++++
 PlexRequests.UI/Content/custom.css        | 2 +-
 PlexRequests.UI/Content/custom.min.css    | 2 +-
 PlexRequests.UI/Modules/ApprovalModule.cs | 6 +++---
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index 81c087ae6..dcceeb1ab 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -59,6 +59,15 @@ namespace PlexRequests.Store
             }
         }
 
+        [JsonIgnore]
+        public bool CanApprove
+        {
+            get
+            {
+                return !Approved && !Available;
+            }
+        }
+
         public bool UserHasRequested(string username)
         {
             return AllUsers.Any(x => x.Equals(username, StringComparison.OrdinalIgnoreCase));
diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index b3b556265..3b8122ea7 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -186,4 +186,4 @@ label {
 .no-search-results .no-search-results-text {
   margin: 20px 0;
   color: #ccc; }
-
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 9e3d7e793..045ce1487 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs
index 9895b08d3..64d861c96 100644
--- a/PlexRequests.UI/Modules/ApprovalModule.cs
+++ b/PlexRequests.UI/Modules/ApprovalModule.cs
@@ -225,7 +225,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.Movie);
+            var requests = Service.GetAll().Where(x => x.CanApprove && x.Type == RequestType.Movie);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {
@@ -250,7 +250,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false && x.Type == RequestType.TvShow);
+            var requests = Service.GetAll().Where(x => x.CanApprove && x.Type == RequestType.TvShow);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {
@@ -279,7 +279,7 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
             }
 
-            var requests = Service.GetAll().Where(x => x.Approved == false);
+            var requests = Service.GetAll().Where(x => x.CanApprove);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())
             {

From 14d1d279bb15731f4b4f32a5735cfc1317e0f1d6 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Wed, 30 Mar 2016 17:38:09 -0500
Subject: [PATCH 33/57] show a "no requests yet" message on the requests page
 (for each cateogory)

---
 PlexRequests.UI/Content/requests.js | 32 ++++++++++++++++++++---------
 PlexRequests.UI/Content/site.js     | 12 ++++++++++-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 6b6d00572..d0b3873b6 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -9,6 +9,8 @@ var searchSource = $("#search-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
 var movieTimer = 0;
 var tvimer = 0;
+var noResultsHtml = "<div class='no-search-results'>" +
+    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, there are no {0} requests yet!</div></div>";
 var mixItUpDefault = {
     animation: { enable: true },
     load: {
@@ -393,11 +395,16 @@ function movieLoad() {
     $ml.html("");
 
     $.ajax("/requests/movies/").success(function (results) {
-        results.forEach(function (result) {
-            var context = buildRequestContext(result, "movie");
-            var html = searchTemplate(context);
-            $ml.append(html);
-        });
+        if (results.length > 0) {
+            results.forEach(function (result) {
+                var context = buildRequestContext(result, "movie");
+                var html = searchTemplate(context);
+                $ml.append(html);
+            });
+        }
+        else {
+            $ml.html(noResultsHtml.format("movie"));
+        }
         $ml.mixItUp(mixItUpConfig());
     });
 };
@@ -411,11 +418,16 @@ function tvLoad() {
     $tvl.html("");
 
     $.ajax("/requests/tvshows/").success(function (results) {
-        results.forEach(function (result) {
-            var context = buildRequestContext(result, "tv");
-            var html = searchTemplate(context);
-            $tvl.append(html);
-        });
+        if (results.length > 0) {
+            results.forEach(function (result) {
+                var context = buildRequestContext(result, "tv");
+                var html = searchTemplate(context);
+                $tvl.append(html);
+            });
+        }
+        else {
+            $tvl.html(noResultsHtml.format("tv show"));
+        }
         $tvl.mixItUp(mixItUpConfig());
     });
 };
diff --git a/PlexRequests.UI/Content/site.js b/PlexRequests.UI/Content/site.js
index f05ca73d6..698178126 100644
--- a/PlexRequests.UI/Content/site.js
+++ b/PlexRequests.UI/Content/site.js
@@ -1,4 +1,14 @@
-function generateNotify(message, type) {
+String.prototype.format = String.prototype.f = function () {
+    var s = this,
+        i = arguments.length;
+
+    while (i--) {
+        s = s.replace(new RegExp('\\{' + i + '\\}', 'gm'), arguments[i]);
+    }
+    return s;
+}
+
+function generateNotify(message, type) {
     // type = danger, warning, info, successs
     $.notify({
         // options

From 8256ceec2df297de5582e87d1d51aa2dc66c569b Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 08:55:21 +0100
Subject: [PATCH 34/57] We now do not show the text Requested By to the user,
 we also show a 'success' message instead of a warning when something has
 already been requested

---
 PlexRequests.UI/Modules/RequestsModule.cs   | 2 +-
 PlexRequests.UI/Modules/SearchModule.cs     | 4 ++--
 PlexRequests.UI/Views/Requests/Index.cshtml | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index b52e81475..193729ab8 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -109,7 +109,7 @@ namespace PlexRequests.UI.Modules
                     Admin = isAdmin,
                     Issues = movie.Issues.Humanize(LetterCasing.Title),
                     OtherMessage = movie.OtherMessage,
-                    AdminNotes = movie.AdminNote
+                    AdminNotes = movie.AdminNote,
                 };
             }).ToList();
 
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 6f566217a..3dbc24118 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -192,7 +192,7 @@ namespace PlexRequests.UI.Modules
                     existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
+                return Response.AsJson(new JsonResponseModel { Result = true, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
             }
 
             Log.Debug("movie with id {0} doesnt exists", movieId);
@@ -330,7 +330,7 @@ namespace PlexRequests.UI.Modules
                     existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
+                return Response.AsJson(new JsonResponseModel { Result = true, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullShowName} was successfully added!" : $"{fullShowName} has already been requested!" });
             }
 
             try
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index a206b383c..06c9fca95 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -140,7 +140,9 @@
                 {{#if_eq type "tv"}}
                 <div>Series Requested: {{seriesRequested}}</div>
                 {{/if_eq}}
+                {{#if requestedUsers}}
                 <div>Requested By: {{requestedUsers}}</div>
+                {{/if}}
                 <div>Requested Date: {{requestedDate}}</div>
                 <div id="issueArea{{requestId}}">
                     {{#if otherMessage}}

From 6334f5d880943e2baffcc5d14ab452a698797095 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 09:24:05 +0100
Subject: [PATCH 35/57] Added music to the search and requests page

---
 PlexRequests.UI/Views/Requests/Index.cshtml | 22 ++++++-
 PlexRequests.UI/Views/Search/Index.cshtml   | 63 ++++++++++++++++++++-
 2 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 06c9fca95..044d41d31 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -14,7 +14,10 @@
         {
             <li role="presentation"><a href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab">TV Shows</a></li>
         }
-
+        @if (Model.SearchForMusic)
+        {
+            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Music</a></li>
+        }
     </ul>
     <br />
 
@@ -34,6 +37,10 @@
                             {
                                 <button id="approveTVShows" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve TV Shows</button>
                             }
+                            @if (Model.SearchForMusic)
+                            {
+                                <button id="approveMusic" class="btn btn-success-outline approve-category" type="submit" style="display: none;"><i class="fa fa-plus"></i> Approve Music</button>
+                            }
                         }
                     </div>
                     <div class="btn-group">
@@ -90,6 +97,19 @@
                 </div>
             </div>
         }
+
+        @if (Model.SearchForMusic)
+            {
+            <!-- Music tab -->
+            <div role="tabpanel" class="tab-pane" id="MusicTab">
+
+                <br />
+                <br />
+                <!-- TV content -->
+                <div id="MusicList">
+                </div>
+            </div>
+        }
     </div>
 
 </div>
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 5006a58c2..641e0d2a6 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -12,6 +12,10 @@
         {
             <li role="presentation"><a href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab">TV Shows</a></li>
         }
+        @if (Model.SearchForMusic)
+        {
+            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Music</a></li>
+        }
 
     </ul>
 
@@ -53,11 +57,30 @@
                 </div>
             </div>
         }
+
+        @if (Model.SearchForMusic)
+        {
+            <!-- Music tab -->
+            <div role="tabpanel" class="tab-pane" id="MusicTab">
+                <div class="input-group">
+                    <input id="musicSearchContent" type="text" class="form-control form-control-custom">
+                    <div class="input-group-addon">
+                        <i id="musicSearchButton" class="fa fa-search"></i>
+                    </div>
+                </div>
+                <br />
+                <br />
+                <!-- Music content -->
+                <div id="musicList">
+                </div>
+            </div>
+        }
     </div>
 
 
 </div>
 
+<!-- Movie and TV Results template -->
 <script id="search-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">
@@ -90,7 +113,7 @@
         </div>
         <div class="col-sm-2 col-sm-push-3">
             <form method="POST" action="/search/request/{{type}}" id="form{{id}}">
-                <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />                
+                <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
                 {{#if_eq type "movie"}}
                 <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMovie" type="submit"><i class="fa fa-plus"></i> Request</button>
                 {{/if_eq}}
@@ -102,7 +125,7 @@
                     </button>
                     <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
                         <li><a id="{{id}}" season-select="0" class="dropdownTv " href="#">All Seasons</a></li>
-                        <li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">First Season</a></li> 
+                        <li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">First Season</a></li>
                         <li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">Latest Season</a></li>
                     </ul>
                 </div>
@@ -123,4 +146,40 @@
 </script>
 
 
+<!-- Music Results template -->
+<script id="music-template" type="text/x-handlebars-template">
+    <div class="row">
+        <div class="col-sm-2">
+
+            <img class="img-responsive" src="http://image.tmdb.org/t/p/w150/{{posterPath}}" alt="poster">
+
+            <img class="img-responsive" width="150" src="{{posterPath}}" alt="poster">
+
+        </div>
+        <div class="col-sm-5 ">
+            <div>
+
+                <a href="http://www.imdb.com/title/{{imdb}}/" target="_blank">
+                    <h4>{{title}} ({{year}})</h4>
+                </a>
+            </div>
+            <p>{{overview}}</p>
+        </div>
+        <div class="col-sm-2 col-sm-push-3">
+            <form method="POST" action="/search/request/{{type}}" id="form{{id}}">
+                <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
+
+                <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMovie" type="submit"><i class="fa fa-plus"></i> Request</button>
+
+                <br />
+                <br />
+                <br />
+            </form>
+        </div>
+
+    </div>
+    <hr />
+</script>
+
+
 <script src="/Content/search.js" type="text/javascript"></script>

From 64125cc44c692dbc7a220e3928359f2fc469e65d Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 10:23:17 +0100
Subject: [PATCH 36/57] First attempt at #123

Added a bunch of tracing and also some more error handling
---
 .../AvailabilityUpdateService.cs              |  7 ++-
 .../PlexAvailabilityChecker.cs                | 57 ++++++++++++++++---
 2 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/PlexRequests.Services/AvailabilityUpdateService.cs b/PlexRequests.Services/AvailabilityUpdateService.cs
index 0774307e6..19b23bbe0 100644
--- a/PlexRequests.Services/AvailabilityUpdateService.cs
+++ b/PlexRequests.Services/AvailabilityUpdateService.cs
@@ -48,9 +48,12 @@ namespace PlexRequests.Services
     {
         public AvailabilityUpdateService()
         {
+            var memCache = new MemoryCacheProvider();
+            var dbConfig = new DbConfiguration(new SqliteFactory());
+            var repo = new SettingsJsonRepository(dbConfig, memCache);
+
             ConfigurationReader = new ConfigurationReader();
-            var repo = new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider());
-            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new JsonRequestService(new RequestJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())), new PlexApi());
+            Checker = new PlexAvailabilityChecker(new SettingsServiceV2<PlexSettings>(repo), new SettingsServiceV2<AuthenticationSettings>(repo), new JsonRequestService(new RequestJsonRepository(dbConfig, memCache)), new PlexApi());
             HostingEnvironment.RegisterObject(this);
         }
 
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index 915cbda28..e7cf9812e 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -31,8 +31,10 @@ using System.Linq;
 using NLog;
 
 using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.Plex;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
 using PlexRequests.Helpers.Exceptions;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Store;
@@ -58,27 +60,66 @@ namespace PlexRequests.Services
 
         public void CheckAndUpdateAll(long check)
         {
+            Log.Trace("Getting the settings");
             var plexSettings = Plex.GetSettings();
             var authSettings = Auth.GetSettings();
+            Log.Trace("Getting all the requests");
             var requests = RequestService.GetAll();
 
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            Log.Trace("Requests Count {0}", requestedModels.Length);
+
             if (!ValidateSettings(plexSettings, authSettings) || !requestedModels.Any())
             {
+                Log.Info("Validation of the settings failed or there is no requests.");
                 return;
             }
 
             var modifiedModel = new List<RequestedModel>();
             foreach (var r in requestedModels)
             {
-                var results = PlexApi.SearchContent(authSettings.PlexAuthToken, r.Title, plexSettings.FullUri);
-                var result = results.Video.FirstOrDefault(x => x.Title == r.Title);
-                var originalRequest = RequestService.Get(r.Id);
+                Log.Trace("We are going to see if Plex has the following title: {0}", r.Title);
+                PlexSearch results;
+                try
+                {
+                    results = PlexApi.SearchContent(authSettings.PlexAuthToken, r.Title, plexSettings.FullUri);
+                }
+                catch (Exception e)
+                {
+                    Log.Error("We failed to search Plex for the following request:");
+                    Log.Error(r.DumpJson());
+                    Log.Error(e);
+                    break; // Let's finish processing and not crash the process, there is a reason why we cannot connect.
+                }
+
+                if (results == null)
+                {
+                    Log.Trace("Could not find any matching result for this title.");
+                    continue;
+                }
+
+                Log.Trace("Search results from Plex for the following request: {0}", r.Title);
+                Log.Trace(results.DumpJson());
+
+                var videoResult = results.Video.FirstOrDefault(x => x.Title == r.Title);
+                var directoryResult = results.Directory?.Title.Equals(r.Title, StringComparison.CurrentCultureIgnoreCase);
+
+                Log.Trace("The result from Plex where the title matches for the video : {0}", videoResult != null);
+                Log.Trace("The result from Plex where the title matches for the directory : {0}", directoryResult != null);
 
-                originalRequest.Available = result != null;
-                modifiedModel.Add(originalRequest);
+                if (videoResult != null || directoryResult != null)
+                {
+                    r.Available = true;
+                    modifiedModel.Add(r);
+                    continue;
+                }
+                
+                Log.Trace("The result from Plex where the title's match was null, so that means the content is not yet in Plex.");
             }
 
+            Log.Trace("Updating the requests now");
+            Log.Trace("Requests that will be updates:");
+            Log.Trace(modifiedModel.SelectMany(x => x.Title).DumpJson());
             RequestService.BatchUpdate(modifiedModel);
         }
 
@@ -91,24 +132,26 @@ namespace PlexRequests.Services
         /// <exception cref="ApplicationSettingsException">The settings are not configured for Plex or Authentication</exception>
         public bool IsAvailable(string title, string year)
         {
+            Log.Trace("Checking if the following {0} {1} is available in Plex", title, year);
             var plexSettings = Plex.GetSettings();
             var authSettings = Auth.GetSettings();
 
             if (!ValidateSettings(plexSettings, authSettings))
             {
+                Log.Warn("The settings are not configured");
                 throw new ApplicationSettingsException("The settings are not configured for Plex or Authentication");
             }
             var results = PlexApi.SearchContent(authSettings.PlexAuthToken, title, plexSettings.FullUri);
             if (!string.IsNullOrEmpty(year))
             {
                 var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase) && x.Year == year);
-                var directoryTitle = results.Directory?.Title == title && results.Directory?.Year == year;
+                var directoryTitle = string.Equals(results.Directory?.Title, title, StringComparison.CurrentCultureIgnoreCase) && results.Directory?.Year == year;
                 return result?.Title != null || directoryTitle;
             }
             else
             {
                 var result = results.Video?.FirstOrDefault(x => x.Title.Equals(title, StringComparison.InvariantCultureIgnoreCase));
-                var directoryTitle = results.Directory?.Title == title;
+                var directoryTitle = string.Equals(results.Directory?.Title, title, StringComparison.CurrentCultureIgnoreCase);
                 return result?.Title != null || directoryTitle;
             }
 

From d6763bf43503dfd40e635ec30bfe0510ee68576c Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 10:40:54 +0100
Subject: [PATCH 37/57] Added happy path tests for the Checker

---
 .../PlexAvailabilityCheckerTests.cs           | 102 +++++++++++++++++-
 .../PlexAvailabilityChecker.cs                |  10 +-
 2 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
index d9c3f1881..2fd0f4803 100644
--- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
+++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs
@@ -284,8 +284,7 @@ namespace PlexRequests.Services.Tests
 
 
         [Test]
-        [Ignore("Need to work out Plex Directory vs Video objects")]
-        public void CheckAndUpdateRequestsTest()
+        public void CheckAndUpdateRequestsThatDoNotExistInPlexTest()
         {
 
             var requests = new List<RequestedModel> {
@@ -315,7 +314,26 @@ namespace PlexRequests.Services.Tests
                 }
             };
 
-            var search = new PlexSearch { };
+            var search = new PlexSearch
+            {
+                Video = new List<Video>
+                {
+                    new Video
+                    {
+                        Title = "Title4",
+                        Year = "2012"
+                    },
+                    new Video
+                    {
+                        Title = "Title2",
+                    }
+                },
+                Directory = new Directory1
+                {
+                    Title = "Title9",
+                    Year = "1978"
+                }
+            };
 
             var settingsMock = new Mock<ISettingsService<PlexSettings>>();
             var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
@@ -324,14 +342,88 @@ namespace PlexRequests.Services.Tests
             settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "192.168.1.1" });
             authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
             requestMock.Setup(x => x.GetAll()).Returns(requests);
-
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(search);
             Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
 
             Checker.CheckAndUpdateAll(1);
 
             requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Never);
             requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
-            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Exactly(3));
+        }
+
+        [Test]
+        public void CheckAndUpdateRequestsAllRequestsTest()
+        {
+
+            var requests = new List<RequestedModel> {
+                new RequestedModel
+                {
+                    Id = 123,
+                    Title = "title1",
+                    Available = false,
+                },
+                new RequestedModel
+                {
+                    Id=222,
+                    Title = "title3",
+                    Available = false
+                },
+                new RequestedModel
+                {
+                    Id = 333,
+                    Title= "missingTitle",
+                    Available = false
+                },
+                new RequestedModel
+                {
+                    Id= 444,
+                    Title = "Hi",
+                    Available = false
+                }
+            };
+
+            var search = new PlexSearch
+            {
+                Video = new List<Video>
+                {
+                    new Video
+                    {
+                        Title = "title1",
+                        Year = "2012"
+                    },
+                    new Video
+                    {
+                        Title = "Title3",
+                    }
+                    ,
+                    new Video
+                    {
+                        Title = "Hi",
+                    }
+                },
+                Directory = new Directory1
+                {
+                    Title = "missingTitle",
+                    Year = "1978"
+                }
+            };
+
+            var settingsMock = new Mock<ISettingsService<PlexSettings>>();
+            var authMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            var requestMock = new Mock<IRequestService>();
+            var plexMock = new Mock<IPlexApi>();
+            settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "192.168.1.1" });
+            authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" });
+            requestMock.Setup(x => x.GetAll()).Returns(requests);
+            plexMock.Setup(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>())).Returns(search);
+            Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object);
+
+            Checker.CheckAndUpdateAll(1);
+
+            requestMock.Verify(x => x.BatchUpdate(It.IsAny<List<RequestedModel>>()), Times.Once);
+            requestMock.Verify(x => x.Get(It.IsAny<int>()), Times.Never);
+            plexMock.Verify(x => x.SearchContent(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<Uri>()), Times.Exactly(4));
         }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index e7cf9812e..3c74c37f2 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -66,7 +66,7 @@ namespace PlexRequests.Services
             Log.Trace("Getting all the requests");
             var requests = RequestService.GetAll();
 
-            var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
+            var requestedModels = requests as RequestedModel[] ?? requests.Where(x => !x.Available).ToArray();
             Log.Trace("Requests Count {0}", requestedModels.Length);
 
             if (!ValidateSettings(plexSettings, authSettings) || !requestedModels.Any())
@@ -107,7 +107,9 @@ namespace PlexRequests.Services
                 Log.Trace("The result from Plex where the title matches for the video : {0}", videoResult != null);
                 Log.Trace("The result from Plex where the title matches for the directory : {0}", directoryResult != null);
 
-                if (videoResult != null || directoryResult != null)
+                var directoryResultVal = directoryResult ?? false;
+
+                if (videoResult != null || directoryResultVal)
                 {
                     r.Available = true;
                     modifiedModel.Add(r);
@@ -120,7 +122,9 @@ namespace PlexRequests.Services
             Log.Trace("Updating the requests now");
             Log.Trace("Requests that will be updates:");
             Log.Trace(modifiedModel.SelectMany(x => x.Title).DumpJson());
-            RequestService.BatchUpdate(modifiedModel);
+
+            if(modifiedModel.Any())
+            { RequestService.BatchUpdate(modifiedModel);}
         }
 
         /// <summary>

From 1332cc6d4015bcba7b5c1f7fb89ae52011fb5366 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 13:15:11 +0100
Subject: [PATCH 38/57] Upped the time of #123

---
 PlexRequests.Services/PlexAvailabilityChecker.cs | 1 +
 PlexRequests.Services/UpdateInterval.cs          | 2 +-
 PlexRequests.Store/DbConfiguration.cs            | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs
index 3c74c37f2..a71b75251 100644
--- a/PlexRequests.Services/PlexAvailabilityChecker.cs
+++ b/PlexRequests.Services/PlexAvailabilityChecker.cs
@@ -60,6 +60,7 @@ namespace PlexRequests.Services
 
         public void CheckAndUpdateAll(long check)
         {
+            Log.Trace("This is check no. {0}", check);
             Log.Trace("Getting the settings");
             var plexSettings = Plex.GetSettings();
             var authSettings = Auth.GetSettings();
diff --git a/PlexRequests.Services/UpdateInterval.cs b/PlexRequests.Services/UpdateInterval.cs
index 876b9e379..92045563a 100644
--- a/PlexRequests.Services/UpdateInterval.cs
+++ b/PlexRequests.Services/UpdateInterval.cs
@@ -32,7 +32,7 @@ namespace PlexRequests.Services
 {
     public class UpdateInterval : IIntervals
     {
-        public TimeSpan Notification => TimeSpan.FromMinutes(5);
+        public TimeSpan Notification => TimeSpan.FromMinutes(10);
 
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Store/DbConfiguration.cs b/PlexRequests.Store/DbConfiguration.cs
index 467f01ab5..28cd9cb98 100644
--- a/PlexRequests.Store/DbConfiguration.cs
+++ b/PlexRequests.Store/DbConfiguration.cs
@@ -49,7 +49,7 @@ namespace PlexRequests.Store
         public virtual bool CheckDb()
         {
             Log.Trace("Checking DB");
-            Console.WriteLine(CurrentPath);
+            Console.WriteLine("Location of the database: {0}",CurrentPath);
             if (!File.Exists(CurrentPath))
             {
                 Log.Trace("DB doesn't exist, creating a new one");
@@ -90,7 +90,7 @@ namespace PlexRequests.Store
             }
             catch (Exception e)
             {
-                Console.WriteLine(e.Message);
+                Log.Error(e);
             }
         }
     }

From e9d0ccd5c0637649a7c68ae316e2886dbc39d0dc Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 13:51:15 +0100
Subject: [PATCH 39/57] Started adding the api part for headphones #32

---
 .../Music/HeadphonesAlbumSearchResult.cs      | 45 +++++++++
 .../Music/HeadphonesArtistSearchResult.cs     | 37 +++++++
 .../PlexRequests.Api.Models.csproj            |  2 +
 PlexRequests.Api/HeadphonesApi.cs             | 99 +++++++++++++++++++
 PlexRequests.Api/PlexRequests.Api.csproj      |  1 +
 5 files changed, 184 insertions(+)
 create mode 100644 PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs
 create mode 100644 PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs
 create mode 100644 PlexRequests.Api/HeadphonesApi.cs

diff --git a/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs b/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs
new file mode 100644
index 000000000..8aa4684c6
--- /dev/null
+++ b/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs
@@ -0,0 +1,45 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: HeadphonesAlbumSearchResult.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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
+namespace PlexRequests.Api.Models.Music
+{
+    public class HeadphonesAlbumSearchResult
+    {
+        public string rgid { get; set; }
+        public string albumurl { get; set; }
+        public string tracks { get; set; }
+        public string date { get; set; }
+        public string id { get; set; } // Artist ID
+        public string rgtype { get; set; }
+        public string title { get; set; }
+        public string url { get; set; }
+        public string country { get; set; }
+        public string albumid { get; set; } // AlbumId
+        public int score { get; set; }
+        public string uniquename { get; set; }
+        public string formats { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs b/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs
new file mode 100644
index 000000000..15c574277
--- /dev/null
+++ b/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs
@@ -0,0 +1,37 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: HeadphonesSearchResult.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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
+namespace PlexRequests.Api.Models.Music
+{
+    public class HeadphonesArtistSearchResult
+    {
+        public string url { get; set; } // MusicBrainz url
+        public int score { get; set; } // Search Match score?
+        public string name { get; set; } // Artist Name
+        public string uniquename { get; set; } // Artist Unique Name
+        public string id { get; set; } // Artist Unique ID for MusicBrainz
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index d67958e0d..35def3d76 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -48,6 +48,8 @@
     <Compile Include="Movie\CouchPotatoAdd.cs" />
     <Compile Include="Movie\CouchPotatoProfiles.cs" />
     <Compile Include="Movie\CouchPotatoStatus.cs" />
+    <Compile Include="Music\HeadphonesAlbumSearchResult.cs" />
+    <Compile Include="Music\HeadphonesArtistSearchResult.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
     <Compile Include="Notifications\PushoverResponse.cs" />
diff --git a/PlexRequests.Api/HeadphonesApi.cs b/PlexRequests.Api/HeadphonesApi.cs
new file mode 100644
index 000000000..d346ba846
--- /dev/null
+++ b/PlexRequests.Api/HeadphonesApi.cs
@@ -0,0 +1,99 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: CouchPotatoApi.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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.Collections.Generic;
+using System.Linq;
+
+using Newtonsoft.Json;
+
+using NLog;
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.Music;
+using PlexRequests.Api.Models.Sonarr;
+using PlexRequests.Helpers;
+
+using RestSharp;
+
+namespace PlexRequests.Api
+{
+    public class HeadphonesApi
+    {
+        public HeadphonesApi()
+        {
+            Api = new ApiRequest();
+        }
+        private ApiRequest Api { get; }
+        private static Logger Log = LogManager.GetCurrentClassLogger();
+
+        public List<HeadphonesAlbumSearchResult> SearchAlbum(string apiKey, Uri baseUrl, string searchTerm)
+        {
+            Log.Trace("Searching for album: {0}", searchTerm);
+            var request = new RestRequest
+            {
+                Resource = "/api?cmd=findAlbum&name={searchTerm}",
+                Method = Method.GET
+            };
+
+            request.AddQueryParameter("apikey", apiKey);
+            request.AddUrlSegment("searchTerm", searchTerm);
+
+            try
+            {
+                return Api.ExecuteJson<List<HeadphonesAlbumSearchResult>>(request, baseUrl);
+            }
+            catch (JsonSerializationException jse)
+            {
+                Log.Warn(jse);
+                return new List<HeadphonesAlbumSearchResult>(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
+            }
+        }
+
+        public bool AddAlbum(string apiKey, Uri baseUrl, string albumId)
+        {
+            Log.Trace("Adding album: {0}", albumId);
+            var request = new RestRequest
+            {
+                Resource = "/api?cmd=addAlbum&id={albumId}",
+                Method = Method.GET
+            };
+
+            request.AddQueryParameter("apikey", apiKey);
+            request.AddUrlSegment("albumId", albumId);
+
+            try
+            {
+                //var result = Api.Execute<string>(request, baseUrl);
+                return false;
+            }
+            catch (JsonSerializationException jse)
+            {
+                Log.Warn(jse);
+                return false; // If there is no matching result we do not get returned a JSON string, it just returns "false".
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 6422dfd6f..9484f59a3 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -75,6 +75,7 @@
     <Compile Include="PushoverApi.cs" />
     <Compile Include="PushbulletApi.cs" />
     <Compile Include="SickrageApi.cs" />
+    <Compile Include="HeadphonesApi.cs" />
     <Compile Include="SonarrApi.cs" />
     <Compile Include="CouchPotatoApi.cs" />
     <Compile Include="MovieBase.cs" />

From bd9022199f7cf07f19e6dc610c0a0e449ea5d62c Mon Sep 17 00:00:00 2001
From: Jamie <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 14:15:28 +0100
Subject: [PATCH 40/57] Update README.md

---
 README.md | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 01f89ee0d..23fd72bf2 100644
--- a/README.md
+++ b/README.md
@@ -10,19 +10,19 @@
 This is based off [Plex Requests by lokenx](https://github.com/lokenx/plexrequests-meteor) so big props to that guy!
 I wanted to write a similar application in .Net!
 
-#Features
+# Features
 
-* Integration with [TheMovieDB](https://www.themoviedb.org/) for all Movies
-* Integration with [TVMaze](www.tvmaze.com) for all TV shows!
-* Secure authentication
-* [Sonarr](https://sonarr.tv/) integration (SickRage/Sickbeard TBD)
-* [CouchPotato](https://couchpota.to/) integration
-* [SickRage](https://sickrage.github.io/) integration
-* Email notifications
-* Pushbullet notifications
-* Pushover notifications
+* Movie and TV Show searching, can't find something on Plex? Just request it! 
+* Notifications! Get notified via Email, Pushbullet and Pushover for new requests and issue reports!
+* Send your TV Shows to either [Sonarr](https://sonarr.tv/) or [SickRage](http://www.sickrage.ca/)!
+* Secure authentication so you don't have to worry about those script kiddies
+* We check to see if the request is already in Plex, if it's already in Plex then why you requesting it?!
+* We have allowed the ability for a user to add a custom note on a request
+* It automatically update the status of requests when they are available on Plex
+* Sick, responsive and mobile friendly UI
+* Headphones integration will be comming soon!
 
-#Preview
+# Preview (Needs updating)
 
 ![Preview](http://i.imgur.com/ucCFUvd.gif)
 
@@ -31,10 +31,10 @@ Download the latest [Release](https://github.com/tidusjar/PlexRequests.Net/relea
 Extract the .zip file (Unblock if on Windows! Right Click > Properties > Unblock).
 Just run `PlexRequests.exe`! (Mono compatible `mono PlexRequests.exe`)
 
-#Configuration
+# FAQ
+Do you have an issue or a question? if so check out our [FAQ!](https://github.com/tidusjar/PlexRequests.Net/wiki/FAQ)
 
-To configure PlexRequests you need to register an admin user by clicking on Admin (top left) and press the Register link.
-You will then have a admin menu option once registered where you can setup Sonarr, Couchpotato and any other settings.
+# Docker
 
 Looking for a Docker Image? Well [rogueosb](https://github.com/rogueosb/) has created a docker image for us, You can find it [here](https://github.com/rogueosb/docker-plexrequestsnet) :smile:
 
@@ -47,14 +47,6 @@ Please feed free to submit a pull request!
 # Donation
 If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
-###### A massive thanks to everyone below!
+## A massive thanks to everyone below for all their help!
 
-[heartisall](https://github.com/heartisall), [Stuke00](https://github.com/Stuke00), [shiitake](https://github.com/shiitake)
-
-
-# Sponsors
-- [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools!!!
-    - [ReSharper](http://www.jetbrains.com/resharper/) 
-    - [dotTrace] (https://www.jetbrains.com/profiler/) 
-    - [dotMemory] (https://www.jetbrains.com/dotmemory/) 
-    - [dotCover] (https://www.jetbrains.com/dotcover/) 
+[heartisall](https://github.com/heartisall), [Stuke00](https://github.com/Stuke00), [shiitake](https://github.com/shiitake), [Drewster727](https://github.com/Drewster727)

From 5d393c6ab413c306aae5433709d8b11f2a0a6801 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Thu, 31 Mar 2016 14:31:38 +0100
Subject: [PATCH 41/57] Added an issue template

---
 .github/ISSUE_TEMPLATE.md | 22 ++++++++++++++++++++++
 PlexRequests.sln          |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..aa693030a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,22 @@
+If this is a bug report please make sure you have filled the following in:
+(If it's not a bug and a feature request then just remove the below)
+
+#### Plex Requests.Net Version:
+
+
+#### Operating System:
+
+
+#### Mono Version:
+
+
+#### Applicable Logs (from `/logs/` directory or the Admin page):
+
+```
+Logs go here (Please make sure you remove any personal information from the logs)
+```
+
+
+#### Reproduction Steps:
+
+Please include any steps to reproduce the issue, this the request that is causing the problem etc.
\ No newline at end of file
diff --git a/PlexRequests.sln b/PlexRequests.sln
index 4cdca72cf..623a5a2e0 100644
--- a/PlexRequests.sln
+++ b/PlexRequests.sln
@@ -17,6 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
+		.github\ISSUE_TEMPLATE.md = .github\ISSUE_TEMPLATE.md
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection

From 1a2ec7ac7ffbc6abbefe244236b7bfd579e64599 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 08:59:54 -0500
Subject: [PATCH 42/57] #106 rename sorting options and polish the dropdown UI
 a bit

---
 PlexRequests.UI/Content/custom.css          |  6 +-
 PlexRequests.UI/Content/custom.min.css      |  2 +-
 PlexRequests.UI/Content/custom.scss         | 70 ++++++++++++---------
 PlexRequests.UI/Content/requests.js         |  4 +-
 PlexRequests.UI/Views/Requests/Index.cshtml | 10 +--
 5 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 3b8122ea7..65fb34ffb 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -47,13 +47,17 @@ label {
 .nav-tabs > li.active > a:focus {
   background: #4e5d6c; }
 
-.navbar .nav a .fa {
+.navbar .nav a .fa,
+.dropdown-menu a .fa {
   font-size: 130%;
   top: 1px;
   position: relative;
   display: inline-block;
   margin-right: 5px; }
 
+.dropdown-menu a .fa {
+  top: 2px; }
+
 .btn-danger-outline {
   color: #d9534f !important;
   background-color: transparent;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 045ce1487..41b7bf4c1 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 9b60351c7..c2c7a07ba 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -76,7 +76,8 @@ label {
     background: #4e5d6c;
 }
 
-.navbar .nav a .fa {
+.navbar .nav a .fa,
+.dropdown-menu a .fa {
     font-size: 130%;
     top: 1px;
     position: relative;
@@ -84,6 +85,10 @@ label {
     margin-right: 5px;
 }
 
+.dropdown-menu a .fa {
+    top: 2px;
+}
+
 .btn-danger-outline {
     color: $danger-colour $i;
     background-color: transparent;
@@ -176,52 +181,55 @@ label {
 }
 
 #movieList .mix {
-	display: none;
+    display: none;
 }
 
 #tvList .mix {
-	display: none;
+    display: none;
 }
 
 $border-radius: 10px;
 
 .scroll-top-wrapper {
     position: fixed;
-	opacity: 0;
-	visibility: hidden;
-	overflow: hidden;
-	text-align: center;
-	z-index: 99999999;
+    opacity: 0;
+    visibility: hidden;
+    overflow: hidden;
+    text-align: center;
+    z-index: 99999999;
     background-color: $form-color;
-	color: #eeeeee;
-	width: 50px;
-	height: 48px;
-	line-height: 48px;
-	right: 30px;
-	bottom: 30px;
-	padding-top: 2px;
-	border-top-left-radius: $border-radius;
-	border-top-right-radius: $border-radius;
-	border-bottom-right-radius: $border-radius;
-	border-bottom-left-radius: $border-radius;
-	-webkit-transition: all 0.5s ease-in-out;
-	-moz-transition: all 0.5s ease-in-out;
-	-ms-transition: all 0.5s ease-in-out;
-	-o-transition: all 0.5s ease-in-out;
-	transition: all 0.5s ease-in-out;
+    color: #eeeeee;
+    width: 50px;
+    height: 48px;
+    line-height: 48px;
+    right: 30px;
+    bottom: 30px;
+    padding-top: 2px;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
+    border-bottom-right-radius: $border-radius;
+    border-bottom-left-radius: $border-radius;
+    -webkit-transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.5s ease-in-out;
+    -ms-transition: all 0.5s ease-in-out;
+    -o-transition: all 0.5s ease-in-out;
+    transition: all 0.5s ease-in-out;
 }
+
 .scroll-top-wrapper:hover {
-	background-color: $form-color-lighter;
+    background-color: $form-color-lighter;
 }
+
 .scroll-top-wrapper.show {
-    visibility:visible;
-    cursor:pointer;
-	opacity: 1.0;
+    visibility: visible;
+    cursor: pointer;
+    opacity: 1.0;
 }
+
 .scroll-top-wrapper i.fa {
-	line-height: inherit;
+    line-height: inherit;
 }
- 
+
 
 .no-search-results {
     text-align: center;
@@ -235,4 +243,4 @@ $border-radius: 10px;
 .no-search-results .no-search-results-text {
     margin: 20px 0;
     color: #ccc;
-}
\ No newline at end of file
+}
diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index d0b3873b6..032da43b1 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -124,8 +124,8 @@ $('#approveTVShows').click(function (e) {
 // filtering/sorting
 $('.filter,.sort', '.dropdown-menu').click(function (e) {
     var $this = $(this);
-    $('.fa-square', $this.parents('.dropdown-menu:first')).removeClass('fa-square').addClass('fa-square-o');
-    $this.children('.fa').first().removeClass('fa-square-o').addClass('fa-square');
+    $('.fa-check-square', $this.parents('.dropdown-menu:first')).removeClass('fa-check-square').addClass('fa-square-o');
+    $this.children('.fa').first().removeClass('fa-square-o').addClass('fa-check-square');
 });
 
 
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 044d41d31..5f47fe7fb 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -49,7 +49,7 @@
                             <i class="fa fa-filter"></i>
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a href="#" class="filter" data-filter="all"><i class="fa fa-square"></i>  All</a></li>
+                            <li><a href="#" class="filter" data-filter="all"><i class="fa fa-check-square"></i>  All</a></li>
                             <li><a href="#" class="filter" data-filter=".approved-true"><i class="fa fa-square-o"></i>  Approved</a></li>
                             <li><a href="#" class="filter" data-filter=".approved-false"><i class="fa fa-square-o"></i>  Not Approved</a></li>
                             <li><a href="#" class="filter" data-filter=".available-true"><i class="fa fa-square-o"></i>  Available</a></li>
@@ -62,10 +62,10 @@
                             <i class="fa fa-sort"></i>
                         </a>
                         <ul class="dropdown-menu">
-                            <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-square"></i>  Recent Requests</a></li>
-                            <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Older Requests</a></li>
-                            <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Recent Releases</a></li>
-                            <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Older Releases</a></li>
+                            <li><a href="#" class="sort" data-sort="requestorder:desc"><i class="fa fa-check-square"></i>  Latest Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="requestorder:asc"><i class="fa fa-square-o"></i>  Oldest Requests</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:desc"><i class="fa fa-square-o"></i>  Latest Releases</a></li>
+                            <li><a href="#" class="sort" data-sort="releaseorder:asc"><i class="fa fa-square-o"></i>  Oldest Releases</a></li>
                         </ul>
                     </div>
                 </div>

From 0b822615bdf980ca7354464fa4868b9a8f05a176 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 12:37:06 -0500
Subject: [PATCH 43/57] #55 first attempt at "suggestions" starting with
 "Comming Soon" and "In Theaters"

---
 PlexRequests.UI/Content/custom.css        | 14 +++++++++
 PlexRequests.UI/Content/custom.min.css    |  2 +-
 PlexRequests.UI/Content/custom.scss       | 17 +++++++++++
 PlexRequests.UI/Content/search.js         | 37 ++++++++++++++++++++---
 PlexRequests.UI/Views/Search/Index.cshtml | 12 +++++++-
 5 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 65fb34ffb..5156ae4ca 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -191,3 +191,17 @@ label {
   margin: 20px 0;
   color: #ccc; }
 
+.form-control-withbuttons {
+  padding-right: 105px; }
+
+.input-group-addon .btn-group {
+  position: absolute;
+  right: 45px;
+  z-index: 2;
+  top: 6px; }
+
+.input-group-addon .btn-group .btn {
+  border: 1px solid rgba(255, 255, 255, 0.7) !important;
+  padding: 3px 12px;
+  color: rgba(255, 255, 255, 0.7) !important; }
+
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 41b7bf4c1..63073d406 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}.form-control-withbuttons{padding-right:105px;}.input-group-addon .btn-group{position:absolute;right:45px;z-index:2;top:6px;}.input-group-addon .btn-group .btn{border:1px solid rgba(255,255,255,.7) !important;padding:3px 12px;color:rgba(255,255,255,.7) !important;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index c2c7a07ba..47d965acd 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -244,3 +244,20 @@ $border-radius: 10px;
     margin: 20px 0;
     color: #ccc;
 }
+
+.form-control-withbuttons {
+    padding-right: 105px;
+}
+
+.input-group-addon .btn-group {
+    position: absolute;
+    right: 45px;
+    z-index: 2;
+    top: 6px;
+}
+
+.input-group-addon .btn-group .btn {
+    border: 1px solid rgba(255,255,255,.7) !important;
+    padding: 3px 12px;
+    color: rgba(255,255,255,.7) !important;
+}
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index 4d7b001bb..263dc54a6 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -22,6 +22,16 @@ $("#movieSearchContent").on("input", function () {
 
 });
 
+$('#moviesComingSoon').on('click', function (e) {
+    e.preventDefault();
+    moviesComingSoon();
+});
+
+$('#moviesInTheaters').on('click', function (e) {
+    e.preventDefault();
+    moviesInTheaters();
+});
+
 // Type in TV search
 $("#tvSearchContent").on("input", function () {
     if (tvimer) {
@@ -114,10 +124,23 @@ function sendRequestAjax(data, type, url, buttonId) {
 }
 
 function movieSearch() {
-    $("#movieList").html("");
     var query = $("#movieSearchContent").val();
+    getMovies("/search/movie/" + query);
+}
+
+function moviesComingSoon() {
+    getMovies("/search/movie/upcoming");
+}
 
-    $.ajax("/search/movie/" + query).success(function (results) {
+function moviesInTheaters() {
+    getMovies("/search/movie/playing")
+}
+
+function getMovies(url) {
+    $("#movieList").html("");
+    
+
+    $.ajax(url).success(function (results) {
         if (results.length > 0) {
             results.forEach(function(result) {
                 var context = buildMovieContext(result);
@@ -133,11 +156,15 @@ function movieSearch() {
     });
 };
 
-function tvSearch() {
-    $("#tvList").html("");
+function tvShowSearch() {
     var query = $("#tvSearchContent").val();
+    getTvShows("/search/tv/" + query);
+}
+
+function getTvShows(url) {
+    $("#tvList").html("");
 
-    $.ajax("/search/tv/" + query).success(function (results) {
+    $.ajax(url).success(function (results) {
         if (results.length > 0) {
             results.forEach(function(result) {
                 var context = buildTvShowContext(result);
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 641e0d2a6..803beda52 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -26,8 +26,18 @@
             <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
                 <div class="input-group">
-                    <input id="movieSearchContent" type="text" class="form-control form-control-custom">
+                    <input id="movieSearchContent" type="text" class="form-control form-control-custom form-control-withbuttons">
                     <div class="input-group-addon">
+                        <div class="btn-group">
+                            <a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                Suggestions
+                                <i class="fa fa-chevron-down"></i>
+                            </a>
+                            <ul class="dropdown-menu">
+                                <li><a id="moviesComingSoon" href="#">Coming Soon</a></li>
+                                <li><a id="moviesInTheaters" href="#">In Theaters</a></li>
+                            </ul>
+                        </div>
                         <i id="movieSearchButton" class="fa fa-search"></i>
                     </div>
                 </div>

From f8d27b0673c864d22e9b5e5439aa8218bf932f61 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 13:50:56 -0500
Subject: [PATCH 44/57] minor search UI adjustments

---
 PlexRequests.UI/Content/custom.css        | 6 +++++-
 PlexRequests.UI/Content/custom.min.css    | 2 +-
 PlexRequests.UI/Content/custom.scss       | 7 ++++++-
 PlexRequests.UI/Views/Search/Index.cshtml | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 5156ae4ca..544939235 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -191,6 +191,9 @@ label {
   margin: 20px 0;
   color: #ccc; }
 
+.form-control-search {
+  padding: 25px 105px 25px 16px; }
+
 .form-control-withbuttons {
   padding-right: 105px; }
 
@@ -198,7 +201,8 @@ label {
   position: absolute;
   right: 45px;
   z-index: 2;
-  top: 6px; }
+  top: 13px;
+  box-shadow: 0 0 0; }
 
 .input-group-addon .btn-group .btn {
   border: 1px solid rgba(255, 255, 255, 0.7) !important;
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 63073d406..3caa3e529 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}.form-control-withbuttons{padding-right:105px;}.input-group-addon .btn-group{position:absolute;right:45px;z-index:2;top:6px;}.input-group-addon .btn-group .btn{border:1px solid rgba(255,255,255,.7) !important;padding:3px 12px;color:rgba(255,255,255,.7) !important;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}.form-control-search{padding:25px 105px 25px 16px;}.form-control-withbuttons{padding-right:105px;}.input-group-addon .btn-group{position:absolute;right:45px;z-index:2;top:13px;box-shadow:0 0 0;}.input-group-addon .btn-group .btn{border:1px solid rgba(255,255,255,.7) !important;padding:3px 12px;color:rgba(255,255,255,.7) !important;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 47d965acd..9dbc01952 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -245,6 +245,10 @@ $border-radius: 10px;
     color: #ccc;
 }
 
+.form-control-search {
+    padding: 25px 105px 25px 16px;
+}
+
 .form-control-withbuttons {
     padding-right: 105px;
 }
@@ -253,7 +257,8 @@ $border-radius: 10px;
     position: absolute;
     right: 45px;
     z-index: 2;
-    top: 6px;
+    top: 13px;
+    box-shadow: 0 0 0;
 }
 
 .input-group-addon .btn-group .btn {
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 803beda52..c485391f8 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -26,7 +26,7 @@
             <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
                 <div class="input-group">
-                    <input id="movieSearchContent" type="text" class="form-control form-control-custom form-control-withbuttons">
+                    <input id="movieSearchContent" type="text" class="form-control form-control-custom form-control-search form-control-withbuttons">
                     <div class="input-group-addon">
                         <div class="btn-group">
                             <a href="#" class="btn btn-sm btn-primary-outline dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@@ -55,7 +55,7 @@
     <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
                 <div class="input-group">
-                    <input id="tvSearchContent" type="text" class="form-control form-control-custom">
+                    <input id="tvSearchContent" type="text" class="form-control form-control-custom form-control-search">
                     <div class="input-group-addon">
                         <i id="tvSearchButton" class="fa fa-search"></i>
                     </div>

From 0dc96b854e5ba8f6d8c4a7a37e0cc90223d36126 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 13:51:37 -0500
Subject: [PATCH 45/57] fix search focus z-index issue (hid suggestions
 options)

---
 PlexRequests.UI/Content/custom.css     | 2 +-
 PlexRequests.UI/Content/custom.min.css | 2 +-
 PlexRequests.UI/Content/custom.scss    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css
index 544939235..66153a87a 100644
--- a/PlexRequests.UI/Content/custom.css
+++ b/PlexRequests.UI/Content/custom.css
@@ -200,7 +200,7 @@ label {
 .input-group-addon .btn-group {
   position: absolute;
   right: 45px;
-  z-index: 2;
+  z-index: 3;
   top: 13px;
   box-shadow: 0 0 0; }
 
diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css
index 3caa3e529..9f60b69e2 100644
--- a/PlexRequests.UI/Content/custom.min.css
+++ b/PlexRequests.UI/Content/custom.min.css
@@ -1 +1 @@
-@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}.form-control-search{padding:25px 105px 25px 16px;}.form-control-withbuttons{padding-right:105px;}.input-group-addon .btn-group{position:absolute;right:45px;z-index:2;top:13px;box-shadow:0 0 0;}.input-group-addon .btn-group .btn{border:1px solid rgba(255,255,255,.7) !important;padding:3px 12px;color:rgba(255,255,255,.7) !important;}
\ No newline at end of file
+@media(min-width:768px){.row{position:relative;}.bottom-align-text{position:absolute;bottom:0;right:0;}}@media(max-width:48em){.home{padding-top:1rem;}}@media(min-width:48em){.home{padding-top:4rem;}}.btn{border-radius:.25rem !important;}.multiSelect{background-color:#4e5d6c;}.form-control-custom{background-color:#4e5d6c !important;color:#fff !important;border-radius:0;box-shadow:0 0 0 !important;}h1{font-size:3.5rem !important;font-weight:600 !important;}.request-title{margin-top:0 !important;font-size:1.9rem !important;}p{font-size:1.1rem !important;}label{display:inline-block !important;margin-bottom:.5rem !important;font-size:16px !important;}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{background:#4e5d6c;}.navbar .nav a .fa,.dropdown-menu a .fa{font-size:130%;top:1px;position:relative;display:inline-block;margin-right:5px;}.dropdown-menu a .fa{top:2px;}.btn-danger-outline{color:#d9534f !important;background-color:transparent;background-image:none;border-color:#d9534f !important;}.btn-danger-outline:focus,.btn-danger-outline.focus,.btn-danger-outline:active,.btn-danger-outline.active,.btn-danger-outline:hover,.open>.btn-danger-outline.dropdown-toggle{color:#fff !important;background-color:#d9534f !important;border-color:#d9534f !important;}.btn-primary-outline{color:#ff761b !important;background-color:transparent;background-image:none;border-color:#ff761b !important;}.btn-primary-outline:focus,.btn-primary-outline.focus,.btn-primary-outline:active,.btn-primary-outline.active,.btn-primary-outline:hover,.open>.btn-primary-outline.dropdown-toggle{color:#fff !important;background-color:#df691a !important;border-color:#df691a !important;}.btn-info-outline{color:#5bc0de !important;background-color:transparent;background-image:none;border-color:#5bc0de !important;}.btn-info-outline:focus,.btn-info-outline.focus,.btn-info-outline:active,.btn-info-outline.active,.btn-info-outline:hover,.open>.btn-info-outline.dropdown-toggle{color:#fff !important;background-color:#5bc0de !important;border-color:#5bc0de !important;}.btn-warning-outline{color:#f0ad4e !important;background-color:transparent;background-image:none;border-color:#f0ad4e !important;}.btn-warning-outline:focus,.btn-warning-outline.focus,.btn-warning-outline:active,.btn-warning-outline.active,.btn-warning-outline:hover,.open>.btn-warning-outline.dropdown-toggle{color:#fff !important;background-color:#f0ad4e !important;border-color:#f0ad4e !important;}.btn-success-outline{color:#5cb85c !important;background-color:transparent;background-image:none;border-color:#5cb85c !important;}.btn-success-outline:focus,.btn-success-outline.focus,.btn-success-outline:active,.btn-success-outline.active,.btn-success-outline:hover,.open>.btn-success-outline.dropdown-toggle{color:#fff !important;background-color:#5cb85c !important;border-color:#5cb85c !important;}#movieList .mix{display:none;}#tvList .mix{display:none;}.scroll-top-wrapper{position:fixed;opacity:0;visibility:hidden;overflow:hidden;text-align:center;z-index:99999999;background-color:#4e5d6c;color:#eee;width:50px;height:48px;line-height:48px;right:30px;bottom:30px;padding-top:2px;border-top-left-radius:10px;border-top-right-radius:10px;border-bottom-right-radius:10px;border-bottom-left-radius:10px;-webkit-transition:all .5s ease-in-out;-moz-transition:all .5s ease-in-out;-ms-transition:all .5s ease-in-out;-o-transition:all .5s ease-in-out;transition:all .5s ease-in-out;}.scroll-top-wrapper:hover{background-color:#637689;}.scroll-top-wrapper.show{visibility:visible;cursor:pointer;opacity:1;}.scroll-top-wrapper i.fa{line-height:inherit;}.no-search-results{text-align:center;}.no-search-results .no-search-results-icon{font-size:10em;color:#4e5d6c;}.no-search-results .no-search-results-text{margin:20px 0;color:#ccc;}.form-control-search{padding:25px 105px 25px 16px;}.form-control-withbuttons{padding-right:105px;}.input-group-addon .btn-group{position:absolute;right:45px;z-index:3;top:13px;box-shadow:0 0 0;}.input-group-addon .btn-group .btn{border:1px solid rgba(255,255,255,.7) !important;padding:3px 12px;color:rgba(255,255,255,.7) !important;}
\ No newline at end of file
diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss
index 9dbc01952..4c42a8dfc 100644
--- a/PlexRequests.UI/Content/custom.scss
+++ b/PlexRequests.UI/Content/custom.scss
@@ -256,7 +256,7 @@ $border-radius: 10px;
 .input-group-addon .btn-group {
     position: absolute;
     right: 45px;
-    z-index: 2;
+    z-index: 3;
     top: 13px;
     box-shadow: 0 0 0;
 }

From ec99dafa29365519432ab4df001c1494bc2bd33a Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 17:46:31 -0500
Subject: [PATCH 46/57] method reference bug fix

---
 PlexRequests.UI/Content/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index 263dc54a6..0f47d3ace 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -156,7 +156,7 @@ function getMovies(url) {
     });
 };
 
-function tvShowSearch() {
+function tvSearch() {
     var query = $("#tvSearchContent").val();
     getTvShows("/search/tv/" + query);
 }

From 3dbef199aaa0fe66e7f7976cf1fa52c55ad2c065 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 22:23:38 -0500
Subject: [PATCH 47/57] #122 store utc time in the databse + obtain timezone
 offset of the client upon login + offset times returned to client based on
 session offset

---
 PlexRequests.Helpers/DateTimeHelper.cs           | 14 ++++++++++++++
 PlexRequests.Helpers/PlexRequests.Helpers.csproj |  1 +
 PlexRequests.UI/Models/SessionKeys.cs            |  1 +
 PlexRequests.UI/Modules/BaseModule.cs            | 15 +++++++++++++++
 PlexRequests.UI/Modules/LoginModule.cs           |  3 ++-
 PlexRequests.UI/Modules/RequestsModule.cs        | 10 +++++-----
 PlexRequests.UI/Modules/SearchModule.cs          |  4 ++--
 PlexRequests.UI/Modules/UserLoginModule.cs       |  7 +++++++
 PlexRequests.UI/Views/Login/Index.cshtml         |  7 +++++++
 PlexRequests.UI/Views/Login/Register.cshtml      |  4 ++--
 PlexRequests.UI/Views/UserLogin/Index.cshtml     |  6 +++++-
 11 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 PlexRequests.Helpers/DateTimeHelper.cs

diff --git a/PlexRequests.Helpers/DateTimeHelper.cs b/PlexRequests.Helpers/DateTimeHelper.cs
new file mode 100644
index 000000000..5cc3857e4
--- /dev/null
+++ b/PlexRequests.Helpers/DateTimeHelper.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace PlexRequests.Helpers
+{
+    public static class DateTimeHelper
+    {
+        public static DateTimeOffset OffsetUTCDateTime(DateTime utcDateTime, int minuteOffset)
+        {
+            TimeSpan ts = TimeSpan.FromMinutes(-minuteOffset);
+            return new DateTimeOffset(utcDateTime).ToOffset(ts);
+        }
+
+    }
+}
diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj
index ec3c70a8d..b2bf29a0a 100644
--- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj
+++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj
@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="AssemblyHelper.cs" />
     <Compile Include="ByteConverterHelper.cs" />
+    <Compile Include="DateTimeHelper.cs" />
     <Compile Include="Exceptions\ApplicationSettingsException.cs" />
     <Compile Include="HtmlRemover.cs" />
     <Compile Include="ICacheProvider.cs" />
diff --git a/PlexRequests.UI/Models/SessionKeys.cs b/PlexRequests.UI/Models/SessionKeys.cs
index 66c766039..949441650 100644
--- a/PlexRequests.UI/Models/SessionKeys.cs
+++ b/PlexRequests.UI/Models/SessionKeys.cs
@@ -29,5 +29,6 @@ namespace PlexRequests.UI.Models
     public class SessionKeys
     {
         public const string UsernameKey = "Username";
+        public const string ClientDateTimeOffsetKey = "ClientDateTimeOffset";
     }
 }
diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs
index f34c46f17..a75766775 100644
--- a/PlexRequests.UI/Modules/BaseModule.cs
+++ b/PlexRequests.UI/Modules/BaseModule.cs
@@ -28,12 +28,14 @@
 using Nancy;
 using Nancy.Extensions;
 using PlexRequests.UI.Models;
+using System;
 
 namespace PlexRequests.UI.Modules
 {
     public class BaseModule : NancyModule
     {
         private string _username;
+        private int _dateTimeOffset = -1;
 
         protected string Username
         {
@@ -47,6 +49,19 @@ namespace PlexRequests.UI.Modules
             }
         }
 
+        protected int DateTimeOffset
+        {
+            get
+            {
+                if (_dateTimeOffset == -1)
+                {
+                    _dateTimeOffset = Session[SessionKeys.ClientDateTimeOffsetKey] != null ?
+                        (int)Session[SessionKeys.ClientDateTimeOffsetKey] : (new DateTimeOffset().Offset).Minutes;
+                }
+                return _dateTimeOffset;
+            }
+        }
+
         public BaseModule()
         {
             Before += (ctx) => CheckAuth();
diff --git a/PlexRequests.UI/Modules/LoginModule.cs b/PlexRequests.UI/Modules/LoginModule.cs
index 578b9cf7f..71a6ebb0a 100644
--- a/PlexRequests.UI/Modules/LoginModule.cs
+++ b/PlexRequests.UI/Modules/LoginModule.cs
@@ -60,6 +60,7 @@ namespace PlexRequests.UI.Modules
             {
                 var username = (string)Request.Form.Username;
                 var password = (string)Request.Form.Password;
+                var dtOffset = (int)Request.Form.DateTimeOffset;
 
                 var userId = UserMapper.ValidateUser(username, password);
 
@@ -72,7 +73,7 @@ namespace PlexRequests.UI.Modules
                 {
                     expiry = DateTime.Now.AddDays(7);
                 }
-                Session[SessionKeys.UsernameKey] = username;
+                Session[SessionKeys.ClientDateTimeOffsetKey] = dtOffset;
                 return this.LoginAndRedirect(userId.Value, expiry);
             };
 
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 193729ab8..2d12ab4a1 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -40,12 +40,12 @@ using PlexRequests.Services.Interfaces;
 using PlexRequests.Services.Notification;
 using PlexRequests.Store;
 using PlexRequests.UI.Models;
+using PlexRequests.Helpers;
 
 namespace PlexRequests.UI.Modules
 {
     public class RequestsModule : BaseModule
     {
-
         public RequestsModule(IRequestService service, ISettingsService<PlexRequestSettings> prSettings, ISettingsService<PlexSettings> plex, INotificationService notify) : base("requests")
         {
             Service = service;
@@ -98,8 +98,8 @@ namespace PlexRequests.UI.Modules
                     PosterPath = movie.PosterPath,
                     ReleaseDate = movie.ReleaseDate.Humanize(),
                     ReleaseDateTicks = movie.ReleaseDate.Ticks,
-                    RequestedDate = movie.RequestedDate.Humanize(),
-                    RequestedDateTicks = movie.RequestedDate.Ticks,
+                    RequestedDate = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Humanize(),
+                    RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(movie.RequestedDate, DateTimeOffset).Ticks,
                     Approved = movie.Available || movie.Approved,
                     Title = movie.Title,
                     Overview = movie.Overview,
@@ -137,8 +137,8 @@ namespace PlexRequests.UI.Modules
                     PosterPath = tv.PosterPath,
                     ReleaseDate = tv.ReleaseDate.Humanize(),
                     ReleaseDateTicks = tv.ReleaseDate.Ticks,
-                    RequestedDate = tv.RequestedDate.Humanize(),
-                    RequestedDateTicks = tv.RequestedDate.Ticks,
+                    RequestedDate = DateTimeHelper.OffsetUTCDateTime(tv.RequestedDate, DateTimeOffset).Humanize(),
+                    RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(tv.RequestedDate, DateTimeOffset).Ticks,
                     Approved = tv.Available || tv.Approved,
                     Title = tv.Title,
                     Overview = tv.Overview,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 3dbc24118..066223d8f 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -220,7 +220,7 @@ namespace PlexRequests.UI.Modules
                 Title = movieInfo.Title,
                 ReleaseDate = movieInfo.ReleaseDate ?? DateTime.MinValue,
                 Status = movieInfo.Status,
-                RequestedDate = DateTime.Now,
+                RequestedDate = DateTime.UtcNow,
                 Approved = false,
                 RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
@@ -356,7 +356,7 @@ namespace PlexRequests.UI.Modules
                 Title = showInfo.name,
                 ReleaseDate = firstAir,
                 Status = showInfo.status,
-                RequestedDate = DateTime.Now,
+                RequestedDate = DateTime.UtcNow,
                 Approved = false,
                 RequestedUsers = new List<string>() { Username },
                 Issues = IssueState.None,
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index bd6643071..148888b11 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -68,6 +68,7 @@ namespace PlexRequests.UI.Modules
 
         private Response LoginUser()
         {
+            var dateTimeOffset = Request.Form.DateTimeOffset;
             var username = Request.Form.username.Value;
             Log.Debug("Username \"{0}\" attempting to login",username);
             if (string.IsNullOrWhiteSpace(username))
@@ -138,6 +139,12 @@ namespace PlexRequests.UI.Modules
                 Session[SessionKeys.UsernameKey] = (string)username;
             }
 
+            Session[SessionKeys.ClientDateTimeOffsetKey] = (int)dateTimeOffset;
+
+            int z = 240;
+
+
+
             return Response.AsJson(authenticated 
                 ? new JsonResponseModel { Result = true } 
                 : new JsonResponseModel { Result = false, Message = "Incorrect User or Password"});
diff --git a/PlexRequests.UI/Views/Login/Index.cshtml b/PlexRequests.UI/Views/Login/Index.cshtml
index 85597f544..0662e2cb2 100644
--- a/PlexRequests.UI/Views/Login/Index.cshtml
+++ b/PlexRequests.UI/Views/Login/Index.cshtml
@@ -6,6 +6,7 @@
     Remember Me <input name="RememberMe" type="checkbox" value="True"/>
     <br/><br/>
     <input class="btn btn-success-outline" type="submit" value="Login"/>
+    <input type="hidden" id="DateTimeOffset" name="DateTimeOffset" />
 </form>
 @if (!Model.AdminExists)
 {
@@ -19,3 +20,9 @@
     </div>
 }
 
+<script>
+    $(function () {
+        var dtOffset = new Date().getTimezoneOffset();
+        $('#DateTimeOffset').val(dtOffset);
+    });
+</script>
diff --git a/PlexRequests.UI/Views/Login/Register.cshtml b/PlexRequests.UI/Views/Login/Register.cshtml
index d8e8564e5..c53fa0193 100644
--- a/PlexRequests.UI/Views/Login/Register.cshtml
+++ b/PlexRequests.UI/Views/Login/Register.cshtml
@@ -1,7 +1,7 @@
 <form method="POST">
-    Username <input class="form-control" type="text" name="Username" />
+    Username <input class="form-control form-control-custom" type="text" name="Username" />
     <br />
-    Password <input class="form-control" name="Password" type="password" />
+    Password <input class="form-control form-control-custom" name="Password" type="password" />
     <br />
    <br />
     <input class="btn btn-success-outline" type="submit" value="Create User" />
diff --git a/PlexRequests.UI/Views/UserLogin/Index.cshtml b/PlexRequests.UI/Views/UserLogin/Index.cshtml
index 414083139..cc9bf9c5d 100644
--- a/PlexRequests.UI/Views/UserLogin/Index.cshtml
+++ b/PlexRequests.UI/Views/UserLogin/Index.cshtml
@@ -38,10 +38,14 @@
         $('#loginBtn').click(function (e) {
             e.preventDefault();
             var $form = $("#loginForm");
+            var formData = $form.serialize();
+            var dtOffset = new Date().getTimezoneOffset();
+            formData += ('&DateTimeOffset=' + dtOffset)
+
             $.ajax({
                 type: $form.prop("method"),
                 url: $form.prop("action"),
-                data: $form.serialize(),
+                data: formData,
                 dataType: "json",
                 success: function (response) {
                     console.log(response);

From d370bf62d03e3d9d928a7c557882e90a0c0b034d Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Thu, 31 Mar 2016 23:37:13 -0500
Subject: [PATCH 48/57] mono datetime offset workaround

---
 PlexRequests.Helpers/DateTimeHelper.cs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/PlexRequests.Helpers/DateTimeHelper.cs b/PlexRequests.Helpers/DateTimeHelper.cs
index 5cc3857e4..88103dcdf 100644
--- a/PlexRequests.Helpers/DateTimeHelper.cs
+++ b/PlexRequests.Helpers/DateTimeHelper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 namespace PlexRequests.Helpers
 {
@@ -6,9 +7,20 @@ namespace PlexRequests.Helpers
     {
         public static DateTimeOffset OffsetUTCDateTime(DateTime utcDateTime, int minuteOffset)
         {
-            TimeSpan ts = TimeSpan.FromMinutes(-minuteOffset);
-            return new DateTimeOffset(utcDateTime).ToOffset(ts);
+            //TimeSpan ts = TimeSpan.FromMinutes(-minuteOffset);
+            //return new DateTimeOffset(utcDateTime).ToOffset(ts);
+
+            // this is a workaround below to work with MONO
+            var tzi = FindTimeZoneFromOffset(minuteOffset);
+            var utcOffset = tzi.GetUtcOffset(utcDateTime);
+            var newDate = utcDateTime + utcOffset;
+            return new DateTimeOffset(newDate.Ticks, utcOffset);
         }
 
+        private static TimeZoneInfo FindTimeZoneFromOffset(int minuteOffset)
+        {
+            var tzc = TimeZoneInfo.GetSystemTimeZones();
+            return tzc.FirstOrDefault(x => x.BaseUtcOffset.TotalMinutes == -minuteOffset);
+        }
     }
 }

From f49e67da8355b876d4a2735213df4f518a106813 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 1 Apr 2016 08:41:30 +0100
Subject: [PATCH 49/57] Added back the username into the Session when the admin
 logs in. This means they do not have to log in twice.

---
 PlexRequests.UI/Modules/LoginModule.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PlexRequests.UI/Modules/LoginModule.cs b/PlexRequests.UI/Modules/LoginModule.cs
index 71a6ebb0a..6750b2c4c 100644
--- a/PlexRequests.UI/Modules/LoginModule.cs
+++ b/PlexRequests.UI/Modules/LoginModule.cs
@@ -73,6 +73,7 @@ namespace PlexRequests.UI.Modules
                 {
                     expiry = DateTime.Now.AddDays(7);
                 }
+                Session[SessionKeys.UsernameKey] = username;
                 Session[SessionKeys.ClientDateTimeOffsetKey] = dtOffset;
                 return this.LoginAndRedirect(userId.Value, expiry);
             };

From 1596dce6293001b41dba06c61077259b8f522235 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 1 Apr 2016 10:15:09 +0100
Subject: [PATCH 50/57] Basic search working for #32

---
 .../Music/MusicBrainzSearchResults.cs         | 152 ++++++++++++++++++
 .../PlexRequests.Api.Models.csproj            |   1 +
 PlexRequests.Api/MusicBrainzApi.cs            |  70 ++++++++
 PlexRequests.Api/PlexRequests.Api.csproj      |   1 +
 PlexRequests.UI/Content/search.js             |  67 ++++++--
 PlexRequests.UI/Modules/SearchModule.cs       |  11 +-
 PlexRequests.UI/Views/Search/Index.cshtml     |   9 +-
 7 files changed, 296 insertions(+), 15 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs
 create mode 100644 PlexRequests.Api/MusicBrainzApi.cs

diff --git a/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs b/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs
new file mode 100644
index 000000000..658b8ca4b
--- /dev/null
+++ b/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs
@@ -0,0 +1,152 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: MusicBrainzSearchResults.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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.Collections.Generic;
+
+using Newtonsoft.Json;
+
+namespace PlexRequests.Api.Models.Music
+{
+    public class TextRepresentation
+    {
+        public string language { get; set; }
+        public string script { get; set; }
+    }
+
+    public class Alias
+    {
+        [JsonProperty(PropertyName = "sort-name")]
+        public string SortName { get; set; }
+        public string name { get; set; }
+        public object locale { get; set; }
+        public string type { get; set; }
+        public object primary { get; set; }
+        [JsonProperty(PropertyName = "begin-date")]
+        public object BeginDate { get; set; }
+        [JsonProperty(PropertyName = "end-date")]
+        public object EndDate { get; set; }
+    }
+
+    public class Artist
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        [JsonProperty(PropertyName = "sort-date")]
+        public string SortName { get; set; }
+        public string disambiguation { get; set; }
+        public List<Alias> aliases { get; set; }
+    }
+
+    public class ArtistCredit
+    {
+        public Artist artist { get; set; }
+    }
+
+    public class ReleaseGroup
+    {
+        public string id { get; set; }
+        [JsonProperty(PropertyName = "primary-type")]
+        public string PrimaryType { get; set; }
+        [JsonProperty(PropertyName = "secondary-types")]
+        public List<string> SecondaryTypes { get; set; }
+    }
+
+    public class Area
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+        [JsonProperty(PropertyName = "sort-name")]
+        public string SortName { get; set; }
+        [JsonProperty(PropertyName = "iso-3166-1-codes")]
+        public List<string> ISO31661Codes { get; set; }
+    }
+
+    public class ReleaseEvent
+    {
+        public string date { get; set; }
+        public Area area { get; set; }
+    }
+
+    public class Label
+    {
+        public string id { get; set; }
+        public string name { get; set; }
+    }
+
+    public class LabelInfo
+    {
+        [JsonProperty(PropertyName = "catalog-number")]
+        public string CatalogNumber { get; set; }
+        public Label label { get; set; }
+    }
+
+    public class Medium
+    {
+        public string format { get; set; }
+        [JsonProperty(PropertyName = "disc-count")]
+        public int DiscCount { get; set; }
+        [JsonProperty(PropertyName = "catalog-number")]
+        public int CatalogNumber { get; set; }
+    }
+
+    public class Release
+    {
+        public string id { get; set; }
+        public string score { get; set; }
+        public int count { get; set; }
+        public string title { get; set; }
+        public string status { get; set; }
+        public string disambiguation { get; set; }
+        public string packaging { get; set; }
+
+        [JsonProperty(PropertyName = "text-representation")]
+        public TextRepresentation TextRepresentation { get; set; }
+        [JsonProperty(PropertyName = "artist-credit")]
+        public List<ArtistCredit> ArtistCredit { get; set; }
+        [JsonProperty(PropertyName = "release-group")]
+        public ReleaseGroup ReleaseGroup { get; set; }
+        public string date { get; set; }
+        public string country { get; set; }
+        [JsonProperty(PropertyName = "release-events")]
+        public List<ReleaseEvent> ReleaseEvents { get; set; }
+        public string barcode { get; set; }
+        public string asin { get; set; }
+        [JsonProperty(PropertyName = "label-info")]
+        public List<LabelInfo> LabelInfo { get; set; }
+        [JsonProperty(PropertyName = "track-count")]
+        public int TrackCount { get; set; }
+        public List<Medium> media { get; set; }
+    }
+
+    public class MusicBrainzSearchResults
+    {
+        public string created { get; set; }
+        public int count { get; set; }
+        public int offset { get; set; }
+        public List<Release> releases { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 35def3d76..61a33d5e5 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Movie\CouchPotatoStatus.cs" />
     <Compile Include="Music\HeadphonesAlbumSearchResult.cs" />
     <Compile Include="Music\HeadphonesArtistSearchResult.cs" />
+    <Compile Include="Music\MusicBrainzSearchResults.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
     <Compile Include="Notifications\PushoverResponse.cs" />
diff --git a/PlexRequests.Api/MusicBrainzApi.cs b/PlexRequests.Api/MusicBrainzApi.cs
new file mode 100644
index 000000000..f419fe851
--- /dev/null
+++ b/PlexRequests.Api/MusicBrainzApi.cs
@@ -0,0 +1,70 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: MusicBrainzApi.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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 Newtonsoft.Json;
+
+using NLog;
+
+using PlexRequests.Api.Models.Music;
+
+using RestSharp;
+
+namespace PlexRequests.Api
+{
+    public class MusicBrainsApi
+    {
+        public MusicBrainsApi()
+        {
+            Api = new ApiRequest();
+        }
+        private ApiRequest Api { get; }
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
+        private readonly Uri BaseUri = new Uri("http://musicbrainz.org/ws/2/");
+
+        public MusicBrainzSearchResults SearchAlbum(string searchTerm)
+        {
+            Log.Trace("Searching for album: {0}", searchTerm);
+            var request = new RestRequest
+            {
+                Resource = "release/?query={searchTerm}&fmt=json",
+                Method = Method.GET
+            };
+            request.AddUrlSegment("searchTerm", searchTerm);
+
+            try
+            {
+                return Api.ExecuteJson<MusicBrainzSearchResults>(request, BaseUri);
+            }
+            catch (JsonSerializationException jse)
+            {
+                Log.Warn(jse);
+                return new MusicBrainzSearchResults(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 9484f59a3..b655cc2be 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -66,6 +66,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
+    <Compile Include="MusicBrainzApi.cs" />
     <Compile Include="MockApiData.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index 0f47d3ace..2d9d65d50 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -6,19 +6,22 @@
 });
 
 var searchSource = $("#search-template").html();
+var musicSource = $("#music-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
+var musicTemplate = Handlebars.compile(musicSource);
 var noResultsHtml = "<div class='no-search-results'>" +
     "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
-var movieTimer = 0;
-var tvimer = 0;
+var noResultsMusic = "<div class='no-search-results'>" +
+    "<i class='fa fa-headphones no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
+var searchTimer = 0;
 
 // Type in movie search
 $("#movieSearchContent").on("input", function () {
-    if (movieTimer) {
-        clearTimeout(movieTimer);
+    if (searchTimer) {
+        clearTimeout(searchTimer);
     }
     $('#movieSearchButton').attr("class","fa fa-spinner fa-spin");
-    movieTimer = setTimeout(movieSearch, 400);
+    searchTimer = setTimeout(movieSearch, 400);
 
 });
 
@@ -34,11 +37,11 @@ $('#moviesInTheaters').on('click', function (e) {
 
 // Type in TV search
 $("#tvSearchContent").on("input", function () {
-    if (tvimer) {
-        clearTimeout(tvimer);
+    if (searchTimer) {
+        clearTimeout(searchTimer);
     }
     $('#tvSearchButton').attr("class", "fa fa-spinner fa-spin");
-    tvimer = setTimeout(tvSearch, 400);
+    searchTimer = setTimeout(tvSearch, 400);
 });
 
 // Click TV dropdown option
@@ -72,6 +75,16 @@ $(document).on("click", ".dropdownTv", function (e) {
     sendRequestAjax(data, type, url, buttonId);
 });
 
+// Search Music
+$("#musicSearchContent").on("input", function () {
+    if (searchTimer) {
+        clearTimeout(searchTimer);
+    }
+    $('#musicSearchButton').attr("class", "fa fa-spinner fa-spin");
+    searchTimer = setTimeout(musicSearch, 400);
+
+});
+
 // Click Request for movie
 $(document).on("click", ".requestMovie", function (e) {
     e.preventDefault();
@@ -133,7 +146,7 @@ function moviesComingSoon() {
 }
 
 function moviesInTheaters() {
-    getMovies("/search/movie/playing")
+    getMovies("/search/movie/playing");
 }
 
 function getMovies(url) {
@@ -179,6 +192,29 @@ function getTvShows(url) {
     });
 };
 
+function musicSearch() {
+    var query = $("#musicSearchContent").val();
+    getMusic("/search/music/" + query);
+}
+
+function getMusic(url) {
+    $("#musicList").html("");
+    
+    $.ajax(url).success(function (results) {
+        if (results.count > 0) {
+            results.releases.forEach(function (result) {
+                var context = buildMusicContext(result);
+
+                var html = musicTemplate(context);
+                $("#musicList").append(html);
+            });
+        }
+        else {
+            $("#musicList").html(noResultsMusic);
+        }
+        $('#musicSearchButton').attr("class", "fa fa-search");
+    });
+};
 
 function buildMovieContext(result) {
     var date = new Date(result.releaseDate);
@@ -212,3 +248,16 @@ function buildTvShowContext(result) {
     };
     return context;
 }
+
+function buildMusicContext(result) {
+
+    var context = {
+        id: result.id,
+        title: result.title,
+        overview: result.disambiguation,
+        year: result.date,
+        type: "music"
+    };
+
+    return context;
+}
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 066223d8f..3cf44c370 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -74,6 +74,7 @@ namespace PlexRequests.UI.Modules
 
             Get["movie/{searchTerm}"] = parameters => SearchMovie((string)parameters.searchTerm);
             Get["tv/{searchTerm}"] = parameters => SearchTvShow((string)parameters.searchTerm);
+            Get["music/{searchTerm}"] = parameters => SearchMusic((string)parameters.searchTerm);
 
             Get["movie/upcoming"] = parameters => UpcomingMovies();
             Get["movie/playing"] = parameters => CurrentlyPlayingMovies();
@@ -152,6 +153,13 @@ namespace PlexRequests.UI.Modules
             return Response.AsJson(model);
         }
 
+        private Response SearchMusic(string searchTerm)
+        {
+            var api = new MusicBrainsApi();
+            var albums = api.SearchAlbum(searchTerm);
+            return Response.AsJson(albums);
+        }
+
         private Response UpcomingMovies() // TODO : Not used
         {
             var movies = MovieApi.GetUpcomingMovies();
@@ -174,7 +182,7 @@ namespace PlexRequests.UI.Modules
         {
             var movieApi = new TheMovieDbApi();
             var movieInfo = movieApi.GetMovieInformation(movieId).Result;
-            string fullMovieName = string.Format("{0}{1}", movieInfo.Title, movieInfo.ReleaseDate.HasValue ? $" ({movieInfo.ReleaseDate.Value.Year})" : string.Empty);
+            var fullMovieName = $"{movieInfo.Title}{(movieInfo.ReleaseDate.HasValue ? $" ({movieInfo.ReleaseDate.Value.Year})" : string.Empty)}";
             Log.Trace("Getting movie info from TheMovieDb");
             Log.Trace(movieInfo.DumpJson);
             //#if !DEBUG
@@ -192,6 +200,7 @@ namespace PlexRequests.UI.Modules
                     existingRequest.RequestedUsers.Add(Username);
                     RequestService.UpdateRequest(existingRequest);
                 }
+
                 return Response.AsJson(new JsonResponseModel { Result = true, Message = settings.UsersCanViewOnlyOwnRequests ? $"{fullMovieName} was successfully added!" : $"{fullMovieName} has already been requested!" });
             }
 
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index c485391f8..42d4d30a1 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -161,17 +161,16 @@
     <div class="row">
         <div class="col-sm-2">
 
-            <img class="img-responsive" src="http://image.tmdb.org/t/p/w150/{{posterPath}}" alt="poster">
+            @*<img class="img-responsive" src="http://image.tmdb.org/t/p/w150/{{posterPath}}" alt="poster">*@
 
-            <img class="img-responsive" width="150" src="{{posterPath}}" alt="poster">
 
         </div>
         <div class="col-sm-5 ">
             <div>
 
-                <a href="http://www.imdb.com/title/{{imdb}}/" target="_blank">
+                @*<a href="http://www.imdb.com/title/{{imdb}}/" target="_blank">*@
                     <h4>{{title}} ({{year}})</h4>
-                </a>
+                @*</a>*@
             </div>
             <p>{{overview}}</p>
         </div>
@@ -179,7 +178,7 @@
             <form method="POST" action="/search/request/{{type}}" id="form{{id}}">
                 <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
 
-                <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMovie" type="submit"><i class="fa fa-plus"></i> Request</button>
+                <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMusic" type="submit"><i class="fa fa-plus"></i> Request</button>
 
                 <br />
                 <br />

From c43f70a0e035570a7e4c39219fe99f078b23a4e0 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 1 Apr 2016 12:16:04 +0100
Subject: [PATCH 51/57] Most of the UI work done for #32

---
 .../Music/MusicBrainzCoverArt.cs              | 55 +++++++++++++++++++
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api/MusicBrainzApi.cs            | 22 ++++++++
 PlexRequests.Core/Setup.cs                    |  2 +-
 PlexRequests.UI/Content/search.js             | 15 +++--
 .../Models/SearchMusicViewModel.cs            | 41 ++++++++++++++
 PlexRequests.UI/Modules/SearchModule.cs       | 36 +++++++++++-
 PlexRequests.UI/PlexRequests.UI.csproj        |  1 +
 PlexRequests.UI/Views/Search/Index.cshtml     | 27 +++++----
 9 files changed, 181 insertions(+), 19 deletions(-)
 create mode 100644 PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs
 create mode 100644 PlexRequests.UI/Models/SearchMusicViewModel.cs

diff --git a/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs b/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs
new file mode 100644
index 000000000..40cecba94
--- /dev/null
+++ b/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs
@@ -0,0 +1,55 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: MusicBrainzCoverArt.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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.Collections.Generic;
+
+namespace PlexRequests.Api.Models.Music
+{
+    public class Thumbnails
+    {
+        public string large { get; set; }
+        public string small { get; set; }
+    }
+
+    public class Image
+    {
+        public List<string> types { get; set; }
+        public bool front { get; set; }
+        public bool back { get; set; }
+        public int edit { get; set; }
+        public string image { get; set; }
+        public string comment { get; set; }
+        public bool approved { get; set; }
+        public string id { get; set; }
+        public Thumbnails thumbnails { get; set; }
+    }
+
+    public class MusicBrainzCoverArt
+    {
+        public List<Image> images { get; set; }
+        public string release { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 61a33d5e5..978171662 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -50,6 +50,7 @@
     <Compile Include="Movie\CouchPotatoStatus.cs" />
     <Compile Include="Music\HeadphonesAlbumSearchResult.cs" />
     <Compile Include="Music\HeadphonesArtistSearchResult.cs" />
+    <Compile Include="Music\MusicBrainzCoverArt.cs" />
     <Compile Include="Music\MusicBrainzSearchResults.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
diff --git a/PlexRequests.Api/MusicBrainzApi.cs b/PlexRequests.Api/MusicBrainzApi.cs
index f419fe851..8331e8a0d 100644
--- a/PlexRequests.Api/MusicBrainzApi.cs
+++ b/PlexRequests.Api/MusicBrainzApi.cs
@@ -66,5 +66,27 @@ namespace PlexRequests.Api
                 return new MusicBrainzSearchResults(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
             }
         }
+
+        public MusicBrainzCoverArt GetCoverArt(string releaseId)
+        {
+            Log.Trace("Getting cover art for release: {0}", releaseId);
+            var request = new RestRequest
+            {
+                Resource = "release/{releaseId}",
+                Method = Method.GET
+            };
+            request.AddUrlSegment("releaseId", releaseId);
+
+            try
+            {
+                return Api.Execute<MusicBrainzCoverArt>(request, new Uri("http://coverartarchive.org/"));
+            }
+            catch (Exception e)
+            {
+                Log.Warn(e);
+                return new MusicBrainzCoverArt(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
+            }
+        }
+
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 4dea3a27a..93d8003e7 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -72,7 +72,7 @@ namespace PlexRequests.Core
             s.SaveSettings(defaultSettings);
         }
 
-        private void MigrateDb() // TODO: Remove when no longer needed
+        private void MigrateDb() // TODO: Remove in v1.7
         {
             var result = new List<long>();
             RequestedModel[] requestedModels;
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index 2d9d65d50..b21b6f409 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -201,8 +201,8 @@ function getMusic(url) {
     $("#musicList").html("");
     
     $.ajax(url).success(function (results) {
-        if (results.count > 0) {
-            results.releases.forEach(function (result) {
+        if (results.length > 0) {
+            results.forEach(function (result) {
                 var context = buildMusicContext(result);
 
                 var html = musicTemplate(context);
@@ -254,9 +254,14 @@ function buildMusicContext(result) {
     var context = {
         id: result.id,
         title: result.title,
-        overview: result.disambiguation,
-        year: result.date,
-        type: "music"
+        overview: result.overview,
+        year: result.releaseDate,
+        type: "album",
+        trackCount: result.trackCount,
+        coverArtUrl: result.coverArtUrl,
+        artist: result.artist,
+        releaseType: result.releaseType,
+        country: result.country
     };
 
     return context;
diff --git a/PlexRequests.UI/Models/SearchMusicViewModel.cs b/PlexRequests.UI/Models/SearchMusicViewModel.cs
new file mode 100644
index 000000000..94d3e6d1e
--- /dev/null
+++ b/PlexRequests.UI/Models/SearchMusicViewModel.cs
@@ -0,0 +1,41 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SearchMusicViewModel.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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
+namespace PlexRequests.UI.Models
+{
+    public class SearchMusicViewModel
+    {
+        public string Id { get; set; }
+        public string Overview { get; set; }
+        public string CoverArtUrl { get; set; }
+        public string Title { get; set; }
+        public string Artist { get; set; }
+        public string ReleaseDate { get; set; }
+        public int TrackCount { get; set; }
+        public string ReleaseType { get; set; }
+        public string Country { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 3cf44c370..ed18a89a3 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -36,6 +36,7 @@ using NLog;
 
 using PlexRequests.Api;
 using PlexRequests.Api.Interfaces;
+using PlexRequests.Api.Models.Music;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
@@ -81,6 +82,7 @@ namespace PlexRequests.UI.Modules
 
             Post["request/movie"] = parameters => RequestMovie((int)Request.Form.movieId);
             Post["request/tv"] = parameters => RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons);
+            Post["request/album"] = parameters => RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons);
         }
         private TheMovieDbApi MovieApi { get; }
         private INotificationService NotificationService { get; }
@@ -157,7 +159,32 @@ namespace PlexRequests.UI.Modules
         {
             var api = new MusicBrainsApi();
             var albums = api.SearchAlbum(searchTerm);
-            return Response.AsJson(albums);
+            var releases = albums.releases ?? new List<Release>();
+            var model = new List<SearchMusicViewModel>();
+            foreach (var a in releases)
+            {
+                var coverArt = api.GetCoverArt(a.id);
+                var firstImage = coverArt?.images?.FirstOrDefault();
+                var img = string.Empty;
+                
+                if (firstImage != null)
+                {
+                    img = firstImage.thumbnails?.small ?? firstImage.image;
+                }
+                model.Add(new SearchMusicViewModel
+                {
+                    Title = a.title,
+                    Id = a.id,
+                    Artist = a.ArtistCredit?.Select(x => x.artist?.name).FirstOrDefault(),
+                    Overview = a.disambiguation,
+                    ReleaseDate = a.date,
+                    TrackCount = a.TrackCount,
+                    CoverArtUrl = img,
+                    ReleaseType = a.status,
+                    Country = a.country
+                });
+            }
+            return Response.AsJson(model);
         }
 
         private Response UpcomingMovies() // TODO : Not used
@@ -448,5 +475,12 @@ namespace PlexRequests.UI.Modules
             var result = Checker.IsAvailable(title, year);
             return result;
         }
+
+        private Response RequestAlbum(string releaseId)
+        {
+            // TODO need to send to Headphones
+
+            return Response.AsJson("");
+        }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index 9a32ef2b3..6d08abb12 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -171,6 +171,7 @@
     <Compile Include="Helpers\TvSender.cs" />
     <Compile Include="Helpers\ValidationHelper.cs" />
     <Compile Include="Models\DatatablesModel.cs" />
+    <Compile Include="Models\SearchMusicViewModel.cs" />
     <Compile Include="Validators\PushoverSettingsValidator.cs" />
     <Compile Include="Validators\PushbulletSettingsValidator.cs" />
     <Compile Include="Validators\EmailNotificationSettingsValidator.cs" />
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index 42d4d30a1..aea09d6ac 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -14,7 +14,7 @@
         }
         @if (Model.SearchForMusic)
         {
-            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Music</a></li>
+            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Albums</a></li>
         }
 
     </ul>
@@ -73,7 +73,7 @@
             <!-- Music tab -->
             <div role="tabpanel" class="tab-pane" id="MusicTab">
                 <div class="input-group">
-                    <input id="musicSearchContent" type="text" class="form-control form-control-custom">
+                    <input id="musicSearchContent" type="text" class="form-control form-control-custom form-control-search">
                     <div class="input-group-addon">
                         <i id="musicSearchButton" class="fa fa-search"></i>
                     </div>
@@ -160,17 +160,21 @@
 <script id="music-template" type="text/x-handlebars-template">
     <div class="row">
         <div class="col-sm-2">
-
-            @*<img class="img-responsive" src="http://image.tmdb.org/t/p/w150/{{posterPath}}" alt="poster">*@
-
-
+            {{#if coverArtUrl}}
+            <img class="img-responsive" src="{{coverArtUrl}}" width="150" alt="poster">
+            {{/if}}
         </div>
         <div class="col-sm-5 ">
             <div>
+                <a href="https://musicbrainz.org/release/{{id}}" target="_blank">
+                <h4>
+                    {{artist}} - {{title}}
+                    {{#if year}}
+                    ({{year}})
+                    {{/if}}
+                </h4>
+                </a>
 
-                @*<a href="http://www.imdb.com/title/{{imdb}}/" target="_blank">*@
-                    <h4>{{title}} ({{year}})</h4>
-                @*</a>*@
             </div>
             <p>{{overview}}</p>
         </div>
@@ -179,10 +183,9 @@
                 <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
 
                 <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMusic" type="submit"><i class="fa fa-plus"></i> Request</button>
-
-                <br />
-                <br />
                 <br />
+                <small class="row">Track Count: {{trackCount}}</small>
+                <small class="row">Country: {{country}}</small>
             </form>
         </div>
 

From 45fb3ad3761a9134b724b14eb3c239a04c102ae6 Mon Sep 17 00:00:00 2001
From: tidusjar <jamierees@outlook.com>
Date: Fri, 1 Apr 2016 12:39:13 +0100
Subject: [PATCH 52/57] A bit more work on #32 started working on requesting
 it. The DB is a bit of an issue...

---
 PlexRequests.Api.Interfaces/IHeadphonesApi.cs | 35 ++++++++++
 .../IMusicBrainzApi.cs                        | 37 +++++++++++
 .../PlexRequests.Api.Interfaces.csproj        |  2 +
 .../Music/MusicBrainzReleaseInfo.cs           | 66 +++++++++++++++++++
 .../PlexRequests.Api.Models.csproj            |  1 +
 PlexRequests.Api/HeadphonesApi.cs             | 33 ++--------
 PlexRequests.Api/MusicBrainzApi.cs            | 26 +++++++-
 PlexRequests.Store/RequestedModel.cs          |  1 +
 PlexRequests.UI/Bootstrapper.cs               |  2 +
 PlexRequests.UI/Modules/SearchModule.cs       | 49 ++++++++++----
 10 files changed, 209 insertions(+), 43 deletions(-)
 create mode 100644 PlexRequests.Api.Interfaces/IHeadphonesApi.cs
 create mode 100644 PlexRequests.Api.Interfaces/IMusicBrainzApi.cs
 create mode 100644 PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs

diff --git a/PlexRequests.Api.Interfaces/IHeadphonesApi.cs b/PlexRequests.Api.Interfaces/IHeadphonesApi.cs
new file mode 100644
index 000000000..2dee51d4f
--- /dev/null
+++ b/PlexRequests.Api.Interfaces/IHeadphonesApi.cs
@@ -0,0 +1,35 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: IHeadphonesApi.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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;
+
+namespace PlexRequests.Api.Interfaces
+{
+    public interface IHeadphonesApi
+    {
+        bool AddAlbum(string apiKey, Uri baseUrl, string albumId);
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs b/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs
new file mode 100644
index 000000000..011c430e7
--- /dev/null
+++ b/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs
@@ -0,0 +1,37 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: IMusicBrainzApi.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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 PlexRequests.Api.Models.Music;
+
+namespace PlexRequests.Api.Interfaces
+{
+    public interface IMusicBrainzApi
+    {
+        MusicBrainzSearchResults SearchAlbum(string searchTerm);
+        MusicBrainzCoverArt GetCoverArt(string releaseId);
+        MusicBrainzReleaseInfo GetAlbum(string releaseId);
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
index 7522c8156..f27825298 100644
--- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
+++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
@@ -47,6 +47,8 @@
   <ItemGroup>
     <Compile Include="IApiRequest.cs" />
     <Compile Include="ICouchPotatoApi.cs" />
+    <Compile Include="IHeadphonesApi.cs" />
+    <Compile Include="IMusicBrainzApi.cs" />
     <Compile Include="IPlexApi.cs" />
     <Compile Include="IPushbulletApi.cs" />
     <Compile Include="IPushoverApi.cs" />
diff --git a/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs b/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs
new file mode 100644
index 000000000..974703cda
--- /dev/null
+++ b/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs
@@ -0,0 +1,66 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: MusicBrainzReleaseInfo.cs
+//    Created By: Jamie Rees
+//   
+//    Permission is hereby granted, free of charge, to any person obtaining
+//    a copy of this software and associated documentation files (the
+//    "Software"), to deal in the Software without restriction, including
+//    without limitation the rights to use, copy, modify, merge, publish,
+//    distribute, sublicense, and/or sell copies of the Software, and to
+//    permit persons to whom the Software is furnished to do so, subject to
+//    the following conditions:
+//   
+//    The above copyright notice and this permission notice shall be
+//    included in all copies or substantial portions of the Software.
+//   
+//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+//    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.Collections.Generic;
+
+using Newtonsoft.Json;
+
+namespace PlexRequests.Api.Models.Music
+{
+    public class CoverArtArchive
+    {
+        public int count { get; set; }
+        public bool back { get; set; }
+        public bool artwork { get; set; }
+        public bool front { get; set; }
+        public bool darkened { get; set; }
+    }
+
+
+    public class MusicBrainzReleaseInfo
+    {
+        public string date { get; set; }
+        public string status { get; set; }
+        public string asin { get; set; }
+        public string title { get; set; }
+        public string quality { get; set; }
+        public string country { get; set; }
+        public string packaging { get; set; }
+
+        [JsonProperty(PropertyName = "text-representation")]
+        public TextRepresentation TextRepresentation { get; set; }
+
+        [JsonProperty(PropertyName = "cover-art-archive")]
+        public CoverArtArchive CoverArtArchive { get; set; }
+        public string barcode { get; set; }
+        public string disambiguation { get; set; }
+
+        [JsonProperty(PropertyName = "release-events")]
+        public List<ReleaseEvent> ReleaseRvents { get; set; }
+        public string id { get; set; }
+    }
+
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
index 978171662..e24c0e31f 100644
--- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -51,6 +51,7 @@
     <Compile Include="Music\HeadphonesAlbumSearchResult.cs" />
     <Compile Include="Music\HeadphonesArtistSearchResult.cs" />
     <Compile Include="Music\MusicBrainzCoverArt.cs" />
+    <Compile Include="Music\MusicBrainzReleaseInfo.cs" />
     <Compile Include="Music\MusicBrainzSearchResults.cs" />
     <Compile Include="Notifications\PushbulletPush.cs" />
     <Compile Include="Notifications\PushbulletResponse.cs" />
diff --git a/PlexRequests.Api/HeadphonesApi.cs b/PlexRequests.Api/HeadphonesApi.cs
index d346ba846..ed0dac9c6 100644
--- a/PlexRequests.Api/HeadphonesApi.cs
+++ b/PlexRequests.Api/HeadphonesApi.cs
@@ -1,7 +1,7 @@
 #region Copyright
 // /************************************************************************
 //    Copyright (c) 2016 Jamie Rees
-//    File: CouchPotatoApi.cs
+//    File: HeadphonesApi.cs
 //    Created By: Jamie Rees
 //   
 //    Permission is hereby granted, free of charge, to any person obtaining
@@ -26,51 +26,26 @@
 #endregion
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 using Newtonsoft.Json;
 
 using NLog;
+
 using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Music;
-using PlexRequests.Api.Models.Sonarr;
-using PlexRequests.Helpers;
 
 using RestSharp;
 
 namespace PlexRequests.Api
 {
-    public class HeadphonesApi
+    public class HeadphonesApi : IHeadphonesApi
     {
         public HeadphonesApi()
         {
             Api = new ApiRequest();
         }
         private ApiRequest Api { get; }
-        private static Logger Log = LogManager.GetCurrentClassLogger();
-
-        public List<HeadphonesAlbumSearchResult> SearchAlbum(string apiKey, Uri baseUrl, string searchTerm)
-        {
-            Log.Trace("Searching for album: {0}", searchTerm);
-            var request = new RestRequest
-            {
-                Resource = "/api?cmd=findAlbum&name={searchTerm}",
-                Method = Method.GET
-            };
-
-            request.AddQueryParameter("apikey", apiKey);
-            request.AddUrlSegment("searchTerm", searchTerm);
-
-            try
-            {
-                return Api.ExecuteJson<List<HeadphonesAlbumSearchResult>>(request, baseUrl);
-            }
-            catch (JsonSerializationException jse)
-            {
-                Log.Warn(jse);
-                return new List<HeadphonesAlbumSearchResult>(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
-            }
-        }
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
 
         public bool AddAlbum(string apiKey, Uri baseUrl, string albumId)
         {
diff --git a/PlexRequests.Api/MusicBrainzApi.cs b/PlexRequests.Api/MusicBrainzApi.cs
index 8331e8a0d..62b0771be 100644
--- a/PlexRequests.Api/MusicBrainzApi.cs
+++ b/PlexRequests.Api/MusicBrainzApi.cs
@@ -30,15 +30,16 @@ using Newtonsoft.Json;
 
 using NLog;
 
+using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Music;
 
 using RestSharp;
 
 namespace PlexRequests.Api
 {
-    public class MusicBrainsApi
+    public class MusicBrainzApi : IMusicBrainzApi
     {
-        public MusicBrainsApi()
+        public MusicBrainzApi()
         {
             Api = new ApiRequest();
         }
@@ -67,6 +68,27 @@ namespace PlexRequests.Api
             }
         }
 
+        public MusicBrainzReleaseInfo GetAlbum(string releaseId)
+        {
+            Log.Trace("Getting album: {0}", releaseId);
+            var request = new RestRequest
+            {
+                Resource = "release/{albumId}?fmt=json",
+                Method = Method.GET
+            };
+            request.AddUrlSegment("albumId", releaseId);
+
+            try
+            {
+                return Api.Execute<MusicBrainzReleaseInfo>(request, BaseUri);
+            }
+            catch (JsonSerializationException jse)
+            {
+                Log.Warn(jse);
+                return new MusicBrainzReleaseInfo(); // If there is no matching result we do not get returned a JSON string, it just returns "false".
+            }
+        }
+
         public MusicBrainzCoverArt GetCoverArt(string releaseId)
         {
             Log.Trace("Getting cover art for release: {0}", releaseId);
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index dcceeb1ab..ffb80db8b 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -38,6 +38,7 @@ namespace PlexRequests.Store
         public int[] SeasonList { get; set; }
         public int SeasonCount { get; set; }
         public string SeasonsRequested { get; set; }
+        public string MusicBrainzId { get; set; }
         public List<string> RequestedUsers { get; set; }
 
         [JsonIgnore]
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index dd1daaec0..a4e13f18b 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -95,6 +95,8 @@ namespace PlexRequests.UI
             container.Register<ISickRageApi, SickrageApi>();
             container.Register<ISonarrApi, SonarrApi>();
             container.Register<IPlexApi, PlexApi>();
+            container.Register<IMusicBrainzApi, MusicBrainzApi>();
+            container.Register<IHeadphonesApi, HeadphonesApi>();
 
             // NotificationService
             container.Register<INotificationService, NotificationService>().AsSingleton();
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index ed18a89a3..4d97a2cce 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -55,7 +55,7 @@ namespace PlexRequests.UI.Modules
             ISettingsService<PlexRequestSettings> prSettings, IAvailabilityChecker checker,
             IRequestService request, ISonarrApi sonarrApi, ISettingsService<SonarrSettings> sonarrSettings,
             ISettingsService<SickRageSettings> sickRageService, ICouchPotatoApi cpApi, ISickRageApi srApi,
-            INotificationService notify) : base("search")
+            INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService<HeadphonesSettings> hpService) : base("search")
         {
             CpService = cpSettings;
             PrService = prSettings;
@@ -70,6 +70,10 @@ namespace PlexRequests.UI.Modules
             SickRageService = sickRageService;
             SickrageApi = srApi;
             NotificationService = notify;
+            MusicBrainzApi = mbApi;
+            HeadphonesApi = hpApi;
+            HeadphonesService = hpService;
+
 
             Get["/"] = parameters => RequestLoad();
 
@@ -96,9 +100,11 @@ namespace PlexRequests.UI.Modules
         private ISettingsService<PlexRequestSettings> PrService { get; }
         private ISettingsService<SonarrSettings> SonarrService { get; }
         private ISettingsService<SickRageSettings> SickRageService { get; }
+        private ISettingsService<HeadphonesSettings> HeadphonesService { get; }
         private IAvailabilityChecker Checker { get; }
+        private IMusicBrainzApi MusicBrainzApi { get; }
+        private IHeadphonesApi HeadphonesApi { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
-        private string AuthToken => Cache.GetOrSet(CacheKeys.TvDbToken, TvApi.Authenticate, 50);
 
         private Negotiator RequestLoad()
         {
@@ -157,20 +163,12 @@ namespace PlexRequests.UI.Modules
 
         private Response SearchMusic(string searchTerm)
         {
-            var api = new MusicBrainsApi();
-            var albums = api.SearchAlbum(searchTerm);
+            var albums = MusicBrainzApi.SearchAlbum(searchTerm);
             var releases = albums.releases ?? new List<Release>();
             var model = new List<SearchMusicViewModel>();
             foreach (var a in releases)
             {
-                var coverArt = api.GetCoverArt(a.id);
-                var firstImage = coverArt?.images?.FirstOrDefault();
-                var img = string.Empty;
-                
-                if (firstImage != null)
-                {
-                    img = firstImage.thumbnails?.small ?? firstImage.image;
-                }
+                var img = GetMusicBrainzCoverArt(a.id);
                 model.Add(new SearchMusicViewModel
                 {
                     Title = a.title,
@@ -478,9 +476,36 @@ namespace PlexRequests.UI.Modules
 
         private Response RequestAlbum(string releaseId)
         {
+            var settings = HeadphonesService.GetSettings();
+
+            var albumInfo = MusicBrainzApi.GetAlbum(releaseId);
+            var img = GetMusicBrainzCoverArt(albumInfo.id);
+            var model = new RequestedModel
+            {
+                Title = albumInfo.title,
+                MusicBrainzId = albumInfo.id,
+                Overview = albumInfo.disambiguation,
+                PosterPath = img,
+                Type = RequestType.Album
+            };
+            
             // TODO need to send to Headphones
 
             return Response.AsJson("");
         }
+
+        private string GetMusicBrainzCoverArt(string id)
+        {
+            var coverArt = MusicBrainzApi.GetCoverArt(id);
+            var firstImage = coverArt?.images?.FirstOrDefault();
+            var img = string.Empty;
+
+            if (firstImage != null)
+            {
+                img = firstImage.thumbnails?.small ?? firstImage.image;
+            }
+
+            return img;
+        }
     }
 }
\ No newline at end of file

From 2ad36fa20fdfb0144f4ed194942defe5e96c0e99 Mon Sep 17 00:00:00 2001
From: Drewster727 <drewm727@hotmail.com>
Date: Fri, 1 Apr 2016 09:08:28 -0500
Subject: [PATCH 53/57] remove test/temp code in UserLoginModule

---
 PlexRequests.UI/Modules/UserLoginModule.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index 148888b11..c1528bdd7 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -141,10 +141,6 @@ namespace PlexRequests.UI.Modules
 
             Session[SessionKeys.ClientDateTimeOffsetKey] = (int)dateTimeOffset;
 
-            int z = 240;
-
-
-
             return Response.AsJson(authenticated 
                 ? new JsonResponseModel { Result = true } 
                 : new JsonResponseModel { Result = false, Message = "Incorrect User or Password"});

From 425302ba12e22537991a69c924df60ff2d1153af Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 1 Apr 2016 22:13:12 +0100
Subject: [PATCH 54/57] Added a DBSchema so we have an easier way to update the
 DB

---
 PlexRequests.Core/PlexRequests.Core.csproj |  4 ++
 PlexRequests.Core/Setup.cs                 | 36 +++++++++++-
 PlexRequests.Core/packages.config          |  1 +
 PlexRequests.Store/DbConfiguration.cs      |  2 +
 PlexRequests.Store/SqlTables.sql           |  6 ++
 PlexRequests.Store/TableCreation.cs        | 65 +++++++++++++++++++++-
 README.md                                  |  6 +-
 7 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj
index 13a1e74ec..735938db4 100644
--- a/PlexRequests.Core/PlexRequests.Core.csproj
+++ b/PlexRequests.Core/PlexRequests.Core.csproj
@@ -46,6 +46,10 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Octokit, Version=0.19.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Octokit.0.19.0\lib\net45\Octokit.dll</HintPath>
       <Private>True</Private>
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 93d8003e7..0dc10a44d 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using Mono.Data.Sqlite;
+using NLog;
 using PlexRequests.Api;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
@@ -40,6 +41,9 @@ namespace PlexRequests.Core
 {
     public class Setup
     {
+        public const int SchemaVersion = 1;
+
+        private static Logger Log = LogManager.GetCurrentClassLogger();
         private static DbConfiguration Db { get; set; }
         public string SetupDb()
         {
@@ -53,11 +57,40 @@ namespace PlexRequests.Core
             }
 
             MigrateDb();
+            CheckSchema();
             return Db.DbConnection().ConnectionString;
         }
 
         public static string ConnectionString => Db.DbConnection().ConnectionString;
 
+
+        private void CheckSchema()
+        {
+            var connection = Db.DbConnection();
+            var schema = connection.GetSchemaVersion();
+            if (schema == null)
+            {
+                connection.CreateSchema(); // Set the default.
+                schema = connection.GetSchemaVersion();
+            }
+
+            var version = schema.SchemaVersion;
+            if (version == 0)
+            {
+                connection.UpdateSchemaVersion(SchemaVersion);
+                try
+                {
+                    TableCreation.AlterTable(Db.DbConnection(), "RequestBlobs", "ADD COLUMN", "MusicId", false, "INTEGER");
+                }
+                catch (Exception e)
+                {
+                    Log.Error("Tried updating the schema to version 1");
+                    Log.Error(e);
+                }
+                return;
+            }
+        }
+
         private void CreateDefaultSettingsPage()
         {
             var defaultSettings = new PlexRequestSettings
@@ -74,6 +107,7 @@ namespace PlexRequests.Core
 
         private void MigrateDb() // TODO: Remove in v1.7
         {
+
             var result = new List<long>();
             RequestedModel[] requestedModels;
             var repo = new GenericRepository<RequestedModel>(Db, new MemoryCacheProvider());
@@ -121,7 +155,7 @@ namespace PlexRequests.Core
                 result.Add(id);
             }
 
-            foreach (var source in requestedModels.Where(x => x.Type== RequestType.Movie))
+            foreach (var source in requestedModels.Where(x => x.Type == RequestType.Movie))
             {
                 var id = jsonRepo.AddRequest(source);
                 result.Add(id);
diff --git a/PlexRequests.Core/packages.config b/PlexRequests.Core/packages.config
index ddcb2361b..6fae42bd4 100644
--- a/PlexRequests.Core/packages.config
+++ b/PlexRequests.Core/packages.config
@@ -3,6 +3,7 @@
   <package id="Nancy" version="1.4.3" targetFramework="net452" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
+  <package id="NLog" version="4.2.3" targetFramework="net46" />
   <package id="Octokit" version="0.19.0" targetFramework="net46" />
   <package id="valueinjecter" version="3.1.1.2" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/PlexRequests.Store/DbConfiguration.cs b/PlexRequests.Store/DbConfiguration.cs
index 28cd9cb98..7ddd60483 100644
--- a/PlexRequests.Store/DbConfiguration.cs
+++ b/PlexRequests.Store/DbConfiguration.cs
@@ -93,5 +93,7 @@ namespace PlexRequests.Store
                 Log.Error(e);
             }
         }
+
+
     }
 }
diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index f23b3c5fc..a35dcf4b7 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -40,3 +40,9 @@ CREATE TABLE IF NOT EXISTS Logs
     Exception							varchar(100) NOT NULL
 );
 CREATE UNIQUE INDEX IF NOT EXISTS Logs_Id ON Logs (Id);
+
+CREATE TABLE IF NOT EXISTS DBInfo
+(
+    SchemaVersion									INTEGER
+
+);
\ No newline at end of file
diff --git a/PlexRequests.Store/TableCreation.cs b/PlexRequests.Store/TableCreation.cs
index 437105ffc..6b0e07044 100644
--- a/PlexRequests.Store/TableCreation.cs
+++ b/PlexRequests.Store/TableCreation.cs
@@ -25,7 +25,7 @@
 //  ***********************************************************************
 #endregion
 using System.Data;
-
+using System.Linq;
 using Dapper;
 using Dapper.Contrib.Extensions;
 
@@ -44,6 +44,57 @@ namespace PlexRequests.Store
             connection.Close();
         }
 
+        public static void AlterTable(IDbConnection connection, string tableName, string alterType, string newColumn, bool isNullable, string dataType)
+        {
+            connection.Open();
+            var result = connection.Query<TableInfo>($"PRAGMA table_info({tableName});");
+            if (result.Any(x => x.name == newColumn))
+            {
+                return;
+            }
+
+            var query = $"ALTER TABLE {tableName} {alterType} {newColumn} {dataType}";
+            if (isNullable)
+            {
+                query = query + " NOT NULL";
+            }
+
+            connection.Execute(query);
+
+            connection.Close();
+        }
+
+        public static DbInfo GetSchemaVersion(this IDbConnection con)
+        {
+            con.Open();
+            var result = con.Query<DbInfo>("SELECT * FROM DBInfo");
+            con.Close();
+
+            return result.FirstOrDefault();
+        }
+
+        public static void UpdateSchemaVersion(this IDbConnection con, int version)
+        {
+            con.Open();
+            con.Query($"UPDATE DBInfo SET SchemaVersion = {version}");
+            con.Close();
+        }
+
+        public static void CreateSchema(this IDbConnection con)
+        {
+            con.Open();
+            con.Query("INSERT INTO DBInfo (SchemaVersion) values (0)");
+            con.Close();
+        }
+
+
+
+        [Table("DBInfo")]
+        public class DbInfo
+        {
+            public int SchemaVersion { get; set; }
+        }
+
         [Table("sqlite_master")]
         public class SqliteMasterTable
         {
@@ -54,5 +105,17 @@ namespace PlexRequests.Store
             public long rootpage { get; set; }
             public string sql { get; set; }
         }
+
+        [Table("table_info")]
+        public class TableInfo
+        {
+            public int cid { get; set; }
+            public string name { get; set; }
+            public int notnull { get; set; }
+            public string dflt_value { get; set; }
+            public int pk { get; set; }
+        }
+
+
     }
 }
diff --git a/README.md b/README.md
index 373655988..efe061498 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,9 @@ end script
 
 ####Reboot, then open up your browser to check that it's running!
 
-```sudo shutdown -r 00```
+```
+sudo shutdown -r 00
+```
 
 # Contributors
 
@@ -97,4 +99,4 @@ If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet)
 
 ## A massive thanks to everyone below for all their help!
 
-[heartisall](https://github.com/heartisall), [Stuke00](https://github.com/Stuke00), [shiitake](https://github.com/shiitake), [Drewster727](https://github.com/Drewster727)
+[heartisall](https://github.com/heartisall), [Stuke00](https://github.com/Stuke00), [shiitake](https://github.com/shiitake), [Drewster727](https://github.com/Drewster727), Majawat

From 420e43dfaf83ef27e4ea21a2df34b05d36f0a84b Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 1 Apr 2016 22:17:15 +0100
Subject: [PATCH 55/57] Change the new columns type

---
 PlexRequests.Core/JsonRequestService.cs   | 2 +-
 PlexRequests.Core/Setup.cs                | 2 +-
 PlexRequests.Store/Models/RequestBlobs.cs | 1 +
 PlexRequests.Store/RequestedModel.cs      | 2 --
 PlexRequests.Store/SqlTables.sql          | 3 ++-
 PlexRequests.UI/Modules/SearchModule.cs   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 45eccb51e..21ddcecc7 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -52,7 +52,7 @@ namespace PlexRequests.Core
             // TODO Keep an eye on this, since we are now doing 2 DB update for 1 single request, inserting and then updating
             model.Id = (int)id;
 
-            entity = new RequestBlobs { Type = model.Type, Content = ByteConverterHelper.ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id };
+            entity = new RequestBlobs { Type = model.Type, Content = ByteConverterHelper.ReturnBytes(model), ProviderId = model.ProviderId, Id = (int)id, MusicId = model.MusicBrainzId};
             var result = Repo.Update(entity);
 
             return result ? id : -1;
diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs
index 0dc10a44d..69d3f9000 100644
--- a/PlexRequests.Core/Setup.cs
+++ b/PlexRequests.Core/Setup.cs
@@ -80,7 +80,7 @@ namespace PlexRequests.Core
                 connection.UpdateSchemaVersion(SchemaVersion);
                 try
                 {
-                    TableCreation.AlterTable(Db.DbConnection(), "RequestBlobs", "ADD COLUMN", "MusicId", false, "INTEGER");
+                    TableCreation.AlterTable(Db.DbConnection(), "RequestBlobs", "ADD COLUMN", "MusicId", false, "TEXT");
                 }
                 catch (Exception e)
                 {
diff --git a/PlexRequests.Store/Models/RequestBlobs.cs b/PlexRequests.Store/Models/RequestBlobs.cs
index 3b1127b6a..f9af75a25 100644
--- a/PlexRequests.Store/Models/RequestBlobs.cs
+++ b/PlexRequests.Store/Models/RequestBlobs.cs
@@ -34,5 +34,6 @@ namespace PlexRequests.Store.Models
         public int ProviderId { get; set; }
         public byte[] Content { get; set; }
         public RequestType Type { get; set; }
+        public string MusicId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs
index ffb80db8b..55fc3abac 100644
--- a/PlexRequests.Store/RequestedModel.cs
+++ b/PlexRequests.Store/RequestedModel.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Security.Cryptography;
-
 using Dapper.Contrib.Extensions;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/PlexRequests.Store/SqlTables.sql b/PlexRequests.Store/SqlTables.sql
index a35dcf4b7..7392c4efc 100644
--- a/PlexRequests.Store/SqlTables.sql
+++ b/PlexRequests.Store/SqlTables.sql
@@ -25,7 +25,8 @@ CREATE TABLE IF NOT EXISTS RequestBlobs
     Id									INTEGER PRIMARY KEY AUTOINCREMENT,
     ProviderId							INTEGER NOT NULL,
     Type								INTEGER NOT NULL,
-    Content								BLOB NOT NULL
+    Content								BLOB NOT NULL,
+	MusicId								TEXT
 );
 CREATE UNIQUE INDEX IF NOT EXISTS RequestBlobs_Id ON RequestBlobs (Id);
 
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 4d97a2cce..81124df26 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -486,7 +486,7 @@ namespace PlexRequests.UI.Modules
                 MusicBrainzId = albumInfo.id,
                 Overview = albumInfo.disambiguation,
                 PosterPath = img,
-                Type = RequestType.Album
+                Type = RequestType.Album,
             };
             
             // TODO need to send to Headphones

From e037ad0f2b8e7a628a587421b6458ad27cf77b34 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 1 Apr 2016 23:05:17 +0100
Subject: [PATCH 56/57] Got the search finished up for #32

---
 PlexRequests.Core/IRequestService.cs          |  2 +
 PlexRequests.Core/JsonRequestService.cs       |  7 ++
 .../SettingModels/HeadphonesSettings.cs       |  2 +-
 .../SettingModels/PlexRequestSettings.cs      |  2 +-
 .../Repository/RequestJsonRepository.cs       | 10 +--
 PlexRequests.UI/Content/search.js             | 22 +++++
 PlexRequests.UI/Modules/SearchModule.cs       | 89 +++++++++++++++++--
 PlexRequests.UI/Views/Search/Index.cshtml     |  2 +-
 8 files changed, 118 insertions(+), 18 deletions(-)

diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs
index fc5187aed..342e83d05 100644
--- a/PlexRequests.Core/IRequestService.cs
+++ b/PlexRequests.Core/IRequestService.cs
@@ -34,6 +34,8 @@ namespace PlexRequests.Core
     {
         long AddRequest(RequestedModel model);
         RequestedModel CheckRequest(int providerId);
+        RequestedModel CheckRequest(string musicId);
+        
         void DeleteRequest(RequestedModel request);
         bool UpdateRequest(RequestedModel model);
         RequestedModel Get(int id);
diff --git a/PlexRequests.Core/JsonRequestService.cs b/PlexRequests.Core/JsonRequestService.cs
index 21ddcecc7..4808cde3b 100644
--- a/PlexRequests.Core/JsonRequestService.cs
+++ b/PlexRequests.Core/JsonRequestService.cs
@@ -65,6 +65,13 @@ namespace PlexRequests.Core
             return blob != null ? ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content) : null;
         }
 
+        public RequestedModel CheckRequest(string musicId)
+        {
+            var blobs = Repo.GetAll();
+            var blob = blobs.FirstOrDefault(x => x.MusicId == musicId);
+            return blob != null ? ByteConverterHelper.ReturnObject<RequestedModel>(blob.Content) : null;
+        }
+
         public void DeleteRequest(RequestedModel request)
         {
             var blob = Repo.Get(request.Id);
diff --git a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
index e77abca47..96deeb821 100644
--- a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
+++ b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs
@@ -36,7 +36,7 @@ namespace PlexRequests.Core.SettingModels
         public bool Enabled { get; set; }
         public string Ip { get; set; }
         public int Port { get; set; }
-        public int ApiKey { get; set; }
+        public string ApiKey { get; set; }
         public bool Ssl { get; set; }
         public string SubDir { get; set; }
        
diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
index 76266cc07..4b4009def 100644
--- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
+++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs
@@ -45,7 +45,7 @@ namespace PlexRequests.Core.SettingModels
         public string NoApprovalUsers { get; set; }
 
         [JsonIgnore]
-        public List<string> NoApprovalUserList
+        public List<string> ApprovalWhiteList
         {
             get
             {
diff --git a/PlexRequests.Store/Repository/RequestJsonRepository.cs b/PlexRequests.Store/Repository/RequestJsonRepository.cs
index d02a111b0..872e07745 100644
--- a/PlexRequests.Store/Repository/RequestJsonRepository.cs
+++ b/PlexRequests.Store/Repository/RequestJsonRepository.cs
@@ -37,13 +37,11 @@ namespace PlexRequests.Store.Repository
     public class RequestJsonRepository : IRequestRepository
     {
         private ICacheProvider Cache { get; }
-
-        private string TypeName { get; }
+        
         public RequestJsonRepository(ISqliteConfiguration config, ICacheProvider cacheProvider)
         {
             Db = config;
             Cache = cacheProvider;
-            TypeName = typeof(RequestJsonRepository).Name;
         }
 
         private ISqliteConfiguration Db { get; }
@@ -60,7 +58,7 @@ namespace PlexRequests.Store.Repository
 
         public IEnumerable<RequestBlobs> GetAll()
         {
-            var key = TypeName + "GetAll";
+            var key = "GetAll";
             var item = Cache.GetOrSet(key, () =>
             {
                 using (var con = Db.DbConnection())
@@ -74,7 +72,7 @@ namespace PlexRequests.Store.Repository
 
         public RequestBlobs Get(int id)
         {
-            var key = TypeName + "Get" + id;
+            var key = "Get" + id;
             var item = Cache.GetOrSet(key, () =>
             {
                 using (var con = Db.DbConnection())
@@ -107,7 +105,7 @@ namespace PlexRequests.Store.Repository
         private void ResetCache()
         {
             Cache.Remove("Get");
-            Cache.Remove(TypeName + "GetAll");
+            Cache.Remove("GetAll");
         }
 
         public bool UpdateAll(IEnumerable<RequestBlobs> entity)
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index b21b6f409..126d65634 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -107,6 +107,28 @@ $(document).on("click", ".requestMovie", function (e) {
     
 });
 
+// Click Request for album
+$(document).on("click", ".requestAlbum", function (e) {
+    e.preventDefault();
+    var buttonId = e.target.id;
+    if ($("#" + buttonId).attr('disabled')) {
+        return;
+    }
+
+    $("#" + buttonId).prop("disabled", true);
+    loadingButton(buttonId, "primary");
+
+
+    var $form = $('#form' + buttonId);
+
+    var type = $form.prop('method');
+    var url = $form.prop('action');
+    var data = $form.serialize();
+
+    sendRequestAjax(data, type, url, buttonId);
+
+});
+
 function sendRequestAjax(data, type, url, buttonId) {
     $.ajax({
         type: type,
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index 81124df26..ee4f518f5 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -86,7 +86,7 @@ namespace PlexRequests.UI.Modules
 
             Post["request/movie"] = parameters => RequestMovie((int)Request.Form.movieId);
             Post["request/tv"] = parameters => RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons);
-            Post["request/album"] = parameters => RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons);
+            Post["request/album"] = parameters => RequestAlbum((string)Request.Form.albumId);
         }
         private TheMovieDbApi MovieApi { get; }
         private INotificationService NotificationService { get; }
@@ -261,7 +261,7 @@ namespace PlexRequests.UI.Modules
             };
 
             Log.Trace(settings.DumpJson());
-            if (!settings.RequireMovieApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireMovieApproval || settings.ApprovalWhiteList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var cpSettings = CpService.GetSettings();
 
@@ -288,7 +288,7 @@ namespace PlexRequests.UI.Modules
                         };
                         NotificationService.Publish(notificationModel);
 
-                        return Response.AsJson(new JsonResponseModel {Result = true, Message = $"{fullMovieName} was successfully added!" });
+                        return Response.AsJson(new JsonResponseModel { Result = true, Message = $"{fullMovieName} was successfully added!" });
                     }
                     return
                         Response.AsJson(new JsonResponseModel
@@ -380,7 +380,7 @@ namespace PlexRequests.UI.Modules
             }
             //#endif
 
-            
+
             var model = new RequestedModel
             {
                 ProviderId = showInfo.externals?.thetvdb ?? 0,
@@ -415,7 +415,7 @@ namespace PlexRequests.UI.Modules
 
             model.SeasonList = seasonsList.ToArray();
 
-            if (!settings.RequireTvShowApproval || settings.NoApprovalUserList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
+            if (!settings.RequireTvShowApproval || settings.ApprovalWhiteList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
             {
                 var sonarrSettings = SonarrService.GetSettings();
                 var sender = new TvSender(SonarrApi, SickrageApi);
@@ -476,10 +476,33 @@ namespace PlexRequests.UI.Modules
 
         private Response RequestAlbum(string releaseId)
         {
-            var settings = HeadphonesService.GetSettings();
+            var settings = PrService.GetSettings();
+            var existingRequest = RequestService.CheckRequest(releaseId);
+            Log.Debug("Checking for an existing request");
+
+            if (existingRequest != null)
+            {
+                Log.Debug("We do have an existing album request");
+                if (!existingRequest.UserHasRequested(Username))
+                {
+                    Log.Debug("Not in the requested list so adding them and updating the request. User: {0}", Username);
+                    existingRequest.RequestedUsers.Add(Username);
+                    RequestService.UpdateRequest(existingRequest);
+                }
+                return Response.AsJson(new JsonResponseModel { Result = true, Message = settings.UsersCanViewOnlyOwnRequests ? $"{existingRequest.Title} was successfully added!" : $"{existingRequest.Title} has already been requested!" });
+            }
+
+
+            Log.Debug("This is a new request");
 
             var albumInfo = MusicBrainzApi.GetAlbum(releaseId);
             var img = GetMusicBrainzCoverArt(albumInfo.id);
+
+            Log.Trace("Album Details:");
+            Log.Trace(albumInfo.DumpJson());
+            Log.Trace("CoverArt Details:");
+            Log.Trace(img.DumpJson());
+
             var model = new RequestedModel
             {
                 Title = albumInfo.title,
@@ -487,11 +510,59 @@ namespace PlexRequests.UI.Modules
                 Overview = albumInfo.disambiguation,
                 PosterPath = img,
                 Type = RequestType.Album,
+                ProviderId = 0,
+                RequestedUsers = new List<string>() { Username },
+                Status = albumInfo.status
             };
-            
-            // TODO need to send to Headphones
 
-            return Response.AsJson("");
+
+            if (!settings.RequireMusicApproval ||
+                settings.ApprovalWhiteList.Any(x => x.Equals(Username, StringComparison.OrdinalIgnoreCase)))
+            {
+                Log.Debug("We don't require approval OR the user is in the whitelist");
+                var hpSettings = HeadphonesService.GetSettings();
+
+                Log.Trace("Headphone Settings:");
+                Log.Trace(hpSettings.DumpJson());
+
+                if (!hpSettings.Enabled)
+                {
+                    RequestService.AddRequest(model);
+                    return
+                        Response.AsJson(new JsonResponseModel
+                        {
+                            Result = true,
+                            Message = $"{model.Title} was successfully added!"
+                        });
+                }
+
+                var headphonesResult = HeadphonesApi.AddAlbum(hpSettings.ApiKey, hpSettings.FullUri, model.MusicBrainzId);
+                Log.Info("Result from adding album to Headphones = {0}", headphonesResult);
+                RequestService.AddRequest(model);
+                if (headphonesResult)
+                {
+                    return
+                        Response.AsJson(new JsonResponseModel
+                        {
+                            Result = true,
+                            Message = $"{model.Title} was successfully added!"
+                        });
+                }
+
+                return
+                    Response.AsJson(new JsonResponseModel
+                    {
+                        Result = false,
+                        Message = $"There was a problem adding {model.Title}. Please contact your admin!"
+                    });
+            }
+            
+            var result = RequestService.AddRequest(model);
+            return Response.AsJson(new JsonResponseModel
+            {
+                Result = true,
+                Message = $"{model.Title} was successfully added!"
+            });
         }
 
         private string GetMusicBrainzCoverArt(string id)
diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml
index aea09d6ac..ef9145ee7 100644
--- a/PlexRequests.UI/Views/Search/Index.cshtml
+++ b/PlexRequests.UI/Views/Search/Index.cshtml
@@ -182,7 +182,7 @@
             <form method="POST" action="/search/request/{{type}}" id="form{{id}}">
                 <input name="{{type}}Id" type="text" value="{{id}}" hidden="hidden" />
 
-                <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestMusic" type="submit"><i class="fa fa-plus"></i> Request</button>
+                <button id="{{id}}" style="text-align: right" class="btn btn-primary-outline requestAlbum" type="submit"><i class="fa fa-plus"></i> Request</button>
                 <br />
                 <small class="row">Track Count: {{trackCount}}</small>
                 <small class="row">Country: {{country}}</small>

From a5d38421d3d5f7b321d85cb4d30e6017741ebaf3 Mon Sep 17 00:00:00 2001
From: tidusjar <jamie.rees@outlook.com>
Date: Fri, 1 Apr 2016 23:24:29 +0100
Subject: [PATCH 57/57] Work on showing the requests for #32

---
 PlexRequests.UI/Content/requests.js         |  41 ++++++-
 PlexRequests.UI/Content/search.js           |   5 +-
 PlexRequests.UI/Content/site.js             |   7 +-
 PlexRequests.UI/Models/RequestViewModel.cs  |   1 +
 PlexRequests.UI/Modules/RequestsModule.cs   |  42 +++++++
 PlexRequests.UI/Modules/SearchModule.cs     |   3 +-
 PlexRequests.UI/Views/Requests/Index.cshtml | 115 +++++++++++++++++++-
 7 files changed, 201 insertions(+), 13 deletions(-)

diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js
index 032da43b1..611d89fba 100644
--- a/PlexRequests.UI/Content/requests.js
+++ b/PlexRequests.UI/Content/requests.js
@@ -6,11 +6,12 @@
 });
 
 var searchSource = $("#search-template").html();
+var albumSource = $("#album-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
+var albumTemplate = Handlebars.compile(albumSource);
 var movieTimer = 0;
 var tvimer = 0;
-var noResultsHtml = "<div class='no-search-results'>" +
-    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, there are no {0} requests yet!</div></div>";
+
 var mixItUpDefault = {
     animation: { enable: true },
     load: {
@@ -86,7 +87,7 @@ $('#approveMovies').click(function (e) {
             generateNotify("Something went wrong!", "danger");
         },
         complete: function (e) {
-            finishLoading(buttonId, "success", origHtml)
+            finishLoading(buttonId, "success", origHtml);
         }
     });
 });
@@ -116,7 +117,7 @@ $('#approveTVShows').click(function (e) {
             generateNotify("Something went wrong!", "danger");
         },
         complete: function (e) {
-            finishLoading(buttonId, "success", origHtml)
+            finishLoading(buttonId, "success", origHtml);
         }
     });
 });
@@ -384,6 +385,8 @@ function mixItUpConfig(activeState) {
 function initLoad() {
     movieLoad();
     tvLoad();
+    albumLoad();
+    //noResultsMusic
 }
 
 function movieLoad() {
@@ -432,6 +435,29 @@ function tvLoad() {
     });
 };
 
+function albumLoad() {
+    var $albumL = $('#MusicList');
+    if ($albumL.mixItUp('isLoaded')) {
+        activeState = $albumL.mixItUp('getState');
+        $albumL.mixItUp('destroy');
+    }
+    $albumL.html("");
+
+    $.ajax("/requests/albums/").success(function (results) {
+        if (results.length > 0) {
+            results.forEach(function (result) {
+                var context = buildRequestContext(result, "album");
+                var html = searchTemplate(context);
+                $albumL.append(html);
+            });
+        }
+        else {
+            $albumL.html(noResultsMusic.format("albums"));
+        }
+        $albumL.mixItUp(mixItUpConfig());
+    });
+};
+
 // Builds the request context.
 function buildRequestContext(result, type) {
     var context = {
@@ -455,8 +481,11 @@ function buildRequestContext(result, type) {
         requestId: result.id,
         adminNote: result.adminNotes,
         imdb: result.imdbId,
-        seriesRequested: result.tvSeriesRequestType
+        seriesRequested: result.tvSeriesRequestType,
+        coverArtUrl: result.coverArtUrl,
+
     };
 
     return context;
-}
\ No newline at end of file
+}
+
diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js
index 126d65634..1c2daa06d 100644
--- a/PlexRequests.UI/Content/search.js
+++ b/PlexRequests.UI/Content/search.js
@@ -9,10 +9,7 @@ var searchSource = $("#search-template").html();
 var musicSource = $("#music-template").html();
 var searchTemplate = Handlebars.compile(searchSource);
 var musicTemplate = Handlebars.compile(musicSource);
-var noResultsHtml = "<div class='no-search-results'>" +
-    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
-var noResultsMusic = "<div class='no-search-results'>" +
-    "<i class='fa fa-headphones no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
+
 var searchTimer = 0;
 
 // Type in movie search
diff --git a/PlexRequests.UI/Content/site.js b/PlexRequests.UI/Content/site.js
index 698178126..72ec831fa 100644
--- a/PlexRequests.UI/Content/site.js
+++ b/PlexRequests.UI/Content/site.js
@@ -44,4 +44,9 @@ function finishLoading(elementId, originalCss, html) {
     $('#' + elementId).removeClass("btn-primary-outline");
     $('#' + elementId).addClass("btn-" + originalCss + "-outline");
     $('#' + elementId).html(html);
-}
\ No newline at end of file
+}
+
+var noResultsHtml = "<div class='no-search-results'>" +
+    "<i class='fa fa-film no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
+var noResultsMusic = "<div class='no-search-results'>" +
+    "<i class='fa fa-headphones no-search-results-icon'></i><div class='no-search-results-text'>Sorry, we didn't find any results!</div></div>";
\ No newline at end of file
diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs
index 292bc39df..575681007 100644
--- a/PlexRequests.UI/Models/RequestViewModel.cs
+++ b/PlexRequests.UI/Models/RequestViewModel.cs
@@ -51,5 +51,6 @@ namespace PlexRequests.UI.Models
         public string OtherMessage { get; set; }
         public string AdminNotes { get; set; }
         public string TvSeriesRequestType { get; set; }
+        public string MusicBrainzId { get; set; }
     }
 }
diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs
index 2d12ab4a1..7d7d7b8ad 100644
--- a/PlexRequests.UI/Modules/RequestsModule.cs
+++ b/PlexRequests.UI/Modules/RequestsModule.cs
@@ -56,6 +56,7 @@ namespace PlexRequests.UI.Modules
             Get["/"] = _ => LoadRequests();
             Get["/movies"] = _ => GetMovies();
             Get["/tvshows"] = _ => GetTvShows();
+            Get["/albums"] = _ => GetAlbumRequests();
             Post["/delete"] = _ => DeleteRequest((int)Request.Form.id);
             Post["/reportissue"] = _ => ReportIssue((int)Request.Form.requestId, (IssueState)(int)Request.Form.issue, null);
             Post["/reportissuecomment"] = _ => ReportIssue((int)Request.Form.requestId, IssueState.Other, (string)Request.Form.commentArea);
@@ -156,6 +157,47 @@ namespace PlexRequests.UI.Modules
             return Response.AsJson(viewModel);
         }
 
+        private Response GetAlbumRequests()
+        {
+            var settings = PrSettings.GetSettings();
+            var isAdmin = Context.CurrentUser.IsAuthenticated();
+            var dbAlbum = Service.GetAll().Where(x => x.Type == RequestType.Album);
+            if (settings.UsersCanViewOnlyOwnRequests && !isAdmin)
+            {
+                dbAlbum = dbAlbum.Where(x => x.UserHasRequested(Username));
+            }
+
+            var viewModel = dbAlbum.Select(album => {
+                return new RequestViewModel
+                {
+                    ProviderId = album.ProviderId,
+                    Type = album.Type,
+                    Status = album.Status,
+                    ImdbId = album.ImdbId,
+                    Id = album.Id,
+                    PosterPath = album.PosterPath,
+                    ReleaseDate = album.ReleaseDate.Humanize(),
+                    ReleaseDateTicks = album.ReleaseDate.Ticks,
+                    RequestedDate = DateTimeHelper.OffsetUTCDateTime(album.RequestedDate, DateTimeOffset).Humanize(),
+                    RequestedDateTicks = DateTimeHelper.OffsetUTCDateTime(album.RequestedDate, DateTimeOffset).Ticks,
+                    Approved = album.Available || album.Approved,
+                    Title = album.Title,
+                    Overview = album.Overview,
+                    RequestedUsers = isAdmin ? album.AllUsers.ToArray() : new string[] { },
+                    ReleaseYear = album.ReleaseDate.Year.ToString(),
+                    Available = album.Available,
+                    Admin = isAdmin,
+                    Issues = album.Issues.Humanize(LetterCasing.Title),
+                    OtherMessage = album.OtherMessage,
+                    AdminNotes = album.AdminNote,
+                    TvSeriesRequestType = album.SeasonsRequested,
+                    MusicBrainzId = album.MusicBrainzId
+                };
+            }).ToList();
+
+            return Response.AsJson(viewModel);
+        }
+
         private Response DeleteRequest(int requestid)
         {
             if (!Context.CurrentUser.IsAuthenticated())
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index ee4f518f5..77783a7ba 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -512,7 +512,8 @@ namespace PlexRequests.UI.Modules
                 Type = RequestType.Album,
                 ProviderId = 0,
                 RequestedUsers = new List<string>() { Username },
-                Status = albumInfo.status
+                Status = albumInfo.status,
+                Issues = IssueState.None
             };
 
 
diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml
index 5f47fe7fb..e2b3d9bd6 100644
--- a/PlexRequests.UI/Views/Requests/Index.cshtml
+++ b/PlexRequests.UI/Views/Requests/Index.cshtml
@@ -16,7 +16,7 @@
         }
         @if (Model.SearchForMusic)
         {
-            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Music</a></li>
+            <li role="presentation"><a href="#MusicTab" aria-controls="profile" role="tab" data-toggle="tab">Albums</a></li>
         }
     </ul>
     <br />
@@ -233,6 +233,119 @@
     </div>
 </script>
 
+<script id="album-template" type="text/x-handlebars-template">
+    <div id="{{requestId}}Template" class="mix available-{{available}} approved-{{approved}}" data-requestorder="{{requestedDateTicks}}" data-releaseorder="{{releaseDateTicks}}">
+        <div class="row">
+            <div class="col-sm-2">
+                {{#if coverArtUrl}}
+                <img class="img-responsive" src="{{coverArtUrl}}" width="150" alt="poster">
+                {{/if}}
+            </div>
+            <div class="col-sm-5 ">
+                <div>
+                    <a href="https://musicbrainz.org/release/{{id}}" target="_blank">
+                        <h4>
+                            {{artist}} - {{title}}
+                            {{#if year}}
+                            ({{year}})
+                            {{/if}}
+                        </h4>
+                    </a>
+                    <span class="label label-success">{{status}}</span>
+                </div>
+                <br />
+                <div>Release Date: {{releaseDate}}</div>
+                <div>
+                    Approved:
+                    {{#if_eq approved false}}
+                    <i id="{{requestId}}notapproved" class="fa fa-times"></i>
+                    {{/if_eq}}
+                    {{#if_eq approved true}}
+                    <i class="fa fa-check"></i>
+                    {{/if_eq}}
+                </div>
+                <div>
+                    Available
+                    {{#if_eq available false}}
+                    <i id="availableIcon{{requestId}}" class="fa fa-times"></i>
+                    {{/if_eq}}
+                    {{#if_eq available true}}
+                    <i id="availableIcon{{requestId}}" class="fa fa-check"></i>
+                    {{/if_eq}}
+                </div>
+                {{#if requestedUsers}}
+                <div>Requested By: {{requestedUsers}}</div>
+                {{/if}}
+                <div>Requested Date: {{requestedDate}}</div>
+                <div id="issueArea{{requestId}}">
+                    {{#if otherMessage}}
+                    <div>Message: {{otherMessage}}</div>
+                    {{else}}
+                    <div>Issue: {{issues}}</div>
+                    {{/if}}
+                </div>
+                <div id="adminNotesArea{{requestId}}">
+                    {{#if adminNote}}
+                    <div>Note from Admin: {{adminNote}}</div>
+                    {{/if}}
+                </div>
+            </div>
+            <div class="col-sm-2 col-sm-push-3">
+                {{#if_eq admin true}}
+                {{#if_eq approved false}}
+                <form method="POST" action="/approval/approve" id="approve{{requestId}}">
+                    <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> Approve</button>
+                </form>
+                {{/if_eq}}
+                <form method="POST" action="/requests/delete" id="delete{{requestId}}">
+                    <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
+                    <button id="{{requestId}}" style="text-align: right" class="btn btn-sm btn-danger-outline delete" type="submit"><i class="fa fa-minus"></i> Remove</button>
+                </form>
+
+                <form method="POST" action="/requests/clearissues" id="clear{{requestId}}">
+                    <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
+                    <button id="{{requestId}}" style="text-align: right" class="btn btn-sm btn-info-outline clear" type="submit"><i class="fa fa-check"></i> Clear Issues</button>
+                </form>
+
+                <form method="POST" action="/requests/changeavailability" id="change{{requestId}}">
+                    <input name="Id" type="text" value="{{requestId}}" hidden="hidden" />
+                    {{#if_eq available true}}
+                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="false" class="btn btn-sm btn-info-outline change" type="submit"><i class="fa fa-minus"></i> Mark Unavailable</button>
+                    {{else}}
+                    <button id="{{requestId}}" custom-availibility="{{requestId}}" style="text-align: right" value="true" class="btn btn-sm btn-success-outline change" type="submit"><i class="fa fa-plus"></i> Mark Available</button>
+                    {{/if_eq}}
+                </form>
+
+                {{/if_eq}}
+
+                <form method="POST" action="/requests/reportissue/" id="report{{requestId}}">
+                    <input name="requestId" type="text" value="{{requestId}}" hidden="hidden" />
+                    <div class="dropdown">
+                        <button id="{{requestId}}" class="btn btn-sm btn-primary-outline dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                            <i class="fa fa-plus"></i> Report Issue
+                            <span class="caret"></span>
+                        </button>
+                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                            <li><a id="{{requestId}}" issue-select="0" class="dropdownIssue" href="#">Wrong Audio</a></li>
+                            <li><a id="{{requestId}}" issue-select="1" class="dropdownIssue" href="#">No Subtitles</a></li>
+                            <li><a id="{{requestId}}" issue-select="2" class="dropdownIssue" href="#">Wrong Content</a></li>
+                            <li><a id="{{requestId}}" issue-select="3" class="dropdownIssue" href="#">Playback Issues</a></li>
+                            <li><a id="{{requestId}}" issue-select="4" class="dropdownIssue" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#myModal">Other</a></li>
+
+                            {{#if_eq admin true}}
+                            <li><a id="{{requestId}}" issue-select="4" class="note" data-identifier="{{requestId}}" href="#" data-toggle="modal" data-target="#noteModal">Add Note</a></li>
+                            {{/if_eq}}
+                        </ul>
+                    </div>
+                </form>
+
+            </div>
+        </div>
+        <hr />
+    </div>
+</script>
+
 <div class="modal fade" id="myModal">
     <div class="modal-dialog">
         <div class="modal-content">