Done most on #59

PlexRequests.Core/JsonRequestService.cs

@@ -32,6 +32,7 @@ using Newtonsoft.Json;
 
 using PlexRequests.Store;
 using PlexRequests.Store.Models;
+using PlexRequests.Store.Repository;
 
 namespace PlexRequests.Core
 {

PlexRequests.Core/PlexRequests.Core.csproj

@@ -81,7 +81,6 @@
     <Compile Include="SettingModels\CouchPotatoSettings.cs" />
     <Compile Include="SettingModels\PlexRequestSettings.cs" />
     <Compile Include="SettingModels\Settings.cs" />
-    <Compile Include="RequestService.cs" />
     <Compile Include="SettingsServiceV2.cs" />
     <Compile Include="Setup.cs" />
     <Compile Include="StatusChecker.cs" />

PlexRequests.Core/RequestService.cs

@@ -1,84 +0,0 @@
-#region Copyright
-// /************************************************************************
-//    Copyright (c) 2016 Jamie Rees
-//    File: RequestService.cs
-//    Created By: Jamie Rees
-//   
-//    Permission is hereby granted, free of charge, to any person obtaining
-//    a copy of this software and associated documentation files (the
-//    "Software"), to deal in the Software without restriction, including
-//    without limitation the rights to use, copy, modify, merge, publish,
-//    distribute, sublicense, and/or sell copies of the Software, and to
-//    permit persons to whom the Software is furnished to do so, subject to
-//    the following conditions:
-//   
-//    The above copyright notice and this permission notice shall be
-//    included in all copies or substantial portions of the Software.
-//   
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-//    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-//    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-//    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//  ************************************************************************/
-#endregion
-
-using System.Collections.Generic;
-using System.Linq;
-using PlexRequests.Store;
-
-namespace PlexRequests.Core
-{
-    public class RequestService : IRequestService
-    {
-        public RequestService(IRepository<RequestedModel> db)
-        {
-            Repo = db;
-        }
-    
-        private IRepository<RequestedModel> Repo { get; set; }
-
-        public long AddRequest(RequestedModel model)
-        {
-            return Repo.Insert(model);
-        }
-
-        public bool CheckRequest(int providerId)
-        {
-            return Repo.GetAll().Any(x => x.ProviderId == providerId);
-        }
-
-        public void DeleteRequest(RequestedModel model)
-        {
-            var entity = Repo.Get(model.Id);
-            Repo.Delete(entity);
-        }
-
-        public bool UpdateRequest(RequestedModel model)
-        {
-            return Repo.Update(model);
-        }
-
-        /// <summary>
-        /// Updates all the entities. NOTE: we need to Id to be the original entity
-        /// </summary>
-        /// <param name="model">The model.</param>
-        /// <returns></returns>
-        public bool BatchUpdate(List<RequestedModel> model)
-        {
-           return Repo.UpdateAll(model);
-        }
-
-        public RequestedModel Get(int id)
-        {
-            return Repo.Get(id);
-        }
-
-        public IEnumerable<RequestedModel> GetAll()
-        {
-            return Repo.GetAll();
-        }
-    }
-}

PlexRequests.Core/SettingsServiceV2.cs

@@ -30,6 +30,7 @@ using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Store;
 using PlexRequests.Store.Models;
+using PlexRequests.Store.Repository;
 
 namespace PlexRequests.Core
 {

PlexRequests.Core/Setup.cs

@@ -75,7 +75,7 @@ namespace PlexRequests.Core
         {
             var result = new List<long>();
             RequestedModel[] requestedModels;
-            var repo = new GenericRepository<RequestedModel>(Db);
+            var repo = new GenericRepository<RequestedModel>(Db, new MemoryCacheProvider());
             try
             {
                 var records = repo.GetAll();

PlexRequests.Core/UserMapper.cs

@@ -88,12 +88,12 @@ namespace PlexRequests.Core
             return users.Any();
         }
 
-        public static Guid? CreateUser(string username, string password)
+        public static Guid? CreateUser(string username, string password, string[] claims = default(string[]))
         {
             var repo = new UserRepository<UsersModel>(Db);
             var salt = PasswordHasher.GenerateSalt();
 
-            var userModel = new UsersModel { UserName = username, UserGuid = Guid.NewGuid().ToString(), Salt = salt, Hash = PasswordHasher.ComputeHash(password, salt)};
+            var userModel = new UsersModel { UserName = username, UserGuid = Guid.NewGuid().ToString(), Salt = salt, Hash = PasswordHasher.ComputeHash(password, salt), Claims = claims};
             repo.Insert(userModel);
 
             var userRecord = repo.Get(userModel.UserGuid);

PlexRequests.Helpers/LoggingHelper.cs

@@ -25,9 +25,14 @@
 //  ************************************************************************/
 #endregion
 using System;
+using System.Data;
 
 using Newtonsoft.Json;
 
+using NLog;
+using NLog.Config;
+using NLog.Targets;
+
 namespace PlexRequests.Helpers
 {
     public static class LoggingHelper
@@ -55,5 +60,57 @@ namespace PlexRequests.Helpers
             }
             return dumpTarget.ToString();
         }
+
+        public static void ConfigureLogging(string connectionString)
+        {
+            LogManager.ThrowExceptions = true;
+            // Step 1. Create configuration object 
+            var config = new LoggingConfiguration();
+
+            // Step 2. Create targets and add them to the configuration 
+            var databaseTarget = new DatabaseTarget
+            {
+                CommandType = CommandType.Text,
+                ConnectionString = connectionString,
+                DBProvider = "Mono.Data.Sqlite.SqliteConnection, Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756",
+                Name = "database"
+            };
+            
+            var messageParam = new DatabaseParameterInfo { Name = "@Message", Layout = "${message}" };
+            var callsiteParam = new DatabaseParameterInfo { Name = "@Callsite", Layout = "${callsite}" };
+            var levelParam = new DatabaseParameterInfo { Name = "@Level", Layout = "${level}" };
+            var dateParam = new DatabaseParameterInfo { Name = "@Date", Layout = "${date}" };
+            var loggerParam = new DatabaseParameterInfo { Name = "@Logger", Layout = "${logger}" };
+            var exceptionParam = new DatabaseParameterInfo { Name = "@Exception", Layout = "${exception:tostring}" };
+
+            databaseTarget.Parameters.Add(messageParam);
+            databaseTarget.Parameters.Add(callsiteParam);
+            databaseTarget.Parameters.Add(levelParam);
+            databaseTarget.Parameters.Add(dateParam);
+            databaseTarget.Parameters.Add(loggerParam);
+            databaseTarget.Parameters.Add(exceptionParam);
+
+            databaseTarget.CommandText = "INSERT INTO Logs (Date,Level,Logger, Message, Callsite, Exception) VALUES(@Date,@Level,@Logger, @Message, @Callsite, @Exception);";
+            config.AddTarget("database", databaseTarget);
+
+            // Step 4. Define rules
+            var rule1 = new LoggingRule("*", LogLevel.Info, databaseTarget);
+            config.LoggingRules.Add(rule1);
+
+            // Step 5. Activate the configuration
+            LogManager.Configuration = config;
+        }
+
+        public static void ReconfigureLogLevel(LogLevel level)
+        {
+            foreach (var rule in LogManager.Configuration.LoggingRules)
+            {
+                rule.EnableLoggingForLevel(level);
+            }
+
+            //Call to update existing Loggers created with GetLogger() or 
+            //GetCurrentClassLogger()
+            LogManager.ReconfigExistingLoggers();
+        }
     }
 }

PlexRequests.Helpers/PlexRequests.Helpers.csproj

@@ -35,6 +35,10 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.2.3\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Caching" />

PlexRequests.Helpers/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net452" />
+  <package id="NLog" version="4.2.3" targetFramework="net46" />
 </packages>

PlexRequests.Store/Models/LogEntity.cs

@@ -26,11 +26,13 @@
 #endregion
 using System;
 
+using Dapper.Contrib.Extensions;
+
 namespace PlexRequests.Store.Models
 {
+    [Table("Logs")]
     public class LogEntity : Entity
     {
-        public string Username { get; set; }
         public DateTime Date { get; set; }
         public string Level { get; set; }
         public string Logger { get; set; }

PlexRequests.Store/PlexRequests.Store.csproj

@@ -58,17 +58,17 @@
   <ItemGroup>
     <Compile Include="DbConfiguration.cs" />
     <Compile Include="Entity.cs" />
-    <Compile Include="IRequestRepository.cs" />
-    <Compile Include="ISettingsRepository.cs" />
+    <Compile Include="Repository\IRequestRepository.cs" />
+    <Compile Include="Repository\ISettingsRepository.cs" />
     <Compile Include="ISqliteConfiguration.cs" />
-    <Compile Include="IRepository.cs" />
+    <Compile Include="Repository\IRepository.cs" />
     <Compile Include="Models\GlobalSettings.cs" />
     <Compile Include="Models\LogEntity.cs" />
     <Compile Include="Models\RequestBlobs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repository\SettingsJsonRepository.cs" />
     <Compile Include="Repository\RequestJsonRepository.cs" />
-    <Compile Include="GenericRepository.cs" />
+    <Compile Include="Repository\GenericRepository.cs" />
     <Compile Include="RequestedModel.cs" />
     <Compile Include="UserEntity.cs" />
     <Compile Include="UsersModel.cs" />

PlexRequests.Store/Repository/GenericRepository.cs

@@ -34,20 +34,23 @@ using NLog;
 
 using PlexRequests.Helpers;
 
-namespace PlexRequests.Store
+namespace PlexRequests.Store.Repository
 {
     public class GenericRepository<T> : IRepository<T> where T : Entity
     {
-        public GenericRepository(ISqliteConfiguration config)
+        private ICacheProvider Cache { get; }
+        public GenericRepository(ISqliteConfiguration config, ICacheProvider cache)
         {
             Config = config;
+            Cache = cache;
         }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
 
-        private ISqliteConfiguration Config { get; set; }
+        private ISqliteConfiguration Config { get; }
         public long Insert(T entity)
         {
+            ResetCache();
             using (var cnn = Config.DbConnection())
             {
                 cnn.Open();
@@ -57,12 +60,14 @@ namespace PlexRequests.Store
 
         public IEnumerable<T> GetAll()
         {
+
             using (var db = Config.DbConnection())
             {
                 db.Open();
                 var result = db.GetAll<T>();
                 return result;
             }
+
         }
 
         public T Get(string id)
@@ -71,16 +76,24 @@ namespace PlexRequests.Store
         }
 
         public T Get(int id)
+        {
+            var key = "Get" + id;
+            var item = Cache.GetOrSet(
+                key,
+                () =>
                 {
                     using (var db = Config.DbConnection())
                     {
                         db.Open();
                         return db.Get<T>(id);
                     }
+                });
+            return item;
         }
 
         public void Delete(T entity)
         {
+            ResetCache();
             using (var db = Config.DbConnection())
             {
                 db.Open();
@@ -90,6 +103,7 @@ namespace PlexRequests.Store
 
         public bool Update(T entity)
         {
+            ResetCache();
             Log.Trace("Updating entity");
             Log.Trace(entity.DumpJson());
             using (var db = Config.DbConnection())
@@ -101,6 +115,7 @@ namespace PlexRequests.Store
 
         public bool UpdateAll(IEnumerable<T> entity)
         {
+            ResetCache();
             Log.Trace("Updating all entities");
             var result = new HashSet<bool>();
 
@@ -114,5 +129,11 @@ namespace PlexRequests.Store
             }
             return result.All(x => true);
         }
+
+        private void ResetCache()
+        {
+            Cache.Remove("Get");
+            Cache.Remove("GetAll");
+        }
     }
 }

PlexRequests.Store/Repository/IRepository.cs

@@ -26,7 +26,7 @@
 #endregion
 using System.Collections.Generic;
 
-namespace PlexRequests.Store
+namespace PlexRequests.Store.Repository
 {
     public interface IRepository<T>
     {

PlexRequests.Store/Repository/IRequestRepository.cs

@@ -28,7 +28,7 @@ using System.Collections.Generic;
 
 using PlexRequests.Store.Models;
 
-namespace PlexRequests.Store
+namespace PlexRequests.Store.Repository
 {
     public interface IRequestRepository
     {

PlexRequests.Store/Repository/ISettingsRepository.cs

@@ -28,7 +28,7 @@ using System.Collections.Generic;
 
 using PlexRequests.Store.Models;
 
-namespace PlexRequests.Store
+namespace PlexRequests.Store.Repository
 {
     public interface ISettingsRepository
     {

PlexRequests.Store/UserRepository.cs

@@ -30,6 +30,8 @@ using System.Linq;
 
 using Dapper.Contrib.Extensions;
 
+using PlexRequests.Store.Repository;
+
 namespace PlexRequests.Store
 {
     public class UserRepository<T> : IRepository<T> where T : UserEntity

PlexRequests.Store/UsersModel.cs

@@ -33,5 +33,6 @@ namespace PlexRequests.Store
     {
         public byte[] Hash { get; set; }
         public byte[] Salt { get; set; }
+        public string[] Claims { get; set; }
     }
 }

PlexRequests.UI.Tests/AdminModuleTests.cs

@@ -39,6 +39,8 @@ using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models.Plex;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
+using PlexRequests.Store.Models;
+using PlexRequests.Store.Repository;
 using PlexRequests.UI.Models;
 using PlexRequests.UI.Modules;
 
@@ -59,6 +61,7 @@ namespace PlexRequests.UI.Tests
         private Mock<ISonarrApi> SonarrApiMock { get; set; }
         private Mock<IPushbulletApi> PushbulletApi { get; set; }
         private Mock<ICouchPotatoApi> CpApi { get; set; }
+        private Mock<IRepository<LogEntity>> LogRepo { get; set; }
 
         private ConfigurableBootstrapper Bootstrapper { get; set; }
 
@@ -83,6 +86,7 @@ namespace PlexRequests.UI.Tests
             PushbulletSettings = new Mock<ISettingsService<PushbulletNotificationSettings>>();
             CpApi = new Mock<ICouchPotatoApi>();
             SickRageSettingsMock = new Mock<ISettingsService<SickRageSettings>>();
+            LogRepo = new Mock<IRepository<LogEntity>>();
 
             Bootstrapper = new ConfigurableBootstrapper(with =>
             {
@@ -99,6 +103,7 @@ namespace PlexRequests.UI.Tests
                 with.Dependency(PushbulletSettings.Object);
                 with.Dependency(CpApi.Object);
                 with.Dependency(SickRageSettingsMock.Object);
+                with.Dependency(LogRepo.Object);
                 with.RootPathProvider<TestRootPathProvider>();
                 with.RequestStartup((container, pipelines, context) =>
                 {

PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj

@@ -117,6 +117,10 @@
       <Project>{566EFA49-68F8-4716-9693-A6B3F2624DEA}</Project>
       <Name>PlexRequests.Services</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Store\PlexRequests.Store.csproj">
+      <Project>{92433867-2B7B-477B-A566-96C382427525}</Project>
+      <Name>PlexRequests.Store</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.UI\PlexRequests.UI.csproj">
       <Project>{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}</Project>
       <Name>PlexRequests.UI</Name>

PlexRequests.UI/Bootstrapper.cs

@@ -47,6 +47,7 @@ using PlexRequests.Services;
 using PlexRequests.Services.Interfaces;
 using PlexRequests.Services.Notification;
 using PlexRequests.Store;
+using PlexRequests.Store.Models;
 using PlexRequests.Store.Repository;
 using PlexRequests.UI.Jobs;
 using TaskFactory = FluentScheduler.TaskFactory;
@@ -77,6 +78,7 @@ namespace PlexRequests.UI
 
             // Repo's
             container.Register<IRepository<RequestedModel>, GenericRepository<RequestedModel>>();
+            container.Register<IRepository<LogEntity>, GenericRepository<LogEntity>>();
             container.Register<IRequestService, JsonRequestService>();
             container.Register<ISettingsRepository, SettingsJsonRepository>();
 

PlexRequests.UI/Modules/AdminModule.cs

@@ -26,6 +26,7 @@
 #endregion
 using System.Dynamic;
 using System.Linq;
+using System.Web.UI.WebControls;
 
 using MarkdownSharp;
 
@@ -44,6 +45,8 @@ using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
 using PlexRequests.Services.Notification;
+using PlexRequests.Store.Models;
+using PlexRequests.Store.Repository;
 using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
 
@@ -63,6 +66,7 @@ namespace PlexRequests.UI.Modules
         private ISonarrApi SonarrApi { get; }
         private PushbulletApi PushbulletApi { get; }
         private ICouchPotatoApi CpApi { get; }
+        private IRepository<LogEntity> LogsRepo { get; }
 
         private static Logger Log = LogManager.GetCurrentClassLogger();
         public AdminModule(ISettingsService<PlexRequestSettings> rpService,
@@ -76,7 +80,8 @@ namespace PlexRequests.UI.Modules
             IPlexApi plexApi,
             ISettingsService<PushbulletNotificationSettings> pbSettings,
             PushbulletApi pbApi,
-            ICouchPotatoApi cpApi) : base("admin")
+            ICouchPotatoApi cpApi,
+            IRepository<LogEntity> logsRepo) : base("admin")
         {
             RpService = rpService;
             CpService = cpService;
@@ -90,6 +95,7 @@ namespace PlexRequests.UI.Modules
             PushbulletApi = pbApi;
             CpApi = cpApi;
             SickRageService = sickrage;
+            LogsRepo = logsRepo;
 
 #if !DEBUG
             this.RequiresAuthentication();
@@ -126,6 +132,10 @@ namespace PlexRequests.UI.Modules
 
             Get["/pushbulletnotification"] = _ => PushbulletNotifications();
             Post["/pushbulletnotification"] = _ => SavePushbulletNotifications();
+
+            Get["/logs"] = _ => Logs();
+            Get["/loglevel"] = _ => GetLogLevels();
+            Post["/loglevel"] = _ => UpdateLogLevels(Request.Form.level);
         }
 
         private Negotiator Authentication()
@@ -422,5 +432,24 @@ namespace PlexRequests.UI.Modules
 
             return Response.AsJson(profiles);
         }
+
+        private Negotiator Logs()
+        {
+            var allLogs = LogsRepo.GetAll().OrderByDescending(x => x.Id).Take(20);
+            return View["Logs", allLogs];
+        }
+
+        private Response GetLogLevels()
+        {
+            var levels = LogManager.Configuration.LoggingRules.FirstOrDefault(x => x.NameMatches("database"));
+            return Response.AsJson(levels.Levels);
+        }
+
+        private Response UpdateLogLevels(int level)
+        {
+            var newLevel = LogLevel.FromOrdinal(level);
+            LoggingHelper.ReconfigureLogLevel(newLevel);
+            return Response.AsJson(new JsonResponseModel { Result = true, Message = $"The new log level is now {newLevel}"});
+        }
     }
 }

PlexRequests.UI/Modules/ApprovalModule.cs

@@ -169,18 +169,14 @@ namespace PlexRequests.UI.Modules
 
         private Response RequestMovieAndUpdateStatus(RequestedModel request)
         {
-            if (!Context.CurrentUser.IsAuthenticated())
-            {
-                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
-            }
-
             var cpSettings = CpService.GetSettings();
             var cp = new CouchPotatoApi();
-            Log.Info("Adding movie to CP : {0}", request.Title);
+            Log.Info("Adding movie to CouchPotato : {0}", request.Title);
             if (!cpSettings.Enabled)
             {
                 // Approve it
                 request.Approved = true;
+                Log.Warn("We approved movie: {0} but could not add it to CouchPotato because it has not been setup", request.Title);
 
                 // Update the record
                 var inserted = Service.UpdateRequest(request);
@@ -226,6 +222,11 @@ namespace PlexRequests.UI.Modules
         /// <returns></returns>
         private Response ApproveAll()
         {
+            if (!Context.CurrentUser.IsAuthenticated())
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "You are not an Admin, so you cannot approve any requests." });
+            }
+
             var requests = Service.GetAll().Where(x => x.Approved == false);
             var requestedModels = requests as RequestedModel[] ?? requests.ToArray();
             if (!requestedModels.Any())

PlexRequests.UI/Modules/LoginModule.cs

@@ -76,7 +76,8 @@ namespace PlexRequests.UI.Modules
                 return this.LoginAndRedirect(userId.Value, expiry);
             };
 
-            Get["/register"] = x => {
+            Get["/register"] = x =>
+            {
                 {
                     dynamic model = new ExpandoObject();
                     model.Errored = Request.Query.error.HasValue;
@@ -91,9 +92,9 @@ namespace PlexRequests.UI.Modules
                 var exists = UserMapper.DoUsersExist();
                 if (exists)
                 {
-                    return Context.GetRedirect("~/register?error=true&username=" + username);
+                    return Context.GetRedirect("~/register?error=true");
                 }
-                var userId = UserMapper.CreateUser(username, Request.Form.Password);
+                var userId = UserMapper.CreateUser(username, Request.Form.Password, new[] { "Admin" });
                 Session[SessionKeys.UsernameKey] = username;
                 return this.LoginAndRedirect((Guid)userId);
             };

PlexRequests.UI/NLog.config

@@ -13,7 +13,7 @@
     layout="${date} ${logger} ${level}: ${message}" />
 
 
-  <target name="Database" xsi:type="Database"
+  <!--<target name="Database" xsi:type="Database"
          dbProvider="Mono.Data.Sqlite.SqliteConnection, Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" keepConnection="false"
          connectionString="Data Source=PlexRequests.sqlite, version=3"
          commandText="INSERT into Logs(Date, Level, Logger, Callsite, Message, Exception) 
@@ -24,11 +24,11 @@
     <parameter name="@Callsite" layout="${callsite:filename=true}"/>
     <parameter name="@Message" layout="${message}"/>
     <parameter name="@Exception" layout="${exception:format=tostring}"/>
-  </target>
+  </target>-->
     
   </targets>
   <rules>
     <logger name="*" minlevel="Trace" writeTo="filelog" />
-    <logger name="*" minlevel="Trace" writeTo="Database" />
+    <!--<logger name="*" minlevel="Trace" writeTo="Database" />-->
   </rules>
 </nlog>

PlexRequests.UI/PlexRequests.UI.csproj

@@ -97,6 +97,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Assemblies\Mono.Data.Sqlite.dll</HintPath>
     </Reference>
+    <Reference Include="Mono.Posix, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Posix.4.0.0.0\lib\net40\Mono.Posix.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
       <Private>True</Private>
@@ -335,6 +339,9 @@
     <Content Include="Views\Login\ChangePassword.cshtml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Views\Admin\Logs.cshtml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <None Include="Web.Debug.config">
       <DependentUpon>web.config</DependentUpon>
     </None>

PlexRequests.UI/Program.cs

@@ -30,6 +30,8 @@ using System.Data;
 using Microsoft.Owin.Hosting;
 
 using Mono.Data.Sqlite;
+using Mono.Unix;
+using Mono.Unix.Native;
 
 using NLog;
 using NLog.Config;
@@ -55,7 +57,7 @@ namespace PlexRequests.UI
                 int portResult;
                 if (!int.TryParse(args[0], out portResult))
                 {
-                    Console.WriteLine("Incorrect Port format. Press Any Key to shut down.");
+                    Console.WriteLine("Incorrect Port format. Press any key.");
                     Console.ReadLine();
                     Environment.Exit(1);
                 }
@@ -65,7 +67,8 @@ namespace PlexRequests.UI
             WriteOutVersion();
 
             var s = new Setup();
-            s.SetupDb();
+            var cn = s.SetupDb();
+            ConfigureTargets(cn);
 
             if (port == -1)
                 port = GetStartupPort();
@@ -76,18 +79,29 @@ namespace PlexRequests.UI
             };
             try
             {
-
                 using (WebApp.Start<Startup>(options))
                 {
-                Console.WriteLine($"Request Plex is running on the following port: {port}");
+                    Console.WriteLine($"Request Plex is running on the following: http://+:{port}/");
+
+                    if (Type.GetType("Mono.Runtime") != null)
+                    {
+                        Log.Info("We are on Mono!");
+                        // on mono, processes will usually run as daemons - this allows you to listen
+                        // for termination signals (ctrl+c, shutdown, etc) and finalize correctly
+                        UnixSignal.WaitAny(
+                            new[] { new UnixSignal(Signum.SIGINT), new UnixSignal(Signum.SIGTERM), new UnixSignal(Signum.SIGQUIT), new UnixSignal(Signum.SIGHUP) });
+                    }
+                    else
+                    {
+                        Log.Info("This is not Mono");
                         Console.WriteLine("Press any key to exit");
                         Console.ReadLine();
                     }
-
+                }
             }
             catch (Exception e)
             {
-                var a = e.Message;
+                Log.Fatal(e);
                 throw;
             }
         }
@@ -116,59 +130,7 @@ namespace PlexRequests.UI
 
         private static void ConfigureTargets(string connectionString)
         {
-            LogManager.ThrowExceptions = true;
-            // Step 1. Create configuration object 
-            var config = new LoggingConfiguration();
-
-            // Step 2. Create targets and add them to the configuration 
-            var databaseTarget = new DatabaseTarget
-            {
-                CommandType = CommandType.Text,
-                ConnectionString = connectionString,
-                DBProvider = "Mono.Data.Sqlite.SqliteConnection, Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756",
-                Name = "database"
-            };
-
-
-            var messageParam = new DatabaseParameterInfo { Name = "@Message", Layout = "${message}" };
-            var callsiteParam = new DatabaseParameterInfo { Name = "@Callsite", Layout = "${callsite}" };
-            var levelParam = new DatabaseParameterInfo { Name = "@Level", Layout = "${level}" };
-            var usernameParam = new DatabaseParameterInfo { Name = "@Username", Layout = "${identity}" };
-            var dateParam = new DatabaseParameterInfo { Name = "@Date", Layout = "${date}" };
-            var loggerParam = new DatabaseParameterInfo { Name = "@Logger", Layout = "${logger}" };
-            var exceptionParam = new DatabaseParameterInfo { Name = "@Exception", Layout = "${exception:tostring}" };
-
-            databaseTarget.Parameters.Add(messageParam);
-            databaseTarget.Parameters.Add(callsiteParam);
-            databaseTarget.Parameters.Add(levelParam);
-            databaseTarget.Parameters.Add(usernameParam);
-            databaseTarget.Parameters.Add(dateParam);
-            databaseTarget.Parameters.Add(loggerParam);
-            databaseTarget.Parameters.Add(exceptionParam);
-
-            databaseTarget.CommandText = "INSERT INTO Log (Username,Date,Level,Logger, Message, Callsite, Exception) VALUES(@Username,@Date,@Level,@Logger, @Message, @Callsite, @Exception);";
-            config.AddTarget("database", databaseTarget);
-
-            // Step 4. Define rules
-            var rule1 = new LoggingRule("*", LogLevel.Error, databaseTarget);
-            config.LoggingRules.Add(rule1);
-
-            try
-            {
-
-                // Step 5. Activate the configuration
-                LogManager.Configuration = config;
-            }
-            catch (Exception)
-            {
-
-                throw;
-            }
-
-            // Example usage
-            Logger logger = LogManager.GetLogger("Example");
-
-            logger.Error("error log message");
+            LoggingHelper.ConfigureLogging(connectionString);
         }
     }
 }

PlexRequests.UI/Views/Admin/Logs.cshtml

@@ -0,0 +1,118 @@
+@Html.Partial("_Sidebar")
+
+<div class="col-sm-8 col-sm-push-1">
+    <fieldset>
+        <legend>Logs</legend>
+
+        <form method="post" id="mainForm" action="/admin/loglevel">
+            <div class="form-group">
+                <label for="logLevel" class="control-label">Log Level</label>
+                <div id="logLevel">
+                    <select class="form-control" id="selected">
+                        <option id="Trace" value="0">Trace</option>
+                        <option id="Debug" value="1">Debug</option>
+                        <option id="Info" value="2">Info</option>
+                        <option id="Warn" value="3">Warn</option>
+                        <option id="Error" value="4">Error</option>
+                        <option id="Fatal" value="5">Fatal</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <div>
+                    <button id="save" type="submit" class="btn btn-primary-outline ">Submit</button>
+                </div>
+            </div>
+        </form>
+
+        <table class="table table-striped table-hover table-responsive">
+            <tr>
+                <th>Message</th>
+                <th>Logger</th>
+                <th>Exception</th>
+                <th>Callsite</th>
+                <th>Log Level</th>
+                <th>Date</th>
+            </tr>
+            @foreach (var m in Model)
+            {
+                <tr>
+                    <td>
+                        @m.Message
+                    </td>
+                    <td>
+                        @m.Logger
+                    </td>
+                    <td>
+                        @m.Exception
+                    </td>
+                    <td>
+                        @m.Callsite
+                    </td>
+                    <td>
+                        @m.Level
+                    </td>
+                    <td>
+                        @m.Date
+                    </td>
+                </tr>
+            }
+        </table>
+
+
+    </fieldset>
+</div>
+
+
+
+<script>
+    $(function () {
+
+
+        $.ajax({
+            type: "get",
+            url: "/admin/loglevel",
+            dataType: "json",
+            success: function (response) {
+                $("#select > option").each(function (level) {
+                    if (response[0] == level.value) {
+                        $('#' + level.target.id).prop("selected", "selected");
+                    }
+                });
+            },
+            error: function (e) {
+                console.log(e);
+                generateNotify("Something went wrong!", "danger");
+            }
+        });
+
+        $('#save').click(function (e) {
+            e.preventDefault();
+           
+            var logLevel = $("#logLevel option:selected").val();
+
+            var $form = $("#mainForm");
+            var data = "level=" + logLevel;
+
+            $.ajax({
+                type: $form.prop("method"),
+                data: data,
+                url: $form.prop("action"),
+                dataType: "json",
+                success: function (response) {
+                    if (response.result === true) {
+                        generateNotify(response.message, "success");
+                    } else {
+                        generateNotify(response.message, "warning");
+                    }
+                },
+                error: function (e) {
+                    console.log(e);
+                    generateNotify("Something went wrong!", "danger");
+                }
+            });
+        });
+
+
+    });
+</script>

PlexRequests.UI/Views/Admin/_Sidebar.cshtml

@@ -70,7 +70,14 @@
         {
             <a class="list-group-item" href="/admin/pushbulletnotification">Pushbullet Notifications</a>
         }
-
+        @if (Context.Request.Path == "/admin/logs")
+        {
+            <a class="list-group-item active" href="/admin/logs">Logs</a>
+        }
+        else
+        {
+            <a class="list-group-item" href="/admin/logs">Logs</a>
+        }
         @if (Context.Request.Path == "/admin/status")
         {
             <a class="list-group-item active" href="/admin/status">Status</a>

PlexRequests.UI/Views/Shared/_Layout.cshtml

@@ -57,26 +57,26 @@
                     {
                         <li><a href="/requests">Requests</a></li>
                     }
-                    @if (Context.CurrentUser.IsAuthenticated())
-                    {
-                        if (Context.Request.Path == "/admin")
-                        {
-                            <li class="active"><a href="/admin">Admin</a></li>
-                        }
-                        else
-                        {
-                            <li><a href="/admin">Admin</a></li>
-                        }
-                    }
                 </ul>
                 <ul class="nav navbar-nav navbar-right">
+
+
+
                     @if (!Context.CurrentUser.IsAuthenticated())
                     {
                         <li><a href="/login">Admin</a></li>
                     }
                     else
                     {
-                        <li><a href="/logout">Admin Logout</a></li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Admin <span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a href="/admin">Settings</a></li>
+                                <li><a href="#">User Management</a></li>
+                                <li class="divider"></li>
+                                <li><a href="#">Logout</a></li>
+                            </ul>
+                        </li>
                     }
                     @if (Context.Request.Session[SessionKeys.UsernameKey] != null)
                     {

PlexRequests.UI/compilerconfig.json

@@ -6,5 +6,9 @@
   {
     "outputFile": "Content/pace.css",
     "inputFile": "Content/pace.scss"
+  },
+  {
+    "outputFile": "Content/requests.es5.js",
+    "inputFile": "Content/requests.js"
   }
 ]

PlexRequests.UI/packages.config

@@ -10,6 +10,7 @@
   <package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net452" />
+  <package id="Mono.Posix" version="4.0.0.0" targetFramework="net46" />
   <package id="Nancy" version="1.4.3" targetFramework="net452" />
   <package id="Nancy.Authentication.Basic" version="1.4.1" targetFramework="net452" />
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />