From 3efd54c1b6e8a0379946e9a7a2bd9b1e5b5b5464 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 6 Apr 2016 23:08:00 +0100 Subject: [PATCH 01/44] Fixed #144 --- .../PlexRequests.Api.Models.csproj | 6 ++++ .../SickRage/SickRageBase.cs | 2 +- .../SickRage/SickRageSeasonList.cs | 31 +++++++++++++++++-- PlexRequests.Api/ApiRequest.cs | 13 ++++++-- PlexRequests.Api/SickrageApi.cs | 2 +- PlexRequests.UI/Views/Shared/_Layout.cshtml | 16 +++++----- appveyor.yml | 2 +- 7 files changed, 57 insertions(+), 15 deletions(-) diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj index db7e29259..33b154211 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -87,6 +87,12 @@ + + + {1252336D-42A3-482A-804C-836E60173DFA} + PlexRequests.Helpers + + - - - - - - - - + + + + + + + + diff --git a/appveyor.yml b/appveyor.yml index adf8268ba..de5218d8d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ assembly_info: file: '**\AssemblyInfo.*' assembly_version: '1.6.0' assembly_file_version: '{version}' - assembly_informational_version: '1.6.0' + assembly_informational_version: '1.6.0' before_build: - cmd: appveyor-retry nuget restore build: From d1c6a1322644c1456c91b1a7fbc275757150a160 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Wed, 6 Apr 2016 18:03:51 -0500 Subject: [PATCH 02/44] #145 firefox css dsplay issue --- PlexRequests.UI/Content/custom.css | 3 ++- PlexRequests.UI/Content/custom.min.css | 2 +- PlexRequests.UI/Content/custom.scss | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PlexRequests.UI/Content/custom.css b/PlexRequests.UI/Content/custom.css index cd5e95112..520b2cc39 100644 --- a/PlexRequests.UI/Content/custom.css +++ b/PlexRequests.UI/Content/custom.css @@ -192,7 +192,8 @@ label { color: #ccc; } .form-control-search { - padding: 25px 105px 25px 16px; } + padding: 13px 105px 13px 16px; + height: 100%; } .form-control-withbuttons { padding-right: 105px; } diff --git a/PlexRequests.UI/Content/custom.min.css b/PlexRequests.UI/Content/custom.min.css index cd21703d4..34e07289c 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: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;}.btn-split .btn{border-radius:0 !important;}.btn-split .btn:not(.dropdown-toggle){border-radius:.25rem 0 0 .25rem !important;}.btn-split .btn.dropdown-toggle{border-radius:0 .25rem .25rem 0 !important;padding:12px 8px;} \ 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:13px 105px 13px 16px;height:100%;}.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;}.btn-split .btn{border-radius:0 !important;}.btn-split .btn:not(.dropdown-toggle){border-radius:.25rem 0 0 .25rem !important;}.btn-split .btn.dropdown-toggle{border-radius:0 .25rem .25rem 0 !important;padding:12px 8px;} \ No newline at end of file diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss index 77a7ca1d9..e2324512b 100644 --- a/PlexRequests.UI/Content/custom.scss +++ b/PlexRequests.UI/Content/custom.scss @@ -246,7 +246,8 @@ $border-radius: 10px; } .form-control-search { - padding: 25px 105px 25px 16px; + padding: 13px 105px 13px 16px; + height: 100%; } .form-control-withbuttons { From c6e6583fd5b79ad308e14821a4ccff3f7ffcc518 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 00:18:27 -0500 Subject: [PATCH 03/44] #125 start indicating in the results if an item is already requested or available --- PlexRequests.UI/Content/search.js | 15 +- .../Models/SearchMovieViewModel.cs | 50 ++++ .../Models/SearchMusicViewModel.cs | 80 +++--- .../Models/SearchTvShowViewModel.cs | 2 +- PlexRequests.UI/Models/SearchViewModel.cs | 37 +++ PlexRequests.UI/Modules/SearchModule.cs | 250 +++++++++++++++--- PlexRequests.UI/PlexRequests.UI.csproj | 2 + PlexRequests.UI/Views/Search/Index.cshtml | 49 ++-- 8 files changed, 383 insertions(+), 102 deletions(-) create mode 100644 PlexRequests.UI/Models/SearchMovieViewModel.cs create mode 100644 PlexRequests.UI/Models/SearchViewModel.cs diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js index 1096290ed..610f1399d 100644 --- a/PlexRequests.UI/Content/search.js +++ b/PlexRequests.UI/Content/search.js @@ -274,7 +274,10 @@ $(function () { voteAverage: result.voteAverage, year: year, type: "movie", - imdb: result.imdbId + imdb: result.imdbId, + requested: result.requested, + approved: result.approved, + available: result.available }; return context; @@ -290,7 +293,10 @@ $(function () { overview: result.overview, year: year, type: "tv", - imdb: result.imdbId + imdb: result.imdbId, + requested: result.requested, + approved: result.approved, + available: result.available }; return context; } @@ -307,7 +313,10 @@ $(function () { coverArtUrl: result.coverArtUrl, artist: result.artist, releaseType: result.releaseType, - country: result.country + country: result.country, + requested: result.requested, + approved: result.approved, + available: result.available }; return context; diff --git a/PlexRequests.UI/Models/SearchMovieViewModel.cs b/PlexRequests.UI/Models/SearchMovieViewModel.cs new file mode 100644 index 000000000..dc7c51a33 --- /dev/null +++ b/PlexRequests.UI/Models/SearchMovieViewModel.cs @@ -0,0 +1,50 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SearchTvShowViewModel.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; + +namespace PlexRequests.UI.Models +{ + public class SearchMovieViewModel : SearchViewModel + { + public bool Adult { get; set; } + public string BackdropPath { get; set; } + public List GenreIds { get; set; } + public int Id { get; set; } + public string OriginalLanguage { get; set; } + public string OriginalTitle { get; set; } + public string Overview { get; set; } + public double Popularity { get; set; } + public string PosterPath { get; set; } + public DateTime? ReleaseDate { get; set; } + public string Title { get; set; } + public bool Video { get; set; } + public double VoteAverage { get; set; } + public int VoteCount { get; set; } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Models/SearchMusicViewModel.cs b/PlexRequests.UI/Models/SearchMusicViewModel.cs index 94d3e6d1e..66d140a12 100644 --- a/PlexRequests.UI/Models/SearchMusicViewModel.cs +++ b/PlexRequests.UI/Models/SearchMusicViewModel.cs @@ -1,41 +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; } - } +#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 : SearchViewModel + { + 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/Models/SearchTvShowViewModel.cs b/PlexRequests.UI/Models/SearchTvShowViewModel.cs index ee6de42d1..2ed46beff 100644 --- a/PlexRequests.UI/Models/SearchTvShowViewModel.cs +++ b/PlexRequests.UI/Models/SearchTvShowViewModel.cs @@ -29,7 +29,7 @@ namespace PlexRequests.UI.Models { - public class SearchTvShowViewModel + public class SearchTvShowViewModel : SearchViewModel { public int Id { get; set; } public string SeriesName { get; set; } diff --git a/PlexRequests.UI/Models/SearchViewModel.cs b/PlexRequests.UI/Models/SearchViewModel.cs new file mode 100644 index 000000000..776b9d2b1 --- /dev/null +++ b/PlexRequests.UI/Models/SearchViewModel.cs @@ -0,0 +1,37 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SearchTvShowViewModel.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 SearchViewModel + { + public bool Approved { get; set; } + public bool Requested { get; set; } + public bool Available { get; set; } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 5b541091c..7e001c489 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -48,6 +48,9 @@ using PlexRequests.Store; using PlexRequests.UI.Helpers; using PlexRequests.UI.Models; +using System.Threading.Tasks; +using TMDbLib.Objects.Search; +using PlexRequests.Api.Models.Tv; namespace PlexRequests.UI.Modules { @@ -109,7 +112,8 @@ public SearchModule(ICacheProvider cache, ISettingsService private IHeadphonesApi HeadphonesApi { get; } private static Logger Log = LogManager.GetCurrentClassLogger(); - private bool IsAdmin { + private bool IsAdmin + { get { return Context.CurrentUser.IsAuthenticated(); @@ -124,29 +128,168 @@ private Negotiator RequestLoad() return View["Search/Index", settings]; } + private Response UpcomingMovies() + { + Log.Trace("Loading upcoming movies"); + + return ProcessMovies(new Task>(() => + { + return MovieApi.GetUpcomingMovies().Result.Select(x => new SearchMovie() + { + Adult = x.Adult, + BackdropPath = x.BackdropPath, + GenreIds = x.GenreIds, + Id = x.Id, + OriginalLanguage = x.OriginalLanguage, + OriginalTitle = x.OriginalTitle, + Overview = x.Overview, + Popularity = x.Popularity, + PosterPath = x.PosterPath, + ReleaseDate = x.ReleaseDate, + Title = x.Title, + Video = x.Video, + VoteAverage = x.VoteAverage, + VoteCount = x.VoteCount + }).ToList(); + })); + } + + private Response CurrentlyPlayingMovies() + { + Log.Trace("Loading currently playing movies"); + + return ProcessMovies(new Task>(() => + { + return MovieApi.GetCurrentPlayingMovies().Result.Select(x => new SearchMovie() + { + Adult = x.Adult, + BackdropPath = x.BackdropPath, + GenreIds = x.GenreIds, + Id = x.Id, + OriginalLanguage = x.OriginalLanguage, + OriginalTitle = x.OriginalTitle, + Overview = x.Overview, + Popularity = x.Popularity, + PosterPath = x.PosterPath, + ReleaseDate = x.ReleaseDate, + Title = x.Title, + Video = x.Video, + VoteAverage = x.VoteAverage, + VoteCount = x.VoteCount + }).ToList(); + })); + } + private Response SearchMovie(string searchTerm) { Log.Trace("Searching for Movie {0}", searchTerm); - var movies = MovieApi.SearchMovie(searchTerm); - var result = movies.Result; - return Response.AsJson(result); + + return ProcessMovies(new Task>(() => + { + return MovieApi.SearchMovie(searchTerm).Result; + })); + } + + private Response ProcessMovies(Task> apiTask) + { + List taskList = new List(); + + List apiMovies = new List(); + + apiTask.ContinueWith((t) => + { + apiMovies = t.Result; + }); + taskList.Add(apiTask); + apiTask.Start(); + + Dictionary dbMovies = new Dictionary(); + taskList.Add(Task.Factory.StartNew(() => + { + return RequestService.GetAll().Where(x => x.Type == RequestType.Movie); + + }).ContinueWith((t) => + { + dbMovies = t.Result.ToDictionary(x => x.ProviderId); + })); + + Task.WaitAll(taskList.ToArray()); + + List viewMovies = new List(); + foreach (SearchMovie movie in apiMovies) + { + var viewMovie = new SearchMovieViewModel() + { + Adult = movie.Adult, + BackdropPath = movie.BackdropPath, + GenreIds = movie.GenreIds, + Id = movie.Id, + OriginalLanguage = movie.OriginalLanguage, + OriginalTitle = movie.OriginalTitle, + Overview = movie.Overview, + Popularity = movie.Popularity, + PosterPath = movie.PosterPath, + ReleaseDate = movie.ReleaseDate, + Title = movie.Title, + Video = movie.Video, + VoteAverage = movie.VoteAverage, + VoteCount = movie.VoteCount + }; + + if (dbMovies.ContainsKey(movie.Id)) + { + var dbm = dbMovies[movie.Id]; + + viewMovie.Requested = true; + viewMovie.Approved = dbm.Approved; + viewMovie.Available = dbm.Available; + } + + viewMovies.Add(viewMovie); + } + + return Response.AsJson(viewMovies); } private Response SearchTvShow(string searchTerm) { Log.Trace("Searching for TV Show {0}", searchTerm); - //var tvShow = TvApi.SearchTv(searchTerm, AuthToken); - var tvShow = new TvMazeApi().Search(searchTerm); - if (!tvShow.Any()) + + List taskList = new List(); + + List apiTv = new List(); + taskList.Add(Task.Factory.StartNew(() => + { + return new TvMazeApi().Search(searchTerm); + + }).ContinueWith((t) => + { + apiTv = t.Result; + })); + + Dictionary dbTv = new Dictionary(); + taskList.Add(Task.Factory.StartNew(() => + { + return RequestService.GetAll().Where(x => x.Type == RequestType.TvShow); + + }).ContinueWith((t) => + { + dbTv = t.Result.ToDictionary(x => x.ProviderId); + })); + + Task.WaitAll(taskList.ToArray()); + + if (!apiTv.Any()) { Log.Trace("TV Show data is null"); return Response.AsJson(""); } - var model = new List(); - foreach (var t in tvShow) + + var viewTv = new List(); + foreach (var t in apiTv) { - model.Add(new SearchTvShowViewModel + var viewT = new SearchTvShowViewModel { // We are constructing the banner with the id: // http://thetvdb.com/banners/_cache/posters/ID-1.jpg @@ -161,24 +304,56 @@ private Response SearchTvShow(string searchTerm) Runtime = t.show.runtime.ToString(), SeriesId = t.show.id, SeriesName = t.show.name, + Status = t.show.status + }; - Status = t.show.status, - }); + if (t.show.externals.thetvdb != null && dbTv.ContainsKey((int)t.show.externals.thetvdb)) + { + var dbt = dbTv[(int)t.show.externals.thetvdb]; + + viewT.Requested = true; + viewT.Approved = dbt.Approved; + viewT.Available = dbt.Available; + } + + viewTv.Add(viewT); } Log.Trace("Returning TV Show results: "); - Log.Trace(model.DumpJson()); - return Response.AsJson(model); + Log.Trace(viewTv.DumpJson()); + return Response.AsJson(viewTv); } private Response SearchMusic(string searchTerm) { - var albums = MusicBrainzApi.SearchAlbum(searchTerm); - var releases = albums.releases ?? new List(); - var model = new List(); - foreach (var a in releases) + List taskList = new List(); + + List apiAlbums = new List(); + taskList.Add(Task.Factory.StartNew(() => + { + return MusicBrainzApi.SearchAlbum(searchTerm); + + }).ContinueWith((t) => { - model.Add(new SearchMusicViewModel + apiAlbums = t.Result.releases ?? new List(); + })); + + Dictionary dbAlbum = new Dictionary(); + taskList.Add(Task.Factory.StartNew(() => + { + return RequestService.GetAll().Where(x => x.Type == RequestType.Album); + + }).ContinueWith((t) => + { + dbAlbum = t.Result.ToDictionary(x => x.MusicBrainzId); + })); + + Task.WaitAll(taskList.ToArray()); + + var viewAlbum = new List(); + foreach (var a in apiAlbums) + { + var viewA = new SearchMusicViewModel { Title = a.title, Id = a.id, @@ -188,27 +363,20 @@ private Response SearchMusic(string searchTerm) TrackCount = a.TrackCount, ReleaseType = a.status, Country = a.country - }); - } - return Response.AsJson(model); - } + }; - private Response UpcomingMovies() // TODO : Not used - { - var movies = MovieApi.GetUpcomingMovies(); - var result = movies.Result; - Log.Trace("Movie Upcoming Results: "); - Log.Trace(result.DumpJson()); - return Response.AsJson(result); - } + if (!string.IsNullOrEmpty(a.id) && dbAlbum.ContainsKey(a.id)) + { + var dba = dbAlbum[a.id]; - private Response CurrentlyPlayingMovies() // TODO : Not used - { - var movies = MovieApi.GetCurrentPlayingMovies(); - var result = movies.Result; - Log.Trace("Movie Currently Playing Results: "); - Log.Trace(result.DumpJson()); - return Response.AsJson(result); + viewA.Requested = true; + viewA.Approved = dba.Approved; + viewA.Available = dba.Available; + } + + viewAlbum.Add(viewA); + } + return Response.AsJson(viewAlbum); } private Response RequestMovie(int movieId) @@ -241,7 +409,7 @@ private Response RequestMovie(int movieId) try { - if (CheckIfTitleExistsInPlex(movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString(),null, PlexType.Movie)) + if (CheckIfTitleExistsInPlex(movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString(), null, PlexType.Movie)) { return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullMovieName} is already in Plex!" }); } @@ -502,7 +670,7 @@ private Response RequestAlbum(string releaseId) Log.Debug("This is a new request"); - + var albumInfo = MusicBrainzApi.GetAlbum(releaseId); DateTime release; DateTimeHelper.CustomParse(albumInfo.ReleaseEvents?.FirstOrDefault()?.date, out release); @@ -581,7 +749,7 @@ private Response RequestAlbum(string releaseId) Message = $"{model.Title} was successfully added!" }); } - + var result = RequestService.AddRequest(model); return Response.AsJson(new JsonResponseModel { diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index e822b1a70..e7076ef55 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -170,7 +170,9 @@ + + diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index e5c316a79..3f89e1c14 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -124,21 +124,29 @@
- {{#if_eq type "movie"}} - - {{/if_eq}} - {{#if_eq type "tv"}} -
- - -
+ {{#if_eq available true}} + + {{else}} + {{#if_eq requested true}} + + {{else}} + {{#if_eq type "movie"}} + + {{/if_eq}} + {{#if_eq type "tv"}} +
+ + +
+ {{/if_eq}} + {{/if_eq}} {{/if_eq}}

@@ -181,8 +189,15 @@
- - + {{#if_eq available true}} + + {{else}} + {{#if_eq requested true}} + + {{else}} + + {{/if_eq}} + {{/if_eq}}
Track Count: {{trackCount}} Country: {{country}} From a6695db590492bee2da390aab49096c863cb9d3b Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 09:08:23 -0500 Subject: [PATCH 04/44] fix search spinner sticking around after clearing search text + make the "Requested" and "Available" indicators in the search page different colors --- PlexRequests.UI/Content/search.js | 31 +++++++++++++++-------- PlexRequests.UI/Views/Search/Index.cshtml | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js index 610f1399d..b4ae49fcf 100644 --- a/PlexRequests.UI/Content/search.js +++ b/PlexRequests.UI/Content/search.js @@ -30,7 +30,6 @@ $(function () { if (searchTimer) { clearTimeout(searchTimer); } - $('#movieSearchButton').attr("class", "fa fa-spinner fa-spin"); searchTimer = setTimeout(movieSearch, 400); }); @@ -50,7 +49,6 @@ $(function () { if (searchTimer) { clearTimeout(searchTimer); } - $('#tvSearchButton').attr("class", "fa fa-spinner fa-spin"); searchTimer = setTimeout(tvSearch, 400); }); @@ -90,7 +88,6 @@ $(function () { if (searchTimer) { clearTimeout(searchTimer); } - $('#musicSearchButton').attr("class", "fa fa-spinner fa-spin"); searchTimer = setTimeout(musicSearch, 400); }); @@ -175,7 +172,7 @@ $(function () { function movieSearch() { var query = $("#movieSearchContent").val(); - getMovies("/search/movie/" + query); + query ? getMovies("/search/movie/" + query) : resetMovies(); } function moviesComingSoon() { @@ -187,9 +184,9 @@ $(function () { } function getMovies(url) { - $("#movieList").html(""); - + resetMovies(); + $('#movieSearchButton').attr("class", "fa fa-spinner fa-spin"); $.ajax(url).success(function (results) { if (results.length > 0) { results.forEach(function (result) { @@ -206,14 +203,19 @@ $(function () { }); }; + function resetMovies() { + $("#movieList").html(""); + } + function tvSearch() { var query = $("#tvSearchContent").val(); - getTvShows("/search/tv/" + query); + query ? getTvShows("/search/tv/" + query) : resetTvShows(); } function getTvShows(url) { - $("#tvList").html(""); + resetTvShows(); + $('#tvSearchButton').attr("class", "fa fa-spinner fa-spin"); $.ajax(url).success(function (results) { if (results.length > 0) { results.forEach(function (result) { @@ -229,14 +231,19 @@ $(function () { }); }; + function resetTvShows() { + $("#tvList").html(""); + } + function musicSearch() { var query = $("#musicSearchContent").val(); - getMusic("/search/music/" + query); + query ? getMusic("/search/music/" + query) : resetMusic(); } function getMusic(url) { - $("#musicList").html(""); + resetMusic(); + $('#musicSearchButton').attr("class", "fa fa-spinner fa-spin"); $.ajax(url).success(function (results) { if (results.length > 0) { results.forEach(function (result) { @@ -254,6 +261,10 @@ $(function () { }); }; + function resetMusic() { + $("#musicList").html(""); + } + function getCoverArt(artistId) { $.ajax("/search/music/coverart/" + artistId).success(function (result) { if (result) { diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index 3f89e1c14..8d2726b44 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -128,7 +128,7 @@ {{else}} {{#if_eq requested true}} - + {{else}} {{#if_eq type "movie"}} From 33de634ade16a68c2af22237c725fb3dbf598f76 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 14:29:23 -0500 Subject: [PATCH 05/44] #125 refactor async task logic to work with mono --- PlexRequests.UI/Models/MovieSearchType.cs | 35 +++++++++ PlexRequests.UI/Modules/SearchModule.cs | 93 +++++++++-------------- PlexRequests.UI/PlexRequests.UI.csproj | 1 + 3 files changed, 74 insertions(+), 55 deletions(-) create mode 100644 PlexRequests.UI/Models/MovieSearchType.cs diff --git a/PlexRequests.UI/Models/MovieSearchType.cs b/PlexRequests.UI/Models/MovieSearchType.cs new file mode 100644 index 000000000..9441ee15f --- /dev/null +++ b/PlexRequests.UI/Models/MovieSearchType.cs @@ -0,0 +1,35 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexType.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 enum MovieSearchType + { + Upcoming, + CurrentlyPlaying, + Search + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 7e001c489..a35a05055 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -51,6 +51,7 @@ using System.Threading.Tasks; using TMDbLib.Objects.Search; using PlexRequests.Api.Models.Tv; +using TMDbLib.Objects.General; namespace PlexRequests.UI.Modules { @@ -131,77 +132,59 @@ private Negotiator RequestLoad() private Response UpcomingMovies() { Log.Trace("Loading upcoming movies"); - - return ProcessMovies(new Task>(() => - { - return MovieApi.GetUpcomingMovies().Result.Select(x => new SearchMovie() - { - Adult = x.Adult, - BackdropPath = x.BackdropPath, - GenreIds = x.GenreIds, - Id = x.Id, - OriginalLanguage = x.OriginalLanguage, - OriginalTitle = x.OriginalTitle, - Overview = x.Overview, - Popularity = x.Popularity, - PosterPath = x.PosterPath, - ReleaseDate = x.ReleaseDate, - Title = x.Title, - Video = x.Video, - VoteAverage = x.VoteAverage, - VoteCount = x.VoteCount - }).ToList(); - })); + return ProcessMovies(MovieSearchType.Upcoming, string.Empty); } private Response CurrentlyPlayingMovies() { Log.Trace("Loading currently playing movies"); - - return ProcessMovies(new Task>(() => - { - return MovieApi.GetCurrentPlayingMovies().Result.Select(x => new SearchMovie() - { - Adult = x.Adult, - BackdropPath = x.BackdropPath, - GenreIds = x.GenreIds, - Id = x.Id, - OriginalLanguage = x.OriginalLanguage, - OriginalTitle = x.OriginalTitle, - Overview = x.Overview, - Popularity = x.Popularity, - PosterPath = x.PosterPath, - ReleaseDate = x.ReleaseDate, - Title = x.Title, - Video = x.Video, - VoteAverage = x.VoteAverage, - VoteCount = x.VoteCount - }).ToList(); - })); + return ProcessMovies(MovieSearchType.CurrentlyPlaying, string.Empty); } private Response SearchMovie(string searchTerm) { Log.Trace("Searching for Movie {0}", searchTerm); - - return ProcessMovies(new Task>(() => - { - return MovieApi.SearchMovie(searchTerm).Result; - })); + return ProcessMovies(MovieSearchType.Search, searchTerm); } - private Response ProcessMovies(Task> apiTask) + private Response ProcessMovies(MovieSearchType searchType, string searchTerm) { List taskList = new List(); - List apiMovies = new List(); - - apiTask.ContinueWith((t) => + List apiMovies = new List(); + taskList.Add(Task.Factory.StartNew>(() => + { + switch(searchType) + { + case MovieSearchType.Search: + return MovieApi.SearchMovie(searchTerm).Result.Select(x => new MovieResult() + { + Adult = x.Adult, + BackdropPath = x.BackdropPath, + GenreIds = x.GenreIds, + Id = x.Id, + OriginalLanguage = x.OriginalLanguage, + OriginalTitle = x.OriginalTitle, + Overview = x.Overview, + Popularity = x.Popularity, + PosterPath = x.PosterPath, + ReleaseDate = x.ReleaseDate, + Title = x.Title, + Video = x.Video, + VoteAverage = x.VoteAverage, + VoteCount = x.VoteCount + }).ToList(); + case MovieSearchType.CurrentlyPlaying: + return MovieApi.GetCurrentPlayingMovies().Result.ToList(); + case MovieSearchType.Upcoming: + return MovieApi.GetUpcomingMovies().Result.ToList(); + default: + return new List(); + } + }).ContinueWith((t) => { apiMovies = t.Result; - }); - taskList.Add(apiTask); - apiTask.Start(); + })); Dictionary dbMovies = new Dictionary(); taskList.Add(Task.Factory.StartNew(() => @@ -216,7 +199,7 @@ private Response ProcessMovies(Task> apiTask) Task.WaitAll(taskList.ToArray()); List viewMovies = new List(); - foreach (SearchMovie movie in apiMovies) + foreach (MovieResult movie in apiMovies) { var viewMovie = new SearchMovieViewModel() { diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index e7076ef55..7d4cbfb9a 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -169,6 +169,7 @@ + From 10be8f0440eebe6b43b110b3223a65e162868611 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 7 Apr 2016 20:38:36 +0100 Subject: [PATCH 06/44] Fixes for sonarr, we now display the error messages back to the user --- .../Sonarr/SonarrAddSeries.cs | 2 +- PlexRequests.Api.Models/Sonarr/SonarrError.cs | 13 ++++++-- PlexRequests.Api/SonarrApi.cs | 4 +-- PlexRequests.UI/Helpers/ValidationHelper.cs | 30 ++++++++++++++++++- .../Modules/ApplicationTesterModule.cs | 2 +- PlexRequests.UI/Modules/ApprovalModule.cs | 18 ++++++----- PlexRequests.UI/Modules/SearchModule.cs | 2 +- 7 files changed, 55 insertions(+), 16 deletions(-) diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs index 23540521f..6d143fc55 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs @@ -26,7 +26,7 @@ public class SonarrAddSeries public string titleSlug { get; set; } public int id { get; set; } [JsonIgnore] - public string ErrorMessage { get; set; } + public List ErrorMessages { get; set; } } public class AddOptions diff --git a/PlexRequests.Api.Models/Sonarr/SonarrError.cs b/PlexRequests.Api.Models/Sonarr/SonarrError.cs index ae3fbdfca..c02b3db76 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrError.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrError.cs @@ -24,13 +24,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + +using System.Collections.Generic; +using Newtonsoft.Json; + 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; } + public object attemptedValue { get; set; } + public FormattedMessagePlaceholderValues formattedMessagePlaceholderValues { get; set; } + } + public class FormattedMessagePlaceholderValues + { + public string propertyName { get; set; } + public object propertyValue { get; set; } } } \ No newline at end of file diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs index f9d68da31..76fd2cbb6 100644 --- a/PlexRequests.Api/SonarrApi.cs +++ b/PlexRequests.Api/SonarrApi.cs @@ -104,8 +104,8 @@ public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool s catch (JsonSerializationException jse) { Log.Error(jse); - var error = Api.ExecuteJson(request, baseUrl); - result = new SonarrAddSeries { ErrorMessage = error.errorMessage }; + var error = Api.ExecuteJson>(request, baseUrl); + result = new SonarrAddSeries { ErrorMessages = error.Select(x => x.errorMessage).ToList() }; } return result; diff --git a/PlexRequests.UI/Helpers/ValidationHelper.cs b/PlexRequests.UI/Helpers/ValidationHelper.cs index ff50a6b95..d66aa6aef 100644 --- a/PlexRequests.UI/Helpers/ValidationHelper.cs +++ b/PlexRequests.UI/Helpers/ValidationHelper.cs @@ -24,8 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Linq; +using System.Collections.Generic; +using System.Linq; +using System.Text; using Nancy.Validation; @@ -55,5 +57,31 @@ public static JsonResponseModel SendJsonError(this ModelValidationResult result) }) .FirstOrDefault(); } + + public static JsonResponseModel SendSonarrError(List result) + { + var model = new JsonResponseModel {Result = false}; + if (!result.Any()) + { + return model; + } + var sb = new StringBuilder(); + sb.AppendLine("Errors from Sonarr: "); + for (var i = 0; i < result.Count; i++) + { + if (i != result.Count - 1) + { + sb.AppendLine(result[i] + ","); + } + else + { + sb.AppendLine(result[i]); + } + } + + model.Message = sb.ToString(); + + return model; + } } } \ No newline at end of file diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs index 929949bd2..000a54d80 100644 --- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs +++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs @@ -100,7 +100,7 @@ private Response SonarrTest() try { var status = SonarrApi.SystemStatus(sonarrSettings.ApiKey, sonarrSettings.FullUri); - return status != null + return status?.version != null ? Response.AsJson(new JsonResponseModel { Result = true, Message = "Connected to Sonarr successfully!" }) : Response.AsJson(new JsonResponseModel { Result = false, Message = "Could not connect to Sonarr, please check your settings." }); diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs index d5871481f..352c479dd 100644 --- a/PlexRequests.UI/Modules/ApprovalModule.cs +++ b/PlexRequests.UI/Modules/ApprovalModule.cs @@ -133,15 +133,17 @@ private Response RequestTvAndUpdateStatus(RequestedModel request, string quality Log.Trace("Approval result: {0}", requestResult); if (requestResult) { - return Response.AsJson(new JsonResponseModel { Result = true }); + return Response.AsJson(new JsonResponseModel {Result = true}); } - return Response.AsJson(new JsonResponseModel { Result = false, Message = "Updated Sonarr but could not approve it in PlexRequests :(" }); + return + Response.AsJson(new JsonResponseModel + { + Result = false, + Message = "Updated Sonarr but could not approve it in PlexRequests :(" + }); } - return Response.AsJson(new JsonResponseModel - { - Result = false, - Message = result.ErrorMessage ?? "Could not add the series to Sonarr" - }); + return Response.AsJson(ValidationHelper.SendSonarrError(result.ErrorMessages)); + } var srSettings = SickRageSettings.GetSettings(); @@ -384,7 +386,7 @@ private Response UpdateRequests(RequestedModel[] requestedModels) else { Log.Error("Could not approve and send the TV {0} to Sonarr!", r.Title); - Log.Error("Error message: {0}", res?.ErrorMessage); + res?.ErrorMessages.ForEach(x => Log.Error("Error messages: {0}", x)); } } } diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 5b541091c..2b810c92f 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -442,7 +442,7 @@ private Response RequestTvShow(int showId, string seasons) } - return Response.AsJson(new JsonResponseModel { Result = false, Message = result?.ErrorMessage ?? "Something went wrong adding the movie to Sonarr! Please check your settings." }); + return Response.AsJson(ValidationHelper.SendSonarrError(result?.ErrorMessages)); } From dd07e7546b18390cadf1a6b31e3ac0dab18de562 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 7 Apr 2016 22:15:14 +0100 Subject: [PATCH 07/44] Added logging around SickRage --- .../SickRage/SickRageSeasonList.cs | 26 +-------- PlexRequests.Api/ApiRequest.cs | 9 ++-- PlexRequests.Api/SickrageApi.cs | 50 ++++++++++++++--- PlexRequests.Api/SonarrApi.cs | 4 +- PlexRequests.Helpers/JsonConvertHelper.cs | 54 +++++++++++++++++++ .../PlexRequests.Helpers.csproj | 1 + PlexRequests.UI/Helpers/TvSender.cs | 5 ++ 7 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 PlexRequests.Helpers/JsonConvertHelper.cs diff --git a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs index 708ecf68f..7716204dc 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using Newtonsoft.Json; +using Newtonsoft.Json; using PlexRequests.Helpers; namespace PlexRequests.Api.Models.SickRage @@ -8,26 +6,6 @@ namespace PlexRequests.Api.Models.SickRage public class SickRageSeasonList : SickRageBase { [JsonIgnore] - public int[] Data => ParseObjectToArray(data); - - protected T[] ParseObjectToArray(object ambiguousObject) - { - var json = ambiguousObject.ToString(); - if (string.IsNullOrWhiteSpace(json)) - { - return new T[0]; // Could return null here instead. - } - if (json.TrimStart().StartsWith("[")) - { - return JsonConvert.DeserializeObject(json); - } - if (json.TrimStart().Equals("{}")) - { - return new T[0]; - } - - return new T[1] { JsonConvert.DeserializeObject(json) }; - - } + public int[] Data => JsonConvertHelper.ParseObjectToArray(data); } } \ No newline at end of file diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs index 68ba4a2af..d3c26066c 100644 --- a/PlexRequests.Api/ApiRequest.cs +++ b/PlexRequests.Api/ApiRequest.cs @@ -60,6 +60,8 @@ public class ApiRequest : IApiRequest var client = new RestClient { BaseUrl = baseUri }; var response = client.Execute(request); + Log.Trace("Api Content Response:"); + Log.Trace(response.Content); if (response.ErrorException != null) { @@ -68,7 +70,6 @@ public class ApiRequest : IApiRequest } return response.Data; - } public IRestResponse Execute(IRestRequest request, Uri baseUri) @@ -107,15 +108,17 @@ public T ExecuteXml(IRestRequest request, Uri baseUri) where T : class var client = new RestClient { BaseUrl = baseUri }; var response = client.Execute(request); - + Log.Trace("Api Content Response:"); + Log.Trace(response.Content); if (response.ErrorException != null) { var message = "Error retrieving response. Check inner details for more info."; throw new ApplicationException(message, response.ErrorException); } - + Log.Trace("Deserialzing Object"); var json = JsonConvert.DeserializeObject(response.Content, Settings); + Log.Trace("Finished Deserialzing Object"); return json; } diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index e344d4b26..4967875b9 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -28,6 +28,7 @@ #endregion using System; +using System.ComponentModel; using System.Diagnostics; using System.Linq; using System.Threading; @@ -55,9 +56,13 @@ public SickrageApi() public async Task AddSeries(int tvdbId, int seasonCount, int[] seasons, string quality, string apiKey, Uri baseUrl) { + var futureStatus = seasons.Length > 0 && !seasons.Any(x => x == seasonCount) ? SickRageStatus.Skipped : SickRageStatus.Wanted; var status = seasons.Length > 0 ? SickRageStatus.Skipped : SickRageStatus.Wanted; + Log.Trace("Future Status: {0}", futureStatus); + Log.Trace("Current Status: {0}", status); + var request = new RestRequest { Resource = "/api/{apiKey}/?cmd=show.addnew", @@ -69,10 +74,15 @@ public async Task AddSeries(int tvdbId, int seasonCount, int[] se request.AddQueryParameter("future_status", futureStatus); if (!quality.Equals("default", StringComparison.CurrentCultureIgnoreCase)) { + Log.Trace("Settings quality to {0}", quality); request.AddQueryParameter("initial", quality); } + Log.Trace("Entering `Execute`"); var obj = Api.Execute(request, baseUrl); + Log.Trace("Exiting `Execute`"); + Log.Trace("obj Result:"); + Log.Trace(obj.DumpJson()); if (obj.result != "failure") { @@ -81,11 +91,13 @@ public async Task AddSeries(int tvdbId, int seasonCount, int[] se var seasonIncrement = 0; var seasonList = new SickRageSeasonList(); + Log.Trace("while (seasonIncrement < seasonCount) where seasonCount = {0}", seasonCount); while (seasonIncrement < seasonCount) { seasonList = VerifyShowHasLoaded(tvdbId, apiKey, baseUrl); seasonIncrement = seasonList.Data?.Length ?? 0; - + Log.Trace("New seasonIncrement -> {0}", seasonIncrement); + if (sw.ElapsedMilliseconds > 30000) // Break out after 30 seconds, it's not going to get added { Log.Warn("Couldn't find out if the show had been added after 10 seconds. I doubt we can change the status to wanted."); @@ -94,17 +106,29 @@ public async Task AddSeries(int tvdbId, int seasonCount, int[] se } sw.Stop(); } - if (seasons.Length > 0) + Log.Trace("seasons.Length > 0 where seasons.Len -> {0}", seasons.Length); + try { - //handle the seasons requested - foreach (var s in seasons) + if (seasons.Length > 0) { - var result = await AddSeason(tvdbId, s, apiKey, baseUrl); - Log.Trace("SickRage adding season results: "); - Log.Trace(result.DumpJson()); + //handle the seasons requested + foreach (var s in seasons) + { + Log.Trace("Adding season {0}", s); + var result = await AddSeason(tvdbId, s, apiKey, baseUrl); + Log.Trace("SickRage adding season results: "); + Log.Trace(result.DumpJson()); + } } } + catch (Exception e) + { + Log.Trace("Exception when adding seasons:"); + Log.Error(e); + throw; + } + Log.Trace("Finished with the API, returning the obj"); return obj; } @@ -124,6 +148,7 @@ public SickRagePing Ping(string apiKey, Uri baseUrl) public SickRageSeasonList VerifyShowHasLoaded(int tvdbId, string apiKey, Uri baseUrl) { + Log.Trace("Entered `VerifyShowHasLoaded({0} <- id)`", tvdbId); var request = new RestRequest { Resource = "/api/{apiKey}/?cmd=show.seasonlist", @@ -134,7 +159,9 @@ public SickRageSeasonList VerifyShowHasLoaded(int tvdbId, string apiKey, Uri bas try { + Log.Trace("Entering `ExecuteJson`"); var obj = Api.ExecuteJson(request, baseUrl); + Log.Trace("Exited `ExecuteJson`"); return obj; } catch (Exception e) @@ -157,7 +184,14 @@ public async Task AddSeason(int tvdbId, int season, string apiKey request.AddQueryParameter("status", SickRageStatus.Wanted); await Task.Run(() => Thread.Sleep(2000)); - return await Task.Run(() => Api.Execute(request, baseUrl)).ConfigureAwait(false); + return await Task.Run(() => + { + Log.Trace("Entering `Execute` in a new `Task`"); + var result = Api.Execute(request, baseUrl); + + Log.Trace("Exiting `Execute` and yeilding `Task` result"); + return result; + }).ConfigureAwait(false); } } } \ No newline at end of file diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs index 76fd2cbb6..91b9be55e 100644 --- a/PlexRequests.Api/SonarrApi.cs +++ b/PlexRequests.Api/SonarrApi.cs @@ -105,7 +105,9 @@ public SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool s { Log.Error(jse); var error = Api.ExecuteJson>(request, baseUrl); - result = new SonarrAddSeries { ErrorMessages = error.Select(x => x.errorMessage).ToList() }; + var messages = error?.Select(x => x.errorMessage).ToList(); + messages?.ForEach(x => Log.Error(x)); + result = new SonarrAddSeries { ErrorMessages = messages }; } return result; diff --git a/PlexRequests.Helpers/JsonConvertHelper.cs b/PlexRequests.Helpers/JsonConvertHelper.cs new file mode 100644 index 000000000..9762e1363 --- /dev/null +++ b/PlexRequests.Helpers/JsonConvertHelper.cs @@ -0,0 +1,54 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: JsonConvertHelper.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 Newtonsoft.Json; + +namespace PlexRequests.Helpers +{ + public static class JsonConvertHelper + { + public static T[] ParseObjectToArray(object ambiguousObject) + { + var json = ambiguousObject.ToString(); + if (string.IsNullOrWhiteSpace(json)) + { + return new T[0]; // Could return null here instead. + } + if (json.TrimStart().StartsWith("[")) + { + return JsonConvert.DeserializeObject(json); + } + if (json.TrimStart().Equals("{}")) + { + return new T[0]; + } + + return new T[1] { JsonConvert.DeserializeObject(json) }; + + } + } +} \ No newline at end of file diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj index b2bf29a0a..d936a71d3 100644 --- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj +++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj @@ -56,6 +56,7 @@ + diff --git a/PlexRequests.UI/Helpers/TvSender.cs b/PlexRequests.UI/Helpers/TvSender.cs index c4edac50f..a00851ec4 100644 --- a/PlexRequests.UI/Helpers/TvSender.cs +++ b/PlexRequests.UI/Helpers/TvSender.cs @@ -77,11 +77,16 @@ public SickRageTvAdd SendToSickRage(SickRageSettings sickRageSettings, Requested public SickRageTvAdd SendToSickRage(SickRageSettings sickRageSettings, RequestedModel model, string qualityId) { + Log.Info("Sending to SickRage {0}", model.Title); if (!sickRageSettings.Qualities.Any(x => x.Key == qualityId)) { qualityId = sickRageSettings.QualityProfile; } + Log.Trace("Calling `AddSeries` with the following settings:"); + Log.Trace(sickRageSettings.DumpJson()); + Log.Trace("And the following `model`:"); + Log.Trace(model.DumpJson()); var apiResult = SickrageApi.AddSeries(model.ProviderId, model.SeasonCount, model.SeasonList, qualityId, sickRageSettings.ApiKey, sickRageSettings.FullUri); From adfbfb54a3f66c4d1ca15c27e1d691b440a936fb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 7 Apr 2016 22:17:22 +0100 Subject: [PATCH 08/44] Set the default log level to info. #141 --- PlexRequests.Helpers/LoggingHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlexRequests.Helpers/LoggingHelper.cs b/PlexRequests.Helpers/LoggingHelper.cs index 49eb9d0f7..03a80d3db 100644 --- a/PlexRequests.Helpers/LoggingHelper.cs +++ b/PlexRequests.Helpers/LoggingHelper.cs @@ -106,7 +106,7 @@ public static void ConfigureLogging(string connectionString) CreateDirs = true }; config.AddTarget(fileTarget); - var rule2 = new LoggingRule("*", LogLevel.Trace, fileTarget); + var rule2 = new LoggingRule("*", LogLevel.Info, fileTarget); config.LoggingRules.Add(rule2); // Step 5. Activate the configuration From 462eb0c9f28227db6ea62782a4476a0eb36ed352 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 7 Apr 2016 22:33:46 +0100 Subject: [PATCH 09/44] I think i've fixed an issue where SickRage reports Show not found. --- PlexRequests.Api/SickrageApi.cs | 31 +++++++++++++++++++-------- PlexRequests.Helpers/LoggingHelper.cs | 2 +- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index 4967875b9..223d3115d 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -92,19 +92,32 @@ public async Task AddSeries(int tvdbId, int seasonCount, int[] se var seasonIncrement = 0; var seasonList = new SickRageSeasonList(); Log.Trace("while (seasonIncrement < seasonCount) where seasonCount = {0}", seasonCount); - while (seasonIncrement < seasonCount) + try { - seasonList = VerifyShowHasLoaded(tvdbId, apiKey, baseUrl); - seasonIncrement = seasonList.Data?.Length ?? 0; - Log.Trace("New seasonIncrement -> {0}", seasonIncrement); - - if (sw.ElapsedMilliseconds > 30000) // Break out after 30 seconds, it's not going to get added + while (seasonIncrement < seasonCount) { - Log.Warn("Couldn't find out if the show had been added after 10 seconds. I doubt we can change the status to wanted."); - break; + seasonList = VerifyShowHasLoaded(tvdbId, apiKey, baseUrl); + if (seasonList.result.Equals("failure")) + { + Thread.Sleep(3000); + continue; + } + seasonIncrement = seasonList.Data?.Length ?? 0; + Log.Trace("New seasonIncrement -> {0}", seasonIncrement); + + if (sw.ElapsedMilliseconds > 30000) // Break out after 30 seconds, it's not going to get added + { + Log.Warn("Couldn't find out if the show had been added after 10 seconds. I doubt we can change the status to wanted."); + break; + } } + sw.Stop(); + } + catch (Exception e) + { + Log.Error("Exception thrown when getting the seasonList"); + Log.Error(e); } - sw.Stop(); } Log.Trace("seasons.Length > 0 where seasons.Len -> {0}", seasons.Length); try diff --git a/PlexRequests.Helpers/LoggingHelper.cs b/PlexRequests.Helpers/LoggingHelper.cs index 03a80d3db..49eb9d0f7 100644 --- a/PlexRequests.Helpers/LoggingHelper.cs +++ b/PlexRequests.Helpers/LoggingHelper.cs @@ -106,7 +106,7 @@ public static void ConfigureLogging(string connectionString) CreateDirs = true }; config.AddTarget(fileTarget); - var rule2 = new LoggingRule("*", LogLevel.Info, fileTarget); + var rule2 = new LoggingRule("*", LogLevel.Trace, fileTarget); config.LoggingRules.Add(rule2); // Step 5. Activate the configuration From e8fb28a0249ad30a64afdda6a5cfe9caf0b70554 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 7 Apr 2016 22:44:03 +0100 Subject: [PATCH 10/44] Change default logging --- PlexRequests.Helpers/LoggingHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlexRequests.Helpers/LoggingHelper.cs b/PlexRequests.Helpers/LoggingHelper.cs index 49eb9d0f7..03a80d3db 100644 --- a/PlexRequests.Helpers/LoggingHelper.cs +++ b/PlexRequests.Helpers/LoggingHelper.cs @@ -106,7 +106,7 @@ public static void ConfigureLogging(string connectionString) CreateDirs = true }; config.AddTarget(fileTarget); - var rule2 = new LoggingRule("*", LogLevel.Trace, fileTarget); + var rule2 = new LoggingRule("*", LogLevel.Info, fileTarget); config.LoggingRules.Add(rule2); // Step 5. Activate the configuration From 6ed7df2c213fbade45f629446b43e0e565feb4aa Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 21:45:05 -0500 Subject: [PATCH 11/44] cache the couchpotato wanted list, update it on an interval, and use it to determine if a movie has been queued already --- .../ICouchPotatoApi.cs | 1 + .../Movie/CouchPotatoAdd.cs | 35 ++++++-- .../Movie/CouchPotatoMovies.cs | 12 +++ .../PlexRequests.Api.Models.csproj | 1 + PlexRequests.Api/CouchPotatoApi.cs | 11 +++ PlexRequests.Core/CacheKeys.cs | 2 + PlexRequests.Services/CouchPotatoCacher.cs | 77 ++++++++++++++++ .../Interfaces/ICouchPotatoCacher.cs | 8 ++ PlexRequests.Services/MediaCacheService.cs | 89 +++++++++++++++++++ PlexRequests.UI/Bootstrapper.cs | 2 + PlexRequests.UI/Jobs/MediaCacheRegistry.cs | 41 +++++++++ PlexRequests.UI/Modules/SearchModule.cs | 14 ++- PlexRequests.UI/PlexRequests.UI.csproj | 1 + 13 files changed, 283 insertions(+), 11 deletions(-) create mode 100644 PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs create mode 100644 PlexRequests.Services/CouchPotatoCacher.cs create mode 100644 PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs create mode 100644 PlexRequests.Services/MediaCacheService.cs create mode 100644 PlexRequests.UI/Jobs/MediaCacheRegistry.cs diff --git a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs index 288f09d67..0e018e6a8 100644 --- a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs +++ b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs @@ -36,5 +36,6 @@ public interface ICouchPotatoApi bool AddMovie(string imdbid, string apiKey, string title, Uri baseUrl, string profileID = default(string)); CouchPotatoStatus GetStatus(Uri url, string apiKey); CouchPotatoProfiles GetProfiles(Uri url, string apiKey); + CouchPotatoMovies GetMovies(Uri baseUrl, string apiKey, string[] status); } } \ No newline at end of file diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs b/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs index 5a2e228b9..adad93c74 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs @@ -14,7 +14,7 @@ public class CouchPotatoAdd } public class Rating { - public List imdb { get; set; } + public List imdb { get; set; } } @@ -23,15 +23,15 @@ public class Images { public List disc_art { get; set; } public List poster { get; set; } + public List backdrop { get; set; } public List extra_thumbs { get; set; } public List poster_original { get; set; } - public List landscape { get; set; } - public string[] actors { get; set; } + public List actors { get; set; } public List backdrop_original { get; set; } public List clear_art { get; set; } public List logo { get; set; } public List banner { get; set; } - public List backdrop { get; set; } + public List landscape { get; set; } public List extra_fanart { get; set; } } @@ -42,16 +42,17 @@ public class Info public int tmdb_id { get; set; } public string plot { get; set; } public string tagline { get; set; } + public Release_Date release_date { get; set; } + public int year { get; set; } public string original_title { get; set; } - public string[] actor_roles { get; set; } + public List actor_roles { get; set; } public bool via_imdb { get; set; } - public string mpaa { get; set; } - public bool via_tmdb { get; set; } + public Images images { get; set; } public List directors { get; set; } public List titles { get; set; } public string imdb { get; set; } - public int year { get; set; } - public Images images { get; set; } + public string mpaa { get; set; } + public bool via_tmdb { get; set; } public List actors { get; set; } public List writers { get; set; } public int runtime { get; set; } @@ -59,6 +60,19 @@ public class Info public string released { get; set; } } + public class Release_Date + { + public int dvd { get; set; } + public int expires { get; set; } + public int theater { get; set; } + public bool bluray { get; set; } + } + + public class Files + { + public List image_poster { get; set; } + } + public class Identifiers { public string imdb { get; set; } @@ -74,8 +88,11 @@ public class Movie public string _rev { get; set; } public string profile_id { get; set; } public string _id { get; set; } + public List tags { get; set; } + public int last_edit { get; set; } public object category_id { get; set; } public string type { get; set; } + public Files files { get; set; } public Identifiers identifiers { get; set; } } diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs b/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs new file mode 100644 index 000000000..33399179c --- /dev/null +++ b/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace PlexRequests.Api.Models.Movie +{ + public class CouchPotatoMovies + { + public List movies { get; set; } + public int total { get; set; } + public bool success { get; set; } + public bool empty { get; set; } + } +} diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj index 33b154211..ec15e83d1 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -46,6 +46,7 @@ + diff --git a/PlexRequests.Api/CouchPotatoApi.cs b/PlexRequests.Api/CouchPotatoApi.cs index 7e660a38d..88cc07075 100644 --- a/PlexRequests.Api/CouchPotatoApi.cs +++ b/PlexRequests.Api/CouchPotatoApi.cs @@ -115,5 +115,16 @@ public CouchPotatoProfiles GetProfiles(Uri url, string apiKey) return Api.Execute(request, url); } + + public CouchPotatoMovies GetMovies(Uri baseUrl, string apiKey, string[] status) + { + RestRequest request; + request = new RestRequest { Resource = "/api/{apikey}/movie.list?status={status}" }; + + request.AddUrlSegment("apikey", apiKey); + request.AddUrlSegment("status", string.Join(",", status)); + + return Api.Execute(request, baseUrl); + } } } \ No newline at end of file diff --git a/PlexRequests.Core/CacheKeys.cs b/PlexRequests.Core/CacheKeys.cs index a40291b91..dfa07891c 100644 --- a/PlexRequests.Core/CacheKeys.cs +++ b/PlexRequests.Core/CacheKeys.cs @@ -31,6 +31,8 @@ public class CacheKeys public const string TvDbToken = "TheTvDbApiToken"; public const string SonarrQualityProfiles = "SonarrQualityProfiles"; public const string SickRageQualityProfiles = "SickRageQualityProfiles"; + public const string CouchPotatoQualityProfiles = "CouchPotatoQualityProfiles"; + public const string CouchPotatoQueued = "CouchPotatoQueued"; } } \ No newline at end of file diff --git a/PlexRequests.Services/CouchPotatoCacher.cs b/PlexRequests.Services/CouchPotatoCacher.cs new file mode 100644 index 000000000..557a29179 --- /dev/null +++ b/PlexRequests.Services/CouchPotatoCacher.cs @@ -0,0 +1,77 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexAvailabilityChecker.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 NLog; + +using PlexRequests.Api.Interfaces; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Services.Interfaces; +using PlexRequests.Api.Models.Movie; +using System.Linq; + +namespace PlexRequests.Services +{ + public class CouchPotatoCacher : ICouchPotatoCacher + { + public CouchPotatoCacher(ISettingsService cpSettings, ICouchPotatoApi cpApi, ICacheProvider cache) + { + CpSettings = cpSettings; + CpApi = cpApi; + Cache = cache; + } + + private ISettingsService CpSettings { get; } + private ICacheProvider Cache { get; } + private ICouchPotatoApi CpApi { get; } + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + public void Queued(long check) + { + Log.Trace("This is check no. {0}", check); + Log.Trace("Getting the settings"); + + var settings = CpSettings.GetSettings(); + if (settings.Enabled) + { + Log.Trace("Getting all movies from CouchPotato"); + var movies = CpApi.GetMovies(settings.FullUri, settings.ApiKey, new[] { "active" }); + Cache.Set(CacheKeys.CouchPotatoQueued, movies, 10); + } + } + + // we do not want to set here... + public int[] QueuedIds() + { + var movies = Cache.Get(CacheKeys.CouchPotatoQueued); + return movies != null ? movies.movies.Select(x => x.info.tmdb_id).ToArray() : new int[] { }; + } + } +} \ No newline at end of file diff --git a/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs b/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs new file mode 100644 index 000000000..4da6fa852 --- /dev/null +++ b/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs @@ -0,0 +1,8 @@ +namespace PlexRequests.Services.Interfaces +{ + public interface ICouchPotatoCacher + { + void Queued(long check); + int[] QueuedIds(); + } +} diff --git a/PlexRequests.Services/MediaCacheService.cs b/PlexRequests.Services/MediaCacheService.cs new file mode 100644 index 000000000..1517234d3 --- /dev/null +++ b/PlexRequests.Services/MediaCacheService.cs @@ -0,0 +1,89 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: AvailabilityUpdateService.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.Reactive.Linq; +using System.Web.Hosting; + +using FluentScheduler; + +using Mono.Data.Sqlite; + +using NLog; + +using PlexRequests.Api; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Services.Interfaces; +using PlexRequests.Store; +using PlexRequests.Store.Repository; + +namespace PlexRequests.Services +{ + public class MediaCacheService : ITask, IRegisteredObject, IAvailabilityUpdateService + { + public MediaCacheService() + { + var memCache = new MemoryCacheProvider(); + var dbConfig = new DbConfiguration(new SqliteFactory()); + var repo = new SettingsJsonRepository(dbConfig, memCache); + + ConfigurationReader = new ConfigurationReader(); + CpCacher = new CouchPotatoCacher(new SettingsServiceV2(repo), new CouchPotatoApi(), memCache); + HostingEnvironment.RegisterObject(this); + } + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + private IConfigurationReader ConfigurationReader { get; } + private ICouchPotatoCacher CpCacher { get; } + private IDisposable UpdateSubscription { get; set; } + + public void Start(Configuration c) + { + UpdateSubscription?.Dispose(); + + CpCacher.Queued(-1); + UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(CpCacher.Queued); + } + + public void Execute() + { + Start(ConfigurationReader.Read()); + } + + public void Stop(bool immediate) + { + HostingEnvironment.UnregisterObject(this); + } + } + + public interface ICouchPotatoCacheService + { + void Start(Configuration c); + } +} diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index a4e13f18b..a3a8bc723 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -85,6 +85,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na // Services container.Register(); + container.Register(); container.Register(); container.Register(); @@ -106,6 +107,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na TaskManager.TaskFactory = new PlexTaskFactory(); TaskManager.Initialize(new PlexRegistry()); + TaskManager.Initialize(new MediaCacheRegistry()); } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) diff --git a/PlexRequests.UI/Jobs/MediaCacheRegistry.cs b/PlexRequests.UI/Jobs/MediaCacheRegistry.cs new file mode 100644 index 000000000..3b4b2b68c --- /dev/null +++ b/PlexRequests.UI/Jobs/MediaCacheRegistry.cs @@ -0,0 +1,41 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexRegistry.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 FluentScheduler; + +using PlexRequests.Services; + +namespace PlexRequests.UI.Jobs +{ + public class MediaCacheRegistry : Registry + { + public MediaCacheRegistry() + { + Schedule().ToRunNow(); + } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 9511034c1..cb2be3625 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -61,7 +61,7 @@ public SearchModule(ICacheProvider cache, ISettingsService ISettingsService prSettings, IAvailabilityChecker checker, IRequestService request, ISonarrApi sonarrApi, ISettingsService sonarrSettings, ISettingsService sickRageService, ICouchPotatoApi cpApi, ISickRageApi srApi, - INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService hpService) : base("search") + INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService hpService, ICouchPotatoCacher cpCacher) : base("search") { CpService = cpSettings; PrService = prSettings; @@ -69,6 +69,7 @@ public SearchModule(ICacheProvider cache, ISettingsService TvApi = new TheTvDbApi(); Cache = cache; Checker = checker; + CpCacher = cpCacher; RequestService = request; SonarrApi = sonarrApi; SonarrService = sonarrSettings; @@ -109,6 +110,7 @@ public SearchModule(ICacheProvider cache, ISettingsService private ISettingsService SickRageService { get; } private ISettingsService HeadphonesService { get; } private IAvailabilityChecker Checker { get; } + private ICouchPotatoCacher CpCacher { get; } private IMusicBrainzApi MusicBrainzApi { get; } private IHeadphonesApi HeadphonesApi { get; } private static Logger Log = LogManager.GetCurrentClassLogger(); @@ -150,6 +152,8 @@ private Response SearchMovie(string searchTerm) private Response ProcessMovies(MovieSearchType searchType, string searchTerm) { List taskList = new List(); + var z = CpService.GetSettings(); + CouchPotatoApi.GetMovies(z.FullUri, z.ApiKey, new[] { "active" }); List apiMovies = new List(); taskList.Add(Task.Factory.StartNew>(() => @@ -198,6 +202,8 @@ private Response ProcessMovies(MovieSearchType searchType, string searchTerm) Task.WaitAll(taskList.ToArray()); + int[] cpCached = CpCacher.QueuedIds(); + List viewMovies = new List(); foreach (MovieResult movie in apiMovies) { @@ -219,7 +225,7 @@ private Response ProcessMovies(MovieSearchType searchType, string searchTerm) VoteCount = movie.VoteCount }; - if (dbMovies.ContainsKey(movie.Id)) + if (dbMovies.ContainsKey(movie.Id)) // compare to the requests db { var dbm = dbMovies[movie.Id]; @@ -227,6 +233,10 @@ private Response ProcessMovies(MovieSearchType searchType, string searchTerm) viewMovie.Approved = dbm.Approved; viewMovie.Available = dbm.Available; } + else if (cpCached.Contains(movie.Id)) // compare to the couchpotato db + { + viewMovie.Requested = true; + } viewMovies.Add(viewMovie); } diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index 7d4cbfb9a..c3325ff7d 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -168,6 +168,7 @@ + From 456e442fa3d89adb88d6b40da8a857b7473c8e6c Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 21:47:11 -0500 Subject: [PATCH 12/44] add csproj with file changes from previous commit --- .../PlexRequests.Services.csproj | 16 ++++++++++++++++ PlexRequests.Services/packages.config | 2 ++ 2 files changed, 18 insertions(+) diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj index dba3cfce0..9642cfed5 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/PlexRequests.Services.csproj @@ -31,11 +31,23 @@ 4 + + ..\packages\MimeKit.1.2.22\lib\net45\BouncyCastle.dll + True + ..\packages\FluentScheduler.3.1.46\lib\net40\FluentScheduler.dll True + + ..\packages\MailKit.1.2.21\lib\net451\MailKit.dll + True + + + ..\packages\MimeKit.1.2.22\lib\net45\MimeKit.dll + True + False ..\Assemblies\Mono.Data.Sqlite.dll @@ -62,6 +74,7 @@ ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll True + @@ -71,9 +84,11 @@ + + @@ -85,6 +100,7 @@ + diff --git a/PlexRequests.Services/packages.config b/PlexRequests.Services/packages.config index a6c58be8f..111fbdb40 100644 --- a/PlexRequests.Services/packages.config +++ b/PlexRequests.Services/packages.config @@ -1,6 +1,8 @@  + + From 5d1c1baae83f4793613a69af254433598ed34319 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 22:00:02 -0500 Subject: [PATCH 13/44] start the initial couchpotato cache call on a separate thread to keep the startup process quick --- PlexRequests.Services/MediaCacheService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PlexRequests.Services/MediaCacheService.cs b/PlexRequests.Services/MediaCacheService.cs index 1517234d3..ab6134364 100644 --- a/PlexRequests.Services/MediaCacheService.cs +++ b/PlexRequests.Services/MediaCacheService.cs @@ -41,6 +41,7 @@ using PlexRequests.Services.Interfaces; using PlexRequests.Store; using PlexRequests.Store.Repository; +using System.Threading.Tasks; namespace PlexRequests.Services { @@ -67,7 +68,7 @@ public void Start(Configuration c) { UpdateSubscription?.Dispose(); - CpCacher.Queued(-1); + Task.Factory.StartNew(() => CpCacher.Queued(-1)); UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(CpCacher.Queued); } From 68624f69711ff350805c2c1f8a6afb8c6a712a90 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 7 Apr 2016 22:07:17 -0500 Subject: [PATCH 14/44] remove couchpotato api test code --- PlexRequests.UI/Modules/SearchModule.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index cb2be3625..959571a13 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -152,8 +152,7 @@ private Response SearchMovie(string searchTerm) private Response ProcessMovies(MovieSearchType searchType, string searchTerm) { List taskList = new List(); - var z = CpService.GetSettings(); - CouchPotatoApi.GetMovies(z.FullUri, z.ApiKey, new[] { "active" }); + var cpSettings = CpService.GetSettings(); List apiMovies = new List(); taskList.Add(Task.Factory.StartNew>(() => From 1af3c216551291f560619d900e1ccacfd2316e8e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Apr 2016 14:14:08 +0100 Subject: [PATCH 15/44] Added a url base --- .../SettingModels/PlexRequestSettings.cs | 2 +- PlexRequests.Core/Setup.cs | 9 +++---- PlexRequests.UI/Bootstrapper.cs | 16 ++++++++++++- PlexRequests.UI/Content/bootstrap.css | 4 ++-- PlexRequests.UI/Content/font-awesome.css | 4 ++-- PlexRequests.UI/PlexRequests.UI.csproj | 4 ++++ PlexRequests.UI/Program.cs | 14 +++++++---- PlexRequests.UI/Views/Admin/Logs.cshtml | 4 ++-- PlexRequests.UI/Views/Requests/Index.cshtml | 2 +- PlexRequests.UI/Views/Search/Index.cshtml | 2 +- PlexRequests.UI/Views/Shared/_Layout.cshtml | 24 +++++++++---------- 11 files changed, 54 insertions(+), 31 deletions(-) diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs index 4b4009def..90596ba39 100644 --- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs +++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs @@ -33,7 +33,7 @@ namespace PlexRequests.Core.SettingModels public class PlexRequestSettings : Settings { public int Port { get; set; } - + public string AssetLocation { get; set; } public bool SearchForMovies { get; set; } public bool SearchForTvShows { get; set; } public bool SearchForMusic { get; set; } diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs index bbf41039e..c59b3556e 100644 --- a/PlexRequests.Core/Setup.cs +++ b/PlexRequests.Core/Setup.cs @@ -44,7 +44,7 @@ public class Setup { private static Logger Log = LogManager.GetCurrentClassLogger(); private static DbConfiguration Db { get; set; } - public string SetupDb() + public string SetupDb(string assetLocation) { Db = new DbConfiguration(new SqliteFactory()); var created = Db.CheckDb(); @@ -52,7 +52,7 @@ public string SetupDb() if (created) { - CreateDefaultSettingsPage(); + CreateDefaultSettingsPage(assetLocation); } var version = CheckSchema(); @@ -89,7 +89,7 @@ private int CheckSchema() return version; } - private void CreateDefaultSettingsPage() + private void CreateDefaultSettingsPage(string assetLocation) { var defaultSettings = new PlexRequestSettings { @@ -97,7 +97,8 @@ private void CreateDefaultSettingsPage() RequireMovieApproval = true, SearchForMovies = true, SearchForTvShows = true, - WeeklyRequestLimit = 0 + WeeklyRequestLimit = 0, + AssetLocation = assetLocation ?? "assets" }; var s = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())); s.SaveSettings(defaultSettings); diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index a3a8bc723..b05b71019 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -32,6 +32,7 @@ using Nancy; using Nancy.Authentication.Forms; using Nancy.Bootstrapper; +using Nancy.Conventions; using Nancy.Cryptography; using Nancy.Diagnostics; using Nancy.Session; @@ -60,6 +61,8 @@ public class Bootstrapper : DefaultNancyBootstrapper // by overriding the various methods and properties. // For more information https://github.com/NancyFx/Nancy/wiki/Bootstrapper + private TinyIoCContainer _container; + protected override void ConfigureRequestContainer(TinyIoCContainer container, NancyContext context) { container.Register(); @@ -108,6 +111,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na TaskManager.TaskFactory = new PlexTaskFactory(); TaskManager.Initialize(new PlexRegistry()); TaskManager.Initialize(new MediaCacheRegistry()); + _container = container; } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) @@ -132,7 +136,17 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline (sender, certificate, chain, sslPolicyErrors) => true; } - + + protected override void ConfigureConventions(NancyConventions nancyConventions) + { + base.ConfigureConventions(nancyConventions); + + var settings = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()),new MemoryCacheProvider())); + var assetLocation = settings.GetSettings().AssetLocation; + nancyConventions.StaticContentsConventions.Add( + StaticContentConventionBuilder.AddDirectory("assets", $"{assetLocation}/Content") + ); + } protected override DiagnosticsConfiguration DiagnosticsConfiguration => new DiagnosticsConfiguration { Password = @"password" }; diff --git a/PlexRequests.UI/Content/bootstrap.css b/PlexRequests.UI/Content/bootstrap.css index 83e3b6fa3..0638c1fb9 100644 --- a/PlexRequests.UI/Content/bootstrap.css +++ b/PlexRequests.UI/Content/bootstrap.css @@ -269,8 +269,8 @@ th { } @font-face { font-family: 'Glyphicons Halflings'; - src: url('../Content/fonts/glyphicons-halflings-regular.eot'); - src: url('../Content/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../Content/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../Content/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../Content/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../Content/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../assets/fonts/glyphicons-halflings-regular.eot'); + src: url('../assets/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../assets/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../assets/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../assets/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../assets/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; diff --git a/PlexRequests.UI/Content/font-awesome.css b/PlexRequests.UI/Content/font-awesome.css index 7f747bf2c..b190f2c94 100644 --- a/PlexRequests.UI/Content/font-awesome.css +++ b/PlexRequests.UI/Content/font-awesome.css @@ -6,8 +6,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../Content/fonts/fontawesome-webfont.eot?v=4.5.0'); - src: url('../Content/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../Content/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../Content/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../Content/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../Content/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg'); + src: url('../assets/fonts/fontawesome-webfont.eot?v=4.5.0'); + src: url('../assets/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../assets/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../assets/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../assets/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../assets/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index c3325ff7d..8fa05a3da 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -462,6 +462,10 @@ + + + + - - - - + + + + - - - - - - - - + + + + + + + + From 75d3c40fcf9633860dcae51a6a9ade6272dcaf71 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Apr 2016 14:16:06 +0100 Subject: [PATCH 16/44] Made the base better --- PlexRequests.UI/Program.cs | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 0383c3fa2..c726e84aa 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -50,18 +50,28 @@ static void Main(string[] args) var port = -1; if (args.Length > 0) { - Log.Info("We are going to use port {0} that was passed in", args[0]); - int portResult; - if (!int.TryParse(args[0], out portResult)) + foreach (var a in args) { - Console.WriteLine("Didn't pass in a port"); - Console.WriteLine("Must be the URL Base"); - assetLocation = args[0]; - } - else - { - port = portResult; + if (a.StartsWith("-base", StringComparison.CurrentCultureIgnoreCase)) + { + Console.WriteLine("Settings URL Base"); + assetLocation = args[0]; + } + else + { + Log.Info("We are going to use port {0} that was passed in", a); + int portResult; + if (!int.TryParse(a, out portResult)) + { + Console.WriteLine("Didn't pass in a port"); + } + else + { + port = portResult; + } + } } + } Log.Trace("Getting product version"); WriteOutVersion(); From 50022cb559c842e7bbe4c48f8c14e5375ef79398 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Apr 2016 14:16:47 +0100 Subject: [PATCH 17/44] fixed --- PlexRequests.UI/Program.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index c726e84aa..55d200c09 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -63,7 +63,9 @@ static void Main(string[] args) int portResult; if (!int.TryParse(a, out portResult)) { - Console.WriteLine("Didn't pass in a port"); + Console.WriteLine("Didn't pass in a valid port"); + Console.ReadLine(); + Environment.Exit(1); } else { From 35310d35ed0916f38a63964c3980a11e66956ffd Mon Sep 17 00:00:00 2001 From: tidusjar Date: Fri, 8 Apr 2016 14:23:26 +0100 Subject: [PATCH 18/44] Fixed args --- PlexRequests.UI/Program.cs | 44 ++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 55d200c09..ab0172848 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -50,30 +50,32 @@ static void Main(string[] args) var port = -1; if (args.Length > 0) { - foreach (var a in args) + for (int i = 0; i < args.Length; i++) { - if (a.StartsWith("-base", StringComparison.CurrentCultureIgnoreCase)) + var arg = args[i].ToLowerInvariant().Substring(1); + switch (arg) { - Console.WriteLine("Settings URL Base"); - assetLocation = args[0]; - } - else - { - Log.Info("We are going to use port {0} that was passed in", a); - int portResult; - if (!int.TryParse(a, out portResult)) - { - Console.WriteLine("Didn't pass in a valid port"); - Console.ReadLine(); - Environment.Exit(1); - } - else - { - port = portResult; - } + case "base": + i++; + var value = args[i]; + Console.WriteLine("Settings URL Base"); + assetLocation = value; + break; + default: + int portResult; + if (!int.TryParse(args[i], out portResult)) + { + Console.WriteLine("Didn't pass in a valid port"); + Console.ReadLine(); + Environment.Exit(1); + } + else + { + port = portResult; + } + break; } } - } Log.Trace("Getting product version"); WriteOutVersion(); @@ -82,7 +84,7 @@ static void Main(string[] args) var cn = s.SetupDb(assetLocation); s.CacheQualityProfiles(); ConfigureTargets(cn); - + if (port == -1) port = GetStartupPort(); From 5f67302b32411a8eb64b8f4534c9c24cc26e101b Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Fri, 8 Apr 2016 10:05:09 -0500 Subject: [PATCH 19/44] #150 sonarr/sickrage cache checking. sickrage has a couple small items left --- PlexRequests.Api.Interfaces/ISickRageApi.cs | 2 + PlexRequests.Api.Interfaces/ISonarrApi.cs | 2 + .../PlexRequests.Api.Models.csproj | 1 + .../Sonarr/SonarrAddSeries.cs | 15 +++- .../Sonarr/SonarrAllSeries.cs | 69 ++++++++++++++++ PlexRequests.Api/Mocks/MockSonarrApi.cs | 5 ++ PlexRequests.Api/SickrageApi.cs | 21 +++++ PlexRequests.Api/SonarrApi.cs | 9 +++ PlexRequests.Core/CacheKeys.cs | 4 + .../Interfaces/ISickRageCacher.cs | 8 ++ .../Interfaces/ISonarrCacher.cs | 8 ++ PlexRequests.Services/MediaCacheService.cs | 8 ++ .../PlexRequests.Services.csproj | 4 + PlexRequests.Services/SickRageCacher.cs | 78 +++++++++++++++++++ PlexRequests.Services/SonarrCacher.cs | 77 ++++++++++++++++++ PlexRequests.UI/Bootstrapper.cs | 2 + PlexRequests.UI/Modules/SearchModule.cs | 28 +++++-- 17 files changed, 332 insertions(+), 9 deletions(-) create mode 100644 PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs create mode 100644 PlexRequests.Services/Interfaces/ISickRageCacher.cs create mode 100644 PlexRequests.Services/Interfaces/ISonarrCacher.cs create mode 100644 PlexRequests.Services/SickRageCacher.cs create mode 100644 PlexRequests.Services/SonarrCacher.cs diff --git a/PlexRequests.Api.Interfaces/ISickRageApi.cs b/PlexRequests.Api.Interfaces/ISickRageApi.cs index 4953b16f6..5d10d7557 100644 --- a/PlexRequests.Api.Interfaces/ISickRageApi.cs +++ b/PlexRequests.Api.Interfaces/ISickRageApi.cs @@ -39,5 +39,7 @@ Task AddSeries(int tvdbId, int seasoncount, int[] seasons, string SickRagePing Ping(string apiKey, Uri baseUrl); Task AddSeason(int tvdbId, int season, string apiKey, Uri baseUrl); + + Task GetShows(string apiKey, Uri baseUrl); } } \ No newline at end of file diff --git a/PlexRequests.Api.Interfaces/ISonarrApi.cs b/PlexRequests.Api.Interfaces/ISonarrApi.cs index e4dce0c3a..7e888f91a 100644 --- a/PlexRequests.Api.Interfaces/ISonarrApi.cs +++ b/PlexRequests.Api.Interfaces/ISonarrApi.cs @@ -39,5 +39,7 @@ SonarrAddSeries AddSeries(int tvdbId, string title, int qualityId, bool seasonFo int seasonCount, int[] seasons, string apiKey, Uri baseUrl); SystemStatus SystemStatus(string apiKey, Uri baseUrl); + + List GetSeries(string apiKey, Uri baseUrl); } } \ 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 ec15e83d1..e109a6d3d 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -74,6 +74,7 @@ + diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs index 6d143fc55..d489fca2b 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Newtonsoft.Json; +using System; namespace PlexRequests.Api.Models.Sonarr { @@ -8,6 +9,17 @@ public class Season { public int seasonNumber { get; set; } public bool monitored { get; set; } + public Statistics statistics { get; set; } + } + + public class Statistics + { + public int episodeFileCount { get; set; } + public int episodeCount { get; set; } + public int totalEpisodeCount { get; set; } + public long sizeOnDisk { get; set; } + public float percentOfEpisodes { get; set; } + public DateTime previousAiring { get; set; } } public class SonarrAddSeries @@ -35,7 +47,4 @@ public class AddOptions public bool ignoreEpisodesWithoutFiles { get; set; } public bool searchForMissingEpisodes { get; set; } } - - - } diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs new file mode 100644 index 000000000..f788d18b7 --- /dev/null +++ b/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; + +namespace PlexRequests.Api.Models.Sonarr +{ + public class SonarrAllSeries + { + public List list { get; set; } + } + + public class Series + { + public string title { get; set; } + public List alternateTitles { get; set; } + public string sortTitle { get; set; } + public int seasonCount { get; set; } + public int totalEpisodeCount { get; set; } + public int episodeCount { get; set; } + public int episodeFileCount { get; set; } + public long sizeOnDisk { get; set; } + public string status { get; set; } + public string overview { get; set; } + public DateTime previousAiring { get; set; } + public string network { get; set; } + public List images { get; set; } + public List seasons { get; set; } + public int year { get; set; } + public string path { get; set; } + public int profileId { get; set; } + public bool seasonFolder { get; set; } + public bool monitored { get; set; } + public bool useSceneNumbering { get; set; } + public int runtime { get; set; } + public int tvdbId { get; set; } + public int tvRageId { get; set; } + public int tvMazeId { get; set; } + public DateTime firstAired { get; set; } + public DateTime lastInfoSync { get; set; } + public string seriesType { get; set; } + public string cleanTitle { get; set; } + public string imdbId { get; set; } + public string titleSlug { get; set; } + public string certification { get; set; } + public List genres { get; set; } + public List tags { get; set; } + public DateTime added { get; set; } + public Ratings ratings { get; set; } + public int qualityProfileId { get; set; } + public int id { get; set; } + } + + public class Ratings + { + public int votes { get; set; } + public float value { get; set; } + } + + public class Alternatetitle + { + public string title { get; set; } + public int seasonNumber { get; set; } + } + + public class Image + { + public string coverType { get; set; } + public string url { get; set; } + } +} diff --git a/PlexRequests.Api/Mocks/MockSonarrApi.cs b/PlexRequests.Api/Mocks/MockSonarrApi.cs index dfb816f8a..abe8e793b 100644 --- a/PlexRequests.Api/Mocks/MockSonarrApi.cs +++ b/PlexRequests.Api/Mocks/MockSonarrApi.cs @@ -55,5 +55,10 @@ public SystemStatus SystemStatus(string apiKey, Uri baseUrl) { throw new NotImplementedException(); } + + public List GetSeries(string apiKey, Uri baseUrl) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index 223d3115d..68a501a04 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -38,6 +38,7 @@ using PlexRequests.Api.Models.SickRage; using PlexRequests.Helpers; using RestSharp; +using Newtonsoft.Json.Linq; namespace PlexRequests.Api { @@ -206,5 +207,25 @@ public async Task AddSeason(int tvdbId, int season, string apiKey return result; }).ConfigureAwait(false); } + + public async Task GetShows(string apiKey, Uri baseUrl) // TODO: get the correct response/models from SR + { + var request = new RestRequest + { + Resource = "/api/{apiKey}/?cmd=shows", + Method = Method.GET + }; + request.AddUrlSegment("apiKey", apiKey); + + //await Task.Run(() => Thread.Sleep(2000)); + //return await Task.Run(() => + //{ + //Log.Trace("Entering `Execute` in a new `Task`"); + var result = Api.ExecuteJson(request, baseUrl); + + //Log.Trace("Exiting `Execute` and yeilding `Task` result"); + return null; + //}).ConfigureAwait(false); + } } } \ No newline at end of file diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs index 91b9be55e..e9e1e96ad 100644 --- a/PlexRequests.Api/SonarrApi.cs +++ b/PlexRequests.Api/SonarrApi.cs @@ -36,6 +36,7 @@ using PlexRequests.Helpers; using RestSharp; +using Newtonsoft.Json.Linq; namespace PlexRequests.Api { @@ -122,5 +123,13 @@ public SystemStatus SystemStatus(string apiKey, Uri baseUrl) return obj; } + + public List GetSeries(string apiKey, Uri baseUrl) + { + var request = new RestRequest { Resource = "/api/series", Method = Method.GET }; + request.AddHeader("X-Api-Key", apiKey); + + return Api.Execute>(request, baseUrl); + } } } \ No newline at end of file diff --git a/PlexRequests.Core/CacheKeys.cs b/PlexRequests.Core/CacheKeys.cs index dfa07891c..3da5be381 100644 --- a/PlexRequests.Core/CacheKeys.cs +++ b/PlexRequests.Core/CacheKeys.cs @@ -29,8 +29,12 @@ namespace PlexRequests.Core public class CacheKeys { public const string TvDbToken = "TheTvDbApiToken"; + public const string SonarrQualityProfiles = "SonarrQualityProfiles"; + public const string SonarrQueued = "SonarrQueued"; + public const string SickRageQualityProfiles = "SickRageQualityProfiles"; + public const string SickRageQueued = "SickRageQueued"; public const string CouchPotatoQualityProfiles = "CouchPotatoQualityProfiles"; public const string CouchPotatoQueued = "CouchPotatoQueued"; diff --git a/PlexRequests.Services/Interfaces/ISickRageCacher.cs b/PlexRequests.Services/Interfaces/ISickRageCacher.cs new file mode 100644 index 000000000..a42d2a1e4 --- /dev/null +++ b/PlexRequests.Services/Interfaces/ISickRageCacher.cs @@ -0,0 +1,8 @@ +namespace PlexRequests.Services.Interfaces +{ + public interface ISickRageCacher + { + void Queued(long check); + int[] QueuedIds(); + } +} diff --git a/PlexRequests.Services/Interfaces/ISonarrCacher.cs b/PlexRequests.Services/Interfaces/ISonarrCacher.cs new file mode 100644 index 000000000..590666e07 --- /dev/null +++ b/PlexRequests.Services/Interfaces/ISonarrCacher.cs @@ -0,0 +1,8 @@ +namespace PlexRequests.Services.Interfaces +{ + public interface ISonarrCacher + { + void Queued(long check); + int[] QueuedIds(); + } +} diff --git a/PlexRequests.Services/MediaCacheService.cs b/PlexRequests.Services/MediaCacheService.cs index ab6134364..7633fc97f 100644 --- a/PlexRequests.Services/MediaCacheService.cs +++ b/PlexRequests.Services/MediaCacheService.cs @@ -55,6 +55,8 @@ public MediaCacheService() ConfigurationReader = new ConfigurationReader(); CpCacher = new CouchPotatoCacher(new SettingsServiceV2(repo), new CouchPotatoApi(), memCache); + SonarrCacher = new SonarrCacher(new SettingsServiceV2(repo), new SonarrApi(), memCache); + SickRageCacher = new SickRageCacher(new SettingsServiceV2(repo), new SickrageApi(), memCache); HostingEnvironment.RegisterObject(this); } @@ -62,6 +64,8 @@ public MediaCacheService() private IConfigurationReader ConfigurationReader { get; } private ICouchPotatoCacher CpCacher { get; } + private ISonarrCacher SonarrCacher { get; } + private ISickRageCacher SickRageCacher { get; } private IDisposable UpdateSubscription { get; set; } public void Start(Configuration c) @@ -69,7 +73,11 @@ public void Start(Configuration c) UpdateSubscription?.Dispose(); Task.Factory.StartNew(() => CpCacher.Queued(-1)); + Task.Factory.StartNew(() => SonarrCacher.Queued(-1)); + Task.Factory.StartNew(() => SickRageCacher.Queued(-1)); UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(CpCacher.Queued); + UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SonarrCacher.Queued); + UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SickRageCacher.Queued); } public void Execute() diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj index 9642cfed5..bcdb54ab0 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/PlexRequests.Services.csproj @@ -84,6 +84,10 @@ + + + + diff --git a/PlexRequests.Services/SickRageCacher.cs b/PlexRequests.Services/SickRageCacher.cs new file mode 100644 index 000000000..277b19645 --- /dev/null +++ b/PlexRequests.Services/SickRageCacher.cs @@ -0,0 +1,78 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexAvailabilityChecker.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 NLog; + +using PlexRequests.Api.Interfaces; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Services.Interfaces; +using PlexRequests.Api.Models.Movie; +using System.Linq; +using PlexRequests.Api.Models.SickRage; + +namespace PlexRequests.Services +{ + public class SickRageCacher : ISickRageCacher + { + public SickRageCacher(ISettingsService srSettings, ISickRageApi srApi, ICacheProvider cache) + { + SrSettings = srSettings; + SrApi = srApi; + Cache = cache; + } + + private ISettingsService SrSettings { get; } + private ICacheProvider Cache { get; } + private ISickRageApi SrApi { get; } + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + public void Queued(long check) + { + Log.Trace("This is check no. {0}", check); + Log.Trace("Getting the settings"); + + var settings = SrSettings.GetSettings(); + if (settings.Enabled) + { + Log.Trace("Getting all shows from SickRage"); + var movies = SrApi.GetShows(settings.ApiKey, settings.FullUri); + Cache.Set(CacheKeys.SickRageQueued, movies, 10); + } + } + + // we do not want to set here... + public int[] QueuedIds() + { + var tv = Cache.Get(CacheKeys.SickRageQueued); + return new int[] { }; //tv != null ? tv.Select(x => x.info.tmdb_id).ToArray() : new int[] { }; // TODO: return the array of tvdb IDs from SR + } + } +} \ No newline at end of file diff --git a/PlexRequests.Services/SonarrCacher.cs b/PlexRequests.Services/SonarrCacher.cs new file mode 100644 index 000000000..018db93c0 --- /dev/null +++ b/PlexRequests.Services/SonarrCacher.cs @@ -0,0 +1,77 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexAvailabilityChecker.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 NLog; + +using PlexRequests.Api.Interfaces; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Services.Interfaces; +using System.Linq; +using System.Collections.Generic; +using PlexRequests.Api.Models.Sonarr; + +namespace PlexRequests.Services +{ + public class SonarrCacher : ISonarrCacher + { + public SonarrCacher(ISettingsService sonarrSettings, ISonarrApi sonarrApi, ICacheProvider cache) + { + SonarrSettings = sonarrSettings; + SonarrApi = sonarrApi; + Cache = cache; + } + + private ISettingsService SonarrSettings { get; } + private ICacheProvider Cache { get; } + private ISonarrApi SonarrApi { get; } + + private static Logger Log = LogManager.GetCurrentClassLogger(); + + public void Queued(long check) + { + Log.Trace("This is check no. {0}", check); + Log.Trace("Getting the settings"); + + var settings = SonarrSettings.GetSettings(); + if (settings.Enabled) + { + Log.Trace("Getting all tv series from Sonarr"); + var series = SonarrApi.GetSeries(settings.ApiKey, settings.FullUri); + Cache.Set(CacheKeys.SonarrQueued, series, 10); + } + } + + // we do not want to set here... + public int[] QueuedIds() + { + var series = Cache.Get>(CacheKeys.SonarrQueued); + return series != null ? series.Select(x => x.tvdbId).ToArray() : new int[] { }; + } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index b05b71019..e50300afa 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -89,6 +89,8 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na // Services container.Register(); container.Register(); + container.Register(); + container.Register(); container.Register(); container.Register(); diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 959571a13..fc39cc91f 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -61,7 +61,8 @@ public SearchModule(ICacheProvider cache, ISettingsService ISettingsService prSettings, IAvailabilityChecker checker, IRequestService request, ISonarrApi sonarrApi, ISettingsService sonarrSettings, ISettingsService sickRageService, ICouchPotatoApi cpApi, ISickRageApi srApi, - INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService hpService, ICouchPotatoCacher cpCacher) : base("search") + INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService hpService, + ICouchPotatoCacher cpCacher, ISonarrCacher sonarrCacher, ISickRageCacher sickRageCacher) : base("search") { CpService = cpSettings; PrService = prSettings; @@ -70,6 +71,8 @@ public SearchModule(ICacheProvider cache, ISettingsService Cache = cache; Checker = checker; CpCacher = cpCacher; + SonarrCacher = sonarrCacher; + SickRageCacher = sickRageCacher; RequestService = request; SonarrApi = sonarrApi; SonarrService = sonarrSettings; @@ -111,6 +114,8 @@ public SearchModule(ICacheProvider cache, ISettingsService private ISettingsService HeadphonesService { get; } private IAvailabilityChecker Checker { get; } private ICouchPotatoCacher CpCacher { get; } + private ISonarrCacher SonarrCacher { get; } + private ISickRageCacher SickRageCacher { get; } private IMusicBrainzApi MusicBrainzApi { get; } private IHeadphonesApi HeadphonesApi { get; } private static Logger Log = LogManager.GetCurrentClassLogger(); @@ -277,6 +282,8 @@ private Response SearchTvShow(string searchTerm) return Response.AsJson(""); } + int[] sonarrCached = SonarrCacher.QueuedIds(); + int[] sickRageCache = SickRageCacher.QueuedIds(); // consider just merging sonarr/sickrage arrays var viewTv = new List(); foreach (var t in apiTv) @@ -299,13 +306,22 @@ private Response SearchTvShow(string searchTerm) Status = t.show.status }; - if (t.show.externals.thetvdb != null && dbTv.ContainsKey((int)t.show.externals.thetvdb)) + if (t.show.externals.thetvdb != null) { - var dbt = dbTv[(int)t.show.externals.thetvdb]; + int tvdbid = (int)t.show.externals.thetvdb; - viewT.Requested = true; - viewT.Approved = dbt.Approved; - viewT.Available = dbt.Available; + if (dbTv.ContainsKey(tvdbid)) + { + var dbt = dbTv[tvdbid]; + + viewT.Requested = true; + viewT.Approved = dbt.Approved; + viewT.Available = dbt.Available; + } + else if (sonarrCached.Contains(tvdbid) || sickRageCache.Contains(tvdbid)) // compare to the sonarr/sickrage db + { + viewT.Requested = true; + } } viewTv.Add(viewT); From e707837bf5c0179748ed672cb14808c978c3a960 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Fri, 8 Apr 2016 10:31:49 -0500 Subject: [PATCH 20/44] #150 split out the cache subscriptions to make sure they subscribe properly --- PlexRequests.Services/MediaCacheService.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/PlexRequests.Services/MediaCacheService.cs b/PlexRequests.Services/MediaCacheService.cs index 7633fc97f..48799f5b6 100644 --- a/PlexRequests.Services/MediaCacheService.cs +++ b/PlexRequests.Services/MediaCacheService.cs @@ -66,18 +66,22 @@ public MediaCacheService() private ICouchPotatoCacher CpCacher { get; } private ISonarrCacher SonarrCacher { get; } private ISickRageCacher SickRageCacher { get; } - private IDisposable UpdateSubscription { get; set; } + private IDisposable CpSubscription { get; set; } + private IDisposable SonarrSubscription { get; set; } + private IDisposable SickRageSubscription { get; set; } public void Start(Configuration c) { - UpdateSubscription?.Dispose(); + CpSubscription?.Dispose(); + SonarrSubscription?.Dispose(); + SickRageSubscription?.Dispose(); Task.Factory.StartNew(() => CpCacher.Queued(-1)); Task.Factory.StartNew(() => SonarrCacher.Queued(-1)); Task.Factory.StartNew(() => SickRageCacher.Queued(-1)); - UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(CpCacher.Queued); - UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SonarrCacher.Queued); - UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SickRageCacher.Queued); + CpSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(CpCacher.Queued); + SonarrSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SonarrCacher.Queued); + SickRageSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(SickRageCacher.Queued); } public void Execute() From 718e8868c12455fb3643e77a821642ad2d939fb0 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Sat, 9 Apr 2016 12:18:04 -0500 Subject: [PATCH 21/44] #150 start caching plex media as well. refactored the availability checker. NEEDS TESTING. also, we need to make the Requests hit the plex api directly rather than hitting the cache as it does now. --- PlexRequests.Api.Interfaces/IPlexApi.cs | 2 + PlexRequests.Api.Models/Plex/PlexLibraries.cs | 22 + PlexRequests.Api.Models/Plex/PlexMediaType.cs | 35 + PlexRequests.Api.Models/Plex/PlexStatus.cs | 2 + .../PlexRequests.Api.Models.csproj | 2 + PlexRequests.Api/PlexApi.cs | 80 +- PlexRequests.Core/CacheKeys.cs | 2 + .../PlexAvailabilityCheckerTests.cs | 917 +++++++++--------- .../AvailabilityUpdateService.cs | 4 +- .../Interfaces/IAvailabilityChecker.cs | 10 +- PlexRequests.Services/Models/PlexAlbum.cs | 9 + PlexRequests.Services/Models/PlexMovie.cs | 8 + PlexRequests.Services/Models/PlexTvShow.cs | 8 + .../PlexAvailabilityChecker.cs | 242 ++--- .../PlexRequests.Services.csproj | 3 + PlexRequests.UI/Modules/SearchModule.cs | 47 +- 16 files changed, 800 insertions(+), 593 deletions(-) create mode 100644 PlexRequests.Api.Models/Plex/PlexLibraries.cs create mode 100644 PlexRequests.Api.Models/Plex/PlexMediaType.cs create mode 100644 PlexRequests.Services/Models/PlexAlbum.cs create mode 100644 PlexRequests.Services/Models/PlexMovie.cs create mode 100644 PlexRequests.Services/Models/PlexTvShow.cs diff --git a/PlexRequests.Api.Interfaces/IPlexApi.cs b/PlexRequests.Api.Interfaces/IPlexApi.cs index e0c8029e6..b13f1401b 100644 --- a/PlexRequests.Api.Interfaces/IPlexApi.cs +++ b/PlexRequests.Api.Interfaces/IPlexApi.cs @@ -38,5 +38,7 @@ public interface IPlexApi PlexSearch SearchContent(string authToken, string searchTerm, Uri plexFullHost); PlexStatus GetStatus(string authToken, Uri uri); PlexAccount GetAccount(string authToken); + PlexLibraries GetLibrarySections(string authToken, Uri plexFullHost); + PlexSearch GetLibrary(string authToken, Uri plexFullHost, string libraryId); } } \ No newline at end of file diff --git a/PlexRequests.Api.Models/Plex/PlexLibraries.cs b/PlexRequests.Api.Models/Plex/PlexLibraries.cs new file mode 100644 index 000000000..0be7185a7 --- /dev/null +++ b/PlexRequests.Api.Models/Plex/PlexLibraries.cs @@ -0,0 +1,22 @@ +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace PlexRequests.Api.Models.Plex +{ + [XmlRoot(ElementName = "MediaContainer")] + public class PlexLibraries + { + [XmlElement(ElementName = "Directory")] + public List Directories { get; set; } + } + + [XmlRoot(ElementName = "Location")] + public partial class Location + { + [XmlElement(ElementName = "id")] + public int id { get; set; } + [XmlElement(ElementName = "path")] + public string path { get; set; } + } + +} diff --git a/PlexRequests.Api.Models/Plex/PlexMediaType.cs b/PlexRequests.Api.Models/Plex/PlexMediaType.cs new file mode 100644 index 000000000..e464bb64b --- /dev/null +++ b/PlexRequests.Api.Models/Plex/PlexMediaType.cs @@ -0,0 +1,35 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexType.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.Services +{ + public enum PlexMediaType + { + Movie, + Show, + Music // double check this one + } +} \ No newline at end of file diff --git a/PlexRequests.Api.Models/Plex/PlexStatus.cs b/PlexRequests.Api.Models/Plex/PlexStatus.cs index e6f1e64bb..7775be50b 100644 --- a/PlexRequests.Api.Models/Plex/PlexStatus.cs +++ b/PlexRequests.Api.Models/Plex/PlexStatus.cs @@ -16,6 +16,8 @@ public class Directory public string Key { get; set; } [XmlAttribute(AttributeName = "title")] public string Title { get; set; } + [XmlAttribute(AttributeName = "type")] + public string type { get; set; } } [XmlRoot(ElementName = "MediaContainer")] diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj index e109a6d3d..a240ccd0e 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -63,8 +63,10 @@ + + diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs index 0c6e2a373..6efcd98d7 100644 --- a/PlexRequests.Api/PlexApi.cs +++ b/PlexRequests.Api/PlexApi.cs @@ -32,6 +32,8 @@ using PlexRequests.Helpers; using RestSharp; +using System.Xml; +using System.Collections.Generic; namespace PlexRequests.Api { @@ -58,10 +60,7 @@ public PlexAuthentication SignIn(string username, string password) Method = Method.POST }; - request.AddHeader("X-Plex-Client-Identifier", "Test213"); // TODO need something unique to the users version/installation - request.AddHeader("X-Plex-Product", "Request Plex"); - request.AddHeader("X-Plex-Version", Version); - request.AddHeader("Content-Type", "application/json"); + AddHeaders(ref request); request.AddJsonBody(userModel); @@ -76,11 +75,7 @@ public PlexFriends GetUsers(string authToken) Method = Method.GET, }; - request.AddHeader("X-Plex-Client-Identifier", "Test213"); - request.AddHeader("X-Plex-Product", "Request Plex"); - request.AddHeader("X-Plex-Version", Version); - request.AddHeader("X-Plex-Token", authToken); - request.AddHeader("Content-Type", "application/xml"); + AddHeaders(ref request, authToken); var api = new ApiRequest(); var users = api.ExecuteXml(request, new Uri("https://plex.tv/pms/friends/all")); @@ -104,11 +99,7 @@ public PlexSearch SearchContent(string authToken, string searchTerm, Uri plexFul }; request.AddUrlSegment("searchTerm", searchTerm); - request.AddHeader("X-Plex-Client-Identifier", "Test213"); - request.AddHeader("X-Plex-Product", "Request Plex"); - request.AddHeader("X-Plex-Version", Version); - request.AddHeader("X-Plex-Token", authToken); - request.AddHeader("Content-Type", "application/xml"); + AddHeaders(ref request, authToken); var api = new ApiRequest(); var search = api.ExecuteXml(request, plexFullHost); @@ -123,11 +114,7 @@ public PlexStatus GetStatus(string authToken, Uri uri) Method = Method.GET, }; - request.AddHeader("X-Plex-Client-Identifier", "Test213"); - request.AddHeader("X-Plex-Product", "Request Plex"); - request.AddHeader("X-Plex-Version", Version); - request.AddHeader("X-Plex-Token", authToken); - request.AddHeader("Content-Type", "application/xml"); + AddHeaders(ref request, authToken); var api = new ApiRequest(); var users = api.ExecuteXml(request, uri); @@ -142,17 +129,62 @@ public PlexAccount GetAccount(string authToken) Method = Method.GET, }; - request.AddHeader("X-Plex-Client-Identifier", "Test213"); - request.AddHeader("X-Plex-Product", "Request Plex"); - request.AddHeader("X-Plex-Version", Version); - request.AddHeader("X-Plex-Token", authToken); - request.AddHeader("Content-Type", "application/xml"); + AddHeaders(ref request, authToken); var api = new ApiRequest(); var account = api.ExecuteXml(request, new Uri("https://plex.tv/users/account")); return account; } + + public PlexLibraries GetLibrarySections(string authToken, Uri plexFullHost) + { + var request = new RestRequest + { + Method = Method.GET, + Resource = "library/sections" + }; + + AddHeaders(ref request, authToken); + + var api = new ApiRequest(); + var sections = api.ExecuteXml(request, plexFullHost); + + var x = GetLibrary(authToken, plexFullHost, sections.Directories[0].Key); + + return sections; + } + + public PlexSearch GetLibrary(string authToken, Uri plexFullHost, string libraryId) + { + var request = new RestRequest + { + Method = Method.GET, + Resource = "library/sections/{libraryId}/all" + }; + + request.AddUrlSegment("libraryId", libraryId.ToString()); + AddHeaders(ref request, authToken); + + var api = new ApiRequest(); + var search = api.ExecuteXml(request, plexFullHost); + + return search; + } + + private void AddHeaders(ref RestRequest request, string authToken) + { + request.AddHeader("X-Plex-Token", authToken); + AddHeaders(ref request); + } + + private void AddHeaders(ref RestRequest request) + { + request.AddHeader("X-Plex-Client-Identifier", "Test213"); + request.AddHeader("X-Plex-Product", "Request Plex"); + request.AddHeader("X-Plex-Version", Version); + request.AddHeader("Content-Type", "application/xml"); + } } } diff --git a/PlexRequests.Core/CacheKeys.cs b/PlexRequests.Core/CacheKeys.cs index 3da5be381..102d05766 100644 --- a/PlexRequests.Core/CacheKeys.cs +++ b/PlexRequests.Core/CacheKeys.cs @@ -28,6 +28,8 @@ namespace PlexRequests.Core { public class CacheKeys { + public const string PlexLibaries = "PlexLibaries"; + public const string TvDbToken = "TheTvDbApiToken"; public const string SonarrQualityProfiles = "SonarrQualityProfiles"; diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs index e8a63474a..476989215 100644 --- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs +++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs @@ -38,6 +38,7 @@ using PlexRequests.Helpers.Exceptions; using PlexRequests.Services.Interfaces; using PlexRequests.Store; +using PlexRequests.Helpers; namespace PlexRequests.Services.Tests { @@ -46,502 +47,524 @@ public class PlexAvailabilityCheckerTests { public IAvailabilityChecker Checker { get; set; } - [Test] - public void IsAvailableWithEmptySettingsTest() - { - var settingsMock = new Mock>(); - var authMock = new Mock>(); - var requestMock = new Mock(); - var plexMock = new Mock(); - Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object); + //[Test] + //public void IsAvailableWithEmptySettingsTest() + //{ + // var settingsMock = new Mock>(); + // var authMock = new Mock>(); + // var requestMock = new Mock(); + // var plexMock = new Mock(); + // var cacheMock = new Mock(); + // Checker = new PlexAvailabilityChecker(settingsMock.Object, authMock.Object, requestMock.Object, plexMock.Object, cacheMock.Object); - Assert.Throws(() => Checker.IsAvailable("title", "2013", null, PlexType.TvShow), "We should be throwing an exception since we cannot talk to the services."); - } + // Assert.Throws(() => Checker.IsAvailable("title", "2013", null, PlexType.TvShow), "We should be throwing an exception since we cannot talk to the services."); + //} - [Test] - public void IsAvailableTest() - { - var settingsMock = new Mock>(); - var authMock = new Mock>(); - var requestMock = new Mock(); - var plexMock = new Mock(); + //[Test] + //public void IsAvailableTest() + //{ + // var settingsMock = new Mock>(); + // var authMock = new Mock>(); + // var requestMock = new Mock(); + // var plexMock = new Mock(); + // var cacheMock = new Mock(); - var searchResult = new PlexSearch { Video = new List + + + diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index fc39cc91f..a278952a7 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -62,8 +62,12 @@ public SearchModule(ICacheProvider cache, ISettingsService IRequestService request, ISonarrApi sonarrApi, ISettingsService sonarrSettings, ISettingsService sickRageService, ICouchPotatoApi cpApi, ISickRageApi srApi, INotificationService notify, IMusicBrainzApi mbApi, IHeadphonesApi hpApi, ISettingsService hpService, - ICouchPotatoCacher cpCacher, ISonarrCacher sonarrCacher, ISickRageCacher sickRageCacher) : base("search") + ICouchPotatoCacher cpCacher, ISonarrCacher sonarrCacher, ISickRageCacher sickRageCacher, IPlexApi plexApi, + ISettingsService plexService, ISettingsService auth) : base("search") { + Auth = auth; + PlexService = plexService; + PlexApi = plexApi; CpService = cpSettings; PrService = prSettings; MovieApi = new TheMovieDbApi(); @@ -99,6 +103,7 @@ public SearchModule(ICacheProvider cache, ISettingsService Post["request/tv"] = parameters => RequestTvShow((int)Request.Form.tvId, (string)Request.Form.seasons); Post["request/album"] = parameters => RequestAlbum((string)Request.Form.albumId); } + private IPlexApi PlexApi { get; } private TheMovieDbApi MovieApi { get; } private INotificationService NotificationService { get; } private ICouchPotatoApi CouchPotatoApi { get; } @@ -107,6 +112,8 @@ public SearchModule(ICacheProvider cache, ISettingsService private ISickRageApi SickrageApi { get; } private IRequestService RequestService { get; } private ICacheProvider Cache { get; } + private ISettingsService Auth { get; } + private ISettingsService PlexService { get; } private ISettingsService CpService { get; } private ISettingsService PrService { get; } private ISettingsService SonarrService { get; } @@ -207,6 +214,7 @@ private Response ProcessMovies(MovieSearchType searchType, string searchTerm) Task.WaitAll(taskList.ToArray()); int[] cpCached = CpCacher.QueuedIds(); + var plexMovies = Checker.GetPlexMovies(); List viewMovies = new List(); foreach (MovieResult movie in apiMovies) @@ -229,7 +237,11 @@ private Response ProcessMovies(MovieSearchType searchType, string searchTerm) VoteCount = movie.VoteCount }; - if (dbMovies.ContainsKey(movie.Id)) // compare to the requests db + if (Checker.IsMovieAvailable(plexMovies.ToArray(), movie.Title, movie.ReleaseDate?.Year.ToString())) + { + viewMovie.Available = true; + } + else if (dbMovies.ContainsKey(movie.Id)) // compare to the requests db { var dbm = dbMovies[movie.Id]; @@ -284,6 +296,7 @@ private Response SearchTvShow(string searchTerm) int[] sonarrCached = SonarrCacher.QueuedIds(); int[] sickRageCache = SickRageCacher.QueuedIds(); // consider just merging sonarr/sickrage arrays + var plexTvShows = Checker.GetPlexTvShows(); var viewTv = new List(); foreach (var t in apiTv) @@ -306,7 +319,11 @@ private Response SearchTvShow(string searchTerm) Status = t.show.status }; - if (t.show.externals.thetvdb != null) + if (Checker.IsTvShowAvailable(plexTvShows.ToArray(), t.show.name, t.show.premiered?.Substring(0, 4))) + { + viewT.Available = true; + } + else if (t.show.externals.thetvdb != null) { int tvdbid = (int)t.show.externals.thetvdb; @@ -358,6 +375,8 @@ private Response SearchMusic(string searchTerm) Task.WaitAll(taskList.ToArray()); + var plexAlbums = Checker.GetPlexAlbums(); + var viewAlbum = new List(); foreach (var a in apiAlbums) { @@ -373,6 +392,13 @@ private Response SearchMusic(string searchTerm) Country = a.country }; + DateTime release; + DateTimeHelper.CustomParse(a.ReleaseEvents?.FirstOrDefault()?.date, out release); + var artist = a.ArtistCredit?.FirstOrDefault()?.artist; + if (Checker.IsAlbumAvailable(plexAlbums.ToArray(), a.title, release.ToString("yyyy"), artist.name)) + { + viewA.Available = true; + } if (!string.IsNullOrEmpty(a.id) && dbAlbum.ContainsKey(a.id)) { var dba = dbAlbum[a.id]; @@ -417,7 +443,8 @@ private Response RequestMovie(int movieId) try { - if (CheckIfTitleExistsInPlex(movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString(), null, PlexType.Movie)) + var movies = Checker.GetPlexMovies(); + if (Checker.IsMovieAvailable(movies.ToArray(), movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString())) { return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullMovieName} is already in Plex!" }); } @@ -553,7 +580,8 @@ private Response RequestTvShow(int showId, string seasons) try { - if (CheckIfTitleExistsInPlex(showInfo.name, showInfo.premiered?.Substring(0, 4), null, PlexType.TvShow)) // Take only the year Format = 2014-01-01 + var shows = Checker.GetPlexTvShows(); + if (Checker.IsTvShowAvailable(shows.ToArray(), showInfo.name, showInfo.premiered?.Substring(0, 4))) { return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{fullShowName} is already in Plex!" }); } @@ -652,12 +680,6 @@ private Response RequestTvShow(int showId, string seasons) return Response.AsJson(new JsonResponseModel { Result = true, Message = $"{fullShowName} was successfully added!" }); } - private bool CheckIfTitleExistsInPlex(string title, string year, string artist, PlexType type) - { - var result = Checker.IsAvailable(title, year, artist, type); - return result; - } - private Response RequestAlbum(string releaseId) { var settings = PrService.GetSettings(); @@ -689,7 +711,8 @@ private Response RequestAlbum(string releaseId) return Response.AsJson(new JsonResponseModel { Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin" }); } - var alreadyInPlex = CheckIfTitleExistsInPlex(albumInfo.title, release.ToString("yyyy"), artist.name, PlexType.Music); + var albums = Checker.GetPlexAlbums(); + var alreadyInPlex = Checker.IsAlbumAvailable(albums.ToArray(), albumInfo.title, release.ToString("yyyy"), artist.name); if (alreadyInPlex) { From 3261bdbf9bd41eeb93f661422e3bd5d036ad1f65 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Sun, 10 Apr 2016 20:01:35 -0500 Subject: [PATCH 22/44] revert everything (except PlexRequests.UI) back to .NET 4.5.2 -- fixes incompatibilities with the latest version of mono (4.2.3.4) -- fixes notifications not working #152 #147 #141 --- .../PlexRequests.Api.Interfaces.csproj | 2 +- PlexRequests.Api.Interfaces/packages.config | 2 +- PlexRequests.Api.Models/PlexRequests.Api.Models.csproj | 2 +- PlexRequests.Api/PlexRequests.Api.csproj | 2 +- PlexRequests.Api/app.config | 8 ++++---- PlexRequests.Api/packages.config | 2 +- PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj | 2 +- PlexRequests.Core.Tests/app.config | 8 ++++---- PlexRequests.Core/PlexRequests.Core.csproj | 2 +- PlexRequests.Core/app.config | 8 ++++---- PlexRequests.Helpers/PlexRequests.Helpers.csproj | 2 +- .../PlexRequests.Services.Tests.csproj | 6 ++++-- PlexRequests.Services.Tests/app.config | 8 ++++---- PlexRequests.Services/PlexRequests.Services.csproj | 2 +- PlexRequests.Services/app.config | 8 ++++---- PlexRequests.Store/PlexRequests.Store.csproj | 2 +- 16 files changed, 34 insertions(+), 32 deletions(-) diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj index f27825298..52b7980a0 100644 --- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj +++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Api.Interfaces PlexRequests.Api.Interfaces - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Api.Interfaces/packages.config b/PlexRequests.Api.Interfaces/packages.config index 1c28751a9..43a581e30 100644 --- a/PlexRequests.Api.Interfaces/packages.config +++ b/PlexRequests.Api.Interfaces/packages.config @@ -1,4 +1,4 @@  - + \ 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 a240ccd0e..e6c3dfde8 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Api.Models PlexRequests.Api.Models - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj index b655cc2be..31e8af32a 100644 --- a/PlexRequests.Api/PlexRequests.Api.csproj +++ b/PlexRequests.Api/PlexRequests.Api.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Api PlexRequests.Api - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Api/app.config b/PlexRequests.Api/app.config index ee433ca9b..0404cdcb4 100644 --- a/PlexRequests.Api/app.config +++ b/PlexRequests.Api/app.config @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/PlexRequests.Api/packages.config b/PlexRequests.Api/packages.config index c0d95d59d..82a3f269f 100644 --- a/PlexRequests.Api/packages.config +++ b/PlexRequests.Api/packages.config @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj b/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj index 7674966ff..31f058854 100644 --- a/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj +++ b/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj @@ -8,7 +8,7 @@ Properties PlexRequests.Core.Tests PlexRequests.Core.Tests - v4.6 + v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 diff --git a/PlexRequests.Core.Tests/app.config b/PlexRequests.Core.Tests/app.config index ee433ca9b..0404cdcb4 100644 --- a/PlexRequests.Core.Tests/app.config +++ b/PlexRequests.Core.Tests/app.config @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/PlexRequests.Core.csproj index 4b588aa82..773d17e88 100644 --- a/PlexRequests.Core/PlexRequests.Core.csproj +++ b/PlexRequests.Core/PlexRequests.Core.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Core PlexRequests.Core - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Core/app.config b/PlexRequests.Core/app.config index ee433ca9b..0404cdcb4 100644 --- a/PlexRequests.Core/app.config +++ b/PlexRequests.Core/app.config @@ -1,11 +1,11 @@ - + - - + + - + diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/PlexRequests.Helpers.csproj index d936a71d3..b15baabc3 100644 --- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj +++ b/PlexRequests.Helpers/PlexRequests.Helpers.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Helpers PlexRequests.Helpers - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj b/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj index 3ce2fa126..efa0af5e2 100644 --- a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj +++ b/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj @@ -8,7 +8,7 @@ Properties PlexRequests.Services.Tests PlexRequests.Services.Tests - v4.6 + v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 10.0 @@ -60,7 +60,9 @@ - + + Designer + diff --git a/PlexRequests.Services.Tests/app.config b/PlexRequests.Services.Tests/app.config index ac2586ac9..0404cdcb4 100644 --- a/PlexRequests.Services.Tests/app.config +++ b/PlexRequests.Services.Tests/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj index 1d7b1f618..552b84941 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/PlexRequests.Services.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Services PlexRequests.Services - v4.6 + v4.5.2 512 diff --git a/PlexRequests.Services/app.config b/PlexRequests.Services/app.config index ac2586ac9..0404cdcb4 100644 --- a/PlexRequests.Services/app.config +++ b/PlexRequests.Services/app.config @@ -1,11 +1,11 @@ - + - - + + - \ No newline at end of file + diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/PlexRequests.Store.csproj index a896a0ee6..ae047a192 100644 --- a/PlexRequests.Store/PlexRequests.Store.csproj +++ b/PlexRequests.Store/PlexRequests.Store.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.Store PlexRequests.Store - v4.6 + v4.5.2 512 From 7679a132543db20ac6ca4946d6039aa867b2760a Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 12 Apr 2016 12:32:27 +0100 Subject: [PATCH 23/44] Fixed #154 --- .../AvailabilityUpdateService.cs | 5 ++++- PlexRequests.UI/Bootstrapper.cs | 5 +---- PlexRequests.UI/Program.cs | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/PlexRequests.Services/AvailabilityUpdateService.cs b/PlexRequests.Services/AvailabilityUpdateService.cs index 35235eb85..a9268a272 100644 --- a/PlexRequests.Services/AvailabilityUpdateService.cs +++ b/PlexRequests.Services/AvailabilityUpdateService.cs @@ -25,6 +25,8 @@ // ************************************************************************/ #endregion using System; +using System.Collections.Concurrent; +using System.Collections.Generic; using System.Reactive.Linq; using System.Web.Hosting; @@ -47,8 +49,10 @@ namespace PlexRequests.Services { public class AvailabilityUpdateService : ITask, IRegisteredObject, IAvailabilityUpdateService { + public AvailabilityUpdateService() { + var memCache = new MemoryCacheProvider(); var dbConfig = new DbConfiguration(new SqliteFactory()); var repo = new SettingsJsonRepository(dbConfig, memCache); @@ -67,7 +71,6 @@ public AvailabilityUpdateService() public void Start(Configuration c) { UpdateSubscription?.Dispose(); - Task.Factory.StartNew(() => Checker.CheckAndUpdateAll(-1)); // cache the libraries and run the availability checks UpdateSubscription = Observable.Interval(c.Intervals.Notification).Subscribe(Checker.CheckAndUpdateAll); } diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index e50300afa..86185e79a 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -110,10 +110,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na SubscribeAllObservers(container); base.ConfigureRequestContainer(container, context); - TaskManager.TaskFactory = new PlexTaskFactory(); - TaskManager.Initialize(new PlexRegistry()); - TaskManager.Initialize(new MediaCacheRegistry()); - _container = container; + } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index ab0172848..859cd5833 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -25,6 +25,8 @@ // ************************************************************************/ #endregion using System; +using System.Collections.Generic; + using Microsoft.Owin.Hosting; using Mono.Data.Sqlite; @@ -39,6 +41,11 @@ using PlexRequests.Store.Repository; using System.Diagnostics; +using FluentScheduler; + +using PlexRequests.Services; +using PlexRequests.UI.Jobs; + namespace PlexRequests.UI { class Program @@ -85,6 +92,9 @@ static void Main(string[] args) s.CacheQualityProfiles(); ConfigureTargets(cn); + SetupSchedulers(); + + if (port == -1) port = GetStartupPort(); @@ -132,7 +142,7 @@ private static void WriteOutVersion() private static int GetStartupPort() { Log.Trace("Getting startup Port"); - var port = 3579; + var port = 8080; var service = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())); var settings = service.GetSettings(); Log.Trace("Port: {0}", settings.Port); @@ -148,5 +158,12 @@ private static void ConfigureTargets(string connectionString) { LoggingHelper.ConfigureLogging(connectionString); } + + private static void SetupSchedulers() + { + TaskManager.TaskFactory = new PlexTaskFactory(); + TaskManager.Initialize(new PlexRegistry()); + TaskManager.Initialize(new MediaCacheRegistry()); + } } } From 854bfdd47951ab32308738dc40d948f162fcd506 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 12 Apr 2016 12:34:13 +0100 Subject: [PATCH 24/44] Converted the UI back down to .NET 4.5.2 --- PlexRequests.UI/PlexRequests.UI.csproj | 2 +- PlexRequests.UI/Program.cs | 3 +-- PlexRequests.UI/app.config | 30 +++++++++++++------------- PlexRequests.UI/packages.config | 4 ++-- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index 8fa05a3da..f9e5207d6 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -9,7 +9,7 @@ Properties PlexRequests.UI PlexRequests - v4.6 + v4.5.2 512 ..\..\ true diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 859cd5833..6cd9653a4 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -93,8 +93,7 @@ static void Main(string[] args) ConfigureTargets(cn); SetupSchedulers(); - - + if (port == -1) port = GetStartupPort(); diff --git a/PlexRequests.UI/app.config b/PlexRequests.UI/app.config index 4a1adc68b..c5d2035eb 100644 --- a/PlexRequests.UI/app.config +++ b/PlexRequests.UI/app.config @@ -1,50 +1,50 @@ - + -
+
- - + + - + - + - + - - + + - - + + - - + + - + - + diff --git a/PlexRequests.UI/packages.config b/PlexRequests.UI/packages.config index 5b88b4438..8c2dea7cd 100644 --- a/PlexRequests.UI/packages.config +++ b/PlexRequests.UI/packages.config @@ -22,9 +22,9 @@ - + - + From 39c89647f0c742e530ac4a20221515b08e24f41b Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Tue, 12 Apr 2016 09:08:28 -0500 Subject: [PATCH 25/44] kick off the schedulers once the web app has started (fixes api errors on start) --- PlexRequests.UI/Program.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 6cd9653a4..51b1b900b 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -92,9 +92,6 @@ static void Main(string[] args) s.CacheQualityProfiles(); ConfigureTargets(cn); - SetupSchedulers(); - - if (port == -1) port = GetStartupPort(); @@ -106,6 +103,8 @@ static void Main(string[] args) { using (WebApp.Start(options)) { + SetupSchedulers(); + Console.WriteLine($"Request Plex is running on the following: http://+:{port}/"); if (Type.GetType("Mono.Runtime") != null) From fdbb373da573ddb3037ebef1135c5ad4329f78a7 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 12 Apr 2016 22:38:14 +0100 Subject: [PATCH 26/44] Finished up the caching TODO's --- PlexRequests.Api.Interfaces/ISickRageApi.cs | 2 +- .../PlexRequests.Api.Models.csproj | 1 + .../SickRage/SickrageShows.cs | 42 +++++++++++++++++++ PlexRequests.Api/SickrageApi.cs | 15 ++----- .../{ISickRageCacher.cs => ITvCacher.cs} | 0 .../PlexRequests.Services.csproj | 2 +- PlexRequests.Services/SickRageCacher.cs | 5 ++- PlexRequests.Services/SonarrCacher.cs | 2 +- 8 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 PlexRequests.Api.Models/SickRage/SickrageShows.cs rename PlexRequests.Services/Interfaces/{ISickRageCacher.cs => ITvCacher.cs} (100%) diff --git a/PlexRequests.Api.Interfaces/ISickRageApi.cs b/PlexRequests.Api.Interfaces/ISickRageApi.cs index 5d10d7557..13cfacd84 100644 --- a/PlexRequests.Api.Interfaces/ISickRageApi.cs +++ b/PlexRequests.Api.Interfaces/ISickRageApi.cs @@ -40,6 +40,6 @@ Task AddSeries(int tvdbId, int seasoncount, int[] seasons, string Task AddSeason(int tvdbId, int season, string apiKey, Uri baseUrl); - Task GetShows(string apiKey, Uri baseUrl); + Task GetShows(string apiKey, Uri baseUrl); } } \ 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 e6c3dfde8..08d39300b 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj @@ -70,6 +70,7 @@ + diff --git a/PlexRequests.Api.Models/SickRage/SickrageShows.cs b/PlexRequests.Api.Models/SickRage/SickrageShows.cs new file mode 100644 index 000000000..b33aeaf58 --- /dev/null +++ b/PlexRequests.Api.Models/SickRage/SickrageShows.cs @@ -0,0 +1,42 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SickrageShows.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; + +namespace PlexRequests.Api.Models.SickRage +{ + public class SickrageShows : SickRageBase> + { + + } + + public class Item + { + public int tvdbid { get; set; } + } +} \ No newline at end of file diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index 68a501a04..7d5aca913 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -33,6 +33,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json; using NLog; using PlexRequests.Api.Interfaces; using PlexRequests.Api.Models.SickRage; @@ -208,7 +209,7 @@ public async Task AddSeason(int tvdbId, int season, string apiKey }).ConfigureAwait(false); } - public async Task GetShows(string apiKey, Uri baseUrl) // TODO: get the correct response/models from SR + public async Task GetShows(string apiKey, Uri baseUrl) { var request = new RestRequest { @@ -216,16 +217,8 @@ public async Task GetShows(string apiKey, Uri baseUrl) // TODO: g Method = Method.GET }; request.AddUrlSegment("apiKey", apiKey); - - //await Task.Run(() => Thread.Sleep(2000)); - //return await Task.Run(() => - //{ - //Log.Trace("Entering `Execute` in a new `Task`"); - var result = Api.ExecuteJson(request, baseUrl); - - //Log.Trace("Exiting `Execute` and yeilding `Task` result"); - return null; - //}).ConfigureAwait(false); + + return await Task.Run(() => Api.Execute(request, baseUrl)).ConfigureAwait(false); } } } \ No newline at end of file diff --git a/PlexRequests.Services/Interfaces/ISickRageCacher.cs b/PlexRequests.Services/Interfaces/ITvCacher.cs similarity index 100% rename from PlexRequests.Services/Interfaces/ISickRageCacher.cs rename to PlexRequests.Services/Interfaces/ITvCacher.cs diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj index 552b84941..3afb8086f 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/PlexRequests.Services.csproj @@ -88,7 +88,7 @@ - + diff --git a/PlexRequests.Services/SickRageCacher.cs b/PlexRequests.Services/SickRageCacher.cs index 277b19645..c42759d16 100644 --- a/PlexRequests.Services/SickRageCacher.cs +++ b/PlexRequests.Services/SickRageCacher.cs @@ -71,8 +71,9 @@ public void Queued(long check) // we do not want to set here... public int[] QueuedIds() { - var tv = Cache.Get(CacheKeys.SickRageQueued); - return new int[] { }; //tv != null ? tv.Select(x => x.info.tmdb_id).ToArray() : new int[] { }; // TODO: return the array of tvdb IDs from SR + var tv = Cache.Get(CacheKeys.SickRageQueued); + var values = tv?.data.Values.Select(x => x.tvdbid).ToArray(); + return values; } } } \ No newline at end of file diff --git a/PlexRequests.Services/SonarrCacher.cs b/PlexRequests.Services/SonarrCacher.cs index 018db93c0..34d00b8c3 100644 --- a/PlexRequests.Services/SonarrCacher.cs +++ b/PlexRequests.Services/SonarrCacher.cs @@ -71,7 +71,7 @@ public void Queued(long check) public int[] QueuedIds() { var series = Cache.Get>(CacheKeys.SonarrQueued); - return series != null ? series.Select(x => x.tvdbId).ToArray() : new int[] { }; + return series?.Select(x => x.tvdbId).ToArray() ?? new int[] { }; } } } \ No newline at end of file From 53524226887122b0c7229af2944bcff15879de1b Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Wed, 13 Apr 2016 09:57:26 -0500 Subject: [PATCH 27/44] Remove test code from plex api GetLibrary method --- PlexRequests.Api/PlexApi.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs index 6efcd98d7..a91355c63 100644 --- a/PlexRequests.Api/PlexApi.cs +++ b/PlexRequests.Api/PlexApi.cs @@ -150,8 +150,6 @@ public PlexLibraries GetLibrarySections(string authToken, Uri plexFullHost) var api = new ApiRequest(); var sections = api.ExecuteXml(request, plexFullHost); - var x = GetLibrary(authToken, plexFullHost, sections.Directories[0].Key); - return sections; } From 6190eceb609886a91ad387ebcfafeff4e2e22675 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 14:50:40 +0100 Subject: [PATCH 28/44] Finally fixed #72 --- .../SettingModels/PlexRequestSettings.cs | 2 +- PlexRequests.Core/Setup.cs | 8 +- PlexRequests.UI/Bootstrapper.cs | 16 ++- PlexRequests.UI/Content/bootstrap.css | 4 +- PlexRequests.UI/Content/font-awesome.css | 4 +- PlexRequests.UI/Helpers/AssetHelper.cs | 109 ++++++++++++++++++ PlexRequests.UI/Helpers/ServiceLocator.cs | 55 +++++++++ .../Modules/ApplicationTesterModule.cs | 2 +- PlexRequests.UI/Modules/ApprovalModule.cs | 2 +- PlexRequests.UI/Modules/BaseAuthModule.cs | 85 ++++++++++++++ PlexRequests.UI/Modules/BaseModule.cs | 58 +++------- PlexRequests.UI/Modules/IndexModule.cs | 2 +- PlexRequests.UI/Modules/RequestsModule.cs | 2 +- PlexRequests.UI/Modules/SearchModule.cs | 2 +- PlexRequests.UI/Modules/UserLoginModule.cs | 2 +- PlexRequests.UI/PlexRequests.UI.csproj | 5 +- PlexRequests.UI/Program.cs | 8 +- PlexRequests.UI/Views/Admin/Logs.cshtml | 7 +- PlexRequests.UI/Views/Admin/Settings.cshtml | 10 ++ PlexRequests.UI/Views/Requests/Index.cshtml | 3 +- PlexRequests.UI/Views/Search/Index.cshtml | 5 +- PlexRequests.UI/Views/Shared/_Layout.cshtml | 17 +-- 22 files changed, 317 insertions(+), 91 deletions(-) create mode 100644 PlexRequests.UI/Helpers/AssetHelper.cs create mode 100644 PlexRequests.UI/Helpers/ServiceLocator.cs create mode 100644 PlexRequests.UI/Modules/BaseAuthModule.cs diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs index 90596ba39..acf817bbc 100644 --- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs +++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs @@ -33,7 +33,7 @@ namespace PlexRequests.Core.SettingModels public class PlexRequestSettings : Settings { public int Port { get; set; } - public string AssetLocation { get; set; } + public string BaseUrl { get; set; } public bool SearchForMovies { get; set; } public bool SearchForTvShows { get; set; } public bool SearchForMusic { get; set; } diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs index c59b3556e..73c4b0554 100644 --- a/PlexRequests.Core/Setup.cs +++ b/PlexRequests.Core/Setup.cs @@ -44,7 +44,7 @@ public class Setup { private static Logger Log = LogManager.GetCurrentClassLogger(); private static DbConfiguration Db { get; set; } - public string SetupDb(string assetLocation) + public string SetupDb(string urlBase) { Db = new DbConfiguration(new SqliteFactory()); var created = Db.CheckDb(); @@ -52,7 +52,7 @@ public string SetupDb(string assetLocation) if (created) { - CreateDefaultSettingsPage(assetLocation); + CreateDefaultSettingsPage(urlBase); } var version = CheckSchema(); @@ -89,7 +89,7 @@ private int CheckSchema() return version; } - private void CreateDefaultSettingsPage(string assetLocation) + private void CreateDefaultSettingsPage(string baseUrl) { var defaultSettings = new PlexRequestSettings { @@ -98,7 +98,7 @@ private void CreateDefaultSettingsPage(string assetLocation) SearchForMovies = true, SearchForTvShows = true, WeeklyRequestLimit = 0, - AssetLocation = assetLocation ?? "assets" + BaseUrl = baseUrl ?? string.Empty }; var s = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())); s.SaveSettings(defaultSettings); diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index 86185e79a..6facd7692 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -50,6 +50,7 @@ using PlexRequests.Store; using PlexRequests.Store.Models; using PlexRequests.Store.Repository; +using PlexRequests.UI.Helpers; using PlexRequests.UI.Jobs; using TaskFactory = FluentScheduler.TaskFactory; @@ -61,7 +62,6 @@ public class Bootstrapper : DefaultNancyBootstrapper // by overriding the various methods and properties. // For more information https://github.com/NancyFx/Nancy/wiki/Bootstrapper - private TinyIoCContainer _container; protected override void ConfigureRequestContainer(TinyIoCContainer container, NancyContext context) { @@ -109,8 +109,8 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na SubscribeAllObservers(container); base.ConfigureRequestContainer(container, context); - - + var loc = ServiceLocator.Instance; + loc.SetContainer(container); } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) @@ -121,10 +121,14 @@ protected override void ApplicationStartup(TinyIoCContainer container, IPipeline base.ApplicationStartup(container, pipelines); + var settings = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())); + var baseUrl = settings.GetSettings().BaseUrl; + var redirect = string.IsNullOrEmpty(baseUrl) ? "~/login" : $"~/{baseUrl}/login"; + // Enable forms auth var formsAuthConfiguration = new FormsAuthenticationConfiguration { - RedirectUrl = "~/login", + RedirectUrl = redirect, UserMapper = container.Resolve() }; @@ -141,9 +145,9 @@ protected override void ConfigureConventions(NancyConventions nancyConventions) base.ConfigureConventions(nancyConventions); var settings = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()),new MemoryCacheProvider())); - var assetLocation = settings.GetSettings().AssetLocation; + var assetLocation = settings.GetSettings().BaseUrl; nancyConventions.StaticContentsConventions.Add( - StaticContentConventionBuilder.AddDirectory("assets", $"{assetLocation}/Content") + StaticContentConventionBuilder.AddDirectory($"{assetLocation}/Content", "Content") ); } diff --git a/PlexRequests.UI/Content/bootstrap.css b/PlexRequests.UI/Content/bootstrap.css index 0638c1fb9..83e3b6fa3 100644 --- a/PlexRequests.UI/Content/bootstrap.css +++ b/PlexRequests.UI/Content/bootstrap.css @@ -269,8 +269,8 @@ th { } @font-face { font-family: 'Glyphicons Halflings'; - src: url('../assets/fonts/glyphicons-halflings-regular.eot'); - src: url('../assets/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../assets/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../assets/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../assets/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../assets/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../Content/fonts/glyphicons-halflings-regular.eot'); + src: url('../Content/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../Content/fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../Content/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../Content/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../Content/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; diff --git a/PlexRequests.UI/Content/font-awesome.css b/PlexRequests.UI/Content/font-awesome.css index b190f2c94..7f747bf2c 100644 --- a/PlexRequests.UI/Content/font-awesome.css +++ b/PlexRequests.UI/Content/font-awesome.css @@ -6,8 +6,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../assets/fonts/fontawesome-webfont.eot?v=4.5.0'); - src: url('../assets/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../assets/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../assets/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../assets/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../assets/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg'); + src: url('../Content/fonts/fontawesome-webfont.eot?v=4.5.0'); + src: url('../Content/fonts/fontawesome-webfont.eot?#iefix&v=4.5.0') format('embedded-opentype'), url('../Content/fonts/fontawesome-webfont.woff2?v=4.5.0') format('woff2'), url('../Content/fonts/fontawesome-webfont.woff?v=4.5.0') format('woff'), url('../Content/fonts/fontawesome-webfont.ttf?v=4.5.0') format('truetype'), url('../Content/fonts/fontawesome-webfont.svg?v=4.5.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/PlexRequests.UI/Helpers/AssetHelper.cs b/PlexRequests.UI/Helpers/AssetHelper.cs new file mode 100644 index 000000000..20cd8a8d6 --- /dev/null +++ b/PlexRequests.UI/Helpers/AssetHelper.cs @@ -0,0 +1,109 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: AssetHelper.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.Text; + +using Nancy.ViewEngines.Razor; + +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; + +namespace PlexRequests.UI.Helpers +{ + public static class AssetHelper + { + private static ServiceLocator Locator => ServiceLocator.Instance; + public static IHtmlString LoadAssets(this HtmlHelpers helper) + { + var settings = Locator.Resolve>().GetSettings(); + var sb = new StringBuilder(); + var assetLocation = settings.BaseUrl; + + var content = GetContentUrl(assetLocation); + + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + sb.AppendLine($""); + + + return helper.Raw(sb.ToString()); + } + + public static IHtmlString LoadSearchAssets(this HtmlHelpers helper) + { + var settings = Locator.Resolve>().GetSettings(); + var sb = new StringBuilder(); + var assetLocation = settings.BaseUrl; + + var content = GetContentUrl(assetLocation); + + sb.AppendLine($""); + + return helper.Raw(sb.ToString()); + } + + public static IHtmlString LoadRequestAssets(this HtmlHelpers helper) + { + var settings = Locator.Resolve>().GetSettings(); + var sb = new StringBuilder(); + var assetLocation = settings.BaseUrl; + + var content = GetContentUrl(assetLocation); + + sb.AppendLine($""); + + return helper.Raw(sb.ToString()); + } + + public static IHtmlString LoadLogsAssets(this HtmlHelpers helper) + { + var settings = Locator.Resolve>().GetSettings(); + var sb = new StringBuilder(); + var assetLocation = settings.BaseUrl; + + var content = GetContentUrl(assetLocation); + + sb.AppendLine($""); + sb.AppendLine($""); + + return helper.Raw(sb.ToString()); + } + + private static string GetContentUrl(string assetLocation) + { + return string.IsNullOrEmpty(assetLocation) ? "~" : $"/{assetLocation}"; + } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Helpers/ServiceLocator.cs b/PlexRequests.UI/Helpers/ServiceLocator.cs new file mode 100644 index 000000000..c26b0c02e --- /dev/null +++ b/PlexRequests.UI/Helpers/ServiceLocator.cs @@ -0,0 +1,55 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: ServiceLocator.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 Nancy.TinyIoc; + +namespace PlexRequests.UI.Helpers +{ + public class ServiceLocator + { + static ServiceLocator() + { + Singleton = new ServiceLocator(); + } + private static ServiceLocator Singleton { get; set; } + private TinyIoCContainer Container { get; set; } + public static ServiceLocator Instance => Singleton; + + public void SetContainer(TinyIoCContainer container) + { + Container = container; + } + + public T Resolve() where T : class + { + if (Container != null) + { + return Container.Resolve(); + } + return null; + } + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs index 000a54d80..1a59fab2b 100644 --- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs +++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs @@ -39,7 +39,7 @@ namespace PlexRequests.UI.Modules { - public class ApplicationTesterModule : BaseModule + public class ApplicationTesterModule : BaseAuthModule { public ApplicationTesterModule(ICouchPotatoApi cpApi, ISonarrApi sonarrApi, IPlexApi plexApi, diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs index 352c479dd..e6cb97c06 100644 --- a/PlexRequests.UI/Modules/ApprovalModule.cs +++ b/PlexRequests.UI/Modules/ApprovalModule.cs @@ -43,7 +43,7 @@ namespace PlexRequests.UI.Modules { - public class ApprovalModule : BaseModule + public class ApprovalModule : BaseAuthModule { public ApprovalModule(IRequestService service, ISettingsService cpService, ICouchPotatoApi cpApi, ISonarrApi sonarrApi, diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs new file mode 100644 index 000000000..fbedffd32 --- /dev/null +++ b/PlexRequests.UI/Modules/BaseAuthModule.cs @@ -0,0 +1,85 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: BaseAuthModule.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 Nancy; +using Nancy.Extensions; +using PlexRequests.UI.Models; +using System; + +namespace PlexRequests.UI.Modules +{ + public class BaseAuthModule : BaseModule + { + private string _username; + private int _dateTimeOffset = -1; + + protected string Username + { + get + { + if (string.IsNullOrEmpty(_username)) + { + _username = Session[SessionKeys.UsernameKey].ToString(); + } + return _username; + } + } + + protected int DateTimeOffset + { + get + { + if (_dateTimeOffset == -1) + { + _dateTimeOffset = (int?)Session[SessionKeys.ClientDateTimeOffsetKey] ?? new DateTimeOffset().Offset.Minutes; + } + return _dateTimeOffset; + } + } + + public BaseAuthModule() + { + Before += (ctx) => CheckAuth(); + } + + public BaseAuthModule(string modulePath) : base(modulePath) + { + Before += (ctx) => CheckAuth(); + } + + + private Response CheckAuth() + { + if (Session[SessionKeys.UsernameKey] == null) + { + return Context.GetRedirect("~/test/userlogin"); + } + return null; + } + + } +} \ No newline at end of file diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs index a75766775..e3f4a47ca 100644 --- a/PlexRequests.UI/Modules/BaseModule.cs +++ b/PlexRequests.UI/Modules/BaseModule.cs @@ -24,63 +24,35 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion - using Nancy; -using Nancy.Extensions; -using PlexRequests.UI.Models; -using System; + +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.UI.Helpers; namespace PlexRequests.UI.Modules { public class BaseModule : NancyModule { - private string _username; - private int _dateTimeOffset = -1; - - protected string Username + private ServiceLocator Locator => ServiceLocator.Instance; + public BaseModule() { - get - { - if (string.IsNullOrEmpty(_username)) - { - _username = Session[SessionKeys.UsernameKey].ToString(); - } - return _username; - } - } + var settings = Locator.Resolve>().GetSettings(); + var baseUrl = settings.BaseUrl; - protected int DateTimeOffset - { - get - { - if (_dateTimeOffset == -1) - { - _dateTimeOffset = Session[SessionKeys.ClientDateTimeOffsetKey] != null ? - (int)Session[SessionKeys.ClientDateTimeOffsetKey] : (new DateTimeOffset().Offset).Minutes; - } - return _dateTimeOffset; - } - } + var modulePath = string.IsNullOrEmpty(baseUrl) ? string.Empty : baseUrl; - public BaseModule() - { - Before += (ctx) => CheckAuth(); + ModulePath = modulePath; } - public BaseModule(string modulePath) : base(modulePath) + public BaseModule(string modulePath) { - Before += (ctx) => CheckAuth(); - } + var settings = Locator.Resolve>().GetSettings(); + var baseUrl = settings.BaseUrl; + var settingModulePath = string.IsNullOrEmpty(baseUrl) ? modulePath : $"{baseUrl}/{modulePath}"; - private Response CheckAuth() - { - if (Session[SessionKeys.UsernameKey] == null) - { - return Context.GetRedirect("~/userlogin"); - } - return null; + ModulePath = settingModulePath; } - } } \ No newline at end of file diff --git a/PlexRequests.UI/Modules/IndexModule.cs b/PlexRequests.UI/Modules/IndexModule.cs index 3a3539b83..bb099889c 100644 --- a/PlexRequests.UI/Modules/IndexModule.cs +++ b/PlexRequests.UI/Modules/IndexModule.cs @@ -29,7 +29,7 @@ namespace PlexRequests.UI.Modules { - public class IndexModule : BaseModule + public class IndexModule : BaseAuthModule { public IndexModule() { diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs index 92a326a56..afb98b454 100644 --- a/PlexRequests.UI/Modules/RequestsModule.cs +++ b/PlexRequests.UI/Modules/RequestsModule.cs @@ -46,7 +46,7 @@ namespace PlexRequests.UI.Modules { - public class RequestsModule : BaseModule + public class RequestsModule : BaseAuthModule { public RequestsModule( IRequestService service, diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index a278952a7..b7faaa9bc 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -55,7 +55,7 @@ namespace PlexRequests.UI.Modules { - public class SearchModule : BaseModule + public class SearchModule : BaseAuthModule { public SearchModule(ICacheProvider cache, ISettingsService cpSettings, ISettingsService prSettings, IAvailabilityChecker checker, diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index c1528bdd7..c0f629f01 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -44,7 +44,7 @@ namespace PlexRequests.UI.Modules { - public class UserLoginModule : NancyModule + public class UserLoginModule : BaseModule { public UserLoginModule(ISettingsService auth, IPlexApi api) : base("userlogin") { diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index f9e5207d6..ec156d653 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -164,7 +164,9 @@ + + @@ -175,6 +177,7 @@ + @@ -197,7 +200,7 @@ - + diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 51b1b900b..6b1fde866 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -53,7 +53,7 @@ class Program private static Logger Log = LogManager.GetCurrentClassLogger(); static void Main(string[] args) { - var assetLocation = "assets"; + var baseUrl = "assets"; var port = -1; if (args.Length > 0) { @@ -65,8 +65,8 @@ static void Main(string[] args) case "base": i++; var value = args[i]; - Console.WriteLine("Settings URL Base"); - assetLocation = value; + Console.WriteLine($"Using a Base URL {args[i]}"); + baseUrl = value; break; default: int portResult; @@ -88,7 +88,7 @@ static void Main(string[] args) WriteOutVersion(); var s = new Setup(); - var cn = s.SetupDb(assetLocation); + var cn = s.SetupDb(baseUrl); s.CacheQualityProfiles(); ConfigureTargets(cn); diff --git a/PlexRequests.UI/Views/Admin/Logs.cshtml b/PlexRequests.UI/Views/Admin/Logs.cshtml index d7d37655f..7281ad000 100644 --- a/PlexRequests.UI/Views/Admin/Logs.cshtml +++ b/PlexRequests.UI/Views/Admin/Logs.cshtml @@ -1,7 +1,6 @@ -@Html.Partial("_Sidebar") - - - +@using PlexRequests.UI.Helpers +@Html.Partial("_Sidebar") +@Html.LoadLogsAssets()
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml index d8e08431e..1bb82cb7a 100644 --- a/PlexRequests.UI/Views/Admin/Settings.cshtml +++ b/PlexRequests.UI/Views/Admin/Settings.cshtml @@ -23,6 +23,16 @@
You will have to restart after changing the port. + +
+ + +
+ +
+
+ You will have to restart after changing the url base. +
- +@Html.LoadRequestAssets() diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index 9fdbb3e06..ea9d2ba8b 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -1,4 +1,5 @@ -
+@using PlexRequests.UI.Helpers +

Search

Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!


@@ -209,4 +210,4 @@ - +@Html.LoadSearchAssets() diff --git a/PlexRequests.UI/Views/Shared/_Layout.cshtml b/PlexRequests.UI/Views/Shared/_Layout.cshtml index 48e312759..50126d584 100644 --- a/PlexRequests.UI/Views/Shared/_Layout.cshtml +++ b/PlexRequests.UI/Views/Shared/_Layout.cshtml @@ -1,5 +1,6 @@ @using Nancy.Security @using Nancy.Session +@using PlexRequests.UI.Helpers @using PlexRequests.UI.Models @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @@ -7,21 +8,7 @@ Plex Requests - - - - - - - - - - - - - - - + @Html.LoadAssets() From 213a088f075ee1d361078cb1bdb8ef6f2eedad85 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 15:06:28 +0100 Subject: [PATCH 29/44] Commented out the unit tests as they need to be reworked now. --- PlexRequests.UI.Tests/UserLoginModuleTests.cs | 6 ++++++ PlexRequests.UI/Bootstrapper.cs | 2 -- PlexRequests.UI/Helpers/ServiceLocator.cs | 9 ++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/PlexRequests.UI.Tests/UserLoginModuleTests.cs b/PlexRequests.UI.Tests/UserLoginModuleTests.cs index 338949b00..eb71e8cd1 100644 --- a/PlexRequests.UI.Tests/UserLoginModuleTests.cs +++ b/PlexRequests.UI.Tests/UserLoginModuleTests.cs @@ -30,6 +30,7 @@ using Nancy; using Nancy.Testing; +using Nancy.TinyIoc; using Newtonsoft.Json; @@ -39,15 +40,18 @@ using PlexRequests.Api.Models.Plex; using PlexRequests.Core; using PlexRequests.Core.SettingModels; +using PlexRequests.UI.Helpers; using PlexRequests.UI.Models; using PlexRequests.UI.Modules; namespace PlexRequests.UI.Tests { [TestFixture] + [Ignore("Needs some work")] public class UserLoginModuleTests { private Mock> AuthMock { get; set; } + private Mock> PlexRequestMock { get; set; } private Mock PlexMock { get; set; } [SetUp] @@ -55,6 +59,7 @@ public void Setup() { AuthMock = new Mock>(); PlexMock = new Mock(); + PlexRequestMock = new Mock>(); } [Test] @@ -68,6 +73,7 @@ public void LoginWithoutAuthentication() with.Module(); with.Dependency(AuthMock.Object); with.Dependency(PlexMock.Object); + with.Dependency(PlexRequestMock.Object); with.RootPathProvider(); }); diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index 6facd7692..4700313c0 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -109,8 +109,6 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na SubscribeAllObservers(container); base.ConfigureRequestContainer(container, context); - var loc = ServiceLocator.Instance; - loc.SetContainer(container); } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) diff --git a/PlexRequests.UI/Helpers/ServiceLocator.cs b/PlexRequests.UI/Helpers/ServiceLocator.cs index c26b0c02e..8941b0b57 100644 --- a/PlexRequests.UI/Helpers/ServiceLocator.cs +++ b/PlexRequests.UI/Helpers/ServiceLocator.cs @@ -34,15 +34,10 @@ static ServiceLocator() { Singleton = new ServiceLocator(); } - private static ServiceLocator Singleton { get; set; } - private TinyIoCContainer Container { get; set; } + private static ServiceLocator Singleton { get; } + private TinyIoCContainer Container => TinyIoCContainer.Current; public static ServiceLocator Instance => Singleton; - public void SetContainer(TinyIoCContainer container) - { - Container = container; - } - public T Resolve() where T : class { if (Container != null) From 866b6d6d6d7e3a9ace83b96c332e39ab2454fd33 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 16:56:55 +0100 Subject: [PATCH 30/44] removed the test code from #72 --- PlexRequests.UI/Modules/BaseAuthModule.cs | 16 +++++++++++----- PlexRequests.UI/Modules/BaseModule.cs | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs index fbedffd32..3dcf930da 100644 --- a/PlexRequests.UI/Modules/BaseAuthModule.cs +++ b/PlexRequests.UI/Modules/BaseAuthModule.cs @@ -30,6 +30,9 @@ using PlexRequests.UI.Models; using System; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; + namespace PlexRequests.UI.Modules { public class BaseAuthModule : BaseModule @@ -74,11 +77,14 @@ public BaseAuthModule(string modulePath) : base(modulePath) private Response CheckAuth() { - if (Session[SessionKeys.UsernameKey] == null) - { - return Context.GetRedirect("~/test/userlogin"); - } - return null; + var settings = Locator.Resolve>().GetSettings(); + var baseUrl = settings.BaseUrl; + + var redirectPath = string.IsNullOrEmpty(baseUrl) ? "~/userlogin" : $"~/{baseUrl}/userlogin"; + + return Session[SessionKeys.UsernameKey] == null + ? Context.GetRedirect(redirectPath) + : null; } } diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs index e3f4a47ca..7048d09dd 100644 --- a/PlexRequests.UI/Modules/BaseModule.cs +++ b/PlexRequests.UI/Modules/BaseModule.cs @@ -34,7 +34,7 @@ namespace PlexRequests.UI.Modules { public class BaseModule : NancyModule { - private ServiceLocator Locator => ServiceLocator.Instance; + protected ServiceLocator Locator => ServiceLocator.Instance; public BaseModule() { var settings = Locator.Resolve>().GetSettings(); From 6dea8b74401988711fbbe06d8bdc9cddcebd3a34 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 17:19:55 +0100 Subject: [PATCH 31/44] Fixed exception and all areas will now use the base url #72 --- PlexRequests.UI/Bootstrapper.cs | 9 ++++----- PlexRequests.UI/Helpers/ServiceLocator.cs | 6 +++++- PlexRequests.UI/Modules/AdminModule.cs | 13 ++++++++++--- PlexRequests.UI/Modules/BaseModule.cs | 3 +++ PlexRequests.UI/Modules/IndexModule.cs | 5 +++-- PlexRequests.UI/Modules/LoginModule.cs | 8 ++++---- PlexRequests.UI/Modules/UserLoginModule.cs | 4 +++- 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index 4700313c0..6e540dbaf 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -26,7 +26,7 @@ #endregion using System.Net; -using FluentScheduler; + using Mono.Data.Sqlite; using Nancy; @@ -40,7 +40,6 @@ using PlexRequests.Api; using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Mocks; using PlexRequests.Core; using PlexRequests.Core.SettingModels; using PlexRequests.Helpers; @@ -51,8 +50,6 @@ using PlexRequests.Store.Models; using PlexRequests.Store.Repository; using PlexRequests.UI.Helpers; -using PlexRequests.UI.Jobs; -using TaskFactory = FluentScheduler.TaskFactory; namespace PlexRequests.UI { @@ -67,7 +64,7 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na { container.Register(); container.Register(new DbConfiguration(new SqliteFactory())); - container.Register(); + container.Register().AsSingleton(); // Settings container.Register, SettingsServiceV2>(); @@ -109,6 +106,8 @@ protected override void ConfigureRequestContainer(TinyIoCContainer container, Na SubscribeAllObservers(container); base.ConfigureRequestContainer(container, context); + var loc = ServiceLocator.Instance; + loc.SetContainer(container); } protected override void ApplicationStartup(TinyIoCContainer container, IPipelines pipelines) diff --git a/PlexRequests.UI/Helpers/ServiceLocator.cs b/PlexRequests.UI/Helpers/ServiceLocator.cs index 8941b0b57..c957bacbb 100644 --- a/PlexRequests.UI/Helpers/ServiceLocator.cs +++ b/PlexRequests.UI/Helpers/ServiceLocator.cs @@ -35,9 +35,13 @@ static ServiceLocator() Singleton = new ServiceLocator(); } private static ServiceLocator Singleton { get; } - private TinyIoCContainer Container => TinyIoCContainer.Current; + private TinyIoCContainer Container { get; set; } public static ServiceLocator Instance => Singleton; + public void SetContainer(TinyIoCContainer con) + { + Container = con; + } public T Resolve() where T : class { if (Container != null) diff --git a/PlexRequests.UI/Modules/AdminModule.cs b/PlexRequests.UI/Modules/AdminModule.cs index 631cc7fe9..9dc93cb38 100644 --- a/PlexRequests.UI/Modules/AdminModule.cs +++ b/PlexRequests.UI/Modules/AdminModule.cs @@ -56,7 +56,7 @@ namespace PlexRequests.UI.Modules { - public class AdminModule : NancyModule + public class AdminModule : BaseModule { private ISettingsService PrService { get; } private ISettingsService CpService { get; } @@ -181,8 +181,16 @@ private Response SaveAuthentication() var result = AuthService.SaveSettings(model); if (result) { + if (!string.IsNullOrEmpty(BaseUrl)) + { + return Context.GetRedirect($"~/{BaseUrl}/admin/authentication"); + } return Context.GetRedirect("~/admin/authentication"); } + if (!string.IsNullOrEmpty(BaseUrl)) + { + return Context.GetRedirect($"~/{BaseUrl}/error"); //TODO create error page + } return Context.GetRedirect("~/error"); //TODO create error page } @@ -201,8 +209,7 @@ private Response SaveAdmin() PrService.SaveSettings(model); - - return Context.GetRedirect("~/admin"); + return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/admin" : "~/admin"); } private Response RequestAuthToken() diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs index 7048d09dd..0fbcbd8bb 100644 --- a/PlexRequests.UI/Modules/BaseModule.cs +++ b/PlexRequests.UI/Modules/BaseModule.cs @@ -35,10 +35,12 @@ namespace PlexRequests.UI.Modules public class BaseModule : NancyModule { protected ServiceLocator Locator => ServiceLocator.Instance; + protected string BaseUrl { get; set; } public BaseModule() { var settings = Locator.Resolve>().GetSettings(); var baseUrl = settings.BaseUrl; + BaseUrl = baseUrl; var modulePath = string.IsNullOrEmpty(baseUrl) ? string.Empty : baseUrl; @@ -49,6 +51,7 @@ public BaseModule(string modulePath) { var settings = Locator.Resolve>().GetSettings(); var baseUrl = settings.BaseUrl; + BaseUrl = baseUrl; var settingModulePath = string.IsNullOrEmpty(baseUrl) ? modulePath : $"{baseUrl}/{modulePath}"; diff --git a/PlexRequests.UI/Modules/IndexModule.cs b/PlexRequests.UI/Modules/IndexModule.cs index bb099889c..46b54e098 100644 --- a/PlexRequests.UI/Modules/IndexModule.cs +++ b/PlexRequests.UI/Modules/IndexModule.cs @@ -33,8 +33,9 @@ public class IndexModule : BaseAuthModule { public IndexModule() { - Get["/"] = parameters => Context.GetRedirect("~/search"); - Get["/Index"] = parameters => Context.GetRedirect("~/search"); + Get["/"] = parameters => Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/search" : "~/search"); + + Get["/Index"] = parameters => Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/search" : "~/search"); } } } \ No newline at end of file diff --git a/PlexRequests.UI/Modules/LoginModule.cs b/PlexRequests.UI/Modules/LoginModule.cs index 6750b2c4c..63b500b6a 100644 --- a/PlexRequests.UI/Modules/LoginModule.cs +++ b/PlexRequests.UI/Modules/LoginModule.cs @@ -38,7 +38,7 @@ namespace PlexRequests.UI.Modules { - public class LoginModule : NancyModule + public class LoginModule : BaseModule { public LoginModule() { @@ -54,7 +54,7 @@ public LoginModule() }; - Get["/logout"] = x => this.LogoutAndRedirect("~/"); + Get["/logout"] = x => this.LogoutAndRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/" : "~/"); Post["/login"] = x => { @@ -66,7 +66,7 @@ public LoginModule() if (userId == null) { - return Context.GetRedirect("~/login?error=true&username=" + username); + return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/login?error=true&username=" + username : "~/login?error=true&username=" + username); } DateTime? expiry = null; if (Request.Form.RememberMe.HasValue) @@ -94,7 +94,7 @@ public LoginModule() var exists = UserMapper.DoUsersExist(); if (exists) { - return Context.GetRedirect("~/register?error=true"); + return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) ? $"~/{BaseUrl}/register?error=true" : "~/register?error=true"); } var userId = UserMapper.CreateUser(username, Request.Form.Password, new[] { "Admin" }); Session[SessionKeys.UsernameKey] = username; diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index c0f629f01..903d99313 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -155,7 +155,9 @@ private Response Logout() { Session.Delete(SessionKeys.UsernameKey); } - return Context.GetRedirect("~/userlogin"); + return Context.GetRedirect(!string.IsNullOrEmpty(BaseUrl) + ? $"~/{BaseUrl}/userlogin" + : "~/userlogin"); } private bool CheckIfUserIsOwner(string authToken, string userName) From acb9aab369d04c1febfd10e5d2c4728cab6d338b Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 17:30:02 +0100 Subject: [PATCH 32/44] More changes for #72 --- PlexRequests.UI.Tests/AdminModuleTests.cs | 1 + PlexRequests.UI/Models/JsonResponseModel.cs | 4 +++- PlexRequests.UI/Modules/UserLoginModule.cs | 2 +- PlexRequests.UI/Views/UserLogin/Index.cshtml | 9 ++++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs index 130000db9..e8ae7f04c 100644 --- a/PlexRequests.UI.Tests/AdminModuleTests.cs +++ b/PlexRequests.UI.Tests/AdminModuleTests.cs @@ -49,6 +49,7 @@ namespace PlexRequests.UI.Tests { [TestFixture] + [Ignore("Needs rework")] public class AdminModuleTests { private Mock> PlexRequestMock { get; set; } diff --git a/PlexRequests.UI/Models/JsonResponseModel.cs b/PlexRequests.UI/Models/JsonResponseModel.cs index 8ce77b144..f272b023b 100644 --- a/PlexRequests.UI/Models/JsonResponseModel.cs +++ b/PlexRequests.UI/Models/JsonResponseModel.cs @@ -29,6 +29,8 @@ namespace PlexRequests.UI.Models public class JsonResponseModel { public bool Result { get; set; } - public string Message { get; set; } + public string Message { get; set; } + public string BaseUrl { get; set; } + public bool HasBase => !string.IsNullOrEmpty(BaseUrl); } } \ No newline at end of file diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index 903d99313..48adb3989 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -142,7 +142,7 @@ private Response LoginUser() Session[SessionKeys.ClientDateTimeOffsetKey] = (int)dateTimeOffset; return Response.AsJson(authenticated - ? new JsonResponseModel { Result = true } + ? new JsonResponseModel { Result = true, BaseUrl = BaseUrl} : new JsonResponseModel { Result = false, Message = "Incorrect User or Password"}); } diff --git a/PlexRequests.UI/Views/UserLogin/Index.cshtml b/PlexRequests.UI/Views/UserLogin/Index.cshtml index cc9bf9c5d..a5f164739 100644 --- a/PlexRequests.UI/Views/UserLogin/Index.cshtml +++ b/PlexRequests.UI/Views/UserLogin/Index.cshtml @@ -40,7 +40,7 @@ var $form = $("#loginForm"); var formData = $form.serialize(); var dtOffset = new Date().getTimezoneOffset(); - formData += ('&DateTimeOffset=' + dtOffset) + formData += ('&DateTimeOffset=' + dtOffset); $.ajax({ type: $form.prop("method"), @@ -50,7 +50,9 @@ success: function (response) { console.log(response); if (response.result === true) { - window.location.replace("/search"); + + window.location.replace("/search"); + } else { generateNotify(response.message, "warning"); } @@ -61,8 +63,5 @@ } }); }); - - - }); \ No newline at end of file From f01f230901cab2943d13ed5e8a2253d7562b8099 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 21:29:32 +0100 Subject: [PATCH 33/44] Fixed when we do not have a base --- PlexRequests.UI/Helpers/AssetHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PlexRequests.UI/Helpers/AssetHelper.cs b/PlexRequests.UI/Helpers/AssetHelper.cs index 20cd8a8d6..5e06fc7e7 100644 --- a/PlexRequests.UI/Helpers/AssetHelper.cs +++ b/PlexRequests.UI/Helpers/AssetHelper.cs @@ -103,7 +103,7 @@ public static IHtmlString LoadLogsAssets(this HtmlHelpers helper) private static string GetContentUrl(string assetLocation) { - return string.IsNullOrEmpty(assetLocation) ? "~" : $"/{assetLocation}"; + return string.IsNullOrEmpty(assetLocation) ? string.Empty : $"/{assetLocation}"; } } } \ No newline at end of file From 256cfbc80fad7663b7e98b61f26cf3f58b99e489 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 21:40:38 +0100 Subject: [PATCH 34/44] Fixed a small bug in the SR cacher --- PlexRequests.Services/SickRageCacher.cs | 2 +- PlexRequests.UI/Helpers/AssetHelper.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PlexRequests.Services/SickRageCacher.cs b/PlexRequests.Services/SickRageCacher.cs index c42759d16..ae012e8d5 100644 --- a/PlexRequests.Services/SickRageCacher.cs +++ b/PlexRequests.Services/SickRageCacher.cs @@ -64,7 +64,7 @@ public void Queued(long check) { Log.Trace("Getting all shows from SickRage"); var movies = SrApi.GetShows(settings.ApiKey, settings.FullUri); - Cache.Set(CacheKeys.SickRageQueued, movies, 10); + Cache.Set(CacheKeys.SickRageQueued, movies.Result); } } diff --git a/PlexRequests.UI/Helpers/AssetHelper.cs b/PlexRequests.UI/Helpers/AssetHelper.cs index 5e06fc7e7..66aa2e48d 100644 --- a/PlexRequests.UI/Helpers/AssetHelper.cs +++ b/PlexRequests.UI/Helpers/AssetHelper.cs @@ -52,6 +52,7 @@ public static IHtmlString LoadAssets(this HtmlHelpers helper) sb.AppendLine($""); sb.AppendLine($""); sb.AppendLine($""); + sb.AppendLine($""); sb.AppendLine($""); sb.AppendLine($""); sb.AppendLine($""); From 7888912c2d939eeb3acfdec63cc028322295bf8f Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 22:12:20 +0100 Subject: [PATCH 35/44] By default don't use a url base --- PlexRequests.UI/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 6b1fde866..c16a08c08 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -53,7 +53,7 @@ class Program private static Logger Log = LogManager.GetCurrentClassLogger(); static void Main(string[] args) { - var baseUrl = "assets"; + var baseUrl = string.Empty; var port = -1; if (args.Length > 0) { @@ -140,7 +140,7 @@ private static void WriteOutVersion() private static int GetStartupPort() { Log.Trace("Getting startup Port"); - var port = 8080; + var port = 3579; var service = new SettingsServiceV2(new SettingsJsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider())); var settings = service.GetSettings(); Log.Trace("Port: {0}", settings.Port); From 770b447d5dba1b6887aba860d2f200aa30414a89 Mon Sep 17 00:00:00 2001 From: Drewster727 Date: Thu, 14 Apr 2016 16:13:56 -0500 Subject: [PATCH 36/44] return empty array when obtaining queued IDs in sickrage cacher --- PlexRequests.Services/SickRageCacher.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PlexRequests.Services/SickRageCacher.cs b/PlexRequests.Services/SickRageCacher.cs index ae012e8d5..9281cdcf2 100644 --- a/PlexRequests.Services/SickRageCacher.cs +++ b/PlexRequests.Services/SickRageCacher.cs @@ -72,8 +72,7 @@ public void Queued(long check) public int[] QueuedIds() { var tv = Cache.Get(CacheKeys.SickRageQueued); - var values = tv?.data.Values.Select(x => x.tvdbid).ToArray(); - return values; + return tv?.data.Values.Select(x => x.tvdbid).ToArray() ?? new int[] { }; } } } \ No newline at end of file From 7c7142c8b5401ec7aead1b4c2604446b413eb85d Mon Sep 17 00:00:00 2001 From: tidusjar Date: Thu, 14 Apr 2016 23:03:33 +0100 Subject: [PATCH 37/44] Done the auth, cp, logs and sidebar for #72 --- PlexRequests.UI/Content/site.js | 11 ++ .../{AssetHelper.cs => BaseUrlHelper.cs} | 62 ++++++--- PlexRequests.UI/PlexRequests.UI.csproj | 2 +- .../Views/Admin/Authentication.cshtml | 27 +++- .../Views/Admin/CouchPotato.cshtml | 18 ++- PlexRequests.UI/Views/Admin/Logs.cshtml | 21 +++- PlexRequests.UI/Views/Admin/_Sidebar.cshtml | 119 +++--------------- 7 files changed, 125 insertions(+), 135 deletions(-) rename PlexRequests.UI/Helpers/{AssetHelper.cs => BaseUrlHelper.cs} (76%) diff --git a/PlexRequests.UI/Content/site.js b/PlexRequests.UI/Content/site.js index e2784b315..e08d5835d 100644 --- a/PlexRequests.UI/Content/site.js +++ b/PlexRequests.UI/Content/site.js @@ -62,6 +62,17 @@ function finishLoading(elementId, originalCss, html) { } } +function createBaseUrl(base, url) { + if (base) { + if (url.charAt(0) === "/") { + url = "/" + base + url; + } else { + url = "/" + base + "/" + url; + } + } + return url; +} + var noResultsHtml = "
" + "
Sorry, we didn't find any results!
"; var noResultsMusic = "
" + diff --git a/PlexRequests.UI/Helpers/AssetHelper.cs b/PlexRequests.UI/Helpers/BaseUrlHelper.cs similarity index 76% rename from PlexRequests.UI/Helpers/AssetHelper.cs rename to PlexRequests.UI/Helpers/BaseUrlHelper.cs index 66aa2e48d..ddeb1fb7b 100644 --- a/PlexRequests.UI/Helpers/AssetHelper.cs +++ b/PlexRequests.UI/Helpers/BaseUrlHelper.cs @@ -1,7 +1,7 @@ #region Copyright // /************************************************************************ // Copyright (c) 2016 Jamie Rees -// File: AssetHelper.cs +// File: BaseUrlHelper.cs // Created By: Jamie Rees // // Permission is hereby granted, free of charge, to any person obtaining @@ -24,8 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Text; +using System.IO; +using System.Text; +using Nancy; using Nancy.ViewEngines.Razor; using PlexRequests.Core; @@ -33,14 +35,13 @@ namespace PlexRequests.UI.Helpers { - public static class AssetHelper + public static class BaseUrlHelper { private static ServiceLocator Locator => ServiceLocator.Instance; public static IHtmlString LoadAssets(this HtmlHelpers helper) { - var settings = Locator.Resolve>().GetSettings(); var sb = new StringBuilder(); - var assetLocation = settings.BaseUrl; + var assetLocation = GetBaseUrl(); var content = GetContentUrl(assetLocation); @@ -64,9 +65,8 @@ public static IHtmlString LoadAssets(this HtmlHelpers helper) public static IHtmlString LoadSearchAssets(this HtmlHelpers helper) { - var settings = Locator.Resolve>().GetSettings(); var sb = new StringBuilder(); - var assetLocation = settings.BaseUrl; + var assetLocation = GetBaseUrl(); var content = GetContentUrl(assetLocation); @@ -77,9 +77,8 @@ public static IHtmlString LoadSearchAssets(this HtmlHelpers helper) public static IHtmlString LoadRequestAssets(this HtmlHelpers helper) { - var settings = Locator.Resolve>().GetSettings(); var sb = new StringBuilder(); - var assetLocation = settings.BaseUrl; + var assetLocation = GetBaseUrl(); var content = GetContentUrl(assetLocation); @@ -90,9 +89,8 @@ public static IHtmlString LoadRequestAssets(this HtmlHelpers helper) public static IHtmlString LoadLogsAssets(this HtmlHelpers helper) { - var settings = Locator.Resolve>().GetSettings(); var sb = new StringBuilder(); - var assetLocation = settings.BaseUrl; + var assetLocation = GetBaseUrl(); var content = GetContentUrl(assetLocation); @@ -101,10 +99,46 @@ public static IHtmlString LoadLogsAssets(this HtmlHelpers helper) return helper.Raw(sb.ToString()); } - - private static string GetContentUrl(string assetLocation) + + public static IHtmlString GetSidebarUrl(this HtmlHelpers helper, NancyContext context, string url, string title) { - return string.IsNullOrEmpty(assetLocation) ? string.Empty : $"/{assetLocation}"; + var returnString = string.Empty; + var content = GetLinkUrl(GetBaseUrl()); + if (!string.IsNullOrEmpty(content)) + { + url = $"/{content}{url}"; + } + if (context.Request.Path == url) + { + returnString = $"{title}"; + } + else + { + returnString = $"{title}"; + } + + return helper.Raw(returnString); + } + + public static IHtmlString GetBaseUrl(this HtmlHelpers helper) + { + return helper.Raw(GetBaseUrl()); + } + + private static string GetBaseUrl() + { + var settings = Locator.Resolve>().GetSettings(); + var assetLocation = settings.BaseUrl; + return assetLocation; + } + + private static string GetLinkUrl(string assetLocation) + { + return string.IsNullOrEmpty(assetLocation) ? string.Empty : $"{assetLocation}"; + } + private static string GetContentUrl(string assetLocation) + { + return string.IsNullOrEmpty(assetLocation) ? string.Empty : $"/{assetLocation}"; } } } \ No newline at end of file diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj index ec156d653..93a345ed1 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/PlexRequests.UI.csproj @@ -164,7 +164,7 @@ - + diff --git a/PlexRequests.UI/Views/Admin/Authentication.cshtml b/PlexRequests.UI/Views/Admin/Authentication.cshtml index a703431b8..da2cea63f 100644 --- a/PlexRequests.UI/Views/Admin/Authentication.cshtml +++ b/PlexRequests.UI/Views/Admin/Authentication.cshtml @@ -1,7 +1,16 @@ -@Html.Partial("_Sidebar") - +@using PlexRequests.UI.Helpers +@Html.Partial("_Sidebar") + +@{ + var baseUrl = Html.GetBaseUrl(); + var formAction = "/admin/authentication"; + if (!string.IsNullOrEmpty(baseUrl.ToHtmlString())) + { + formAction = "/" + baseUrl.ToHtmlString() + formAction; + } +}
- +
Authentication Settings @@ -100,21 +109,24 @@