Making the configuration actually do something. Setting a default configuration if there is no DB

PlexRequests.Core/SettingModels/PlexRequestSettings.cs

@@ -32,7 +32,7 @@ namespace PlexRequests.Core.SettingModels
        
         public bool SearchForMovies { get; set; }
         public bool SearchForTvShows { get; set; }
-        public bool RequireApprovial { get; set; }
+        public bool RequireApproval { get; set; }
         public int WeeklyRequestLimit { get; set; }
     }
 }

PlexRequests.Core/Setup.cs

@@ -25,8 +25,10 @@
 //  ************************************************************************/
 #endregion
 using Mono.Data.Sqlite;
-
+using PlexRequests.Core.SettingModels;
+using PlexRequests.Helpers;
 using PlexRequests.Store;
+using PlexRequests.Store.Repository;
 
 namespace PlexRequests.Core
 {
@@ -36,9 +38,29 @@ namespace PlexRequests.Core
         public string SetupDb()
         {
             var db = new DbConfiguration(new SqliteFactory());
-            db.CheckDb();
+            var created = db.CheckDb();
             TableCreation.CreateTables(db.DbConnection());
+
+            if (created)
+            {
+                CreateDefaultSettingsPage();
+            }
+
             return db.DbConnection().ConnectionString;
         }
+
+
+        private void CreateDefaultSettingsPage()
+        {
+            var defaultSettings = new PlexRequestSettings
+            {
+                RequireApproval = true,
+                SearchForMovies = true,
+                SearchForTvShows = true,
+                WeeklyRequestLimit = 0
+            };
+            var s = new SettingsServiceV2<PlexRequestSettings>(new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
+            s.SaveSettings(defaultSettings);
+        }
     }
 }

PlexRequests.Store/DbConfiguration.cs

@@ -31,6 +31,8 @@ using System.IO;
 using Mono.Data.Sqlite;
 
 using NLog;
+using PlexRequests.Helpers;
+using PlexRequests.Store.Repository;
 
 namespace PlexRequests.Store
 {
@@ -44,14 +46,16 @@ namespace PlexRequests.Store
 
         private SqliteFactory Factory { get; set; }
 
-        public virtual void CheckDb()
+        public virtual bool CheckDb()
         {
             Log.Trace("Checking DB");
             if (!File.Exists(DbFile))
             {
                 Log.Trace("DB doesn't exist, creating a new one");
                 CreateDatabase();
+                return true;
             }
+            return false;
         }
 
         public string DbFile = "RequestPlex.sqlite";

PlexRequests.Store/ISqliteConfiguration.cs

@@ -33,7 +33,7 @@ namespace PlexRequests.Store
 		/// <summary>
 		/// Checks the database.
 		/// </summary>
-		void CheckDb();
+		bool CheckDb();
 
 		/// <summary>
 		/// Returns the database connection.

PlexRequests.UI/Modules/RequestsModule.cs

@@ -30,7 +30,8 @@ using Humanizer;
 
 using Nancy;
 using Nancy.Responses.Negotiation;
-
+using PlexRequests.Core;
+using PlexRequests.Core.SettingModels;
 using PlexRequests.Store;
 using PlexRequests.UI.Models;
 
@@ -38,10 +39,11 @@ namespace PlexRequests.UI.Modules
 {
     public class RequestsModule : BaseModule
     {
-        private IRepository<RequestedModel> Service { get; set; }
+
-        public RequestsModule(IRepository<RequestedModel> service) : base("requests")
+        public RequestsModule(IRepository<RequestedModel> service, ISettingsService<PlexRequestSettings> prSettings) : base("requests")
         {
             Service = service;
+            PrSettings = prSettings;
 
             Get["/"] = _ => LoadRequests();
             Get["/movies"] = _ => GetMovies();
@@ -52,11 +54,13 @@ namespace PlexRequests.UI.Modules
                 return DeleteRequest((int)Request.Form.id, convertedType);
             };
         }
-
+        private IRepository<RequestedModel> Service { get; }
+        private ISettingsService<PlexRequestSettings> PrSettings { get; }
 
         private Negotiator LoadRequests()
         {
-            return View["Requests/Index"];
+            var settings = PrSettings.GetSettings();
+            return View["Requests/Index", settings];
         }
 
         private Response GetMovies()

PlexRequests.UI/Modules/SearchModule.cs

@@ -43,9 +43,10 @@ namespace PlexRequests.UI.Modules
 {
     public class SearchModule : BaseModule
     {
-        public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings> cpSettings) : base("search")
+        public SearchModule(ICacheProvider cache, ISettingsService<CouchPotatoSettings> cpSettings, ISettingsService<PlexRequestSettings> prSettings) : base("search")
         {
             CpService = cpSettings;
+            PrService = prSettings;
             MovieApi = new TheMovieDbApi();
             TvApi = new TheTvDbApi();
             Cache = cache;
@@ -64,14 +65,17 @@ namespace PlexRequests.UI.Modules
         private TheMovieDbApi MovieApi { get; }
         private TheTvDbApi TvApi { get; }
         private ICacheProvider Cache { get; }
-        private ISettingsService<CouchPotatoSettings> CpService { get; set; }
+        private ISettingsService<CouchPotatoSettings> CpService { get; }
+        private ISettingsService<PlexRequestSettings> PrService { get; }
         private static Logger Log = LogManager.GetCurrentClassLogger();
         private string AuthToken => Cache.GetOrSet(CacheKeys.TvDbToken, TvApi.Authenticate, 50);
 
         private Negotiator RequestLoad()
         {
+            var settings = PrService.GetSettings();
+
             Log.Trace("Loading Index");
-            return View["Search/Index"];
+            return View["Search/Index", settings];
         }
 
         private Response SearchMovie(string searchTerm)
@@ -148,14 +152,14 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new { Result = false, Message = "Movie has already been requested!" });
             }
             Log.Trace("movie with id {0} doesnt exists", movieId);
-            var settings = CpService.GetSettings();
+            var cpSettings = CpService.GetSettings();
-            if (settings.ApiKey == null)
+            if (cpSettings.ApiKey == null)
             {
                 Log.Warn("CP apiKey is null");
                 return Response.AsJson(new { Result = false, Message = "CouchPotato is not yet configured, If you are the Admin, please log in." });
             }
             Log.Trace("Settings: ");
-            Log.Trace(settings.DumpJson);
+            Log.Trace(cpSettings.DumpJson);
 
             var movieApi = new TheMovieDbApi();
             var movieInfo = movieApi.GetMovieInformation(movieId).Result;
@@ -173,16 +177,22 @@ namespace PlexRequests.UI.Modules
                 ReleaseDate = movieInfo.ReleaseDate ?? DateTime.MinValue,
                 Status = movieInfo.Status,
                 RequestedDate = DateTime.Now,
-                Approved = false
+                Approved = false,
+                RequestedBy = Session[SessionKeys.UsernameKey].ToString()
             };
 
+
+            var settings = PrService.GetSettings();
+            if (!settings.RequireApproval)
+            {
                 var cp = new CouchPotatoApi();
-            Log.Trace("Adding movie to CP");
+                Log.Trace("Adding movie to CP (No approval required)");
-            var result = cp.AddMovie(model.ImdbId, settings.ApiKey, model.Title, settings.FullUri);
+                var result = cp.AddMovie(model.ImdbId, cpSettings.ApiKey, model.Title, cpSettings.FullUri);
                 Log.Trace("Adding movie to CP result {0}", result);
                 if (result)
                 {
-                Log.Trace("Adding movie to database requests");
+                    model.Approved = true;
+                    Log.Trace("Adding movie to database requests (No approval required)");
                     s.AddRequest(movieId, model);
 
                     return Response.AsJson(new { Result = true });
@@ -190,6 +200,20 @@ namespace PlexRequests.UI.Modules
                 return Response.AsJson(new { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
             }
 
+            try
+            {
+                Log.Trace("Adding movie to database requests");
+                s.AddRequest(movieId, model);
+                return Response.AsJson(new { Result = true });
+            }
+            catch (Exception e)
+            {
+                Log.Fatal(e);
+
+                return Response.AsJson(new { Result = false, Message = "Something went wrong adding the movie to CouchPotato! Please check your settings." });
+            }
+        }
+
         /// <summary>
         /// Requests the tv show.
         /// </summary>
@@ -223,7 +247,8 @@ namespace PlexRequests.UI.Modules
                 ReleaseDate = firstAir,
                 Status = showInfo.status,
                 RequestedDate = DateTime.Now,
-                Approved = false
+                Approved = false,
+                RequestedBy = Session[SessionKeys.UsernameKey].ToString()
             };
 
             s.AddRequest(showId, model);

PlexRequests.UI/Views/Admin/Settings.cshtml

@@ -54,6 +54,23 @@
                     </label>
                 </div>
             </div>
+            <div class="form-group">
+                <label for="RequireApproval" class="col-lg-2 control-label">Require approval of requests</label>
+
+                <div class="col-lg-10 checkbox">
+                    <label>
+                        @if (Model.RequireApproval)
+                        {
+                            <input type="checkbox" id="RequireApproval" name="RequireApproval" checked="checked">
+                        }
+                        else
+                        {
+                            <input type="checkbox" id="RequireApproval" name="RequireApproval">
+                        }
+                    </label>
+
+                </div>
+            </div>
   
             <div class="form-group">
                 <label for="WeeklyRequestLimit" class="col-lg-2 control-label">Weekly Request Limit</label>

PlexRequests.UI/Views/Admin/_Sidebar.cshtml

@@ -1,6 +1,6 @@
 <div class="col-lg-3 col-md-3 col-sm-4">
     <div class="list-group table-of-contents">
-        <a class="list-group-item" href="/admin">Request Plex Settings</a>
+        <a class="list-group-item" href="/admin">Plex Request Settings</a>
         <a class="list-group-item" href="/admin/authentication">Authentication</a>
         <a class="list-group-item" href="/admin/couchpotato">CouchPotato Settings</a>
         <a class="list-group-item" href="/admin/sonarr">Sonarr Settings</a>

PlexRequests.UI/Views/Requests/Index.cshtml

@@ -3,14 +3,21 @@
     <h4>Below you can see yours and all other requests, as well as their download and approval status.</h4>
     <!-- Nav tabs -->
     <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
+        @if (Model.SearchForMovies)
+        {
             <li role="presentation" class="active"><a href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab">Movies</a></li>
+        }
+        @if (Model.SearchForTvShows)
+        {
             <li role="presentation"><a href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab">TV Shows</a></li>
+        }
 
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-
+        @if (Model.SearchForMovies)
+        {
     <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
                 <br />
@@ -19,7 +26,10 @@
                 <div id="movieList">
                 </div>
             </div>
+        }
 
+        @if (Model.SearchForTvShows)
+        {
     <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
                 <br />
@@ -28,6 +38,7 @@
                 <div id="tvList">
                 </div>
             </div>
+        }
     </div>
 
 </div>

PlexRequests.UI/Views/Search/Index.cshtml

@@ -1,16 +1,23 @@
 <div>
     <h2>Search</h2>
-    <h4>Want to wacth something that is not currently on Plex?! No problem! Just search for it below and request it!</h4>
+    <h4>Want to watch something that is not currently on Plex?! No problem! Just search for it below and request it!</h4>
     <!-- Nav tabs -->
     <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
+        @if (Model.SearchForMovies)
+        {
             <li role="presentation" class="active"><a href="#MoviesTab" aria-controls="home" role="tab" data-toggle="tab">Movies</a></li>
+        }
+        @if (Model.SearchForTvShows)
+        {
             <li role="presentation"><a href="#TvShowTab" aria-controls="profile" role="tab" data-toggle="tab">TV Shows</a></li>
+        }
 
     </ul>
 
     <!-- Tab panes -->
     <div class="tab-content">
-
+        @if (Model.SearchForMovies)
+        {
             <!-- Movie tab -->
             <div role="tabpanel" class="tab-pane active" id="MoviesTab">
                 <div class="input-group">
@@ -25,7 +32,11 @@
                 <div id="movieList">
                 </div>
             </div>
+        }
 
+
+        @if (Model.SearchForTvShows)
+        {
     <!-- TV tab -->
             <div role="tabpanel" class="tab-pane" id="TvShowTab">
                 <div class="input-group">
@@ -40,8 +51,10 @@
                 <div id="tvList">
                 </div>
             </div>
+        }
     </div>
 
+
 </div>