Merge pull request #14 from tidusjar/dev

Update to 1.2.1

PlexRequests.UI/Bootstrapper.cs

@@ -85,8 +85,6 @@ namespace PlexRequests.UI
             //container.Register<ISonarrApi, MockSonarrApi>();
 
 
-
-
             container.Register<IPlexApi, PlexApi>();
             base.ConfigureRequestContainer(container, context);
         }
@@ -100,6 +98,7 @@ namespace PlexRequests.UI
             
             StaticConfiguration.DisableErrorTraces = false;
 
+
             base.ApplicationStartup(container, pipelines);
 
             // Enable forms auth

PlexRequests.UI/Helpers/ValidationHelper.cs

@@ -0,0 +1,59 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: ValidationHelper.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.Linq;
+
+using Nancy.Validation;
+
+
+using PlexRequests.UI.Models;
+
+namespace PlexRequests.UI.Helpers
+{
+    public static class ValidationHelper
+    {
+
+        /// <summary>
+        /// This will send the first error as a JsonResponseModel
+        /// </summary>
+        /// <param name="result">The result.</param>
+        /// <returns></returns>
+        public static JsonResponseModel SendJsonError(this ModelValidationResult result)
+        {
+            var errors = result.Errors;
+            return errors
+                .Select(e => e.Value.FirstOrDefault())
+                .Where(modelValidationError => modelValidationError != null)
+                .Select(modelValidationError =>
+                new JsonResponseModel
+                {
+                    Result = false,
+                    Message = modelValidationError.ErrorMessage
+                })
+                .FirstOrDefault();
+        }
+    }
+}

PlexRequests.UI/Modules/AdminModule.cs

@@ -32,6 +32,7 @@ using Nancy.Extensions;
 using Nancy.ModelBinding;
 using Nancy.Responses.Negotiation;
 using Nancy.Security;
+using Nancy.Validation;
 
 using NLog;
 
@@ -39,6 +40,7 @@ using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
+using PlexRequests.UI.Helpers;
 using PlexRequests.UI.Models;
 
 namespace PlexRequests.UI.Modules
@@ -214,9 +216,16 @@ namespace PlexRequests.UI.Modules
         private Response SaveCouchPotato()
         {
             var couchPotatoSettings = this.Bind<CouchPotatoSettings>();
-            CpService.SaveSettings(couchPotatoSettings);
+            var valid = this.Validate(couchPotatoSettings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
 
-            return Context.GetRedirect("~/admin/couchpotato");
+            var result = CpService.SaveSettings(couchPotatoSettings);
+            return Response.AsJson(result 
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for CouchPotato!" } 
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
         private Negotiator Plex()
@@ -229,9 +238,18 @@ namespace PlexRequests.UI.Modules
         private Response SavePlex()
         {
             var plexSettings = this.Bind<PlexSettings>();
-            PlexService.SaveSettings(plexSettings);
+            var valid = this.Validate(plexSettings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+
 
-            return Context.GetRedirect("~/admin/plex");
+            var result = PlexService.SaveSettings(plexSettings);
+
+            return Response.AsJson(result
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Plex!" }
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
         private Negotiator Sonarr()
@@ -243,10 +261,19 @@ namespace PlexRequests.UI.Modules
 
         private Response SaveSonarr()
         {
-            var plexSettings = this.Bind<SonarrSettings>();
-            SonarrService.SaveSettings(plexSettings);
+            var sonarrSettings = this.Bind<SonarrSettings>();
+
+            var valid = this.Validate(sonarrSettings);
+            if (!valid.IsValid)
+            {
+                return Response.AsJson(valid.SendJsonError());
+            }
+
+            var result = SonarrService.SaveSettings(sonarrSettings);
 
-            return Response.AsJson(new JsonResponseModel { Result = true });
+            return Response.AsJson(result
+                ? new JsonResponseModel { Result = true, Message = "Successfully Updated the Settings for Sonarr!" }
+                : new JsonResponseModel { Result = false, Message = "Could not update the settings, take a look at the logs." });
         }
 
         private Response GetSonarrQualityProfiles()

PlexRequests.UI/PlexRequests.UI.csproj

@@ -65,6 +65,10 @@
       <HintPath>..\packages\FluentScheduler.3.1.46\lib\net40\FluentScheduler.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="FluentValidation, Version=6.2.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentValidation.6.2.1.0\lib\Net45\FluentValidation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Humanizer, Version=2.0.1.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\packages\Humanizer.Core.2.0.1\lib\dotnet\Humanizer.dll</HintPath>
       <Private>True</Private>
@@ -109,6 +113,10 @@
       <HintPath>..\packages\Nancy.Owin.1.4.1\lib\net40\Nancy.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Nancy.Validation.FluentValidation, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Validation.FluentValidation.1.4.1\lib\net40\Nancy.Validation.FluentValidation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Nancy.ViewEngines.Razor, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Nancy.Viewengines.Razor.1.4.1\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
       <Private>True</Private>
@@ -152,6 +160,10 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Helpers\ValidationHelper.cs" />
+    <Compile Include="Validators\CouchPotatoValidator.cs" />
+    <Compile Include="Validators\PlexValidator.cs" />
+    <Compile Include="Validators\SonarrValidator.cs" />
     <Content Include="Content\bootstrap-notify.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -373,11 +385,16 @@
     <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.99.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.99.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.99.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.99.0\build\net46\System.Data.SQLite.Core.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <Target Name="RemoveSatelliteAssemblies" AfterTargets="ResolveAssemblyReferences">
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Remove="@(ReferenceSatellitePaths)" />
+    </ItemGroup>
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

PlexRequests.UI/Program.cs

@@ -59,24 +59,39 @@ namespace PlexRequests.UI
                     Console.ReadLine();
                     Environment.Exit(1);
                 }
-                uri = $"http://localhost:{portResult}";
+                uri = $"http://*:{portResult}";
             }
 
             Log.Trace("Getting product version");
             WriteOutVersion();
-            
+
             var s = new Setup();
             s.SetupDb();
-            
-            if(string.IsNullOrEmpty(uri))
+
+            if (string.IsNullOrEmpty(uri))
                 uri = GetStartupUri();
 
-            using (WebApp.Start<Startup>(uri))
+;
+            var options = new StartOptions(uri)
+            {
+                ServerFactory = "Microsoft.Owin.Host.HttpListener"
+            };
+            try
+            {
+
+            using (WebApp.Start<Startup>(options))
             {
                 Console.WriteLine($"Request Plex is running on {uri}");
                 Console.WriteLine("Press any key to exit");
                 Console.ReadLine();
             }
+
+            }
+            catch (Exception e)
+            {
+                var a = e.Message;
+                throw;
+            }
         }
 
         private static void WriteOutVersion()
@@ -89,13 +104,13 @@ namespace PlexRequests.UI
         private static string GetStartupUri()
         {
             Log.Trace("Getting startup URI");
-            var uri = "http://localhost:3579/";
+            var uri = "http://*:3579/";
             var service = new SettingsServiceV2<PlexRequestSettings>(new JsonRepository(new DbConfiguration(new SqliteFactory()), new MemoryCacheProvider()));
             var settings = service.GetSettings();
             Log.Trace("Port: {0}", settings.Port);
             if (settings.Port != 0)
             {
-                uri = $"http://localhost:{settings.Port}";
+                uri = $"http://*:{settings.Port}";
             }
 
             return uri;
@@ -146,7 +161,7 @@ namespace PlexRequests.UI
                 // Step 5. Activate the configuration
                 LogManager.Configuration = config;
             }
-            catch (Exception )
+            catch (Exception)
             {
 
                 throw;

PlexRequests.UI/Validators/CouchPotatoValidator.cs

@@ -0,0 +1,42 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.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 FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class CouchPotatoValidator : AbstractValidator<CouchPotatoSettings>
+    {
+        public CouchPotatoValidator()
+        {
+            RuleFor(request => request.Ip).NotEmpty().WithMessage("You must specify a IP/Host name.");
+            RuleFor(request => request.Port).NotEmpty().WithMessage("You must specify a Port.");
+            RuleFor(request => request.ApiKey).NotEmpty().WithMessage("You must specify a Api Key.");
+        }
+    }
+}

PlexRequests.UI/Validators/PlexValidator.cs

@@ -0,0 +1,41 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.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 FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class PlexValidator : AbstractValidator<PlexSettings>
+    {
+        public PlexValidator()
+        {
+            RuleFor(request => request.Ip).NotEmpty().WithMessage("You must specify a IP/Host name.");
+            RuleFor(request => request.Port).NotEmpty().WithMessage("You must specify a Port.");
+        }
+    }
+}

PlexRequests.UI/Validators/SonarrValidator.cs

@@ -0,0 +1,44 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: SonarrValidator.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 FluentValidation;
+
+using PlexRequests.Core.SettingModels;
+
+namespace PlexRequests.UI.Validators
+{
+    public class SonarrValidator : AbstractValidator<SonarrSettings>
+    {
+        public SonarrValidator()
+        {
+            RuleFor(request => request.ApiKey).NotEmpty().WithMessage("You must specify a Api Key.");
+            RuleFor(request => request.Ip).NotEmpty().WithMessage("You must specify a IP/Host name.");
+            RuleFor(request => request.Port).NotEmpty().WithMessage("You must specify a Port.");
+            RuleFor(request => request.QualityProfile).NotEmpty().WithMessage("You must specify a Quality Profile.");
+            RuleFor(request => request.RootPath).NotEmpty().WithMessage("You must specify a Root Path.");
+        }
+    }
+}

PlexRequests.UI/Views/Admin/CouchPotato.cshtml

@@ -50,7 +50,7 @@
 
             <div class="form-group">
                 <div>
-                    <button type="submit" class="btn btn-primary-outline">Submit</button>
+                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
                 </div>
             </div>
         </fieldset>
@@ -85,6 +85,33 @@
                 }
             });
         });
+
+        $('#save').click(function (e) {
+            e.preventDefault();
+            var port = $('#portNumber').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a Port.", "warning");
+                return;
+            }
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                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/Plex.cshtml

@@ -37,7 +37,7 @@
 
             <div class="form-group">
                 <div>
-                    <button type="submit" class="btn btn-primary-outline">Submit</button>
+                    <button id="save" type="submit" class="btn btn-primary-outline">Submit</button>
                 </div>
             </div>
         </fieldset>
@@ -72,5 +72,33 @@
             });
         });
 
+        $('#save').click(function (e) {
+            e.preventDefault();
+            var port = $('#portNumber').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a Port.", "warning");
+                return;
+            }
+
+            var $form = $("#mainForm");
+            $.ajax({
+                type: $form.prop("method"),
+                data: $form.serialize(),
+                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/Settings.cshtml

@@ -75,7 +75,7 @@
                         <input type="number" id="WeeklyRequestLimit" name="WeeklyRequestLimit" class="form-control form-control-custom " value="@Model.WeeklyRequestLimit">
                     </label>
                 </div>
-            </div> //TODO: Need to implement this*@ 
+            </div> //TODO: Need to implement this*@
 
             <div>
             </div>
@@ -86,4 +86,5 @@
             </div>
         </fieldset>
     </form>
-</div>
+</div>
+

PlexRequests.UI/Views/Admin/Sonarr.cshtml

@@ -131,6 +131,11 @@
 
         $('#save').click(function(e) {
             e.preventDefault();
+            var port = $('#portNumber').val();
+            if (isNaN(port)) {
+                generateNotify("You must specify a Port.", "warning");
+                return;
+            }
             var qualityProfile = $("#profiles option:selected").val();
 
             var $form = $("#mainForm");

PlexRequests.UI/packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="Dapper" version="1.42" targetFramework="net46" />
   <package id="FluentScheduler" version="3.1.46" targetFramework="net46" />
+  <package id="FluentValidation" version="6.2.1.0" targetFramework="net46" />
   <package id="Humanizer.Core" version="2.0.1" targetFramework="net452" />
   <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net452" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net452" />
@@ -13,6 +14,7 @@
   <package id="Nancy.Authentication.Forms" version="1.4.1" targetFramework="net452" />
   <package id="Nancy.Hosting.Self" version="1.4.1" targetFramework="net452" />
   <package id="Nancy.Owin" version="1.4.1" targetFramework="net452" />
+  <package id="Nancy.Validation.FluentValidation" version="1.4.1" targetFramework="net46" />
   <package id="Nancy.Viewengines.Razor" version="1.4.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net46" />
   <package id="NLog" version="4.2.3" targetFramework="net452" />

README.md

@@ -35,6 +35,9 @@ We are looking for any contributions to the project! Just pick up a task, if you
 
 Please feed free to submit a pull request!
 
+# Donation
+If you feel like donating you can [here!](paypal.me/PlexRequestsNet)
+
 
 # Sponsors
 - [JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools!!!

appveyor.yml

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