From a1ec30c641b5d61214491f6d3dc45444eea0ce48 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 19 Dec 2016 19:24:54 +0000 Subject: [PATCH 01/46] Product name change --- PlexRequests.sln => Ombi.sln | 30 +++++++------- Ombi.sln.DotSettings | 27 +++++++++++++ ...aces.csproj => Ombi.Api.Interfaces.csproj} | 8 ++-- .../Properties/AssemblyInfo.cs | 4 +- ...i.Models.csproj => Ombi.Api.Models.csproj} | 8 ++-- .../Properties/AssemblyInfo.cs | 4 +- ...lexRequests.Api.csproj => Ombi.Api.csproj} | 16 ++++---- PlexRequests.Api/PlexApi.cs | 4 +- PlexRequests.Api/Properties/AssemblyInfo.cs | 4 +- .../MigrationRunner.cs | 1 + .../Migrations/BaseMigration.cs | 1 + .../Migrations/Version1100.cs | 1 + ...tion.csproj => Ombi.Core.Migration.csproj} | 24 +++++------ .../Properties/AssemblyInfo.cs | 4 +- ...re.Tests.csproj => Ombi.Core.Tests.csproj} | 12 +++--- .../Properties/AssemblyInfo.cs | 4 +- ...xRequests.Core.csproj => Ombi.Core.csproj} | 24 +++++------ PlexRequests.Core/Properties/AssemblyInfo.cs | 4 +- PlexRequests.Core/Setup.cs | 1 + .../StatusChecker/StatusChecker.cs | 4 +- ...Tests.csproj => Ombi.Helpers.Tests.csproj} | 16 ++++---- .../Properties/AssemblyInfo.cs | 4 +- ...sts.Helpers.csproj => Ombi.Helpers.csproj} | 4 +- .../Properties/AssemblyInfo.cs | 4 +- ...ests.csproj => Ombi.Services.Tests.csproj} | 28 ++++++------- .../Properties/AssemblyInfo.cs | 4 +- .../Jobs/Templates/RecentlyAddedTemplate.html | 2 +- ...s.Services.csproj => Ombi.Services.csproj} | 28 ++++++------- .../Properties/AssemblyInfo.cs | 4 +- ...equests.Store.csproj => Ombi.Store.csproj} | 8 ++-- PlexRequests.Store/Properties/AssemblyInfo.cs | 4 +- PlexRequests.Store/Sql.Designer.cs | 25 ++++++------ PlexRequests.Store/TableCreation.cs | 2 +- ...s.UI.Tests.csproj => Ombi.UI.Tests.csproj} | 32 +++++++-------- .../Properties/AssemblyInfo.cs | 4 +- PlexRequests.UI.Tests/UserLoginModuleTests.cs | 2 +- PlexRequests.UI/Modules/SearchModule.cs | 39 ++++++++---------- PlexRequests.UI/Modules/UserLoginModule.cs | 5 +-- ...{PlexRequests.UI.csproj => Ombi.UI.csproj} | 40 +++++++++---------- PlexRequests.UI/Properties/AssemblyInfo.cs | 4 +- PlexRequests.UI/Resources/UI1.Designer.cs | 4 +- ...sts.Updater.csproj => Ombi.Updater.csproj} | 12 +++--- .../Properties/AssemblyInfo.cs | 4 +- README.md | 22 +++++----- appveyor.yml | 4 +- 45 files changed, 256 insertions(+), 234 deletions(-) rename PlexRequests.sln => Ombi.sln (68%) create mode 100644 Ombi.sln.DotSettings rename PlexRequests.Api.Interfaces/{PlexRequests.Api.Interfaces.csproj => Ombi.Api.Interfaces.csproj} (92%) rename PlexRequests.Api.Models/{PlexRequests.Api.Models.csproj => Ombi.Api.Models.csproj} (95%) rename PlexRequests.Api/{PlexRequests.Api.csproj => Ombi.Api.csproj} (90%) rename PlexRequests.Core.Migration/{PlexRequests.Core.Migration.csproj => Ombi.Core.Migration.csproj} (85%) rename PlexRequests.Core.Tests/{PlexRequests.Core.Tests.csproj => Ombi.Core.Tests.csproj} (93%) rename PlexRequests.Core/{PlexRequests.Core.csproj => Ombi.Core.csproj} (92%) rename PlexRequests.Helpers.Tests/{PlexRequests.Helpers.Tests.csproj => Ombi.Helpers.Tests.csproj} (92%) rename PlexRequests.Helpers/{PlexRequests.Helpers.csproj => Ombi.Helpers.csproj} (97%) rename PlexRequests.Services.Tests/{PlexRequests.Services.Tests.csproj => Ombi.Services.Tests.csproj} (88%) rename PlexRequests.Services/{PlexRequests.Services.csproj => Ombi.Services.csproj} (90%) rename PlexRequests.Store/{PlexRequests.Store.csproj => Ombi.Store.csproj} (96%) rename PlexRequests.UI.Tests/{PlexRequests.UI.Tests.csproj => Ombi.UI.Tests.csproj} (90%) rename PlexRequests.UI/{PlexRequests.UI.csproj => Ombi.UI.csproj} (97%) rename PlexRequests.Updater/{PlexRequests.Updater.csproj => Ombi.Updater.csproj} (86%) diff --git a/PlexRequests.sln b/Ombi.sln similarity index 68% rename from PlexRequests.sln rename to Ombi.sln index 6aedc31cd..6eb562fc5 100644 --- a/PlexRequests.sln +++ b/Ombi.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.UI", "PlexRequests.UI\PlexRequests.UI.csproj", "{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.UI", "PlexRequests.UI\Ombi.UI.csproj", "{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api", "PlexRequests.Api\PlexRequests.Api.csproj", "{8CB8D235-2674-442D-9C6A-35FCAEEB160D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Api", "PlexRequests.Api\Ombi.Api.csproj", "{8CB8D235-2674-442D-9C6A-35FCAEEB160D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api.Interfaces", "PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj", "{95834072-A675-415D-AA8F-877C91623810}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Api.Interfaces", "PlexRequests.Api.Interfaces\Ombi.Api.Interfaces.csproj", "{95834072-A675-415D-AA8F-877C91623810}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Core", "PlexRequests.Core\PlexRequests.Core.csproj", "{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Core", "PlexRequests.Core\Ombi.Core.csproj", "{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Store", "PlexRequests.Store\PlexRequests.Store.csproj", "{92433867-2B7B-477B-A566-96C382427525}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Store", "PlexRequests.Store\Ombi.Store.csproj", "{92433867-2B7B-477B-A566-96C382427525}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F4BC839C-B8FF-48BE-B22E-536A0A0A81A5}" ProjectSection(SolutionItems) = preProject @@ -21,23 +21,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Helpers", "PlexRequests.Helpers\PlexRequests.Helpers.csproj", "{1252336D-42A3-482A-804C-836E60173DFA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Helpers", "PlexRequests.Helpers\Ombi.Helpers.csproj", "{1252336D-42A3-482A-804C-836E60173DFA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.UI.Tests", "PlexRequests.UI.Tests\PlexRequests.UI.Tests.csproj", "{A930E2CF-79E2-45F9-B06A-9A719A254CE4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.UI.Tests", "PlexRequests.UI.Tests\Ombi.UI.Tests.csproj", "{A930E2CF-79E2-45F9-B06A-9A719A254CE4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Core.Tests", "PlexRequests.Core.Tests\PlexRequests.Core.Tests.csproj", "{FCFECD5D-47F6-454D-8692-E27A921BE655}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Core.Tests", "PlexRequests.Core.Tests\Ombi.Core.Tests.csproj", "{FCFECD5D-47F6-454D-8692-E27A921BE655}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Services", "PlexRequests.Services\PlexRequests.Services.csproj", "{566EFA49-68F8-4716-9693-A6B3F2624DEA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Services", "PlexRequests.Services\Ombi.Services.csproj", "{566EFA49-68F8-4716-9693-A6B3F2624DEA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api.Models", "PlexRequests.Api.Models\PlexRequests.Api.Models.csproj", "{CB37A5F8-6DFC-4554-99D3-A42B502E4591}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Api.Models", "PlexRequests.Api.Models\Ombi.Api.Models.csproj", "{CB37A5F8-6DFC-4554-99D3-A42B502E4591}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Services.Tests", "PlexRequests.Services.Tests\PlexRequests.Services.Tests.csproj", "{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Services.Tests", "PlexRequests.Services.Tests\Ombi.Services.Tests.csproj", "{EAADB4AC-064F-4D3A-AFF9-64A33131A9A7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Updater", "PlexRequests.Updater\PlexRequests.Updater.csproj", "{EBE6FC1C-7B4B-47E9-AF54-0EE0604A2BE5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Updater", "PlexRequests.Updater\Ombi.Updater.csproj", "{EBE6FC1C-7B4B-47E9-AF54-0EE0604A2BE5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Helpers.Tests", "PlexRequests.Helpers.Tests\PlexRequests.Helpers.Tests.csproj", "{0E6395D3-B074-49E8-898D-0EB99E507E0E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Helpers.Tests", "PlexRequests.Helpers.Tests\Ombi.Helpers.Tests.csproj", "{0E6395D3-B074-49E8-898D-0EB99E507E0E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Core.Migration", "PlexRequests.Core.Migration\PlexRequests.Core.Migration.csproj", "{8406EE57-D533-47C0-9302-C6B5F8C31E55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ombi.Core.Migration", "PlexRequests.Core.Migration\Ombi.Core.Migration.csproj", "{8406EE57-D533-47C0-9302-C6B5F8C31E55}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Ombi.sln.DotSettings b/Ombi.sln.DotSettings new file mode 100644 index 000000000..6c902f71f --- /dev/null +++ b/Ombi.sln.DotSettings @@ -0,0 +1,27 @@ + + /************************************************************************ + Copyright (c) $CURRENT_YEAR$ Jamie Rees + File: $FILENAME$ + Created By: $USER_NAME$ + + 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. + ************************************************************************/ + + Copyright \ No newline at end of file diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/Ombi.Api.Interfaces.csproj similarity index 92% rename from PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj rename to PlexRequests.Api.Interfaces/Ombi.Api.Interfaces.csproj index 749739acc..c1f200351 100644 --- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj +++ b/PlexRequests.Api.Interfaces/Ombi.Api.Interfaces.csproj @@ -7,8 +7,8 @@ {95834072-A675-415D-AA8F-877C91623810} Library Properties - PlexRequests.Api.Interfaces - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces + Ombi.Api.Interfaces v4.5 512 @@ -58,9 +58,9 @@ - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models diff --git a/PlexRequests.Api.Interfaces/Properties/AssemblyInfo.cs b/PlexRequests.Api.Interfaces/Properties/AssemblyInfo.cs index 0ad652e33..99bc4fa78 100644 --- a/PlexRequests.Api.Interfaces/Properties/AssemblyInfo.cs +++ b/PlexRequests.Api.Interfaces/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Api.Interfaces")] +[assembly: AssemblyTitle("Ombi.Api.Interfaces")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Api.Interfaces")] +[assembly: AssemblyProduct("Ombi.Api.Interfaces")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/Ombi.Api.Models.csproj similarity index 95% rename from PlexRequests.Api.Models/PlexRequests.Api.Models.csproj rename to PlexRequests.Api.Models/Ombi.Api.Models.csproj index 1d29ec759..48f0578b3 100644 --- a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj +++ b/PlexRequests.Api.Models/Ombi.Api.Models.csproj @@ -7,8 +7,8 @@ {CB37A5F8-6DFC-4554-99D3-A42B502E4591} Library Properties - PlexRequests.Api.Models - PlexRequests.Api.Models + Ombi.Api.Models + Ombi.Api.Models v4.5 512 @@ -110,9 +110,9 @@ - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers diff --git a/PlexRequests.Api.Models/Properties/AssemblyInfo.cs b/PlexRequests.Api.Models/Properties/AssemblyInfo.cs index f226d6680..3481af11b 100644 --- a/PlexRequests.Api.Models/Properties/AssemblyInfo.cs +++ b/PlexRequests.Api.Models/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Api.Models")] +[assembly: AssemblyTitle("Ombi.Api.Models")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Api.Models")] +[assembly: AssemblyProduct("Ombi.Api.Models")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/Ombi.Api.csproj similarity index 90% rename from PlexRequests.Api/PlexRequests.Api.csproj rename to PlexRequests.Api/Ombi.Api.csproj index 3039d30c9..45eb2e40d 100644 --- a/PlexRequests.Api/PlexRequests.Api.csproj +++ b/PlexRequests.Api/Ombi.Api.csproj @@ -7,8 +7,8 @@ {8CB8D235-2674-442D-9C6A-35FCAEEB160D} Library Properties - PlexRequests.Api - PlexRequests.Api + Ombi.Api + Ombi.Api v4.5 512 @@ -92,17 +92,17 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs index b20971910..af2823d95 100644 --- a/PlexRequests.Api/PlexApi.cs +++ b/PlexRequests.Api/PlexApi.cs @@ -420,8 +420,8 @@ namespace PlexRequests.Api private void AddHeaders(ref RestRequest request, bool json) { - request.AddHeader("X-Plex-Client-Identifier", $"PlexRequests.Net{Version}"); - request.AddHeader("X-Plex-Product", "Plex Requests .Net"); + request.AddHeader("X-Plex-Client-Identifier", $"Ombi{Version}"); + request.AddHeader("X-Plex-Product", "Ombi"); request.AddHeader("X-Plex-Version", Version); request.AddHeader("Content-Type", json ? "application/json" : "application/xml"); request.AddHeader("Accept", json ? "application/json" : "application/xml"); diff --git a/PlexRequests.Api/Properties/AssemblyInfo.cs b/PlexRequests.Api/Properties/AssemblyInfo.cs index 9b93a138e..e3fb1bc28 100644 --- a/PlexRequests.Api/Properties/AssemblyInfo.cs +++ b/PlexRequests.Api/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Api")] +[assembly: AssemblyTitle("Ombi.Api")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Api")] +[assembly: AssemblyProduct("Ombi.Api")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Core.Migration/MigrationRunner.cs b/PlexRequests.Core.Migration/MigrationRunner.cs index 21d0a1863..5a2002400 100644 --- a/PlexRequests.Core.Migration/MigrationRunner.cs +++ b/PlexRequests.Core.Migration/MigrationRunner.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Reflection; using Ninject; using NLog; +using Ombi.Store; using PlexRequests.Store; namespace PlexRequests.Core.Migration diff --git a/PlexRequests.Core.Migration/Migrations/BaseMigration.cs b/PlexRequests.Core.Migration/Migrations/BaseMigration.cs index e6bcff34b..1c52e7368 100644 --- a/PlexRequests.Core.Migration/Migrations/BaseMigration.cs +++ b/PlexRequests.Core.Migration/Migrations/BaseMigration.cs @@ -28,6 +28,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; +using Ombi.Store; using PlexRequests.Store; namespace PlexRequests.Core.Migration.Migrations diff --git a/PlexRequests.Core.Migration/Migrations/Version1100.cs b/PlexRequests.Core.Migration/Migrations/Version1100.cs index aa776230b..f30d31b05 100644 --- a/PlexRequests.Core.Migration/Migrations/Version1100.cs +++ b/PlexRequests.Core.Migration/Migrations/Version1100.cs @@ -31,6 +31,7 @@ using System; using System.Data; using NLog; using System.Linq; +using Ombi.Store; using PlexRequests.Api.Interfaces; using PlexRequests.Core.SettingModels; using PlexRequests.Helpers; diff --git a/PlexRequests.Core.Migration/PlexRequests.Core.Migration.csproj b/PlexRequests.Core.Migration/Ombi.Core.Migration.csproj similarity index 85% rename from PlexRequests.Core.Migration/PlexRequests.Core.Migration.csproj rename to PlexRequests.Core.Migration/Ombi.Core.Migration.csproj index 0b582b68b..d15b88133 100644 --- a/PlexRequests.Core.Migration/PlexRequests.Core.Migration.csproj +++ b/PlexRequests.Core.Migration/Ombi.Core.Migration.csproj @@ -7,8 +7,8 @@ {8406EE57-D533-47C0-9302-C6B5F8C31E55} Library Properties - PlexRequests.Core.Migration - PlexRequests.Core.Migration + Ombi.Core.Migration + Ombi.Core.Migration v4.5 512 @@ -74,25 +74,25 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store diff --git a/PlexRequests.Core.Migration/Properties/AssemblyInfo.cs b/PlexRequests.Core.Migration/Properties/AssemblyInfo.cs index 6e44d89b7..944b1cde9 100644 --- a/PlexRequests.Core.Migration/Properties/AssemblyInfo.cs +++ b/PlexRequests.Core.Migration/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Core.Migration")] +[assembly: AssemblyTitle("Ombi.Core.Migration")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Core.Migration")] +[assembly: AssemblyProduct("Ombi.Core.Migration")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj b/PlexRequests.Core.Tests/Ombi.Core.Tests.csproj similarity index 93% rename from PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj rename to PlexRequests.Core.Tests/Ombi.Core.Tests.csproj index 5002e3c21..7f360305d 100644 --- a/PlexRequests.Core.Tests/PlexRequests.Core.Tests.csproj +++ b/PlexRequests.Core.Tests/Ombi.Core.Tests.csproj @@ -6,8 +6,8 @@ {FCFECD5D-47F6-454D-8692-E27A921BE655} Library Properties - PlexRequests.Core.Tests - PlexRequests.Core.Tests + Ombi.Core.Tests + Ombi.Core.Tests v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -68,13 +68,13 @@ - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers diff --git a/PlexRequests.Core.Tests/Properties/AssemblyInfo.cs b/PlexRequests.Core.Tests/Properties/AssemblyInfo.cs index ce0830f7e..6c0502c07 100644 --- a/PlexRequests.Core.Tests/Properties/AssemblyInfo.cs +++ b/PlexRequests.Core.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Core.Tests")] +[assembly: AssemblyTitle("Ombi.Core.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Core.Tests")] +[assembly: AssemblyProduct("Ombi.Core.Tests")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Core/PlexRequests.Core.csproj b/PlexRequests.Core/Ombi.Core.csproj similarity index 92% rename from PlexRequests.Core/PlexRequests.Core.csproj rename to PlexRequests.Core/Ombi.Core.csproj index 20e3e74fe..4bdfe692d 100644 --- a/PlexRequests.Core/PlexRequests.Core.csproj +++ b/PlexRequests.Core/Ombi.Core.csproj @@ -7,8 +7,8 @@ {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} Library Properties - PlexRequests.Core - PlexRequests.Core + Ombi.Core + Ombi.Core v4.5 512 @@ -166,25 +166,25 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {8CB8D235-2674-442D-9C6A-35FCAEEB160D} - PlexRequests.Api + Ombi.Api - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store diff --git a/PlexRequests.Core/Properties/AssemblyInfo.cs b/PlexRequests.Core/Properties/AssemblyInfo.cs index 987f775fe..33c0318b2 100644 --- a/PlexRequests.Core/Properties/AssemblyInfo.cs +++ b/PlexRequests.Core/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Core")] +[assembly: AssemblyTitle("Ombi.Core")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Core")] +[assembly: AssemblyProduct("Ombi.Core")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs index e43809a16..548ff5dab 100644 --- a/PlexRequests.Core/Setup.cs +++ b/PlexRequests.Core/Setup.cs @@ -37,6 +37,7 @@ using PlexRequests.Helpers; using PlexRequests.Store; using PlexRequests.Store.Repository; using System.Threading.Tasks; +using Ombi.Store; using Quartz; namespace PlexRequests.Core diff --git a/PlexRequests.Core/StatusChecker/StatusChecker.cs b/PlexRequests.Core/StatusChecker/StatusChecker.cs index 16e5aeee1..dc3be9a88 100644 --- a/PlexRequests.Core/StatusChecker/StatusChecker.cs +++ b/PlexRequests.Core/StatusChecker/StatusChecker.cs @@ -43,14 +43,14 @@ namespace PlexRequests.Core.StatusChecker public StatusChecker(ISettingsService ss) { SystemSettings = ss; - Git = new GitHubClient(new ProductHeaderValue("PlexRequests-StatusChecker")); + Git = new GitHubClient(new ProductHeaderValue("Ombi-StatusChecker")); } private ISettingsService SystemSettings { get; } private IGitHubClient Git { get; } private const string Owner = "tidusjar"; - private const string RepoName = "PlexRequests.Net"; + private const string RepoName = "Ombi"; private const string AppveyorApiUrl = "https://ci.appveyor.com/api"; private const string Api = diff --git a/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj b/PlexRequests.Helpers.Tests/Ombi.Helpers.Tests.csproj similarity index 92% rename from PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj rename to PlexRequests.Helpers.Tests/Ombi.Helpers.Tests.csproj index 4b4627c34..f7950f033 100644 --- a/PlexRequests.Helpers.Tests/PlexRequests.Helpers.Tests.csproj +++ b/PlexRequests.Helpers.Tests/Ombi.Helpers.Tests.csproj @@ -6,8 +6,8 @@ {0E6395D3-B074-49E8-898D-0EB99E507E0E} Library Properties - PlexRequests.Helpers.Tests - PlexRequests.Helpers.Tests + Ombi.Helpers.Tests + Ombi.Helpers.Tests v4.5 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -88,17 +88,17 @@ - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336d-42a3-482a-804c-836e60173dfa} - PlexRequests.Helpers + Ombi.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store diff --git a/PlexRequests.Helpers.Tests/Properties/AssemblyInfo.cs b/PlexRequests.Helpers.Tests/Properties/AssemblyInfo.cs index 3a3229bd4..8acad2fe6 100644 --- a/PlexRequests.Helpers.Tests/Properties/AssemblyInfo.cs +++ b/PlexRequests.Helpers.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Helpers.Tests")] +[assembly: AssemblyTitle("Ombi.Helpers.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Helpers.Tests")] +[assembly: AssemblyProduct("Ombi.Helpers.Tests")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Helpers/PlexRequests.Helpers.csproj b/PlexRequests.Helpers/Ombi.Helpers.csproj similarity index 97% rename from PlexRequests.Helpers/PlexRequests.Helpers.csproj rename to PlexRequests.Helpers/Ombi.Helpers.csproj index bdb65a017..889d6bed8 100644 --- a/PlexRequests.Helpers/PlexRequests.Helpers.csproj +++ b/PlexRequests.Helpers/Ombi.Helpers.csproj @@ -7,8 +7,8 @@ {1252336D-42A3-482A-804C-836E60173DFA} Library Properties - PlexRequests.Helpers - PlexRequests.Helpers + Ombi.Helpers + Ombi.Helpers v4.5 512 diff --git a/PlexRequests.Helpers/Properties/AssemblyInfo.cs b/PlexRequests.Helpers/Properties/AssemblyInfo.cs index 994814c88..44994e2ad 100644 --- a/PlexRequests.Helpers/Properties/AssemblyInfo.cs +++ b/PlexRequests.Helpers/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Helpers")] +[assembly: AssemblyTitle("Ombi.Helpers")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Helpers")] +[assembly: AssemblyProduct("Ombi.Helpers")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj b/PlexRequests.Services.Tests/Ombi.Services.Tests.csproj similarity index 88% rename from PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj rename to PlexRequests.Services.Tests/Ombi.Services.Tests.csproj index 40794ab7d..19fb2ec5c 100644 --- a/PlexRequests.Services.Tests/PlexRequests.Services.Tests.csproj +++ b/PlexRequests.Services.Tests/Ombi.Services.Tests.csproj @@ -6,8 +6,8 @@ {EAADB4AC-064F-4D3A-AFF9-64A33131A9A7} Library Properties - PlexRequests.Services.Tests - PlexRequests.Services.Tests + Ombi.Services.Tests + Ombi.Services.Tests v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -87,29 +87,29 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers - + {566EFA49-68F8-4716-9693-A6B3F2624DEA} - PlexRequests.Services + Ombi.Services - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store diff --git a/PlexRequests.Services.Tests/Properties/AssemblyInfo.cs b/PlexRequests.Services.Tests/Properties/AssemblyInfo.cs index acc2a63f4..5983aa5b4 100644 --- a/PlexRequests.Services.Tests/Properties/AssemblyInfo.cs +++ b/PlexRequests.Services.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Services.Tests")] +[assembly: AssemblyTitle("Ombi.Services.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Services.Tests")] +[assembly: AssemblyProduct("Ombi.Services.Tests")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.html b/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.html index 5a7258ea0..96e2664cd 100644 --- a/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.html +++ b/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.html @@ -170,7 +170,7 @@
- Powered by Plex Requests .Net + Powered by Ombi
diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/Ombi.Services.csproj similarity index 90% rename from PlexRequests.Services/PlexRequests.Services.csproj rename to PlexRequests.Services/Ombi.Services.csproj index 928f56627..57645ee1e 100644 --- a/PlexRequests.Services/PlexRequests.Services.csproj +++ b/PlexRequests.Services/Ombi.Services.csproj @@ -7,8 +7,8 @@ {566EFA49-68F8-4716-9693-A6B3F2624DEA} Library Properties - PlexRequests.Services - PlexRequests.Services + Ombi.Services + Ombi.Services v4.5 512 @@ -132,29 +132,29 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {8CB8D235-2674-442D-9C6A-35FCAEEB160D} - PlexRequests.Api + Ombi.Api - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store diff --git a/PlexRequests.Services/Properties/AssemblyInfo.cs b/PlexRequests.Services/Properties/AssemblyInfo.cs index 6341e31b2..6350a65b8 100644 --- a/PlexRequests.Services/Properties/AssemblyInfo.cs +++ b/PlexRequests.Services/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Services")] +[assembly: AssemblyTitle("Ombi.Services")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Services")] +[assembly: AssemblyProduct("Ombi.Services")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Store/PlexRequests.Store.csproj b/PlexRequests.Store/Ombi.Store.csproj similarity index 96% rename from PlexRequests.Store/PlexRequests.Store.csproj rename to PlexRequests.Store/Ombi.Store.csproj index ce6546de8..2528a3737 100644 --- a/PlexRequests.Store/PlexRequests.Store.csproj +++ b/PlexRequests.Store/Ombi.Store.csproj @@ -7,8 +7,8 @@ {92433867-2B7B-477B-A566-96C382427525} Library Properties - PlexRequests.Store - PlexRequests.Store + Ombi.Store + Ombi.Store v4.5 512 @@ -124,9 +124,9 @@ - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers diff --git a/PlexRequests.Store/Properties/AssemblyInfo.cs b/PlexRequests.Store/Properties/AssemblyInfo.cs index 96d3e6e03..2533e6cad 100644 --- a/PlexRequests.Store/Properties/AssemblyInfo.cs +++ b/PlexRequests.Store/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.Store")] +[assembly: AssemblyTitle("Ombi.Store")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.Store")] +[assembly: AssemblyProduct("Ombi.Store")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.Store/Sql.Designer.cs b/PlexRequests.Store/Sql.Designer.cs index 8cd4f8666..fae63e4e9 100644 --- a/PlexRequests.Store/Sql.Designer.cs +++ b/PlexRequests.Store/Sql.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PlexRequests.Store { +namespace Ombi.Store { using System; @@ -39,7 +39,7 @@ namespace PlexRequests.Store { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PlexRequests.Store.Sql", typeof(Sql).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ombi.Store.Sql", typeof(Sql).Assembly); resourceMan = temp; } return resourceMan; @@ -63,24 +63,23 @@ namespace PlexRequests.Store { /// /// Looks up a localized string similar to --Any DB changes need to be made in this file. /// - ///CREATE TABLE IF NOT EXISTS User + ///CREATE TABLE IF NOT EXISTS Users ///( /// Id INTEGER PRIMARY KEY AUTOINCREMENT, - /// User varchar(50) NOT NULL , + /// UserGuid varchar(50) NOT NULL , /// UserName varchar(50) NOT NULL, - /// Password varchar(100) NOT NULL + /// Salt BLOB NOT NULL, + /// Hash BLOB NOT NULL, + /// UserProperties BLOB, + /// Permissions INTEGER, + /// Features INTEGER, + /// Claims BLOB ///); /// - ///CREATE TABLE IF NOT EXISTS Settings + ///CREATE TABLE IF NOT EXISTS UserLogins ///( /// Id INTEGER PRIMARY KEY AUTOINCREMENT, - /// Port INTEGER NOT NULL, - /// UserAuthentication INTEGER NOT NULL, - /// PlexAuthToken varchar(50) - ///); - /// - ///CREATE TABLE IF NOT EXISTS Requested - ///( [rest of string was truncated]";. + /// UserId varchar(50 [rest of string was truncated]";. /// internal static string SqlTables { get { diff --git a/PlexRequests.Store/TableCreation.cs b/PlexRequests.Store/TableCreation.cs index 24ba97c94..e3fc2c3f8 100644 --- a/PlexRequests.Store/TableCreation.cs +++ b/PlexRequests.Store/TableCreation.cs @@ -31,7 +31,7 @@ using System.Linq; using Dapper; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store +namespace Ombi.Store { public static class TableCreation { diff --git a/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj b/PlexRequests.UI.Tests/Ombi.UI.Tests.csproj similarity index 90% rename from PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj rename to PlexRequests.UI.Tests/Ombi.UI.Tests.csproj index 20e939b34..b5db04d6e 100644 --- a/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj +++ b/PlexRequests.UI.Tests/Ombi.UI.Tests.csproj @@ -6,8 +6,8 @@ {A930E2CF-79E2-45F9-B06A-9A719A254CE4} Library Properties - PlexRequests.UI.Tests - PlexRequests.UI.Tests + Ombi.UI.Tests + Ombi.UI.Tests v4.6 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -118,33 +118,33 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336d-42a3-482a-804c-836e60173dfa} - PlexRequests.Helpers + Ombi.Helpers - + {566EFA49-68F8-4716-9693-A6B3F2624DEA} - PlexRequests.Services + Ombi.Services - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store - + {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6} - PlexRequests.UI + Ombi.UI diff --git a/PlexRequests.UI.Tests/Properties/AssemblyInfo.cs b/PlexRequests.UI.Tests/Properties/AssemblyInfo.cs index 054088d5a..40e553b33 100644 --- a/PlexRequests.UI.Tests/Properties/AssemblyInfo.cs +++ b/PlexRequests.UI.Tests/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.UI.Tests")] +[assembly: AssemblyTitle("Ombi.UI.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.UI.Tests")] +[assembly: AssemblyProduct("Ombi.UI.Tests")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.UI.Tests/UserLoginModuleTests.cs b/PlexRequests.UI.Tests/UserLoginModuleTests.cs index dfe72c9ab..703b96036 100644 --- a/PlexRequests.UI.Tests/UserLoginModuleTests.cs +++ b/PlexRequests.UI.Tests/UserLoginModuleTests.cs @@ -37,7 +37,7 @@ using Nancy.Testing; using Newtonsoft.Json; using NUnit.Framework; - +using Ombi.UI.Modules; using PlexRequests.Api.Interfaces; using PlexRequests.Api.Models.Plex; using PlexRequests.Core; diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 2ce0e9469..e5ee0e931 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -31,46 +31,39 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; - +using System.Threading.Tasks; using Nancy; +using Nancy.Extensions; using Nancy.Responses.Negotiation; - +using Newtonsoft.Json; using NLog; - using PlexRequests.Api; using PlexRequests.Api.Interfaces; using PlexRequests.Api.Models.Music; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using System.Threading.Tasks; - -using Nancy.Extensions; - -using Newtonsoft.Json; - using PlexRequests.Api.Models.Sonarr; using PlexRequests.Api.Models.Tv; +using PlexRequests.Core; using PlexRequests.Core.Models; using PlexRequests.Core.Queue; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; using PlexRequests.Helpers.Analytics; using PlexRequests.Helpers.Permissions; +using PlexRequests.Services.Interfaces; +using PlexRequests.Services.Notification; +using PlexRequests.Store; using PlexRequests.Store.Models; using PlexRequests.Store.Models.Plex; using PlexRequests.Store.Repository; - +using PlexRequests.UI.Helpers; +using PlexRequests.UI.Models; +using PlexRequests.UI.Modules; using TMDbLib.Objects.General; - using Action = PlexRequests.Helpers.Analytics.Action; using EpisodesModel = PlexRequests.Store.EpisodesModel; using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class SearchModule : BaseAuthModule { @@ -520,7 +513,7 @@ namespace PlexRequests.UI.Modules Result = true, Message = Security.HasPermissions(User, Permissions.UsersCanViewOnlyOwnRequests) - ? $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}" + ? $"{fullMovieName} {Ombi.UI.Resources.UI.Search_SuccessfullyAdded}" : $"{fullMovieName} {Resources.UI.Search_AlreadyRequested}" }); } @@ -722,7 +715,7 @@ namespace PlexRequests.UI.Modules case "episode": model.Episodes = new List(); - foreach (var ep in episodeModel?.Episodes ?? new Models.EpisodesModel[0]) + foreach (var ep in episodeModel?.Episodes ?? new PlexRequests.UI.Models.EpisodesModel[0]) { model.Episodes.Add(new EpisodesModel { @@ -1350,7 +1343,7 @@ namespace PlexRequests.UI.Modules return Response.AsJson(new JsonResponseModel { Result = true, Message = message }); } - private IEnumerable GetListDifferences(IEnumerable existing, IEnumerable request) + private IEnumerable GetListDifferences(IEnumerable existing, IEnumerable request) { var newRequest = request .Select(r => diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index 35db4c40a..a08dd270d 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -28,12 +28,10 @@ using System; using System.Linq; using System.Threading.Tasks; - using Nancy; using Nancy.Extensions; using Nancy.Linker; using NLog; - using PlexRequests.Api.Interfaces; using PlexRequests.Api.Models.Plex; using PlexRequests.Core; @@ -46,10 +44,11 @@ using PlexRequests.Store; using PlexRequests.Store.Models; using PlexRequests.Store.Repository; using PlexRequests.UI.Authentication; +using PlexRequests.UI.Modules; using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class UserLoginModule : BaseModule { diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/Ombi.UI.csproj similarity index 97% rename from PlexRequests.UI/PlexRequests.UI.csproj rename to PlexRequests.UI/Ombi.UI.csproj index 0a0cadbc7..bc2f0a29d 100644 --- a/PlexRequests.UI/PlexRequests.UI.csproj +++ b/PlexRequests.UI/Ombi.UI.csproj @@ -7,8 +7,8 @@ {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6} Exe Properties - PlexRequests.UI - PlexRequests + Ombi.UI + Ombi.UI v4.5 512 ..\..\ @@ -796,41 +796,41 @@ - + {95834072-A675-415D-AA8F-877C91623810} - PlexRequests.Api.Interfaces + Ombi.Api.Interfaces - + {CB37A5F8-6DFC-4554-99D3-A42B502E4591} - PlexRequests.Api.Models + Ombi.Api.Models - + {8CB8D235-2674-442D-9C6A-35FCAEEB160D} - PlexRequests.Api + Ombi.Api - + {8406EE57-D533-47C0-9302-C6B5F8C31E55} - PlexRequests.Core.Migration + Ombi.Core.Migration - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers - + {566EFA49-68F8-4716-9693-A6B3F2624DEA} - PlexRequests.Services + Ombi.Services - + {92433867-2B7B-477B-A566-96C382427525} - PlexRequests.Store + Ombi.Store - + {ebe6fc1c-7b4b-47e9-af54-0ee0604a2be5} - PlexRequests.Updater + Ombi.Updater diff --git a/PlexRequests.UI/Properties/AssemblyInfo.cs b/PlexRequests.UI/Properties/AssemblyInfo.cs index c5fe8e902..f92c8cfc9 100644 --- a/PlexRequests.UI/Properties/AssemblyInfo.cs +++ b/PlexRequests.UI/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PlexRequests.UI")] +[assembly: AssemblyTitle("Ombi.UI")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PlexRequests.UI")] +[assembly: AssemblyProduct("Ombi.UI")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/PlexRequests.UI/Resources/UI1.Designer.cs b/PlexRequests.UI/Resources/UI1.Designer.cs index fa19b86d6..2c11fca13 100644 --- a/PlexRequests.UI/Resources/UI1.Designer.cs +++ b/PlexRequests.UI/Resources/UI1.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace PlexRequests.UI.Resources { +namespace Ombi.UI.Resources { using System; @@ -39,7 +39,7 @@ namespace PlexRequests.UI.Resources { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PlexRequests.UI.Resources.UI", typeof(UI).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ombi.UI.Resources.UI", typeof(UI).Assembly); resourceMan = temp; } return resourceMan; diff --git a/PlexRequests.Updater/PlexRequests.Updater.csproj b/PlexRequests.Updater/Ombi.Updater.csproj similarity index 86% rename from PlexRequests.Updater/PlexRequests.Updater.csproj rename to PlexRequests.Updater/Ombi.Updater.csproj index 194cbd128..154f7fcec 100644 --- a/PlexRequests.Updater/PlexRequests.Updater.csproj +++ b/PlexRequests.Updater/Ombi.Updater.csproj @@ -5,8 +5,8 @@ AnyCPU {EBE6FC1C-7B4B-47E9-AF54-0EE0604A2BE5} Exe - PlexRequests.Updater - PlexRequests.Updater + Ombi.Updater + Ombi.Updater v4.5 @@ -44,13 +44,13 @@ - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - PlexRequests.Core + Ombi.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - PlexRequests.Helpers + Ombi.Helpers diff --git a/PlexRequests.Updater/Properties/AssemblyInfo.cs b/PlexRequests.Updater/Properties/AssemblyInfo.cs index c1c129870..ce88c0f50 100644 --- a/PlexRequests.Updater/Properties/AssemblyInfo.cs +++ b/PlexRequests.Updater/Properties/AssemblyInfo.cs @@ -4,11 +4,11 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("PlexRequests.Updater")] +[assembly: AssemblyTitle("Ombi.Updater")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] +[assembly: AssemblyProduct("Ombi.Updater")] [assembly: AssemblyCopyright ("TidusJar")] [assembly: AssemblyTrademark ("")] [assembly: AssemblyCulture ("")] diff --git a/README.md b/README.md index 51425bda6..e01b532e7 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ ![](http://i.imgur.com/s4nswSA.png?1) ____ -[![Gitter](https://badges.gitter.im/tidusjar/PlexRequest.NET.svg)](https://gitter.im/tidusjar/PlexRequests.Net?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/tidusjar/Ombi.svg)](https://gitter.im/tidusjar/Ombi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex) -[![Linux Status](https://travis-ci.org/tidusjar/PlexRequests.Net.svg)](https://travis-ci.org/tidusjar/PlexRequests.Net) -[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/tidusjar/plexrequests.net.svg)](http://isitmaintained.com/project/tidusjar/plexrequests.net "Average time to resolve an issue") -[![Percentage of issues still open](http://isitmaintained.com/badge/open/tidusjar/plexrequests.net.svg)](http://isitmaintained.com/project/tidusjar/plexrequests.net "Percentage of issues still open") -[![Github All Releases](https://img.shields.io/github/downloads/tidusjar/PlexRequests.net/total.svg)](https://github.com/tidusjar/PlexRequests.Net) -[![Stories in Progress](https://badge.waffle.io/tidusjar/PlexRequests.Net.svg?label=in progress&title=In Progress)](http://waffle.io/tidusjar/PlexRequests.Net) +[![Linux Status](https://travis-ci.org/tidusjar/Ombi.svg)](https://travis-ci.org/tidusjar/Ombi) +[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/tidusjar/Ombi.svg)](http://isitmaintained.com/project/tidusjar/Ombi "Average time to resolve an issue") +[![Percentage of issues still open](http://isitmaintained.com/badge/open/tidusjar/Ombi.svg)](http://isitmaintained.com/project/tidusjar/Ombi "Percentage of issues still open") +[![Github All Releases](https://img.shields.io/github/downloads/tidusjar/Ombi/total.svg)](https://github.com/tidusjar/Ombi) +[![Stories in Progress](https://badge.waffle.io/tidusjar/Ombi.svg?label=in progress&title=In Progress)](http://waffle.io/tidusjar/Ombi) # Features -Here some of the features Plex Requests.Net has: +Here some of the features Ombi has: * All your users to Request Movies, TV Shows (Whole series, whole seaons or even single episodes!) and Albums * Easily manage your requests * Allow your users to report issues and manage them seperatly @@ -50,7 +50,7 @@ Supported notifications: [Ubuntu Guide!](http://www.htpcguides.com/install-plex-requests-net-ubuntu-14-x/) # FAQ -Do you have an issue or a question? if so check out our [FAQ!](https://github.com/tidusjar/PlexRequests.Net/wiki/FAQ) +Do you have an issue or a question? if so check out our [FAQ!](https://github.com/tidusjar/Ombi/wiki/FAQ) # Docker @@ -67,9 +67,9 @@ If you feel like donating you can [here!](https://paypal.me/PlexRequestsNet) ### A massive thanks to everyone for all their help! -## [Feathub](http://feathub.com/tidusjar/PlexRequests.Net) -[![Feature Requests](http://feathub.com/tidusjar/PlexRequests.Net?format=svg)](http://feathub.com/tidusjar/PlexRequests.Net) +## [Feathub](http://feathub.com/tidusjar/Ombi) +[![Feature Requests](http://feathub.com/tidusjar/Ombi?format=svg)](http://feathub.com/tidusjar/Ombi) ## Stats -[![Throughput Graph](https://graphs.waffle.io/tidusjar/PlexRequests.Net/throughput.svg)](https://waffle.io/tidusjar/PlexRequests.Net/metrics/throughput) +[![Throughput Graph](https://graphs.waffle.io/tidusjar/Ombi/throughput.svg)](https://waffle.io/tidusjar/Ombi/metrics/throughput) diff --git a/appveyor.yml b/appveyor.yml index af8494fff..dc40d0bcb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,11 +14,11 @@ after_build: - cmd: >- 7z a PlexRequests.zip %APPVEYOR_BUILD_FOLDER%\PlexRequests.UI\bin\Release\ - appveyor PushArtifact PlexRequests.zip + appveyor PushArtifact Ombi.zip deploy: - provider: GitHub - release: PlexRequests v$(appveyor_build_version) + release: Ombi v$(appveyor_build_version) auth_token: secure: jDpp1/WUQl3uN41fNI3VeZoRZbDiDfs3GPQ1v+C5ZNE3cWdnUvuJfCCfUbYUV1Rp draft: true From b90fd59e5e111d04c57d6258d5e23098a8735bec Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 19 Dec 2016 19:59:33 +0000 Subject: [PATCH 02/46] Renamed zip --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index dc40d0bcb..61bf6c6cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ build: verbosity: minimal after_build: - cmd: >- - 7z a PlexRequests.zip %APPVEYOR_BUILD_FOLDER%\PlexRequests.UI\bin\Release\ + 7z a Ombi.zip %APPVEYOR_BUILD_FOLDER%\PlexRequests.UI\bin\Release\ appveyor PushArtifact Ombi.zip From 9c517aa2e028b3600ad11aa2f6e61daad9e92914 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Mon, 19 Dec 2016 20:05:04 +0000 Subject: [PATCH 03/46] moved namespaces --- PlexRequests.Api.Interfaces/IApiRequest.cs | 4 +- .../ICouchPotatoApi.cs | 5 +- PlexRequests.Api.Interfaces/IHeadphonesApi.cs | 6 +-- .../IMusicBrainzApi.cs | 5 +- PlexRequests.Api.Interfaces/IPlexApi.cs | 6 +-- PlexRequests.Api.Interfaces/IPushbulletApi.cs | 6 +-- PlexRequests.Api.Interfaces/IPushoverApi.cs | 6 +-- PlexRequests.Api.Interfaces/ISickRageApi.cs | 4 +- PlexRequests.Api.Interfaces/ISlackApi.cs | 6 +-- PlexRequests.Api.Interfaces/ISonarrApi.cs | 6 +-- .../Movie/CouchPotatoAdd.cs | 3 +- .../Movie/CouchPotatoApiKey.cs | 3 +- .../Movie/CouchPotatoMovies.cs | 2 +- .../Movie/CouchPotatoProfiles.cs | 4 +- .../Movie/CouchPotatoStatus.cs | 8 +-- .../Music/HeadphonesAlbumSearchResult.cs | 2 +- .../Music/HeadphonesArtistSearchResult.cs | 2 +- .../Music/HeadphonesGetIndex.cs | 2 +- .../Music/HeadphonesVersion.cs | 2 +- .../Music/MusicBrainzCoverArt.cs | 3 +- .../Music/MusicBrainzReleaseInfo.cs | 4 +- .../Music/MusicBrainzSearchResults.cs | 4 +- .../Notifications/PushbulletPush.cs | 3 +- .../Notifications/PushbulletResponse.cs | 2 +- .../Notifications/PushoverResponse.cs | 2 +- .../Notifications/SlackNotificationBody.cs | 3 +- PlexRequests.Api.Models/Plex/PlexAccount.cs | 2 +- .../Plex/PlexAuthentication.cs | 2 +- .../Plex/PlexEpisodeMetadata.cs | 9 ++-- PlexRequests.Api.Models/Plex/PlexError.cs | 2 +- PlexRequests.Api.Models/Plex/PlexFriends.cs | 2 +- PlexRequests.Api.Models/Plex/PlexLibraries.cs | 2 +- PlexRequests.Api.Models/Plex/PlexMediaType.cs | 2 +- PlexRequests.Api.Models/Plex/PlexMetadata.cs | 2 +- PlexRequests.Api.Models/Plex/PlexSearch.cs | 3 +- PlexRequests.Api.Models/Plex/PlexServer.cs | 3 +- PlexRequests.Api.Models/Plex/PlexStatus.cs | 8 +-- .../Plex/PlexUserRequest.cs | 2 +- .../Plex/RecentlyAddedModelOld.cs | 2 +- .../SickRage/SickRageBase.cs | 2 +- .../SickRage/SickRagePing.cs | 2 +- .../SickRage/SickRageSeasonList.cs | 4 +- .../SickRage/SickRageShowInformation.cs | 2 +- .../SickRage/SickRageStatus.cs | 2 +- .../SickRage/SickRageTvAdd.cs | 2 +- .../SickRage/SickrageShows.cs | 3 +- .../Sonarr/SonarrAddEpisodeBody.cs | 2 +- .../Sonarr/SonarrAddEpisodeResult.cs | 2 +- .../Sonarr/SonarrAddSeries.cs | 7 ++- .../Sonarr/SonarrAllSeries.cs | 2 +- .../Sonarr/SonarrEpisode.cs | 2 +- .../Sonarr/SonarrEpisodes.cs | 2 +- PlexRequests.Api.Models/Sonarr/SonarrError.cs | 5 +- .../Sonarr/SonarrProfile.cs | 2 +- .../Sonarr/SonarrSearchCommand.cs | 4 +- .../Sonarr/SonarrSeasonSearchResult.cs | 2 +- .../Sonarr/SonarrSeriesSearchResult.cs | 2 +- .../Sonarr/SystemStatus.cs | 2 +- PlexRequests.Api.Models/Tv/Authentication.cs | 2 +- PlexRequests.Api.Models/Tv/TVMazeShow.cs | 2 +- PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs | 2 +- PlexRequests.Api.Models/Tv/TvMazeSearch.cs | 3 +- PlexRequests.Api.Models/Tv/TvMazeSeasons.cs | 8 +-- PlexRequests.Api.Models/Tv/TvSearchResult.cs | 3 +- PlexRequests.Api.Models/Tv/TvShow.cs | 3 +- PlexRequests.Api.Models/Tv/TvShowImages.cs | 2 +- PlexRequests.Api/ApiRequest.cs | 11 ++-- PlexRequests.Api/CouchPotatoApi.cs | 13 ++--- PlexRequests.Api/HeadphonesApi.cs | 13 ++--- PlexRequests.Api/MovieBase.cs | 5 +- PlexRequests.Api/MusicBrainzApi.cs | 11 ++-- PlexRequests.Api/PlexApi.cs | 13 ++--- PlexRequests.Api/PushbulletApi.cs | 9 ++-- PlexRequests.Api/PushoverApi.cs | 9 ++-- PlexRequests.Api/RetryHandler.cs | 4 +- PlexRequests.Api/SickrageApi.cs | 15 +++--- PlexRequests.Api/SlackApi.cs | 9 ++-- PlexRequests.Api/SonarrApi.cs | 12 ++--- PlexRequests.Api/TheMovieDbApi.cs | 6 +-- PlexRequests.Api/TheTvDbApi.cs | 7 ++- PlexRequests.Api/TvBase.cs | 6 +-- PlexRequests.Api/TvMazeApi.cs | 7 ++- PlexRequests.Api/TvMazeBase.cs | 2 +- PlexRequests.Core.Migration/IMigration.cs | 2 +- .../IMigrationRunner.cs | 2 +- PlexRequests.Core.Migration/Migrate.cs | 2 +- .../MigrationAttribute.cs | 2 +- .../MigrationRunner.cs | 4 +- .../Migrations/BaseMigration.cs | 3 +- .../Migrations/Version1100.cs | 19 ++++--- .../Migrations/Version195.cs | 5 +- .../AuthenticationSettingsTests.cs | 6 +-- PlexRequests.Core/CacheKeys.cs | 2 +- PlexRequests.Core/HeadphonesSender.cs | 8 +-- PlexRequests.Core/IIssueService.cs | 6 +-- PlexRequests.Core/IPlexReadOnlyDatabase.cs | 4 +- PlexRequests.Core/IRequestService.cs | 5 +- PlexRequests.Core/ISecurityExtensions.cs | 4 +- PlexRequests.Core/ISettingsService.cs | 2 +- PlexRequests.Core/IStatusChecker.cs | 4 +- .../JsonIssuesModelRequestService.cs | 13 +++-- .../JsonRequestModelRequestService.cs | 13 +++-- PlexRequests.Core/Models/IssuesModel.cs | 6 +-- PlexRequests.Core/Models/NotificationType.cs | 2 +- PlexRequests.Core/Models/StatusModel.cs | 2 +- PlexRequests.Core/Models/UserProperties.cs | 2 +- .../Notification/NotificationMessage.cs | 5 +- .../NotificationMessageContent.cs | 2 +- .../Notification/NotificationMessageCurlys.cs | 3 +- .../NotificationMessageResolver.cs | 7 ++- .../Templates/EmailBasicTemplate.cs | 7 +-- .../Templates/IEmailBasicTemplate.cs | 4 +- .../Notification/TransportType.cs | 2 +- PlexRequests.Core/PlexReadOnlyDatabase.cs | 8 +-- .../Queue/ITransientFaultQueue.cs | 6 +-- .../Queue/TransientFaultQueue.cs | 10 ++-- PlexRequests.Core/SecurityExtensions.cs | 11 ++-- .../SettingModels/AuthenticationSettings.cs | 4 +- .../SettingModels/CouchPotatoSettings.cs | 2 +- .../SettingModels/CustomizationSettings.cs | 2 +- .../EmailNotificationSettings.cs | 2 +- .../SettingModels/ExternalSettings.cs | 7 ++- .../SettingModels/HeadphonesSettings.cs | 2 +- .../SettingModels/LandingPageSettings.cs | 4 +- .../SettingModels/LogSettings.cs | 2 +- .../SettingModels/NewsletterSettings.cs | 4 +- .../SettingModels/NotificationSettings.cs | 8 +-- .../SettingModels/NotificationSettingsV2.cs | 6 +-- .../SettingModels/PlexRequestSettings.cs | 5 +- .../SettingModels/PlexSettings.cs | 4 +- .../PushBulletNotificationSettings.cs | 2 +- .../PushoverNotificationSettings.cs | 2 +- .../SettingModels/RequestSettings.cs | 3 +- .../SettingModels/ScheduledJobsSettings.cs | 2 +- PlexRequests.Core/SettingModels/Settings.cs | 2 +- .../SettingModels/SickRageSettings.cs | 3 +- .../SlackNotificationSettings.cs | 3 +- .../SettingModels/SonarrSettings.cs | 2 +- .../SettingModels/SystemSettings.cs | 5 +- .../SettingModels/UserManagementSettings.cs | 2 +- PlexRequests.Core/SettingsServiceV2.cs | 11 ++-- PlexRequests.Core/Setup.cs | 16 +++--- .../StatusChecker/AppveyorArtifactResult.cs | 2 +- .../StatusChecker/AppveyorBranchResult.cs | 2 +- .../StatusChecker/StatusChecker.cs | 10 ++-- PlexRequests.Core/TvSender.cs | 12 ++--- PlexRequests.Core/TvSenderOld.cs | 12 ++--- PlexRequests.Core/UserIdentity.cs | 4 +- PlexRequests.Core/UserMapper.cs | 14 +++-- PlexRequests.Core/Users/IUserHelper.cs | 4 +- PlexRequests.Core/Users/UserHelper.cs | 10 ++-- PlexRequests.Core/Users/UserHelperModel.cs | 6 +-- .../Users/UserManagementHelper.cs | 6 +-- .../AssemblyHelperTests.cs | 3 +- .../CookieHelperTests.cs | 4 +- .../DateTimeHelperTests.cs | 4 +- .../HtmlRemoverTests.cs | 2 +- .../PasswordHasherTests.cs | 2 +- PlexRequests.Helpers.Tests/PlexHelperTests.cs | 4 +- .../StringHasherTests.cs | 5 +- .../StringHelperTests.cs | 7 ++- PlexRequests.Helpers.Tests/TypeHelperTests.cs | 6 +-- PlexRequests.Helpers.Tests/UriHelperTests.cs | 3 +- PlexRequests.Helpers/Analytics/Action.cs | 2 +- PlexRequests.Helpers/Analytics/Analytics.cs | 7 +-- PlexRequests.Helpers/Analytics/Category.cs | 2 +- PlexRequests.Helpers/Analytics/HitType.cs | 2 +- PlexRequests.Helpers/Analytics/IAnalytics.cs | 3 +- PlexRequests.Helpers/AssemblyHelper.cs | 3 +- PlexRequests.Helpers/ByteConverterHelper.cs | 4 +- PlexRequests.Helpers/CookieHelper.cs | 3 +- PlexRequests.Helpers/DateTimeHelper.cs | 2 +- PlexRequests.Helpers/EnumExtensions.cs | 2 +- PlexRequests.Helpers/EnumHelper.cs | 2 +- .../Exceptions/ApiRequestException.cs | 3 +- .../ApplicationSettingsException.cs | 3 +- PlexRequests.Helpers/HtmlRemover.cs | 2 +- PlexRequests.Helpers/ICacheProvider.cs | 3 +- PlexRequests.Helpers/JsonConvertHelper.cs | 2 +- PlexRequests.Helpers/LoggingHelper.cs | 5 +- PlexRequests.Helpers/MemoryCacheProvider.cs | 3 +- PlexRequests.Helpers/ObjectCopier.cs | 3 +- PlexRequests.Helpers/OperatingSystemHelper.cs | 2 +- PlexRequests.Helpers/PasswordHasher.cs | 4 +- PlexRequests.Helpers/Permissions/Features.cs | 2 +- .../Permissions/Permissions.cs | 2 +- PlexRequests.Helpers/PlexHelper.cs | 2 +- PlexRequests.Helpers/SerializerSettings.cs | 4 +- PlexRequests.Helpers/SessionKeys.cs | 2 +- PlexRequests.Helpers/StringCipher.cs | 3 +- PlexRequests.Helpers/StringHasher.cs | 3 +- PlexRequests.Helpers/StringHelper.cs | 2 +- PlexRequests.Helpers/TypeHelper.cs | 3 +- PlexRequests.Helpers/UriHelper.cs | 5 +- PlexRequests.Helpers/UserClaims.cs | 4 +- PlexRequests.Helpers/UserType.cs | 2 +- .../NotificationServiceTests.cs | 10 ++-- .../UserRequestLimitResetterTests.cs | 22 ++++---- .../Interfaces/IAvailabilityChecker.cs | 9 ++-- .../Interfaces/ICouchPotatoCacher.cs | 2 +- .../Interfaces/IIntervals.cs | 3 +- .../Interfaces/IJobRecord.cs | 6 +-- .../Interfaces/INotification.cs | 8 +-- .../Interfaces/INotificationEngine.cs | 6 +-- .../Interfaces/INotificationService.cs | 8 +-- .../Interfaces/ISickRageCacher.cs | 2 +- .../Interfaces/ISonarrCacher.cs | 4 +- .../Jobs/CouchPotatoCacher.cs | 17 +++---- .../Jobs/FaultQueueHandler.cs | 24 ++++----- .../Jobs/HtmlTemplateGenerator.cs | 4 +- .../Jobs/IPlexContentCacher.cs | 2 +- PlexRequests.Services/Jobs/IRecentlyAdded.cs | 2 +- PlexRequests.Services/Jobs/JobNames.cs | 2 +- PlexRequests.Services/Jobs/JobRecord.cs | 10 ++-- .../Jobs/PlexAvailabilityChecker.cs | 33 ++++++------ .../Jobs/PlexContentCacher.cs | 32 +++++------- .../Jobs/PlexEpisodeCacher.cs | 23 ++++----- PlexRequests.Services/Jobs/PlexUserChecker.cs | 16 +++--- PlexRequests.Services/Jobs/RecentlyAdded.cs | 24 ++++----- PlexRequests.Services/Jobs/SickRageCacher.cs | 18 +++---- PlexRequests.Services/Jobs/SonarrCacher.cs | 23 ++++----- PlexRequests.Services/Jobs/StoreBackup.cs | 11 ++-- PlexRequests.Services/Jobs/StoreCleanup.cs | 12 ++--- .../Jobs/Templates/RecentlyAddedTemplate.cs | 2 +- .../Jobs/UserRequestLimitResetter.cs | 18 +++---- PlexRequests.Services/Models/PlexAlbum.cs | 2 +- .../Models/PlexEpisodeModel.cs | 5 +- PlexRequests.Services/Models/PlexMovie.cs | 2 +- PlexRequests.Services/Models/PlexTvShow.cs | 2 +- .../Models/SonarrCachedResult.cs | 2 +- .../Notification/EmailMessageNotification.cs | 16 +++--- .../Notification/NotificationEngine.cs | 22 ++++---- .../Notification/NotificationModel.cs | 8 +-- .../Notification/NotificationService.cs | 9 ++-- .../Notification/PushbulletNotification.cs | 17 +++---- .../Notification/PushoverNotification.cs | 17 +++---- .../Notification/SlackNotification.cs | 19 ++++--- PlexRequests.Store/DbConfiguration.cs | 6 +-- PlexRequests.Store/Entity.cs | 3 +- PlexRequests.Store/IPlexDatabase.cs | 5 +- PlexRequests.Store/ISqliteConfiguration.cs | 3 +- PlexRequests.Store/Models/Audit.cs | 2 +- PlexRequests.Store/Models/GlobalSettings.cs | 3 +- PlexRequests.Store/Models/IssueBlobs.cs | 3 +- PlexRequests.Store/Models/LogEntity.cs | 4 +- .../Models/Plex/MetadataItems.cs | 3 +- PlexRequests.Store/Models/Plex/PlexContent.cs | 3 +- .../Models/Plex/PlexMediaType .cs | 2 +- PlexRequests.Store/Models/PlexEpisodes.cs | 3 +- PlexRequests.Store/Models/PlexUsers.cs | 3 +- PlexRequests.Store/Models/RequestBlobs.cs | 3 +- PlexRequests.Store/Models/RequestLimit.cs | 4 +- PlexRequests.Store/Models/RequestQueue.cs | 2 +- PlexRequests.Store/Models/ScheduledJobs.cs | 4 +- PlexRequests.Store/Models/UsersToNotify.cs | 3 +- PlexRequests.Store/PlexDatabase.cs | 6 +-- .../Repository/BaseGenericRepository.cs | 10 ++-- .../Repository/GenericRepository.cs | 5 +- PlexRequests.Store/Repository/IRepository.cs | 3 +- .../Repository/IRequestRepository.cs | 6 +-- .../Repository/ISettingsRepository.cs | 5 +- .../Repository/PlexUserRepository.cs | 7 ++- .../Repository/RequestJsonRepository.cs | 9 ++-- .../Repository/SettingsJsonRepository.cs | 8 +-- .../Repository/UserRepository.cs | 5 +- PlexRequests.Store/RequestedModel.cs | 4 +- PlexRequests.Store/UserEntity.cs | 3 +- PlexRequests.Store/UserLogins.cs | 4 +- PlexRequests.Store/UserRepository.cs | 8 +-- PlexRequests.Store/UsersModel.cs | 2 +- PlexRequests.UI.Tests/AdminModuleTests.cs | 36 ++++++------- .../BootstrapperExtensions.cs | 4 +- PlexRequests.UI.Tests/LandingPageTests.cs | 7 ++- PlexRequests.UI.Tests/TestRootPathProvider.cs | 4 +- PlexRequests.UI.Tests/TvSenderTests.cs | 18 +++---- PlexRequests.UI.Tests/UserLoginModuleTests.cs | 24 ++++----- .../CustomAuthenticationConfiguration.cs | 4 +- .../CustomAuthenticationProvider.cs | 5 +- .../Authentication/CustomModuleExtensions.cs | 3 +- PlexRequests.UI/Bootstrapper.cs | 28 ++++------ PlexRequests.UI/Helpers/AngularViewBase.cs | 3 +- PlexRequests.UI/Helpers/BaseUrlHelper.cs | 11 ++-- .../Helpers/ContravariantBindingResolver.cs | 5 +- PlexRequests.UI/Helpers/CultureHelper.cs | 3 +- PlexRequests.UI/Helpers/CustomHtmlHelper.cs | 4 +- .../Helpers/DebugRootPathProvider.cs | 4 +- PlexRequests.UI/Helpers/EmptyViewBase.cs | 3 +- PlexRequests.UI/Helpers/HtmlSecurityHelper.cs | 6 +-- PlexRequests.UI/Helpers/ServiceLocator.cs | 6 +-- PlexRequests.UI/Helpers/Themes.cs | 2 +- PlexRequests.UI/Helpers/ValidationHelper.cs | 6 +-- PlexRequests.UI/Jobs/CustomJobFactory.cs | 8 ++- PlexRequests.UI/Jobs/Scheduler.cs | 10 ++-- .../AuthSettingsDataProvider.cs | 6 +-- .../CouchPotatoDataProvider.cs | 6 +-- .../HeadphonesDataProvider.cs | 6 +-- .../PlexSettingsDataProvider.cs | 6 +-- .../RequestedModelDataProvider.cs | 6 +-- .../SickRageDataProvider.cs | 6 +-- .../SonarrSettingsDataProvider.cs | 6 +-- .../UserUpdateViewModelDataProvider.cs | 6 +-- PlexRequests.UI/Models/AboutAdminViewModel.cs | 2 +- PlexRequests.UI/Models/ApiModel.cs | 4 +- PlexRequests.UI/Models/DatatablesModel.cs | 2 +- .../Models/EpisodeListViewModel.cs | 2 +- PlexRequests.UI/Models/EpisodeRequestModel.cs | 2 +- .../Models/FaultedRequestsViewModel.cs | 4 +- .../Models/IssuesDetailsViewModel.cs | 8 +-- PlexRequests.UI/Models/IssuesViewMOdel.cs | 4 +- PlexRequests.UI/Models/JsonResponseModel.cs | 2 +- .../Models/JsonUpdateAvailableModel.cs | 2 +- .../Models/LandingPageViewModel.cs | 4 +- PlexRequests.UI/Models/MovieSearchType.cs | 2 +- PlexRequests.UI/Models/PlexAuth.cs | 2 +- PlexRequests.UI/Models/QualityModel.cs | 2 +- PlexRequests.UI/Models/RequestViewModel.cs | 5 +- .../Models/ScheduledJobsViewModel.cs | 6 +-- .../Models/SearchMovieViewModel.cs | 2 +- .../Models/SearchMusicViewModel.cs | 2 +- .../Models/SearchTvShowViewModel.cs | 2 +- PlexRequests.UI/Models/SearchViewModel.cs | 2 +- .../UserManagement/DeleteUserViewModel.cs | 2 +- .../UserManagementUsersViewModel.cs | 4 +- .../UserManagement/UserUpdateViewModel.cs | 2 +- PlexRequests.UI/Modules/Admin/AboutModule.cs | 15 +++--- PlexRequests.UI/Modules/Admin/AdminModule.cs | 51 ++++++++----------- .../Modules/Admin/CustomizationModule.cs | 12 ++--- .../Modules/Admin/FaultQueueModule.cs | 22 ++++---- .../Modules/Admin/SystemStatusModule.cs | 25 ++++----- .../Admin/UserManagementSettingsModule.cs | 16 +++--- PlexRequests.UI/Modules/ApiDocsModule.cs | 13 ++--- .../Modules/ApiRequestMetadataModule.cs | 10 ++-- PlexRequests.UI/Modules/ApiRequestModule.cs | 19 +++---- .../Modules/ApiSettingsMetadataModule.cs | 7 +-- PlexRequests.UI/Modules/ApiSettingsModule.cs | 19 +++---- .../Modules/ApiUserMetadataModule.cs | 7 +-- PlexRequests.UI/Modules/ApiUserModule.cs | 17 +++---- .../Modules/ApplicationTesterModule.cs | 20 +++----- PlexRequests.UI/Modules/ApprovalModule.cs | 30 +++++------ PlexRequests.UI/Modules/BaseApiModule.cs | 16 +++--- PlexRequests.UI/Modules/BaseAuthModule.cs | 10 ++-- PlexRequests.UI/Modules/BaseModule.cs | 18 +++---- PlexRequests.UI/Modules/BetaModule.cs | 3 +- PlexRequests.UI/Modules/CultureModule.cs | 22 ++++---- PlexRequests.UI/Modules/DonationLinkModule.cs | 14 ++--- PlexRequests.UI/Modules/IndexModule.cs | 14 ++--- PlexRequests.UI/Modules/IssuesModule.cs | 32 +++++------- PlexRequests.UI/Modules/LandingPageModule.cs | 17 +++---- PlexRequests.UI/Modules/LayoutModule.cs | 24 ++++----- PlexRequests.UI/Modules/LoginModule.cs | 23 ++++----- PlexRequests.UI/Modules/RequestsModule.cs | 40 +++++++-------- PlexRequests.UI/Modules/SearchModule.cs | 51 +++++++++---------- PlexRequests.UI/Modules/UserLoginModule.cs | 27 +++++----- .../Modules/UserManagementModule.cs | 34 ++++++------- PlexRequests.UI/Modules/UserWizardModule.cs | 30 +++++------ PlexRequests.UI/NinjectModules/ApiModule.cs | 8 +-- .../NinjectModules/ConfigurationModule.cs | 25 +++++---- .../NinjectModules/DependancyResolver.cs | 4 +- .../NinjectModules/RepositoryModule.cs | 14 ++--- .../NinjectModules/ServicesModule.cs | 14 ++--- .../NinjectModules/SettingServiceModule.cs | 6 +-- PlexRequests.UI/Program.cs | 32 +++++------- PlexRequests.UI/Resources/UI.da.resx | 2 +- PlexRequests.UI/Resources/UI.de.resx | 2 +- PlexRequests.UI/Resources/UI.es.resx | 2 +- PlexRequests.UI/Resources/UI.fr.resx | 2 +- PlexRequests.UI/Resources/UI.it.resx | 2 +- PlexRequests.UI/Resources/UI.nl.resx | 2 +- PlexRequests.UI/Resources/UI.pt.resx | 2 +- PlexRequests.UI/Resources/UI.resx | 2 +- PlexRequests.UI/Resources/UI.sv.resx | 2 +- PlexRequests.UI/Resources/UI1.Designer.cs | 2 +- PlexRequests.UI/Start/StartupOptions.cs | 2 +- PlexRequests.UI/Start/UpdateValue.cs | 2 +- PlexRequests.UI/Startup.cs | 29 +++++------ .../Validators/CouchPotatoValidator.cs | 6 +-- .../EmailNotificationSettingsValidator.cs | 6 +-- .../Validators/HeadphonesValidator.cs | 6 +-- .../Validators/PlexRequestsValidator.cs | 5 +- PlexRequests.UI/Validators/PlexValidator.cs | 6 +-- .../Validators/PushbulletSettingsValidator.cs | 6 +-- .../Validators/PushoverSettingsValidator.cs | 6 +-- .../Validators/RequestedModelValidator.cs | 6 +-- .../Validators/SickRageValidator.cs | 6 +-- .../Validators/SlackSettingsValidator.cs | 6 +-- PlexRequests.UI/Validators/SonarrValidator.cs | 6 +-- .../Validators/UserViewModelValidator.cs | 6 +-- PlexRequests.UI/Views/About/About.cshtml | 4 +- .../Views/Admin/Authentication.cshtml | 2 +- .../Views/Admin/CouchPotato.cshtml | 4 +- .../Views/Admin/EmailNotifications.cshtml | 5 +- PlexRequests.UI/Views/Admin/Headphones.cshtml | 2 +- .../Views/Admin/LandingPage.cshtml | 6 +-- PlexRequests.UI/Views/Admin/Logs.cshtml | 2 +- .../Views/Admin/NewsletterSettings.cshtml | 5 +- .../Views/Admin/NotificationSettings.cshtml | 5 +- PlexRequests.UI/Views/Admin/Plex.cshtml | 4 +- .../Admin/PushbulletNotifications.cshtml | 2 +- .../Views/Admin/PushoverNotifications.cshtml | 2 +- .../Views/Admin/SchedulerSettings.cshtml | 3 +- PlexRequests.UI/Views/Admin/Settings.cshtml | 4 +- PlexRequests.UI/Views/Admin/Sickrage.cshtml | 2 +- .../Views/Admin/SlackNotifications.cshtml | 2 +- PlexRequests.UI/Views/Admin/Sonarr.cshtml | 2 +- .../Views/Customization/Customization.cshtml | 4 +- .../Views/FaultQueue/RequestFaultQueue.cshtml | 3 +- PlexRequests.UI/Views/Issues/Details.cshtml | 8 +-- PlexRequests.UI/Views/Issues/Index.cshtml | 2 +- PlexRequests.UI/Views/Landing/Index.cshtml | 5 +- PlexRequests.UI/Views/Login/Index.cshtml | 2 +- PlexRequests.UI/Views/Requests/Index.cshtml | 4 +- PlexRequests.UI/Views/Search/Index.cshtml | 2 +- PlexRequests.UI/Views/Shared/Blank.cshtml | 3 +- .../Views/Shared/Partial/_Head.cshtml | 4 +- .../Shared/Partial/_LayoutScripts.cshtml | 3 +- .../Views/Shared/Partial/_Navbar.cshtml | 6 +-- .../Views/Shared/Partial/_Sidebar.cshtml | 2 +- .../Views/Shared/_AngularLayout.cshtml | 2 +- PlexRequests.UI/Views/Shared/_Layout.cshtml | 4 +- .../Views/SystemStatus/Status.cshtml | 4 +- PlexRequests.UI/Views/UserLogin/Index.cshtml | 4 +- .../Views/UserManagement/Index.cshtml | 4 +- .../UserManagementSettings.cshtml | 4 +- PlexRequests.UI/Views/UserWizard/Index.cshtml | 5 +- PlexRequests.Updater/Program.cs | 2 +- PlexRequests.Updater/Updater.cs | 3 +- 426 files changed, 1297 insertions(+), 1541 deletions(-) diff --git a/PlexRequests.Api.Interfaces/IApiRequest.cs b/PlexRequests.Api.Interfaces/IApiRequest.cs index 396551dba..ed6462de6 100644 --- a/PlexRequests.Api.Interfaces/IApiRequest.cs +++ b/PlexRequests.Api.Interfaces/IApiRequest.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using RestSharp; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface IApiRequest { diff --git a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs index c7e570399..844bcc1cd 100644 --- a/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs +++ b/PlexRequests.Api.Interfaces/ICouchPotatoApi.cs @@ -26,10 +26,9 @@ #endregion using System; +using Ombi.Api.Models.Movie; -using PlexRequests.Api.Models.Movie; - -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface ICouchPotatoApi { diff --git a/PlexRequests.Api.Interfaces/IHeadphonesApi.cs b/PlexRequests.Api.Interfaces/IHeadphonesApi.cs index edd041fd4..521831b9e 100644 --- a/PlexRequests.Api.Interfaces/IHeadphonesApi.cs +++ b/PlexRequests.Api.Interfaces/IHeadphonesApi.cs @@ -24,13 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Api.Models.Music; -using PlexRequests.Api.Models.Music; - -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface IHeadphonesApi { diff --git a/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs b/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs index 011c430e7..d4fed985b 100644 --- a/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs +++ b/PlexRequests.Api.Interfaces/IMusicBrainzApi.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Api.Models.Music; -namespace PlexRequests.Api.Interfaces +using Ombi.Api.Models.Music; + +namespace Ombi.Api.Interfaces { public interface IMusicBrainzApi { diff --git a/PlexRequests.Api.Interfaces/IPlexApi.cs b/PlexRequests.Api.Interfaces/IPlexApi.cs index bfd42ae50..4bc2124a4 100644 --- a/PlexRequests.Api.Interfaces/IPlexApi.cs +++ b/PlexRequests.Api.Interfaces/IPlexApi.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using PlexRequests.Api.Models.Plex; +using System; +using Ombi.Api.Models.Plex; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface IPlexApi { diff --git a/PlexRequests.Api.Interfaces/IPushbulletApi.cs b/PlexRequests.Api.Interfaces/IPushbulletApi.cs index 7d9b486b1..4bf646353 100644 --- a/PlexRequests.Api.Interfaces/IPushbulletApi.cs +++ b/PlexRequests.Api.Interfaces/IPushbulletApi.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using PlexRequests.Api.Models.Notifications; +using System.Threading.Tasks; +using Ombi.Api.Models.Notifications; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface IPushbulletApi { diff --git a/PlexRequests.Api.Interfaces/IPushoverApi.cs b/PlexRequests.Api.Interfaces/IPushoverApi.cs index fb1179c28..bdaab8464 100644 --- a/PlexRequests.Api.Interfaces/IPushoverApi.cs +++ b/PlexRequests.Api.Interfaces/IPushoverApi.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using PlexRequests.Api.Models.Notifications; +using System.Threading.Tasks; +using Ombi.Api.Models.Notifications; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface IPushoverApi { diff --git a/PlexRequests.Api.Interfaces/ISickRageApi.cs b/PlexRequests.Api.Interfaces/ISickRageApi.cs index 7363d676f..7022c218e 100644 --- a/PlexRequests.Api.Interfaces/ISickRageApi.cs +++ b/PlexRequests.Api.Interfaces/ISickRageApi.cs @@ -27,9 +27,9 @@ using System; using System.Threading.Tasks; -using PlexRequests.Api.Models.SickRage; +using Ombi.Api.Models.SickRage; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface ISickRageApi { diff --git a/PlexRequests.Api.Interfaces/ISlackApi.cs b/PlexRequests.Api.Interfaces/ISlackApi.cs index 812419f69..e0649a5cc 100644 --- a/PlexRequests.Api.Interfaces/ISlackApi.cs +++ b/PlexRequests.Api.Interfaces/ISlackApi.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using PlexRequests.Api.Models.Notifications; +using System.Threading.Tasks; +using Ombi.Api.Models.Notifications; -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface ISlackApi { diff --git a/PlexRequests.Api.Interfaces/ISonarrApi.cs b/PlexRequests.Api.Interfaces/ISonarrApi.cs index 63c698b74..203020737 100644 --- a/PlexRequests.Api.Interfaces/ISonarrApi.cs +++ b/PlexRequests.Api.Interfaces/ISonarrApi.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; +using Ombi.Api.Models.Sonarr; -using PlexRequests.Api.Models.Sonarr; - -namespace PlexRequests.Api.Interfaces +namespace Ombi.Api.Interfaces { public interface ISonarrApi { diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs b/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs index 63b20df1e..926f51e40 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Api.Models.Movie +namespace Ombi.Api.Models.Movie { public class CouchPotatoAdd { diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoApiKey.cs b/PlexRequests.Api.Models/Movie/CouchPotatoApiKey.cs index 54305fda6..39d9a1aa3 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoApiKey.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoApiKey.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Newtonsoft.Json; -namespace PlexRequests.Api.Models.Movie +namespace Ombi.Api.Models.Movie { public class CouchPotatoApiKey { diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs b/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs index 672297588..fcf7abcb5 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoMovies.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Movie +namespace Ombi.Api.Models.Movie { public class CouchPotatoMovies { diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs b/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs index 41fc02379..4daf85918 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoProfiles.cs @@ -26,11 +26,9 @@ #endregion using System.Collections.Generic; - using Newtonsoft.Json; -using Newtonsoft.Json.Serialization; -namespace PlexRequests.Api.Models.Movie +namespace Ombi.Api.Models.Movie { public class ProfileList { diff --git a/PlexRequests.Api.Models/Movie/CouchPotatoStatus.cs b/PlexRequests.Api.Models/Movie/CouchPotatoStatus.cs index fc527fd63..868b75e29 100644 --- a/PlexRequests.Api.Models/Movie/CouchPotatoStatus.cs +++ b/PlexRequests.Api.Models/Movie/CouchPotatoStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PlexRequests.Api.Models.Movie +namespace Ombi.Api.Models.Movie { public class CouchPotatoStatus { diff --git a/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs b/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs index bcbd8e4e6..b30fcd79f 100644 --- a/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs +++ b/PlexRequests.Api.Models/Music/HeadphonesAlbumSearchResult.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class HeadphonesAlbumSearchResult { diff --git a/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs b/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs index 0d822fe59..8115f1215 100644 --- a/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs +++ b/PlexRequests.Api.Models/Music/HeadphonesArtistSearchResult.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class HeadphonesArtistSearchResult { diff --git a/PlexRequests.Api.Models/Music/HeadphonesGetIndex.cs b/PlexRequests.Api.Models/Music/HeadphonesGetIndex.cs index 7f4d46c9e..81adf8f59 100644 --- a/PlexRequests.Api.Models/Music/HeadphonesGetIndex.cs +++ b/PlexRequests.Api.Models/Music/HeadphonesGetIndex.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class HeadphonesGetIndex { diff --git a/PlexRequests.Api.Models/Music/HeadphonesVersion.cs b/PlexRequests.Api.Models/Music/HeadphonesVersion.cs index b700d7214..42829d3ac 100644 --- a/PlexRequests.Api.Models/Music/HeadphonesVersion.cs +++ b/PlexRequests.Api.Models/Music/HeadphonesVersion.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class HeadphonesVersion { diff --git a/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs b/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs index 40cecba94..6f6c4930a 100644 --- a/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs +++ b/PlexRequests.Api.Models/Music/MusicBrainzCoverArt.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class Thumbnails { diff --git a/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs b/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs index 683a36a2c..5cea78619 100644 --- a/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs +++ b/PlexRequests.Api.Models/Music/MusicBrainzReleaseInfo.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class CoverArtArchive { diff --git a/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs b/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs index 157bd5861..9f7f38cf2 100644 --- a/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs +++ b/PlexRequests.Api.Models/Music/MusicBrainzSearchResults.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using Newtonsoft.Json; -namespace PlexRequests.Api.Models.Music +namespace Ombi.Api.Models.Music { public class TextRepresentation { diff --git a/PlexRequests.Api.Models/Notifications/PushbulletPush.cs b/PlexRequests.Api.Models/Notifications/PushbulletPush.cs index 755dc240d..d8e0b22c3 100644 --- a/PlexRequests.Api.Models/Notifications/PushbulletPush.cs +++ b/PlexRequests.Api.Models/Notifications/PushbulletPush.cs @@ -24,9 +24,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Newtonsoft.Json; -namespace PlexRequests.Api.Models.Notifications +namespace Ombi.Api.Models.Notifications { public class PushbulletPush { diff --git a/PlexRequests.Api.Models/Notifications/PushbulletResponse.cs b/PlexRequests.Api.Models/Notifications/PushbulletResponse.cs index 4c4daede9..65e580110 100644 --- a/PlexRequests.Api.Models/Notifications/PushbulletResponse.cs +++ b/PlexRequests.Api.Models/Notifications/PushbulletResponse.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Notifications +namespace Ombi.Api.Models.Notifications { public class PushbulletResponse { diff --git a/PlexRequests.Api.Models/Notifications/PushoverResponse.cs b/PlexRequests.Api.Models/Notifications/PushoverResponse.cs index 1b31f80f1..572347a91 100644 --- a/PlexRequests.Api.Models/Notifications/PushoverResponse.cs +++ b/PlexRequests.Api.Models/Notifications/PushoverResponse.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Notifications +namespace Ombi.Api.Models.Notifications { public class PushoverResponse { diff --git a/PlexRequests.Api.Models/Notifications/SlackNotificationBody.cs b/PlexRequests.Api.Models/Notifications/SlackNotificationBody.cs index a92b06d4f..49a55baa8 100644 --- a/PlexRequests.Api.Models/Notifications/SlackNotificationBody.cs +++ b/PlexRequests.Api.Models/Notifications/SlackNotificationBody.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Newtonsoft.Json; -namespace PlexRequests.Api.Models.Notifications +namespace Ombi.Api.Models.Notifications { public class SlackNotificationBody { diff --git a/PlexRequests.Api.Models/Plex/PlexAccount.cs b/PlexRequests.Api.Models/Plex/PlexAccount.cs index 45204e3c2..189e4c5f1 100644 --- a/PlexRequests.Api.Models/Plex/PlexAccount.cs +++ b/PlexRequests.Api.Models/Plex/PlexAccount.cs @@ -1,6 +1,6 @@ using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "user")] public class PlexAccount diff --git a/PlexRequests.Api.Models/Plex/PlexAuthentication.cs b/PlexRequests.Api.Models/Plex/PlexAuthentication.cs index 40ff14fab..73b0b0397 100644 --- a/PlexRequests.Api.Models/Plex/PlexAuthentication.cs +++ b/PlexRequests.Api.Models/Plex/PlexAuthentication.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { public class PlexAuthentication { diff --git a/PlexRequests.Api.Models/Plex/PlexEpisodeMetadata.cs b/PlexRequests.Api.Models/Plex/PlexEpisodeMetadata.cs index 41f4d1e0a..a6e8788e3 100644 --- a/PlexRequests.Api.Models/Plex/PlexEpisodeMetadata.cs +++ b/PlexRequests.Api.Models/Plex/PlexEpisodeMetadata.cs @@ -24,11 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Plex -{ - using System.Xml.Serialization; - using System.Collections.Generic; +using System.Collections.Generic; +using System.Xml.Serialization; + +namespace Ombi.Api.Models.Plex +{ [XmlRoot(ElementName = "MediaContainer")] public class PlexEpisodeMetadata { diff --git a/PlexRequests.Api.Models/Plex/PlexError.cs b/PlexRequests.Api.Models/Plex/PlexError.cs index d5be3a374..ca0b8c964 100644 --- a/PlexRequests.Api.Models/Plex/PlexError.cs +++ b/PlexRequests.Api.Models/Plex/PlexError.cs @@ -27,7 +27,7 @@ using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "errors")] public class PlexError diff --git a/PlexRequests.Api.Models/Plex/PlexFriends.cs b/PlexRequests.Api.Models/Plex/PlexFriends.cs index 1c115c97a..552fd112a 100644 --- a/PlexRequests.Api.Models/Plex/PlexFriends.cs +++ b/PlexRequests.Api.Models/Plex/PlexFriends.cs @@ -27,7 +27,7 @@ using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "Server")] public class Server diff --git a/PlexRequests.Api.Models/Plex/PlexLibraries.cs b/PlexRequests.Api.Models/Plex/PlexLibraries.cs index d9ae732d8..0e780c62e 100644 --- a/PlexRequests.Api.Models/Plex/PlexLibraries.cs +++ b/PlexRequests.Api.Models/Plex/PlexLibraries.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "MediaContainer")] public class PlexLibraries diff --git a/PlexRequests.Api.Models/Plex/PlexMediaType.cs b/PlexRequests.Api.Models/Plex/PlexMediaType.cs index bc660a6af..515a1b44f 100644 --- a/PlexRequests.Api.Models/Plex/PlexMediaType.cs +++ b/PlexRequests.Api.Models/Plex/PlexMediaType.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Services +namespace Ombi.Api.Models.Plex { public enum PlexMediaType { diff --git a/PlexRequests.Api.Models/Plex/PlexMetadata.cs b/PlexRequests.Api.Models/Plex/PlexMetadata.cs index 7e0eddb1f..6c942657b 100644 --- a/PlexRequests.Api.Models/Plex/PlexMetadata.cs +++ b/PlexRequests.Api.Models/Plex/PlexMetadata.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "MediaContainer")] public class PlexMetadata diff --git a/PlexRequests.Api.Models/Plex/PlexSearch.cs b/PlexRequests.Api.Models/Plex/PlexSearch.cs index c09f9ae7d..4f5473221 100644 --- a/PlexRequests.Api.Models/Plex/PlexSearch.cs +++ b/PlexRequests.Api.Models/Plex/PlexSearch.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "Part")] public class Part diff --git a/PlexRequests.Api.Models/Plex/PlexServer.cs b/PlexRequests.Api.Models/Plex/PlexServer.cs index 818f88556..db507fbe9 100644 --- a/PlexRequests.Api.Models/Plex/PlexServer.cs +++ b/PlexRequests.Api.Models/Plex/PlexServer.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "Server")] public class ServerInfo diff --git a/PlexRequests.Api.Models/Plex/PlexStatus.cs b/PlexRequests.Api.Models/Plex/PlexStatus.cs index db20e0f44..9312c139e 100644 --- a/PlexRequests.Api.Models/Plex/PlexStatus.cs +++ b/PlexRequests.Api.Models/Plex/PlexStatus.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using System.Xml.Serialization; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { [XmlRoot(ElementName = "Directory")] public class Directory diff --git a/PlexRequests.Api.Models/Plex/PlexUserRequest.cs b/PlexRequests.Api.Models/Plex/PlexUserRequest.cs index ea45297ba..a9595051b 100644 --- a/PlexRequests.Api.Models/Plex/PlexUserRequest.cs +++ b/PlexRequests.Api.Models/Plex/PlexUserRequest.cs @@ -25,7 +25,7 @@ // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { public class PlexUserRequest { diff --git a/PlexRequests.Api.Models/Plex/RecentlyAddedModelOld.cs b/PlexRequests.Api.Models/Plex/RecentlyAddedModelOld.cs index 01b64a4f0..467390eef 100644 --- a/PlexRequests.Api.Models/Plex/RecentlyAddedModelOld.cs +++ b/PlexRequests.Api.Models/Plex/RecentlyAddedModelOld.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Plex +namespace Ombi.Api.Models.Plex { public class RecentlyAddedChild { diff --git a/PlexRequests.Api.Models/SickRage/SickRageBase.cs b/PlexRequests.Api.Models/SickRage/SickRageBase.cs index 3cbb12cf5..4bbc7bab7 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageBase.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageBase.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public abstract class SickRageBase { diff --git a/PlexRequests.Api.Models/SickRage/SickRagePing.cs b/PlexRequests.Api.Models/SickRage/SickRagePing.cs index 1385c1ee8..adfd2cc2a 100644 --- a/PlexRequests.Api.Models/SickRage/SickRagePing.cs +++ b/PlexRequests.Api.Models/SickRage/SickRagePing.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public class SickRagePingData { diff --git a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs index 80e561ca7..55f49e3b5 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageSeasonList.cs @@ -1,7 +1,7 @@ using Newtonsoft.Json; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public class SickRageSeasonList : SickRageBase { diff --git a/PlexRequests.Api.Models/SickRage/SickRageShowInformation.cs b/PlexRequests.Api.Models/SickRage/SickRageShowInformation.cs index 295be41c3..f322b03a7 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageShowInformation.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageShowInformation.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public class Cache { diff --git a/PlexRequests.Api.Models/SickRage/SickRageStatus.cs b/PlexRequests.Api.Models/SickRage/SickRageStatus.cs index edeb03a21..faf5b4a97 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageStatus.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageStatus.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public static class SickRageStatus { diff --git a/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs b/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs index e668b841c..3f6a22843 100644 --- a/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs +++ b/PlexRequests.Api.Models/SickRage/SickRageTvAdd.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public class SickRageTvAddData { diff --git a/PlexRequests.Api.Models/SickRage/SickrageShows.cs b/PlexRequests.Api.Models/SickRage/SickrageShows.cs index 53131e56e..dcb352700 100644 --- a/PlexRequests.Api.Models/SickRage/SickrageShows.cs +++ b/PlexRequests.Api.Models/SickRage/SickrageShows.cs @@ -25,10 +25,9 @@ // ************************************************************************/ #endregion -using System; using System.Collections.Generic; -namespace PlexRequests.Api.Models.SickRage +namespace Ombi.Api.Models.SickRage { public class SickrageShows : SickRageBase> { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs index 6cf970241..0676c08c0 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeBody.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SonarrAddEpisodeBody { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs index 953503ea2..2eaa15eaa 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAddEpisodeResult.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class Body { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs index cb7cc8722..881770e0c 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAddSeries.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; - +using System; +using System.Collections.Generic; using Newtonsoft.Json; -using System; -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class Season { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs b/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs index 608bb4f4a..14c6ecb0a 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrAllSeries.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SonarrAllSeries { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs b/PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs index f982eb780..a4775c247 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrEpisode.cs @@ -25,7 +25,7 @@ // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class Revision diff --git a/PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs b/PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs index 05f6e4607..de20e669e 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrEpisodes.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SonarrEpisodes { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrError.cs b/PlexRequests.Api.Models/Sonarr/SonarrError.cs index 81eb2d115..8393a5418 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrError.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrError.cs @@ -25,10 +25,7 @@ // ************************************************************************/ #endregion -using System.Collections.Generic; -using Newtonsoft.Json; - -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SonarrError { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrProfile.cs b/PlexRequests.Api.Models/Sonarr/SonarrProfile.cs index b95fe32fe..0efb3f764 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrProfile.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrProfile.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class Cutoff { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrSearchCommand.cs b/PlexRequests.Api.Models/Sonarr/SonarrSearchCommand.cs index f2649cd94..79e9b2847 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrSearchCommand.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrSearchCommand.cs @@ -25,9 +25,7 @@ // ************************************************************************/ #endregion -using System.Xml.Linq; - -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SonarrSearchCommand { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrSeasonSearchResult.cs b/PlexRequests.Api.Models/Sonarr/SonarrSeasonSearchResult.cs index a0fe8bb29..86bf2f8b2 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrSeasonSearchResult.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrSeasonSearchResult.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SeasonBody { diff --git a/PlexRequests.Api.Models/Sonarr/SonarrSeriesSearchResult.cs b/PlexRequests.Api.Models/Sonarr/SonarrSeriesSearchResult.cs index 76e5fc9ad..9e86f4717 100644 --- a/PlexRequests.Api.Models/Sonarr/SonarrSeriesSearchResult.cs +++ b/PlexRequests.Api.Models/Sonarr/SonarrSeriesSearchResult.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SeriesBody { diff --git a/PlexRequests.Api.Models/Sonarr/SystemStatus.cs b/PlexRequests.Api.Models/Sonarr/SystemStatus.cs index 8dc3c0f57..47c6db83a 100644 --- a/PlexRequests.Api.Models/Sonarr/SystemStatus.cs +++ b/PlexRequests.Api.Models/Sonarr/SystemStatus.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Sonarr +namespace Ombi.Api.Models.Sonarr { public class SystemStatus { diff --git a/PlexRequests.Api.Models/Tv/Authentication.cs b/PlexRequests.Api.Models/Tv/Authentication.cs index ae427ff45..e77cdf6a9 100644 --- a/PlexRequests.Api.Models/Tv/Authentication.cs +++ b/PlexRequests.Api.Models/Tv/Authentication.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class Authentication { diff --git a/PlexRequests.Api.Models/Tv/TVMazeShow.cs b/PlexRequests.Api.Models/Tv/TVMazeShow.cs index cbff57b65..03aa39ce5 100644 --- a/PlexRequests.Api.Models/Tv/TVMazeShow.cs +++ b/PlexRequests.Api.Models/Tv/TVMazeShow.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class TvMazeShow { diff --git a/PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs b/PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs index fb301bd7e..e7e20bad2 100644 --- a/PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs +++ b/PlexRequests.Api.Models/Tv/TvMazeEpisodes.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class TvMazeEpisodes { diff --git a/PlexRequests.Api.Models/Tv/TvMazeSearch.cs b/PlexRequests.Api.Models/Tv/TvMazeSearch.cs index d879579bf..506f789c0 100644 --- a/PlexRequests.Api.Models/Tv/TvMazeSearch.cs +++ b/PlexRequests.Api.Models/Tv/TvMazeSearch.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class Schedule { diff --git a/PlexRequests.Api.Models/Tv/TvMazeSeasons.cs b/PlexRequests.Api.Models/Tv/TvMazeSeasons.cs index bce31cea5..f681a4e0e 100644 --- a/PlexRequests.Api.Models/Tv/TvMazeSeasons.cs +++ b/PlexRequests.Api.Models/Tv/TvMazeSeasons.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class TvMazeSeasons : TvMazeShow { diff --git a/PlexRequests.Api.Models/Tv/TvSearchResult.cs b/PlexRequests.Api.Models/Tv/TvSearchResult.cs index a97b6834b..9c1cc0e0a 100644 --- a/PlexRequests.Api.Models/Tv/TvSearchResult.cs +++ b/PlexRequests.Api.Models/Tv/TvSearchResult.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class TvShowSearchResult { diff --git a/PlexRequests.Api.Models/Tv/TvShow.cs b/PlexRequests.Api.Models/Tv/TvShow.cs index d11024a31..4ed967dac 100644 --- a/PlexRequests.Api.Models/Tv/TvShow.cs +++ b/PlexRequests.Api.Models/Tv/TvShow.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class TvShow { diff --git a/PlexRequests.Api.Models/Tv/TvShowImages.cs b/PlexRequests.Api.Models/Tv/TvShowImages.cs index 7100657c3..4deac4590 100644 --- a/PlexRequests.Api.Models/Tv/TvShowImages.cs +++ b/PlexRequests.Api.Models/Tv/TvShowImages.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Api.Models.Tv +namespace Ombi.Api.Models.Tv { public class RatingsInfo { diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs index 8bf1a2721..67a5bbc9e 100644 --- a/PlexRequests.Api/ApiRequest.cs +++ b/PlexRequests.Api/ApiRequest.cs @@ -24,20 +24,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.IO; using System.Xml.Serialization; - using Newtonsoft.Json; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Helpers.Exceptions; - +using Ombi.Api.Interfaces; +using Ombi.Helpers.Exceptions; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class ApiRequest : IApiRequest { diff --git a/PlexRequests.Api/CouchPotatoApi.cs b/PlexRequests.Api/CouchPotatoApi.cs index 9523d7284..a6434c30f 100644 --- a/PlexRequests.Api/CouchPotatoApi.cs +++ b/PlexRequests.Api/CouchPotatoApi.cs @@ -24,19 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Newtonsoft.Json.Linq; - using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Movie; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Exceptions; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Movie; +using Ombi.Helpers; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class CouchPotatoApi : ICouchPotatoApi { diff --git a/PlexRequests.Api/HeadphonesApi.cs b/PlexRequests.Api/HeadphonesApi.cs index 4b6c08a80..7405ce0e9 100644 --- a/PlexRequests.Api/HeadphonesApi.cs +++ b/PlexRequests.Api/HeadphonesApi.cs @@ -24,21 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Threading.Tasks; - using Newtonsoft.Json; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Music; -using PlexRequests.Helpers; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Music; +using Ombi.Helpers; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class HeadphonesApi : IHeadphonesApi { diff --git a/PlexRequests.Api/MovieBase.cs b/PlexRequests.Api/MovieBase.cs index 8a62e0209..c21bfcbd2 100644 --- a/PlexRequests.Api/MovieBase.cs +++ b/PlexRequests.Api/MovieBase.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Helpers; -namespace PlexRequests.Api +using Ombi.Helpers; + +namespace Ombi.Api { public abstract class MovieBase { diff --git a/PlexRequests.Api/MusicBrainzApi.cs b/PlexRequests.Api/MusicBrainzApi.cs index b9c581986..7e40f0612 100644 --- a/PlexRequests.Api/MusicBrainzApi.cs +++ b/PlexRequests.Api/MusicBrainzApi.cs @@ -24,18 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Newtonsoft.Json; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Music; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Music; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class MusicBrainzApi : IMusicBrainzApi { diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs index af2823d95..85e96ea68 100644 --- a/PlexRequests.Api/PlexApi.cs +++ b/PlexRequests.Api/PlexApi.cs @@ -23,21 +23,18 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ -using Polly; #endregion -using System; +using System; using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Helpers; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Helpers; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class PlexApi : IPlexApi { diff --git a/PlexRequests.Api/PushbulletApi.cs b/PlexRequests.Api/PushbulletApi.cs index fe9dbf46e..3d7c8bce1 100644 --- a/PlexRequests.Api/PushbulletApi.cs +++ b/PlexRequests.Api/PushbulletApi.cs @@ -24,15 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Notifications; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Notifications; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class PushbulletApi : IPushbulletApi { diff --git a/PlexRequests.Api/PushoverApi.cs b/PlexRequests.Api/PushoverApi.cs index 068e5b800..6169d6803 100644 --- a/PlexRequests.Api/PushoverApi.cs +++ b/PlexRequests.Api/PushoverApi.cs @@ -24,15 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Notifications; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Notifications; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class PushoverApi : IPushoverApi { diff --git a/PlexRequests.Api/RetryHandler.cs b/PlexRequests.Api/RetryHandler.cs index f385b6c5c..14a228fdd 100644 --- a/PlexRequests.Api/RetryHandler.cs +++ b/PlexRequests.Api/RetryHandler.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Polly; using Polly.Retry; -namespace PlexRequests.Api +namespace Ombi.Api { public static class RetryHandler { diff --git a/PlexRequests.Api/SickrageApi.cs b/PlexRequests.Api/SickrageApi.cs index df5f859e5..327ca27bc 100644 --- a/PlexRequests.Api/SickrageApi.cs +++ b/PlexRequests.Api/SickrageApi.cs @@ -24,23 +24,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Linq; using System; using System.Diagnostics; +using System.Linq; using System.Threading; using System.Threading.Tasks; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.SickRage; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Exceptions; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.SickRage; +using Ombi.Helpers; +using Ombi.Helpers.Exceptions; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class SickrageApi : ISickRageApi { diff --git a/PlexRequests.Api/SlackApi.cs b/PlexRequests.Api/SlackApi.cs index 929b475f1..3a4138330 100644 --- a/PlexRequests.Api/SlackApi.cs +++ b/PlexRequests.Api/SlackApi.cs @@ -24,15 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Notifications; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Notifications; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class SlackApi : ISlackApi { diff --git a/PlexRequests.Api/SonarrApi.cs b/PlexRequests.Api/SonarrApi.cs index 10811f10f..7c80883dc 100644 --- a/PlexRequests.Api/SonarrApi.cs +++ b/PlexRequests.Api/SonarrApi.cs @@ -24,20 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; - using Newtonsoft.Json; - using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Helpers; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Sonarr; +using Ombi.Helpers; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class SonarrApi : ISonarrApi { diff --git a/PlexRequests.Api/TheMovieDbApi.cs b/PlexRequests.Api/TheMovieDbApi.cs index eba5e115e..6ccd775dd 100644 --- a/PlexRequests.Api/TheMovieDbApi.cs +++ b/PlexRequests.Api/TheMovieDbApi.cs @@ -24,17 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; + using System.Collections.Generic; using System.Threading.Tasks; - using TMDbLib.Client; using TMDbLib.Objects.General; using TMDbLib.Objects.Movies; using TMDbLib.Objects.Search; -using TMDbLib.Objects.TvShows; -namespace PlexRequests.Api +namespace Ombi.Api { public class TheMovieDbApi : MovieBase { diff --git a/PlexRequests.Api/TheTvDbApi.cs b/PlexRequests.Api/TheTvDbApi.cs index 057558eef..50de76848 100644 --- a/PlexRequests.Api/TheTvDbApi.cs +++ b/PlexRequests.Api/TheTvDbApi.cs @@ -24,13 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; - -using PlexRequests.Api.Models.Tv; +using System; +using Ombi.Api.Models.Tv; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { [Obsolete("Use TVMazeAPP")] public class TheTvDbApi : TvBase diff --git a/PlexRequests.Api/TvBase.cs b/PlexRequests.Api/TvBase.cs index 3c20b6274..4456f3ee3 100644 --- a/PlexRequests.Api/TvBase.cs +++ b/PlexRequests.Api/TvBase.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using PlexRequests.Helpers; +using System; +using Ombi.Helpers; -namespace PlexRequests.Api +namespace Ombi.Api { public abstract class TvBase { diff --git a/PlexRequests.Api/TvMazeApi.cs b/PlexRequests.Api/TvMazeApi.cs index 98f95306e..5bb534990 100644 --- a/PlexRequests.Api/TvMazeApi.cs +++ b/PlexRequests.Api/TvMazeApi.cs @@ -24,16 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using NLog; - -using PlexRequests.Api.Models.Tv; - +using Ombi.Api.Models.Tv; using RestSharp; -namespace PlexRequests.Api +namespace Ombi.Api { public class TvMazeApi : TvMazeBase { diff --git a/PlexRequests.Api/TvMazeBase.cs b/PlexRequests.Api/TvMazeBase.cs index e4e723c95..20e1eba9a 100644 --- a/PlexRequests.Api/TvMazeBase.cs +++ b/PlexRequests.Api/TvMazeBase.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Api +namespace Ombi.Api { public class TvMazeBase { diff --git a/PlexRequests.Core.Migration/IMigration.cs b/PlexRequests.Core.Migration/IMigration.cs index 572ebc930..d5db62141 100644 --- a/PlexRequests.Core.Migration/IMigration.cs +++ b/PlexRequests.Core.Migration/IMigration.cs @@ -27,7 +27,7 @@ using System.Data; -namespace PlexRequests.Core.Migration +namespace Ombi.Core.Migration { public interface IMigration { diff --git a/PlexRequests.Core.Migration/IMigrationRunner.cs b/PlexRequests.Core.Migration/IMigrationRunner.cs index 4ccd615e8..eff1f47dd 100644 --- a/PlexRequests.Core.Migration/IMigrationRunner.cs +++ b/PlexRequests.Core.Migration/IMigrationRunner.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Core.Migration +namespace Ombi.Core.Migration { public interface IMigrationRunner { diff --git a/PlexRequests.Core.Migration/Migrate.cs b/PlexRequests.Core.Migration/Migrate.cs index e5266aa5b..11223318e 100644 --- a/PlexRequests.Core.Migration/Migrate.cs +++ b/PlexRequests.Core.Migration/Migrate.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Migration +namespace Ombi.Core.Migration { public class Migrate { diff --git a/PlexRequests.Core.Migration/MigrationAttribute.cs b/PlexRequests.Core.Migration/MigrationAttribute.cs index b117c1127..e04d13bb5 100644 --- a/PlexRequests.Core.Migration/MigrationAttribute.cs +++ b/PlexRequests.Core.Migration/MigrationAttribute.cs @@ -27,7 +27,7 @@ using System; -namespace PlexRequests.Core.Migration +namespace Ombi.Core.Migration { [AttributeUsage(AttributeTargets.Class)] public class Migration : Attribute diff --git a/PlexRequests.Core.Migration/MigrationRunner.cs b/PlexRequests.Core.Migration/MigrationRunner.cs index 5a2002400..5772de1b1 100644 --- a/PlexRequests.Core.Migration/MigrationRunner.cs +++ b/PlexRequests.Core.Migration/MigrationRunner.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; -using System.Data.Common; using System.Linq; using System.Reflection; using Ninject; using NLog; using Ombi.Store; -using PlexRequests.Store; -namespace PlexRequests.Core.Migration +namespace Ombi.Core.Migration { public class MigrationRunner : IMigrationRunner { diff --git a/PlexRequests.Core.Migration/Migrations/BaseMigration.cs b/PlexRequests.Core.Migration/Migrations/BaseMigration.cs index 1c52e7368..63c0cb4c7 100644 --- a/PlexRequests.Core.Migration/Migrations/BaseMigration.cs +++ b/PlexRequests.Core.Migration/Migrations/BaseMigration.cs @@ -29,9 +29,8 @@ using System.Collections.Generic; using System.Data; using System.Linq; using Ombi.Store; -using PlexRequests.Store; -namespace PlexRequests.Core.Migration.Migrations +namespace Ombi.Core.Migration.Migrations { public abstract class BaseMigration { diff --git a/PlexRequests.Core.Migration/Migrations/Version1100.cs b/PlexRequests.Core.Migration/Migrations/Version1100.cs index f30d31b05..55d537758 100644 --- a/PlexRequests.Core.Migration/Migrations/Version1100.cs +++ b/PlexRequests.Core.Migration/Migrations/Version1100.cs @@ -29,18 +29,17 @@ using System; using System.Data; -using NLog; using System.Linq; +using NLog; +using Ombi.Api.Interfaces; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; using Ombi.Store; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Core.Migration.Migrations +using Ombi.Store.Models; +using Ombi.Store.Repository; + +namespace Ombi.Core.Migration.Migrations { [Migration(11000, "v1.10.0.0")] public class Version1100 : BaseMigration, IMigration diff --git a/PlexRequests.Core.Migration/Migrations/Version195.cs b/PlexRequests.Core.Migration/Migrations/Version195.cs index 790fef19c..3dee6a9e5 100644 --- a/PlexRequests.Core.Migration/Migrations/Version195.cs +++ b/PlexRequests.Core.Migration/Migrations/Version195.cs @@ -27,11 +27,10 @@ using System; using System.Data; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; +using Ombi.Core.SettingModels; using Quartz; -namespace PlexRequests.Core.Migration.Migrations +namespace Ombi.Core.Migration.Migrations { [Migration(1950, "v1.9.5.0")] public class Version195 : BaseMigration, IMigration diff --git a/PlexRequests.Core.Tests/AuthenticationSettingsTests.cs b/PlexRequests.Core.Tests/AuthenticationSettingsTests.cs index 62b03470c..3690b77a9 100644 --- a/PlexRequests.Core.Tests/AuthenticationSettingsTests.cs +++ b/PlexRequests.Core.Tests/AuthenticationSettingsTests.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using NUnit.Framework; -using PlexRequests.Core.SettingModels; +using NUnit.Framework; +using Ombi.Core.SettingModels; -namespace PlexRequests.Core.Tests +namespace Ombi.Core.Tests { [TestFixture] public class AuthenticationSettingsTests diff --git a/PlexRequests.Core/CacheKeys.cs b/PlexRequests.Core/CacheKeys.cs index e40dd9efd..ba94819c8 100644 --- a/PlexRequests.Core/CacheKeys.cs +++ b/PlexRequests.Core/CacheKeys.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core +namespace Ombi.Core { public class CacheKeys { diff --git a/PlexRequests.Core/HeadphonesSender.cs b/PlexRequests.Core/HeadphonesSender.cs index 19e438be2..f3dab3850 100644 --- a/PlexRequests.Core/HeadphonesSender.cs +++ b/PlexRequests.Core/HeadphonesSender.cs @@ -29,11 +29,11 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; +using Ombi.Api.Interfaces; +using Ombi.Core.SettingModels; +using Ombi.Store; -namespace PlexRequests.Core +namespace Ombi.Core { public class HeadphonesSender { diff --git a/PlexRequests.Core/IIssueService.cs b/PlexRequests.Core/IIssueService.cs index dab00222e..440ae16c6 100644 --- a/PlexRequests.Core/IIssueService.cs +++ b/PlexRequests.Core/IIssueService.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Core.Models; -using PlexRequests.Core.Models; - -namespace PlexRequests.Core +namespace Ombi.Core { public interface IIssueService { diff --git a/PlexRequests.Core/IPlexReadOnlyDatabase.cs b/PlexRequests.Core/IPlexReadOnlyDatabase.cs index 93a4dc98f..745b34735 100644 --- a/PlexRequests.Core/IPlexReadOnlyDatabase.cs +++ b/PlexRequests.Core/IPlexReadOnlyDatabase.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using PlexRequests.Store.Models.Plex; +using Ombi.Store.Models.Plex; -namespace PlexRequests.Core +namespace Ombi.Core { public interface IPlexReadOnlyDatabase { diff --git a/PlexRequests.Core/IRequestService.cs b/PlexRequests.Core/IRequestService.cs index 7dae2f6a7..e7aea8ded 100644 --- a/PlexRequests.Core/IRequestService.cs +++ b/PlexRequests.Core/IRequestService.cs @@ -27,10 +27,9 @@ using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Store; -using PlexRequests.Store; - -namespace PlexRequests.Core +namespace Ombi.Core { public interface IRequestService { diff --git a/PlexRequests.Core/ISecurityExtensions.cs b/PlexRequests.Core/ISecurityExtensions.cs index 25fd68334..e3b52a613 100644 --- a/PlexRequests.Core/ISecurityExtensions.cs +++ b/PlexRequests.Core/ISecurityExtensions.cs @@ -2,9 +2,9 @@ using Nancy; using Nancy.Security; using Nancy.Session; -using PlexRequests.Helpers.Permissions; +using Ombi.Helpers.Permissions; -namespace PlexRequests.Core +namespace Ombi.Core { public interface ISecurityExtensions { diff --git a/PlexRequests.Core/ISettingsService.cs b/PlexRequests.Core/ISettingsService.cs index 2b3098811..fc88f10a3 100644 --- a/PlexRequests.Core/ISettingsService.cs +++ b/PlexRequests.Core/ISettingsService.cs @@ -27,7 +27,7 @@ using System.Threading.Tasks; -namespace PlexRequests.Core +namespace Ombi.Core { public interface ISettingsService { diff --git a/PlexRequests.Core/IStatusChecker.cs b/PlexRequests.Core/IStatusChecker.cs index 52bf0ece3..f6c1069b8 100644 --- a/PlexRequests.Core/IStatusChecker.cs +++ b/PlexRequests.Core/IStatusChecker.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using Octokit; -using PlexRequests.Core.Models; +using Ombi.Core.Models; -namespace PlexRequests.Core +namespace Ombi.Core { public interface IStatusChecker { diff --git a/PlexRequests.Core/JsonIssuesModelRequestService.cs b/PlexRequests.Core/JsonIssuesModelRequestService.cs index 10aa7a0b5..ca8a92f07 100644 --- a/PlexRequests.Core/JsonIssuesModelRequestService.cs +++ b/PlexRequests.Core/JsonIssuesModelRequestService.cs @@ -24,19 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - using Newtonsoft.Json; +using Ombi.Core.Models; +using Ombi.Helpers; +using Ombi.Store.Models; +using Ombi.Store.Repository; -using PlexRequests.Core.Models; -using PlexRequests.Helpers; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Core +namespace Ombi.Core { public class IssueJsonService : IIssueService { diff --git a/PlexRequests.Core/JsonRequestModelRequestService.cs b/PlexRequests.Core/JsonRequestModelRequestService.cs index 12aaa7467..3388fd589 100644 --- a/PlexRequests.Core/JsonRequestModelRequestService.cs +++ b/PlexRequests.Core/JsonRequestModelRequestService.cs @@ -24,19 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; - using Newtonsoft.Json; +using Ombi.Helpers; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; -using PlexRequests.Helpers; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Core +namespace Ombi.Core { public class JsonRequestModelRequestService : IRequestService { diff --git a/PlexRequests.Core/Models/IssuesModel.cs b/PlexRequests.Core/Models/IssuesModel.cs index 4aefb61cd..4d8edfbf3 100644 --- a/PlexRequests.Core/Models/IssuesModel.cs +++ b/PlexRequests.Core/Models/IssuesModel.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; -using PlexRequests.Store; +using System.Collections.Generic; +using Ombi.Store; -namespace PlexRequests.Core.Models +namespace Ombi.Core.Models { public class IssuesModel : Entity { diff --git a/PlexRequests.Core/Models/NotificationType.cs b/PlexRequests.Core/Models/NotificationType.cs index eace7b018..5408b4b1c 100644 --- a/PlexRequests.Core/Models/NotificationType.cs +++ b/PlexRequests.Core/Models/NotificationType.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Models +namespace Ombi.Core.Models { public enum NotificationType { diff --git a/PlexRequests.Core/Models/StatusModel.cs b/PlexRequests.Core/Models/StatusModel.cs index ee55ab373..8d6b9b2dc 100644 --- a/PlexRequests.Core/Models/StatusModel.cs +++ b/PlexRequests.Core/Models/StatusModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Models +namespace Ombi.Core.Models { public class StatusModel { diff --git a/PlexRequests.Core/Models/UserProperties.cs b/PlexRequests.Core/Models/UserProperties.cs index 3e313bb83..1fabfd69e 100644 --- a/PlexRequests.Core/Models/UserProperties.cs +++ b/PlexRequests.Core/Models/UserProperties.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Models +namespace Ombi.Core.Models { public class UserProperties { diff --git a/PlexRequests.Core/Notification/NotificationMessage.cs b/PlexRequests.Core/Notification/NotificationMessage.cs index 168211efd..df76ebb29 100644 --- a/PlexRequests.Core/Notification/NotificationMessage.cs +++ b/PlexRequests.Core/Notification/NotificationMessage.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Core.Models; -namespace PlexRequests.Core.Notification +using Ombi.Core.Models; + +namespace Ombi.Core.Notification { public class NotificationMessage { diff --git a/PlexRequests.Core/Notification/NotificationMessageContent.cs b/PlexRequests.Core/Notification/NotificationMessageContent.cs index 4c0ad0bd4..5881f1c96 100644 --- a/PlexRequests.Core/Notification/NotificationMessageContent.cs +++ b/PlexRequests.Core/Notification/NotificationMessageContent.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Notification +namespace Ombi.Core.Notification { public class NotificationMessageContent { diff --git a/PlexRequests.Core/Notification/NotificationMessageCurlys.cs b/PlexRequests.Core/Notification/NotificationMessageCurlys.cs index 28edd08a3..343bb6a13 100644 --- a/PlexRequests.Core/Notification/NotificationMessageCurlys.cs +++ b/PlexRequests.Core/Notification/NotificationMessageCurlys.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Core.Notification +namespace Ombi.Core.Notification { public class NotificationMessageCurlys { diff --git a/PlexRequests.Core/Notification/NotificationMessageResolver.cs b/PlexRequests.Core/Notification/NotificationMessageResolver.cs index f9c7b1b82..f5f0b90f9 100644 --- a/PlexRequests.Core/Notification/NotificationMessageResolver.cs +++ b/PlexRequests.Core/Notification/NotificationMessageResolver.cs @@ -28,11 +28,10 @@ using System; using System.Collections.Generic; using System.Linq; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.Core.Notification +namespace Ombi.Core.Notification { public class NotificationMessageResolver { diff --git a/PlexRequests.Core/Notification/Templates/EmailBasicTemplate.cs b/PlexRequests.Core/Notification/Templates/EmailBasicTemplate.cs index 8ce53afb6..7c1e24499 100644 --- a/PlexRequests.Core/Notification/Templates/EmailBasicTemplate.cs +++ b/PlexRequests.Core/Notification/Templates/EmailBasicTemplate.cs @@ -26,17 +26,12 @@ #endregion using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using NLog; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -namespace PlexRequests.Core.Notification.Templates +namespace Ombi.Core.Notification.Templates { public class EmailBasicTemplate : IEmailBasicTemplate { diff --git a/PlexRequests.Core/Notification/Templates/IEmailBasicTemplate.cs b/PlexRequests.Core/Notification/Templates/IEmailBasicTemplate.cs index e72645722..f96d123a5 100644 --- a/PlexRequests.Core/Notification/Templates/IEmailBasicTemplate.cs +++ b/PlexRequests.Core/Notification/Templates/IEmailBasicTemplate.cs @@ -25,9 +25,7 @@ // ************************************************************************/ #endregion -using System.Threading.Tasks; - -namespace PlexRequests.Core.Notification.Templates +namespace Ombi.Core.Notification.Templates { public interface IEmailBasicTemplate { diff --git a/PlexRequests.Core/Notification/TransportType.cs b/PlexRequests.Core/Notification/TransportType.cs index 6244b2f99..f37ab4404 100644 --- a/PlexRequests.Core/Notification/TransportType.cs +++ b/PlexRequests.Core/Notification/TransportType.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.Notification +namespace Ombi.Core.Notification { public enum TransportType { diff --git a/PlexRequests.Core/PlexReadOnlyDatabase.cs b/PlexRequests.Core/PlexReadOnlyDatabase.cs index 4c41e1e63..8e7d5c27c 100644 --- a/PlexRequests.Core/PlexReadOnlyDatabase.cs +++ b/PlexRequests.Core/PlexReadOnlyDatabase.cs @@ -29,11 +29,11 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; -using PlexRequests.Store.Models.Plex; +using Ombi.Core.SettingModels; +using Ombi.Store; +using Ombi.Store.Models.Plex; -namespace PlexRequests.Core +namespace Ombi.Core { public class PlexReadOnlyDatabase : IPlexReadOnlyDatabase { diff --git a/PlexRequests.Core/Queue/ITransientFaultQueue.cs b/PlexRequests.Core/Queue/ITransientFaultQueue.cs index ee5ea05d0..a4d3878c0 100644 --- a/PlexRequests.Core/Queue/ITransientFaultQueue.cs +++ b/PlexRequests.Core/Queue/ITransientFaultQueue.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using PlexRequests.Store; -using PlexRequests.Store.Models; +using Ombi.Store; +using Ombi.Store.Models; -namespace PlexRequests.Core.Queue +namespace Ombi.Core.Queue { public interface ITransientFaultQueue { diff --git a/PlexRequests.Core/Queue/TransientFaultQueue.cs b/PlexRequests.Core/Queue/TransientFaultQueue.cs index 2be15bfa5..a3be57dc8 100644 --- a/PlexRequests.Core/Queue/TransientFaultQueue.cs +++ b/PlexRequests.Core/Queue/TransientFaultQueue.cs @@ -29,12 +29,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Dapper; -using PlexRequests.Helpers; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; +using Ombi.Helpers; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; -namespace PlexRequests.Core.Queue +namespace Ombi.Core.Queue { public class TransientFaultQueue : ITransientFaultQueue { diff --git a/PlexRequests.Core/SecurityExtensions.cs b/PlexRequests.Core/SecurityExtensions.cs index 4a237007e..eecf89283 100644 --- a/PlexRequests.Core/SecurityExtensions.cs +++ b/PlexRequests.Core/SecurityExtensions.cs @@ -31,13 +31,12 @@ using Nancy.Linker; using Nancy.Responses; using Nancy.Security; using Nancy.Session; -using PlexRequests.Core.Models; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store.Repository; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core.Models; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Store.Repository; -namespace PlexRequests.Core +namespace Ombi.Core { public class SecurityExtensions : ISecurityExtensions { diff --git a/PlexRequests.Core/SettingModels/AuthenticationSettings.cs b/PlexRequests.Core/SettingModels/AuthenticationSettings.cs index f95ff061d..2f0aa14a7 100644 --- a/PlexRequests.Core/SettingModels/AuthenticationSettings.cs +++ b/PlexRequests.Core/SettingModels/AuthenticationSettings.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; - using Newtonsoft.Json; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class AuthenticationSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs index 9be02d332..5e850367e 100644 --- a/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs +++ b/PlexRequests.Core/SettingModels/CouchPotatoSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class CouchPotatoSettings : ExternalSettings { diff --git a/PlexRequests.Core/SettingModels/CustomizationSettings.cs b/PlexRequests.Core/SettingModels/CustomizationSettings.cs index 9c0d47a65..6225861ad 100644 --- a/PlexRequests.Core/SettingModels/CustomizationSettings.cs +++ b/PlexRequests.Core/SettingModels/CustomizationSettings.cs @@ -25,7 +25,7 @@ // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class CustomizationSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs b/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs index a8069644a..65f55a61a 100644 --- a/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs +++ b/PlexRequests.Core/SettingModels/EmailNotificationSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class EmailNotificationSettings : NotificationSettings { diff --git a/PlexRequests.Core/SettingModels/ExternalSettings.cs b/PlexRequests.Core/SettingModels/ExternalSettings.cs index 6a52d5609..8aa6f7343 100644 --- a/PlexRequests.Core/SettingModels/ExternalSettings.cs +++ b/PlexRequests.Core/SettingModels/ExternalSettings.cs @@ -24,13 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Newtonsoft.Json; +using Ombi.Helpers; -using PlexRequests.Helpers; - -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public abstract class ExternalSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs index d283e6562..61f9f6ecf 100644 --- a/PlexRequests.Core/SettingModels/HeadphonesSettings.cs +++ b/PlexRequests.Core/SettingModels/HeadphonesSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class HeadphonesSettings : ExternalSettings { diff --git a/PlexRequests.Core/SettingModels/LandingPageSettings.cs b/PlexRequests.Core/SettingModels/LandingPageSettings.cs index 81a20e9dd..79f8c5d44 100644 --- a/PlexRequests.Core/SettingModels/LandingPageSettings.cs +++ b/PlexRequests.Core/SettingModels/LandingPageSettings.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Newtonsoft.Json; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class LandingPageSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/LogSettings.cs b/PlexRequests.Core/SettingModels/LogSettings.cs index 54250c999..da6f11e87 100644 --- a/PlexRequests.Core/SettingModels/LogSettings.cs +++ b/PlexRequests.Core/SettingModels/LogSettings.cs @@ -26,7 +26,7 @@ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class LogSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/NewsletterSettings.cs b/PlexRequests.Core/SettingModels/NewsletterSettings.cs index e91051b4c..7af719461 100644 --- a/PlexRequests.Core/SettingModels/NewsletterSettings.cs +++ b/PlexRequests.Core/SettingModels/NewsletterSettings.cs @@ -27,9 +27,9 @@ using System.Collections.Generic; using Newtonsoft.Json; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class NewletterSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/NotificationSettings.cs b/PlexRequests.Core/SettingModels/NotificationSettings.cs index 58a1128f0..595bdb431 100644 --- a/PlexRequests.Core/SettingModels/NotificationSettings.cs +++ b/PlexRequests.Core/SettingModels/NotificationSettings.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; -using PlexRequests.Core.Models; -using PlexRequests.Core.Notification; +using System.Collections.Generic; +using Ombi.Core.Models; +using Ombi.Core.Notification; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class NotificationSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/NotificationSettingsV2.cs b/PlexRequests.Core/SettingModels/NotificationSettingsV2.cs index 5f8885f33..2380d70f1 100644 --- a/PlexRequests.Core/SettingModels/NotificationSettingsV2.cs +++ b/PlexRequests.Core/SettingModels/NotificationSettingsV2.cs @@ -26,10 +26,10 @@ #endregion using System.Collections.Generic; -using PlexRequests.Core.Models; -using PlexRequests.Core.Notification; +using Ombi.Core.Models; +using Ombi.Core.Notification; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class NotificationSettingsV2 : Settings { diff --git a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs index f4aec5a96..6c77ba727 100644 --- a/PlexRequests.Core/SettingModels/PlexRequestSettings.cs +++ b/PlexRequests.Core/SettingModels/PlexRequestSettings.cs @@ -24,11 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Newtonsoft.Json; + using System; -using System.Collections.Generic; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class PlexRequestSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/PlexSettings.cs b/PlexRequests.Core/SettingModels/PlexSettings.cs index 108edee19..b40b69018 100644 --- a/PlexRequests.Core/SettingModels/PlexSettings.cs +++ b/PlexRequests.Core/SettingModels/PlexSettings.cs @@ -25,9 +25,7 @@ // ************************************************************************/ #endregion -using Newtonsoft.Json; - -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class PlexSettings : ExternalSettings { diff --git a/PlexRequests.Core/SettingModels/PushBulletNotificationSettings.cs b/PlexRequests.Core/SettingModels/PushBulletNotificationSettings.cs index b65c5f1b5..e5e580bf0 100644 --- a/PlexRequests.Core/SettingModels/PushBulletNotificationSettings.cs +++ b/PlexRequests.Core/SettingModels/PushBulletNotificationSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class PushbulletNotificationSettings : NotificationSettings { diff --git a/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs b/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs index 276a5c96c..5a5e64891 100644 --- a/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs +++ b/PlexRequests.Core/SettingModels/PushoverNotificationSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class PushoverNotificationSettings : NotificationSettings { diff --git a/PlexRequests.Core/SettingModels/RequestSettings.cs b/PlexRequests.Core/SettingModels/RequestSettings.cs index 5a9140947..d8329e2f1 100644 --- a/PlexRequests.Core/SettingModels/RequestSettings.cs +++ b/PlexRequests.Core/SettingModels/RequestSettings.cs @@ -25,10 +25,9 @@ // ************************************************************************/ #endregion -using System; using System.Collections.Generic; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class RequestSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/ScheduledJobsSettings.cs b/PlexRequests.Core/SettingModels/ScheduledJobsSettings.cs index d0e6b05e1..8b9504307 100644 --- a/PlexRequests.Core/SettingModels/ScheduledJobsSettings.cs +++ b/PlexRequests.Core/SettingModels/ScheduledJobsSettings.cs @@ -27,7 +27,7 @@ using System; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class ScheduledJobsSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/Settings.cs b/PlexRequests.Core/SettingModels/Settings.cs index dfdb4cbde..ed91f516c 100644 --- a/PlexRequests.Core/SettingModels/Settings.cs +++ b/PlexRequests.Core/SettingModels/Settings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class Settings { diff --git a/PlexRequests.Core/SettingModels/SickRageSettings.cs b/PlexRequests.Core/SettingModels/SickRageSettings.cs index b2f011755..45982c624 100644 --- a/PlexRequests.Core/SettingModels/SickRageSettings.cs +++ b/PlexRequests.Core/SettingModels/SickRageSettings.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class SickRageSettings : ExternalSettings { diff --git a/PlexRequests.Core/SettingModels/SlackNotificationSettings.cs b/PlexRequests.Core/SettingModels/SlackNotificationSettings.cs index 80a26ab7e..41bf7b5d8 100644 --- a/PlexRequests.Core/SettingModels/SlackNotificationSettings.cs +++ b/PlexRequests.Core/SettingModels/SlackNotificationSettings.cs @@ -1,8 +1,7 @@ using System; - using Newtonsoft.Json; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class SlackNotificationSettings : NotificationSettings { diff --git a/PlexRequests.Core/SettingModels/SonarrSettings.cs b/PlexRequests.Core/SettingModels/SonarrSettings.cs index 5b99b8ac2..31f96b3e6 100644 --- a/PlexRequests.Core/SettingModels/SonarrSettings.cs +++ b/PlexRequests.Core/SettingModels/SonarrSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public sealed class SonarrSettings : ExternalSettings { diff --git a/PlexRequests.Core/SettingModels/SystemSettings.cs b/PlexRequests.Core/SettingModels/SystemSettings.cs index 8d387f9e7..d905af2e4 100644 --- a/PlexRequests.Core/SettingModels/SystemSettings.cs +++ b/PlexRequests.Core/SettingModels/SystemSettings.cs @@ -26,12 +26,11 @@ #endregion using System.Collections.Generic; -using System.ComponentModel; using System.ComponentModel.DataAnnotations; using Newtonsoft.Json; -using PlexRequests.Core.Models; +using Ombi.Core.Models; -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class SystemSettings : Settings { diff --git a/PlexRequests.Core/SettingModels/UserManagementSettings.cs b/PlexRequests.Core/SettingModels/UserManagementSettings.cs index 768a2167c..99cda4f48 100644 --- a/PlexRequests.Core/SettingModels/UserManagementSettings.cs +++ b/PlexRequests.Core/SettingModels/UserManagementSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.SettingModels +namespace Ombi.Core.SettingModels { public class UserManagementSettings : Settings { diff --git a/PlexRequests.Core/SettingsServiceV2.cs b/PlexRequests.Core/SettingsServiceV2.cs index 9c25a1e38..f8c61591a 100644 --- a/PlexRequests.Core/SettingsServiceV2.cs +++ b/PlexRequests.Core/SettingsServiceV2.cs @@ -27,13 +27,12 @@ using System.Threading.Tasks; using Newtonsoft.Json; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Store.Models; +using Ombi.Store.Repository; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Core +namespace Ombi.Core { public class SettingsServiceV2 : ISettingsService where T : Settings, new() diff --git a/PlexRequests.Core/Setup.cs b/PlexRequests.Core/Setup.cs index 548ff5dab..f70749a40 100644 --- a/PlexRequests.Core/Setup.cs +++ b/PlexRequests.Core/Setup.cs @@ -26,21 +26,17 @@ #endregion using System; -using System.Linq; -using System.Text.RegularExpressions; - +using System.Threading.Tasks; using Mono.Data.Sqlite; using NLog; -using PlexRequests.Api; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Store; -using PlexRequests.Store.Repository; -using System.Threading.Tasks; +using Ombi.Api; +using Ombi.Core.SettingModels; +using Ombi.Helpers; using Ombi.Store; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Core +namespace Ombi.Core { public class Setup { diff --git a/PlexRequests.Core/StatusChecker/AppveyorArtifactResult.cs b/PlexRequests.Core/StatusChecker/AppveyorArtifactResult.cs index 9e67262d6..4957d7c0b 100644 --- a/PlexRequests.Core/StatusChecker/AppveyorArtifactResult.cs +++ b/PlexRequests.Core/StatusChecker/AppveyorArtifactResult.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Core.StatusChecker +namespace Ombi.Core.StatusChecker { public class AppveyorArtifactResult { diff --git a/PlexRequests.Core/StatusChecker/AppveyorBranchResult.cs b/PlexRequests.Core/StatusChecker/AppveyorBranchResult.cs index 766e5a804..f051e978f 100644 --- a/PlexRequests.Core/StatusChecker/AppveyorBranchResult.cs +++ b/PlexRequests.Core/StatusChecker/AppveyorBranchResult.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Core.StatusChecker +namespace Ombi.Core.StatusChecker { public class NuGetFeed { diff --git a/PlexRequests.Core/StatusChecker/StatusChecker.cs b/PlexRequests.Core/StatusChecker/StatusChecker.cs index dc3be9a88..7f1bbb9d7 100644 --- a/PlexRequests.Core/StatusChecker/StatusChecker.cs +++ b/PlexRequests.Core/StatusChecker/StatusChecker.cs @@ -30,13 +30,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Octokit; -using PlexRequests.Api; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; +using Ombi.Api; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; using RestSharp; -namespace PlexRequests.Core.StatusChecker +namespace Ombi.Core.StatusChecker { public class StatusChecker : IStatusChecker { diff --git a/PlexRequests.Core/TvSender.cs b/PlexRequests.Core/TvSender.cs index 7ec462582..1e97e3550 100644 --- a/PlexRequests.Core/TvSender.cs +++ b/PlexRequests.Core/TvSender.cs @@ -30,13 +30,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.SickRage; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.SickRage; +using Ombi.Api.Models.Sonarr; +using Ombi.Core.SettingModels; +using Ombi.Store; -namespace PlexRequests.Core +namespace Ombi.Core { public class TvSender { diff --git a/PlexRequests.Core/TvSenderOld.cs b/PlexRequests.Core/TvSenderOld.cs index b603272b1..6594fe5b8 100644 --- a/PlexRequests.Core/TvSenderOld.cs +++ b/PlexRequests.Core/TvSenderOld.cs @@ -30,13 +30,13 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.SickRage; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.SickRage; +using Ombi.Api.Models.Sonarr; +using Ombi.Core.SettingModels; +using Ombi.Store; -namespace PlexRequests.Core +namespace Ombi.Core { public class TvSenderOld { diff --git a/PlexRequests.Core/UserIdentity.cs b/PlexRequests.Core/UserIdentity.cs index 3a01146e5..3fa0bc3b8 100644 --- a/PlexRequests.Core/UserIdentity.cs +++ b/PlexRequests.Core/UserIdentity.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using Nancy.Security; -namespace PlexRequests.Core +namespace Ombi.Core { public class UserIdentity : IUserIdentity { diff --git a/PlexRequests.Core/UserMapper.cs b/PlexRequests.Core/UserMapper.cs index 50215093d..ace0f4f0f 100644 --- a/PlexRequests.Core/UserMapper.cs +++ b/PlexRequests.Core/UserMapper.cs @@ -24,23 +24,21 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Security; using System.Threading.Tasks; - using Nancy; using Nancy.Authentication.Forms; using Nancy.Security; +using Ombi.Core.Models; +using Ombi.Helpers; +using Ombi.Store; +using Ombi.Store.Repository; -using PlexRequests.Core.Models; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Core +namespace Ombi.Core { public class UserMapper : IUserMapper, ICustomUserMapper { diff --git a/PlexRequests.Core/Users/IUserHelper.cs b/PlexRequests.Core/Users/IUserHelper.cs index 492574d47..8f0cbfa01 100644 --- a/PlexRequests.Core/Users/IUserHelper.cs +++ b/PlexRequests.Core/Users/IUserHelper.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using PlexRequests.Helpers.Permissions; +using Ombi.Helpers.Permissions; -namespace PlexRequests.Core.Users +namespace Ombi.Core.Users { public interface IUserHelper { diff --git a/PlexRequests.Core/Users/UserHelper.cs b/PlexRequests.Core/Users/UserHelper.cs index 1654e0906..099b025b8 100644 --- a/PlexRequests.Core/Users/UserHelper.cs +++ b/PlexRequests.Core/Users/UserHelper.cs @@ -27,12 +27,12 @@ using System.Collections.Generic; using System.Linq; -using PlexRequests.Core.Models; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store.Repository; +using Ombi.Core.Models; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Store.Repository; -namespace PlexRequests.Core.Users +namespace Ombi.Core.Users { public class UserHelper : IUserHelper { diff --git a/PlexRequests.Core/Users/UserHelperModel.cs b/PlexRequests.Core/Users/UserHelperModel.cs index 5d66fc066..1b08d9fb1 100644 --- a/PlexRequests.Core/Users/UserHelperModel.cs +++ b/PlexRequests.Core/Users/UserHelperModel.cs @@ -25,10 +25,10 @@ // ************************************************************************/ #endregion -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; -namespace PlexRequests.Core.Users +namespace Ombi.Core.Users { public class UserHelperModel { diff --git a/PlexRequests.Core/Users/UserManagementHelper.cs b/PlexRequests.Core/Users/UserManagementHelper.cs index 1188a7717..2e21ee1e1 100644 --- a/PlexRequests.Core/Users/UserManagementHelper.cs +++ b/PlexRequests.Core/Users/UserManagementHelper.cs @@ -1,7 +1,7 @@ -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; +using Ombi.Core.SettingModels; +using Ombi.Helpers.Permissions; -namespace PlexRequests.Core.Users +namespace Ombi.Core.Users { public static class UserManagementHelper { diff --git a/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs b/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs index 0f4e6b9c5..0f5d4cecd 100644 --- a/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs +++ b/PlexRequests.Helpers.Tests/AssemblyHelperTests.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class AssemblyHelperTests diff --git a/PlexRequests.Helpers.Tests/CookieHelperTests.cs b/PlexRequests.Helpers.Tests/CookieHelperTests.cs index 6acf94e85..eac799ff5 100644 --- a/PlexRequests.Helpers.Tests/CookieHelperTests.cs +++ b/PlexRequests.Helpers.Tests/CookieHelperTests.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class CookieHelperTests diff --git a/PlexRequests.Helpers.Tests/DateTimeHelperTests.cs b/PlexRequests.Helpers.Tests/DateTimeHelperTests.cs index b327f1259..111bceb9e 100644 --- a/PlexRequests.Helpers.Tests/DateTimeHelperTests.cs +++ b/PlexRequests.Helpers.Tests/DateTimeHelperTests.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; - using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class DateTimeHelperTests diff --git a/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs b/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs index 85d6cc192..55c9f4fb5 100644 --- a/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs +++ b/PlexRequests.Helpers.Tests/HtmlRemoverTests.cs @@ -29,7 +29,7 @@ using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class HtmlRemoverTests diff --git a/PlexRequests.Helpers.Tests/PasswordHasherTests.cs b/PlexRequests.Helpers.Tests/PasswordHasherTests.cs index dc34e528b..2634bae95 100644 --- a/PlexRequests.Helpers.Tests/PasswordHasherTests.cs +++ b/PlexRequests.Helpers.Tests/PasswordHasherTests.cs @@ -27,7 +27,7 @@ using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class PasswordHasherTests diff --git a/PlexRequests.Helpers.Tests/PlexHelperTests.cs b/PlexRequests.Helpers.Tests/PlexHelperTests.cs index 33a1bf1a3..a2239e2ce 100644 --- a/PlexRequests.Helpers.Tests/PlexHelperTests.cs +++ b/PlexRequests.Helpers.Tests/PlexHelperTests.cs @@ -25,12 +25,10 @@ // ************************************************************************/ #endregion -using System; using System.Collections.Generic; - using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class PlexHelperTests diff --git a/PlexRequests.Helpers.Tests/StringHasherTests.cs b/PlexRequests.Helpers.Tests/StringHasherTests.cs index a51482f00..68c06ad0f 100644 --- a/PlexRequests.Helpers.Tests/StringHasherTests.cs +++ b/PlexRequests.Helpers.Tests/StringHasherTests.cs @@ -24,12 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using System.Collections.Generic; +using System.Collections.Generic; using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class StringHasherTests diff --git a/PlexRequests.Helpers.Tests/StringHelperTests.cs b/PlexRequests.Helpers.Tests/StringHelperTests.cs index 48fcbb534..d040005a9 100644 --- a/PlexRequests.Helpers.Tests/StringHelperTests.cs +++ b/PlexRequests.Helpers.Tests/StringHelperTests.cs @@ -24,13 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using NUnit.Framework; +using Ombi.Core.Models; -using PlexRequests.Core.Models; - -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class StringHelperTests diff --git a/PlexRequests.Helpers.Tests/TypeHelperTests.cs b/PlexRequests.Helpers.Tests/TypeHelperTests.cs index 7aff9b29c..cff7d16d5 100644 --- a/PlexRequests.Helpers.Tests/TypeHelperTests.cs +++ b/PlexRequests.Helpers.Tests/TypeHelperTests.cs @@ -24,14 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using NUnit.Framework; +using Ombi.Store; -using PlexRequests.Store; - -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class TypeHelperTests diff --git a/PlexRequests.Helpers.Tests/UriHelperTests.cs b/PlexRequests.Helpers.Tests/UriHelperTests.cs index be69d7932..d6a02b9ff 100644 --- a/PlexRequests.Helpers.Tests/UriHelperTests.cs +++ b/PlexRequests.Helpers.Tests/UriHelperTests.cs @@ -27,10 +27,9 @@ using System; using System.Collections.Generic; - using NUnit.Framework; -namespace PlexRequests.Helpers.Tests +namespace Ombi.Helpers.Tests { [TestFixture] public class UriHelperTests diff --git a/PlexRequests.Helpers/Analytics/Action.cs b/PlexRequests.Helpers/Analytics/Action.cs index 37019751c..bea808b40 100644 --- a/PlexRequests.Helpers/Analytics/Action.cs +++ b/PlexRequests.Helpers/Analytics/Action.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Helpers.Analytics +namespace Ombi.Helpers.Analytics { public enum Action { diff --git a/PlexRequests.Helpers/Analytics/Analytics.cs b/PlexRequests.Helpers/Analytics/Analytics.cs index 67a92ed33..4c9c5909a 100644 --- a/PlexRequests.Helpers/Analytics/Analytics.cs +++ b/PlexRequests.Helpers/Analytics/Analytics.cs @@ -24,20 +24,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; - using NLog; - using HttpUtility = Nancy.Helpers.HttpUtility; -namespace PlexRequests.Helpers.Analytics +namespace Ombi.Helpers.Analytics { public class Analytics : IAnalytics { diff --git a/PlexRequests.Helpers/Analytics/Category.cs b/PlexRequests.Helpers/Analytics/Category.cs index e15173672..08b181df7 100644 --- a/PlexRequests.Helpers/Analytics/Category.cs +++ b/PlexRequests.Helpers/Analytics/Category.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Helpers.Analytics +namespace Ombi.Helpers.Analytics { public enum Category { diff --git a/PlexRequests.Helpers/Analytics/HitType.cs b/PlexRequests.Helpers/Analytics/HitType.cs index c3882f96a..594741f27 100644 --- a/PlexRequests.Helpers/Analytics/HitType.cs +++ b/PlexRequests.Helpers/Analytics/HitType.cs @@ -25,7 +25,7 @@ // ************************************************************************/ #endregion // ReSharper disable InconsistentNaming -namespace PlexRequests.Helpers.Analytics +namespace Ombi.Helpers.Analytics { internal enum HitType { diff --git a/PlexRequests.Helpers/Analytics/IAnalytics.cs b/PlexRequests.Helpers/Analytics/IAnalytics.cs index b808c392a..3982e403e 100644 --- a/PlexRequests.Helpers/Analytics/IAnalytics.cs +++ b/PlexRequests.Helpers/Analytics/IAnalytics.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Threading.Tasks; -namespace PlexRequests.Helpers.Analytics +namespace Ombi.Helpers.Analytics { public interface IAnalytics { diff --git a/PlexRequests.Helpers/AssemblyHelper.cs b/PlexRequests.Helpers/AssemblyHelper.cs index abdcfeeaf..1ada28100 100644 --- a/PlexRequests.Helpers/AssemblyHelper.cs +++ b/PlexRequests.Helpers/AssemblyHelper.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Diagnostics; using System.Reflection; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class AssemblyHelper { diff --git a/PlexRequests.Helpers/ByteConverterHelper.cs b/PlexRequests.Helpers/ByteConverterHelper.cs index a18ecfce8..2886a4f61 100644 --- a/PlexRequests.Helpers/ByteConverterHelper.cs +++ b/PlexRequests.Helpers/ByteConverterHelper.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Text; +using System.Text; using Newtonsoft.Json; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class ByteConverterHelper { diff --git a/PlexRequests.Helpers/CookieHelper.cs b/PlexRequests.Helpers/CookieHelper.cs index 95209e022..5d0cb5980 100644 --- a/PlexRequests.Helpers/CookieHelper.cs +++ b/PlexRequests.Helpers/CookieHelper.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class CookieHelper { diff --git a/PlexRequests.Helpers/DateTimeHelper.cs b/PlexRequests.Helpers/DateTimeHelper.cs index 3e2174ae9..d8dbc681a 100644 --- a/PlexRequests.Helpers/DateTimeHelper.cs +++ b/PlexRequests.Helpers/DateTimeHelper.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class DateTimeHelper { diff --git a/PlexRequests.Helpers/EnumExtensions.cs b/PlexRequests.Helpers/EnumExtensions.cs index 72e1fcf68..6d4e9f088 100644 --- a/PlexRequests.Helpers/EnumExtensions.cs +++ b/PlexRequests.Helpers/EnumExtensions.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class EnumExtensions { diff --git a/PlexRequests.Helpers/EnumHelper.cs b/PlexRequests.Helpers/EnumHelper.cs index 387f867e9..316de8ec7 100644 --- a/PlexRequests.Helpers/EnumHelper.cs +++ b/PlexRequests.Helpers/EnumHelper.cs @@ -31,7 +31,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Reflection; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class EnumHelper { diff --git a/PlexRequests.Helpers/Exceptions/ApiRequestException.cs b/PlexRequests.Helpers/Exceptions/ApiRequestException.cs index e44a8fdec..86b247b60 100644 --- a/PlexRequests.Helpers/Exceptions/ApiRequestException.cs +++ b/PlexRequests.Helpers/Exceptions/ApiRequestException.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; -namespace PlexRequests.Helpers.Exceptions +namespace Ombi.Helpers.Exceptions { public class ApiRequestException : Exception { diff --git a/PlexRequests.Helpers/Exceptions/ApplicationSettingsException.cs b/PlexRequests.Helpers/Exceptions/ApplicationSettingsException.cs index a923651d1..d54aef22e 100644 --- a/PlexRequests.Helpers/Exceptions/ApplicationSettingsException.cs +++ b/PlexRequests.Helpers/Exceptions/ApplicationSettingsException.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; -namespace PlexRequests.Helpers.Exceptions +namespace Ombi.Helpers.Exceptions { public class ApplicationSettingsException : Exception { diff --git a/PlexRequests.Helpers/HtmlRemover.cs b/PlexRequests.Helpers/HtmlRemover.cs index 812f845a7..1e69a1f7e 100644 --- a/PlexRequests.Helpers/HtmlRemover.cs +++ b/PlexRequests.Helpers/HtmlRemover.cs @@ -27,7 +27,7 @@ using System.Text.RegularExpressions; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class HtmlRemover { diff --git a/PlexRequests.Helpers/ICacheProvider.cs b/PlexRequests.Helpers/ICacheProvider.cs index 18b051ca0..779564ed7 100644 --- a/PlexRequests.Helpers/ICacheProvider.cs +++ b/PlexRequests.Helpers/ICacheProvider.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public interface ICacheProvider { diff --git a/PlexRequests.Helpers/JsonConvertHelper.cs b/PlexRequests.Helpers/JsonConvertHelper.cs index 9eda9652f..1652a488c 100644 --- a/PlexRequests.Helpers/JsonConvertHelper.cs +++ b/PlexRequests.Helpers/JsonConvertHelper.cs @@ -27,7 +27,7 @@ using Newtonsoft.Json; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class JsonConvertHelper { diff --git a/PlexRequests.Helpers/LoggingHelper.cs b/PlexRequests.Helpers/LoggingHelper.cs index 7ef307f9e..0a0933fac 100644 --- a/PlexRequests.Helpers/LoggingHelper.cs +++ b/PlexRequests.Helpers/LoggingHelper.cs @@ -24,18 +24,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Data; using System.IO; using System.Windows.Forms; - using Newtonsoft.Json; - using NLog; using NLog.Config; using NLog.Targets; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class LoggingHelper { diff --git a/PlexRequests.Helpers/MemoryCacheProvider.cs b/PlexRequests.Helpers/MemoryCacheProvider.cs index 98b10408c..effe76de8 100644 --- a/PlexRequests.Helpers/MemoryCacheProvider.cs +++ b/PlexRequests.Helpers/MemoryCacheProvider.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Linq; using System.Runtime.Caching; using System.Threading.Tasks; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class MemoryCacheProvider : ICacheProvider { diff --git a/PlexRequests.Helpers/ObjectCopier.cs b/PlexRequests.Helpers/ObjectCopier.cs index 2cd24808c..f38bb4bbb 100644 --- a/PlexRequests.Helpers/ObjectCopier.cs +++ b/PlexRequests.Helpers/ObjectCopier.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Newtonsoft.Json; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { /// /// Provides a method for performing a deep copy of an object. diff --git a/PlexRequests.Helpers/OperatingSystemHelper.cs b/PlexRequests.Helpers/OperatingSystemHelper.cs index 9c47b9bd9..acc583dc0 100644 --- a/PlexRequests.Helpers/OperatingSystemHelper.cs +++ b/PlexRequests.Helpers/OperatingSystemHelper.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class OperatingSystemHelper { diff --git a/PlexRequests.Helpers/PasswordHasher.cs b/PlexRequests.Helpers/PasswordHasher.cs index b3b4543cc..183f80f09 100644 --- a/PlexRequests.Helpers/PasswordHasher.cs +++ b/PlexRequests.Helpers/PasswordHasher.cs @@ -24,9 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Security.Cryptography; -namespace PlexRequests.Helpers + +namespace Ombi.Helpers { public static class PasswordHasher diff --git a/PlexRequests.Helpers/Permissions/Features.cs b/PlexRequests.Helpers/Permissions/Features.cs index 24a945ee3..ec493ea85 100644 --- a/PlexRequests.Helpers/Permissions/Features.cs +++ b/PlexRequests.Helpers/Permissions/Features.cs @@ -28,7 +28,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace PlexRequests.Helpers.Permissions +namespace Ombi.Helpers.Permissions { [Flags] public enum Features diff --git a/PlexRequests.Helpers/Permissions/Permissions.cs b/PlexRequests.Helpers/Permissions/Permissions.cs index 57112ee7e..bbfe07a4d 100644 --- a/PlexRequests.Helpers/Permissions/Permissions.cs +++ b/PlexRequests.Helpers/Permissions/Permissions.cs @@ -28,7 +28,7 @@ using System; using System.ComponentModel.DataAnnotations; -namespace PlexRequests.Helpers.Permissions +namespace Ombi.Helpers.Permissions { [Flags] //// diff --git a/PlexRequests.Helpers/PlexHelper.cs b/PlexRequests.Helpers/PlexHelper.cs index 008c737a9..6282687de 100644 --- a/PlexRequests.Helpers/PlexHelper.cs +++ b/PlexRequests.Helpers/PlexHelper.cs @@ -28,7 +28,7 @@ using System; using NLog; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class PlexHelper { diff --git a/PlexRequests.Helpers/SerializerSettings.cs b/PlexRequests.Helpers/SerializerSettings.cs index 00a995189..7dd604df5 100644 --- a/PlexRequests.Helpers/SerializerSettings.cs +++ b/PlexRequests.Helpers/SerializerSettings.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Runtime.Serialization.Formatters; +using System.Runtime.Serialization.Formatters; using Newtonsoft.Json; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class SerializerSettings { diff --git a/PlexRequests.Helpers/SessionKeys.cs b/PlexRequests.Helpers/SessionKeys.cs index fe43a909d..7c801c973 100644 --- a/PlexRequests.Helpers/SessionKeys.cs +++ b/PlexRequests.Helpers/SessionKeys.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class SessionKeys { diff --git a/PlexRequests.Helpers/StringCipher.cs b/PlexRequests.Helpers/StringCipher.cs index 55455a8ae..d33da0585 100644 --- a/PlexRequests.Helpers/StringCipher.cs +++ b/PlexRequests.Helpers/StringCipher.cs @@ -24,13 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class StringCipher { diff --git a/PlexRequests.Helpers/StringHasher.cs b/PlexRequests.Helpers/StringHasher.cs index d18083186..319eeb392 100644 --- a/PlexRequests.Helpers/StringHasher.cs +++ b/PlexRequests.Helpers/StringHasher.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Security.Cryptography; using System.Text; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class StringHasher { diff --git a/PlexRequests.Helpers/StringHelper.cs b/PlexRequests.Helpers/StringHelper.cs index de41af441..3dcd9e5eb 100644 --- a/PlexRequests.Helpers/StringHelper.cs +++ b/PlexRequests.Helpers/StringHelper.cs @@ -30,7 +30,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class StringHelper { diff --git a/PlexRequests.Helpers/TypeHelper.cs b/PlexRequests.Helpers/TypeHelper.cs index 77eae6360..a525cd7ed 100644 --- a/PlexRequests.Helpers/TypeHelper.cs +++ b/PlexRequests.Helpers/TypeHelper.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class TypeHelper { diff --git a/PlexRequests.Helpers/UriHelper.cs b/PlexRequests.Helpers/UriHelper.cs index 11a4863e5..d6b18bb8e 100644 --- a/PlexRequests.Helpers/UriHelper.cs +++ b/PlexRequests.Helpers/UriHelper.cs @@ -1,8 +1,7 @@ using System; +using Ombi.Helpers.Exceptions; -using PlexRequests.Helpers.Exceptions; - -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public static class UriHelper { diff --git a/PlexRequests.Helpers/UserClaims.cs b/PlexRequests.Helpers/UserClaims.cs index a42023e44..c56f8d8e4 100644 --- a/PlexRequests.Helpers/UserClaims.cs +++ b/PlexRequests.Helpers/UserClaims.cs @@ -1,6 +1,4 @@ -using System; - -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public class UserClaims { diff --git a/PlexRequests.Helpers/UserType.cs b/PlexRequests.Helpers/UserType.cs index b9a3c98a2..30c4a492c 100644 --- a/PlexRequests.Helpers/UserType.cs +++ b/PlexRequests.Helpers/UserType.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Helpers +namespace Ombi.Helpers { public enum UserType diff --git a/PlexRequests.Services.Tests/NotificationServiceTests.cs b/PlexRequests.Services.Tests/NotificationServiceTests.cs index a7df1c791..8c597c939 100644 --- a/PlexRequests.Services.Tests/NotificationServiceTests.cs +++ b/PlexRequests.Services.Tests/NotificationServiceTests.cs @@ -24,17 +24,15 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - using Moq; - using NUnit.Framework; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; - -namespace PlexRequests.Services.Tests +namespace Ombi.Services.Tests { [TestFixture] public class NotificationServiceTests diff --git a/PlexRequests.Services.Tests/UserRequestLimitResetterTests.cs b/PlexRequests.Services.Tests/UserRequestLimitResetterTests.cs index be437c7fe..31f946d08 100644 --- a/PlexRequests.Services.Tests/UserRequestLimitResetterTests.cs +++ b/PlexRequests.Services.Tests/UserRequestLimitResetterTests.cs @@ -24,26 +24,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; - using Moq; - using NUnit.Framework; - -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Ploeh.AutoFixture; - using Quartz; -namespace PlexRequests.Services.Tests +namespace Ombi.Services.Tests { [TestFixture] public class UserRequestLimitResetterTests diff --git a/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs b/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs index a801bf294..1e4f66af4 100644 --- a/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs +++ b/PlexRequests.Services/Interfaces/IAvailabilityChecker.cs @@ -24,14 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Services.Models; + using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Store.Models; +using Ombi.Store.Models.Plex; -using PlexRequests.Store.Models; -using PlexRequests.Store.Models.Plex; - -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface IAvailabilityChecker { diff --git a/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs b/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs index 826c8129e..dec658685 100644 --- a/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs +++ b/PlexRequests.Services/Interfaces/ICouchPotatoCacher.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface ICouchPotatoCacher { diff --git a/PlexRequests.Services/Interfaces/IIntervals.cs b/PlexRequests.Services/Interfaces/IIntervals.cs index 0d946302e..093afeedc 100644 --- a/PlexRequests.Services/Interfaces/IIntervals.cs +++ b/PlexRequests.Services/Interfaces/IIntervals.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface IIntervals { diff --git a/PlexRequests.Services/Interfaces/IJobRecord.cs b/PlexRequests.Services/Interfaces/IJobRecord.cs index a47a31bbe..350b88116 100644 --- a/PlexRequests.Services/Interfaces/IJobRecord.cs +++ b/PlexRequests.Services/Interfaces/IJobRecord.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Store.Models; -using PlexRequests.Store.Models; - -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface IJobRecord { diff --git a/PlexRequests.Services/Interfaces/INotification.cs b/PlexRequests.Services/Interfaces/INotification.cs index 1ca2ed5fe..086cf9662 100644 --- a/PlexRequests.Services/Interfaces/INotification.cs +++ b/PlexRequests.Services/Interfaces/INotification.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using PlexRequests.Services.Notification; -using PlexRequests.Core.SettingModels; +using System.Threading.Tasks; +using Ombi.Core.SettingModels; +using Ombi.Services.Notification; -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface INotification { diff --git a/PlexRequests.Services/Interfaces/INotificationEngine.cs b/PlexRequests.Services/Interfaces/INotificationEngine.cs index 5a4198d00..bfca46dfa 100644 --- a/PlexRequests.Services/Interfaces/INotificationEngine.cs +++ b/PlexRequests.Services/Interfaces/INotificationEngine.cs @@ -27,10 +27,10 @@ using System.Collections.Generic; using System.Threading.Tasks; -using PlexRequests.Core.Models; -using PlexRequests.Store; +using Ombi.Core.Models; +using Ombi.Store; -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface INotificationEngine { diff --git a/PlexRequests.Services/Interfaces/INotificationService.cs b/PlexRequests.Services/Interfaces/INotificationService.cs index c97556f99..6eb2d238c 100644 --- a/PlexRequests.Services/Interfaces/INotificationService.cs +++ b/PlexRequests.Services/Interfaces/INotificationService.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using PlexRequests.Services.Notification; -using PlexRequests.Core.SettingModels; +using System.Threading.Tasks; +using Ombi.Core.SettingModels; +using Ombi.Services.Notification; -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface INotificationService { diff --git a/PlexRequests.Services/Interfaces/ISickRageCacher.cs b/PlexRequests.Services/Interfaces/ISickRageCacher.cs index 54f1e0573..4c444af5d 100644 --- a/PlexRequests.Services/Interfaces/ISickRageCacher.cs +++ b/PlexRequests.Services/Interfaces/ISickRageCacher.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface ISickRageCacher { diff --git a/PlexRequests.Services/Interfaces/ISonarrCacher.cs b/PlexRequests.Services/Interfaces/ISonarrCacher.cs index 291216d98..be3526786 100644 --- a/PlexRequests.Services/Interfaces/ISonarrCacher.cs +++ b/PlexRequests.Services/Interfaces/ISonarrCacher.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using PlexRequests.Services.Models; +using Ombi.Services.Models; -namespace PlexRequests.Services.Interfaces +namespace Ombi.Services.Interfaces { public interface ISonarrCacher { diff --git a/PlexRequests.Services/Jobs/CouchPotatoCacher.cs b/PlexRequests.Services/Jobs/CouchPotatoCacher.cs index a45e74509..96a6d1225 100644 --- a/PlexRequests.Services/Jobs/CouchPotatoCacher.cs +++ b/PlexRequests.Services/Jobs/CouchPotatoCacher.cs @@ -27,19 +27,16 @@ using System; using System.Linq; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Movie; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Movie; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class CouchPotatoCacher : IJob, ICouchPotatoCacher { diff --git a/PlexRequests.Services/Jobs/FaultQueueHandler.cs b/PlexRequests.Services/Jobs/FaultQueueHandler.cs index b83446610..7ec0183b0 100644 --- a/PlexRequests.Services/Jobs/FaultQueueHandler.cs +++ b/PlexRequests.Services/Jobs/FaultQueueHandler.cs @@ -30,22 +30,20 @@ using System; using System.Collections.Generic; using System.Linq; - using NLog; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Api; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class FaultQueueHandler : IJob { diff --git a/PlexRequests.Services/Jobs/HtmlTemplateGenerator.cs b/PlexRequests.Services/Jobs/HtmlTemplateGenerator.cs index 0872ef8c1..990daa98f 100644 --- a/PlexRequests.Services/Jobs/HtmlTemplateGenerator.cs +++ b/PlexRequests.Services/Jobs/HtmlTemplateGenerator.cs @@ -25,11 +25,9 @@ // ************************************************************************/ #endregion -using System.IO; using System.Text; -using System.Web.UI; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public abstract class HtmlTemplateGenerator { diff --git a/PlexRequests.Services/Jobs/IPlexContentCacher.cs b/PlexRequests.Services/Jobs/IPlexContentCacher.cs index 1e50a1401..3e8954106 100644 --- a/PlexRequests.Services/Jobs/IPlexContentCacher.cs +++ b/PlexRequests.Services/Jobs/IPlexContentCacher.cs @@ -1,6 +1,6 @@ using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public interface IPlexContentCacher { diff --git a/PlexRequests.Services/Jobs/IRecentlyAdded.cs b/PlexRequests.Services/Jobs/IRecentlyAdded.cs index f557d7893..4aa279b9a 100644 --- a/PlexRequests.Services/Jobs/IRecentlyAdded.cs +++ b/PlexRequests.Services/Jobs/IRecentlyAdded.cs @@ -1,6 +1,6 @@ using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public interface IRecentlyAdded { diff --git a/PlexRequests.Services/Jobs/JobNames.cs b/PlexRequests.Services/Jobs/JobNames.cs index d88cef62b..c5b2da663 100644 --- a/PlexRequests.Services/Jobs/JobNames.cs +++ b/PlexRequests.Services/Jobs/JobNames.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public static class JobNames { diff --git a/PlexRequests.Services/Jobs/JobRecord.cs b/PlexRequests.Services/Jobs/JobRecord.cs index 629ac8446..9965db807 100644 --- a/PlexRequests.Services/Jobs/JobRecord.cs +++ b/PlexRequests.Services/Jobs/JobRecord.cs @@ -24,16 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Ombi.Services.Interfaces; +using Ombi.Store.Models; +using Ombi.Store.Repository; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class JobRecord : IJobRecord { diff --git a/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs b/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs index 8697fa1b2..a58b5841c 100644 --- a/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs +++ b/PlexRequests.Services/Jobs/PlexAvailabilityChecker.cs @@ -24,32 +24,29 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Dapper; -using Newtonsoft.Json; using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Models; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Models.Plex; -using PlexRequests.Store.Repository; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Services.Models; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Models.Plex; +using Ombi.Store.Repository; using Quartz; +using PlexMediaType = Ombi.Api.Models.Plex.PlexMediaType; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class PlexAvailabilityChecker : IJob, IAvailabilityChecker { diff --git a/PlexRequests.Services/Jobs/PlexContentCacher.cs b/PlexRequests.Services/Jobs/PlexContentCacher.cs index 575ca4373..0df3dadb7 100644 --- a/PlexRequests.Services/Jobs/PlexContentCacher.cs +++ b/PlexRequests.Services/Jobs/PlexContentCacher.cs @@ -24,32 +24,26 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; - using Dapper; -using Newtonsoft.Json; using NLog; -using Org.BouncyCastle.Crypto.Modes.Gcm; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Models; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Models.Plex; -using PlexRequests.Store.Repository; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Services.Models; +using Ombi.Store.Models; +using Ombi.Store.Models.Plex; +using Ombi.Store.Repository; using Quartz; +using PlexMediaType = Ombi.Api.Models.Plex.PlexMediaType; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class PlexContentCacher : IJob, IPlexContentCacher { diff --git a/PlexRequests.Services/Jobs/PlexEpisodeCacher.cs b/PlexRequests.Services/Jobs/PlexEpisodeCacher.cs index e91d61e3e..1dae188d6 100644 --- a/PlexRequests.Services/Jobs/PlexEpisodeCacher.cs +++ b/PlexRequests.Services/Jobs/PlexEpisodeCacher.cs @@ -24,27 +24,24 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Models; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class PlexEpisodeCacher : IJob { diff --git a/PlexRequests.Services/Jobs/PlexUserChecker.cs b/PlexRequests.Services/Jobs/PlexUserChecker.cs index d4bd53f12..cd1d26bb3 100644 --- a/PlexRequests.Services/Jobs/PlexUserChecker.cs +++ b/PlexRequests.Services/Jobs/PlexUserChecker.cs @@ -30,16 +30,16 @@ using System; using System.Linq; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Core.Users; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Core.Users; +using Ombi.Services.Interfaces; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class PlexUserChecker : IJob { diff --git a/PlexRequests.Services/Jobs/RecentlyAdded.cs b/PlexRequests.Services/Jobs/RecentlyAdded.cs index fac9a5730..676f4a09b 100644 --- a/PlexRequests.Services/Jobs/RecentlyAdded.cs +++ b/PlexRequests.Services/Jobs/RecentlyAdded.cs @@ -34,21 +34,19 @@ using System.Text; using MailKit.Net.Smtp; using MimeKit; using NLog; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Core.Users; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs.Templates; -using PlexRequests.Store.Models.Plex; +using Ombi.Api; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Core.Users; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs.Templates; using Quartz; - -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class RecentlyAdded : HtmlTemplateGenerator, IJob, IRecentlyAdded { diff --git a/PlexRequests.Services/Jobs/SickRageCacher.cs b/PlexRequests.Services/Jobs/SickRageCacher.cs index 6fedf4b27..c3f9eae9e 100644 --- a/PlexRequests.Services/Jobs/SickRageCacher.cs +++ b/PlexRequests.Services/Jobs/SickRageCacher.cs @@ -24,20 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Linq; +using System.Linq; using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.SickRage; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.SickRage; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class SickRageCacher : IJob, ISickRageCacher { diff --git a/PlexRequests.Services/Jobs/SonarrCacher.cs b/PlexRequests.Services/Jobs/SonarrCacher.cs index 9e0304f37..75ac63444 100644 --- a/PlexRequests.Services/Jobs/SonarrCacher.cs +++ b/PlexRequests.Services/Jobs/SonarrCacher.cs @@ -24,24 +24,19 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Models; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Sonarr; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Services.Models; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class SonarrCacher : IJob, ISonarrCacher { diff --git a/PlexRequests.Services/Jobs/StoreBackup.cs b/PlexRequests.Services/Jobs/StoreBackup.cs index 1bc45f54b..6a9f4ac6c 100644 --- a/PlexRequests.Services/Jobs/StoreBackup.cs +++ b/PlexRequests.Services/Jobs/StoreBackup.cs @@ -24,19 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.IO; using System.Linq; - using NLog; - -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; - +using Ombi.Services.Interfaces; +using Ombi.Store; using Quartz; - -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class StoreBackup : IJob { diff --git a/PlexRequests.Services/Jobs/StoreCleanup.cs b/PlexRequests.Services/Jobs/StoreCleanup.cs index b329eaa95..75bdd2f34 100644 --- a/PlexRequests.Services/Jobs/StoreCleanup.cs +++ b/PlexRequests.Services/Jobs/StoreCleanup.cs @@ -24,19 +24,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; - using NLog; - -using PlexRequests.Services.Interfaces; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Services.Interfaces; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class StoreCleanup : IJob { diff --git a/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.cs b/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.cs index c375e04f2..edf006440 100644 --- a/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.cs +++ b/PlexRequests.Services/Jobs/Templates/RecentlyAddedTemplate.cs @@ -31,7 +31,7 @@ using System.Text; using System.Windows.Forms; using NLog; -namespace PlexRequests.Services.Jobs.Templates +namespace Ombi.Services.Jobs.Templates { public class RecentlyAddedTemplate { diff --git a/PlexRequests.Services/Jobs/UserRequestLimitResetter.cs b/PlexRequests.Services/Jobs/UserRequestLimitResetter.cs index f32320fc8..446b2d7ba 100644 --- a/PlexRequests.Services/Jobs/UserRequestLimitResetter.cs +++ b/PlexRequests.Services/Jobs/UserRequestLimitResetter.cs @@ -24,22 +24,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; - using NLog; - -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; using Quartz; -namespace PlexRequests.Services.Jobs +namespace Ombi.Services.Jobs { public class UserRequestLimitResetter : IJob { diff --git a/PlexRequests.Services/Models/PlexAlbum.cs b/PlexRequests.Services/Models/PlexAlbum.cs index cfd225ae4..32dc6917c 100644 --- a/PlexRequests.Services/Models/PlexAlbum.cs +++ b/PlexRequests.Services/Models/PlexAlbum.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Services.Models +namespace Ombi.Services.Models { public class PlexAlbum { diff --git a/PlexRequests.Services/Models/PlexEpisodeModel.cs b/PlexRequests.Services/Models/PlexEpisodeModel.cs index fc249e0ec..61a2fb21a 100644 --- a/PlexRequests.Services/Models/PlexEpisodeModel.cs +++ b/PlexRequests.Services/Models/PlexEpisodeModel.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Helpers; -namespace PlexRequests.Services.Models +using Ombi.Helpers; + +namespace Ombi.Services.Models { public class PlexEpisodeModel { diff --git a/PlexRequests.Services/Models/PlexMovie.cs b/PlexRequests.Services/Models/PlexMovie.cs index db4f9b1b1..f0a55e4ce 100644 --- a/PlexRequests.Services/Models/PlexMovie.cs +++ b/PlexRequests.Services/Models/PlexMovie.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Services.Models +namespace Ombi.Services.Models { public class PlexMovie { diff --git a/PlexRequests.Services/Models/PlexTvShow.cs b/PlexRequests.Services/Models/PlexTvShow.cs index 3447b1665..60223c233 100644 --- a/PlexRequests.Services/Models/PlexTvShow.cs +++ b/PlexRequests.Services/Models/PlexTvShow.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.Services.Models +namespace Ombi.Services.Models { public class PlexTvShow { diff --git a/PlexRequests.Services/Models/SonarrCachedResult.cs b/PlexRequests.Services/Models/SonarrCachedResult.cs index 1398a7ce4..17125d709 100644 --- a/PlexRequests.Services/Models/SonarrCachedResult.cs +++ b/PlexRequests.Services/Models/SonarrCachedResult.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.Services.Models +namespace Ombi.Services.Models { public class SonarrCachedResult { diff --git a/PlexRequests.Services/Notification/EmailMessageNotification.cs b/PlexRequests.Services/Notification/EmailMessageNotification.cs index cc22155f2..f832eceb6 100644 --- a/PlexRequests.Services/Notification/EmailMessageNotification.cs +++ b/PlexRequests.Services/Notification/EmailMessageNotification.cs @@ -24,20 +24,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; using MimeKit; using NLog; - -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.Notification.Templates; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.Notification.Templates; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Store; using SmtpClient = MailKit.Net.Smtp.SmtpClient; -using PlexRequests.Store; -namespace PlexRequests.Services.Notification +namespace Ombi.Services.Notification { public class EmailMessageNotification : INotification { diff --git a/PlexRequests.Services/Notification/NotificationEngine.cs b/PlexRequests.Services/Notification/NotificationEngine.cs index e776e2d57..d57d64ab5 100644 --- a/PlexRequests.Services/Notification/NotificationEngine.cs +++ b/PlexRequests.Services/Notification/NotificationEngine.cs @@ -30,18 +30,16 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using NLog; -using NLog.Fluent; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core.Models; -using PlexRequests.Core.Users; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; - -namespace PlexRequests.Services.Notification +using Ombi.Api.Interfaces; +using Ombi.Core.Models; +using Ombi.Core.Users; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; + +namespace Ombi.Services.Notification { public class NotificationEngine : INotificationEngine { diff --git a/PlexRequests.Services/Notification/NotificationModel.cs b/PlexRequests.Services/Notification/NotificationModel.cs index 4114083bb..c0878c2fb 100644 --- a/PlexRequests.Services/Notification/NotificationModel.cs +++ b/PlexRequests.Services/Notification/NotificationModel.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Store; -using System; -using PlexRequests.Core.Models; +using System; +using Ombi.Core.Models; +using Ombi.Store; -namespace PlexRequests.Services.Notification +namespace Ombi.Services.Notification { public class NotificationModel { diff --git a/PlexRequests.Services/Notification/NotificationService.cs b/PlexRequests.Services/Notification/NotificationService.cs index 1d87c2fdf..1ff6a5fc0 100644 --- a/PlexRequests.Services/Notification/NotificationService.cs +++ b/PlexRequests.Services/Notification/NotificationService.cs @@ -24,17 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Concurrent; using System.Linq; using System.Threading.Tasks; - using NLog; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; -using PlexRequests.Services.Interfaces; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.Services.Notification +namespace Ombi.Services.Notification { public class NotificationService : INotificationService { diff --git a/PlexRequests.Services/Notification/PushbulletNotification.cs b/PlexRequests.Services/Notification/PushbulletNotification.cs index ff1d2e48d..7ca9ff404 100644 --- a/PlexRequests.Services/Notification/PushbulletNotification.cs +++ b/PlexRequests.Services/Notification/PushbulletNotification.cs @@ -24,19 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - using NLog; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Store; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; - -namespace PlexRequests.Services.Notification +namespace Ombi.Services.Notification { public class PushbulletNotification : INotification { diff --git a/PlexRequests.Services/Notification/PushoverNotification.cs b/PlexRequests.Services/Notification/PushoverNotification.cs index f04ed8560..2fa36a4c6 100644 --- a/PlexRequests.Services/Notification/PushoverNotification.cs +++ b/PlexRequests.Services/Notification/PushoverNotification.cs @@ -24,19 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - using NLog; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Store; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store; - -namespace PlexRequests.Services.Notification +namespace Ombi.Services.Notification { public class PushoverNotification : INotification { diff --git a/PlexRequests.Services/Notification/SlackNotification.cs b/PlexRequests.Services/Notification/SlackNotification.cs index 41ce4cc05..ccb735cd6 100644 --- a/PlexRequests.Services/Notification/SlackNotification.cs +++ b/PlexRequests.Services/Notification/SlackNotification.cs @@ -24,19 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - using NLog; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Notifications; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; - -namespace PlexRequests.Services.Notification +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Notifications; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; + +namespace Ombi.Services.Notification { public class SlackNotification : INotification { diff --git a/PlexRequests.Store/DbConfiguration.cs b/PlexRequests.Store/DbConfiguration.cs index 14d2670a6..7350cb6b8 100644 --- a/PlexRequests.Store/DbConfiguration.cs +++ b/PlexRequests.Store/DbConfiguration.cs @@ -23,20 +23,18 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // *********************************************************************** -using System.Globalization; #endregion + using System; using System.Data; using System.IO; using System.Windows.Forms; - using Mono.Data.Sqlite; - using NLog; -namespace PlexRequests.Store +namespace Ombi.Store { public class DbConfiguration : ISqliteConfiguration { diff --git a/PlexRequests.Store/Entity.cs b/PlexRequests.Store/Entity.cs index 318eab3f6..5b029f80a 100644 --- a/PlexRequests.Store/Entity.cs +++ b/PlexRequests.Store/Entity.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store +namespace Ombi.Store { public class Entity { diff --git a/PlexRequests.Store/IPlexDatabase.cs b/PlexRequests.Store/IPlexDatabase.cs index ac8b6fbea..1d9c2b631 100644 --- a/PlexRequests.Store/IPlexDatabase.cs +++ b/PlexRequests.Store/IPlexDatabase.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; -using System.Data; using System.Threading.Tasks; -using PlexRequests.Store.Models.Plex; +using Ombi.Store.Models.Plex; -namespace PlexRequests.Store +namespace Ombi.Store { public interface IPlexDatabase { diff --git a/PlexRequests.Store/ISqliteConfiguration.cs b/PlexRequests.Store/ISqliteConfiguration.cs index 963c2c498..3b2bcfabc 100644 --- a/PlexRequests.Store/ISqliteConfiguration.cs +++ b/PlexRequests.Store/ISqliteConfiguration.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // *********************************************************************** #endregion + using System.Data; -namespace PlexRequests.Store +namespace Ombi.Store { public interface ISqliteConfiguration { diff --git a/PlexRequests.Store/Models/Audit.cs b/PlexRequests.Store/Models/Audit.cs index b0edc4aad..b5013d645 100644 --- a/PlexRequests.Store/Models/Audit.cs +++ b/PlexRequests.Store/Models/Audit.cs @@ -1,7 +1,7 @@ using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store +namespace Ombi.Store.Models { [Table("Audit")] public class Audit : Entity diff --git a/PlexRequests.Store/Models/GlobalSettings.cs b/PlexRequests.Store/Models/GlobalSettings.cs index ece36bbe7..857724ef6 100644 --- a/PlexRequests.Store/Models/GlobalSettings.cs +++ b/PlexRequests.Store/Models/GlobalSettings.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("GlobalSettings")] diff --git a/PlexRequests.Store/Models/IssueBlobs.cs b/PlexRequests.Store/Models/IssueBlobs.cs index 5dfa99914..b5680fc39 100644 --- a/PlexRequests.Store/Models/IssueBlobs.cs +++ b/PlexRequests.Store/Models/IssueBlobs.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("IssueBlobs")] public class IssueBlobs : Entity diff --git a/PlexRequests.Store/Models/LogEntity.cs b/PlexRequests.Store/Models/LogEntity.cs index 860fc482a..d98633a88 100644 --- a/PlexRequests.Store/Models/LogEntity.cs +++ b/PlexRequests.Store/Models/LogEntity.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Dapper.Contrib.Extensions; using Newtonsoft.Json; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("Logs")] public class LogEntity : Entity diff --git a/PlexRequests.Store/Models/Plex/MetadataItems.cs b/PlexRequests.Store/Models/Plex/MetadataItems.cs index 8ba55fc39..23230201f 100644 --- a/PlexRequests.Store/Models/Plex/MetadataItems.cs +++ b/PlexRequests.Store/Models/Plex/MetadataItems.cs @@ -26,10 +26,9 @@ #endregion using System; -using Dapper; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models.Plex +namespace Ombi.Store.Models.Plex { [Table("metadata_items")] public class MetadataItems diff --git a/PlexRequests.Store/Models/Plex/PlexContent.cs b/PlexRequests.Store/Models/Plex/PlexContent.cs index e7c4940ed..4a24c4e1f 100644 --- a/PlexRequests.Store/Models/Plex/PlexContent.cs +++ b/PlexRequests.Store/Models/Plex/PlexContent.cs @@ -25,10 +25,9 @@ // ************************************************************************/ #endregion -using System; using System.Data.Linq.Mapping; -namespace PlexRequests.Store.Models.Plex +namespace Ombi.Store.Models.Plex { [Table(Name = nameof(PlexContent))] public class PlexContent : Entity diff --git a/PlexRequests.Store/Models/Plex/PlexMediaType .cs b/PlexRequests.Store/Models/Plex/PlexMediaType .cs index baf4868ec..67435b27d 100644 --- a/PlexRequests.Store/Models/Plex/PlexMediaType .cs +++ b/PlexRequests.Store/Models/Plex/PlexMediaType .cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.Store.Models.Plex +namespace Ombi.Store.Models.Plex { public enum PlexMediaType { diff --git a/PlexRequests.Store/Models/PlexEpisodes.cs b/PlexRequests.Store/Models/PlexEpisodes.cs index 671c98160..922fab03c 100644 --- a/PlexRequests.Store/Models/PlexEpisodes.cs +++ b/PlexRequests.Store/Models/PlexEpisodes.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("PlexEpisodes")] public class PlexEpisodes : Entity diff --git a/PlexRequests.Store/Models/PlexUsers.cs b/PlexRequests.Store/Models/PlexUsers.cs index c4f8a0296..b61b2a99e 100644 --- a/PlexRequests.Store/Models/PlexUsers.cs +++ b/PlexRequests.Store/Models/PlexUsers.cs @@ -25,10 +25,9 @@ // ************************************************************************/ #endregion -using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table(nameof(PlexUsers))] public class PlexUsers : Entity diff --git a/PlexRequests.Store/Models/RequestBlobs.cs b/PlexRequests.Store/Models/RequestBlobs.cs index 9e1bcf0fd..9c9695411 100644 --- a/PlexRequests.Store/Models/RequestBlobs.cs +++ b/PlexRequests.Store/Models/RequestBlobs.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("RequestBlobs")] public class RequestBlobs : Entity diff --git a/PlexRequests.Store/Models/RequestLimit.cs b/PlexRequests.Store/Models/RequestLimit.cs index 1c86986c6..acf2b5a66 100644 --- a/PlexRequests.Store/Models/RequestLimit.cs +++ b/PlexRequests.Store/Models/RequestLimit.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("RequestLimit")] public class RequestLimit : Entity diff --git a/PlexRequests.Store/Models/RequestQueue.cs b/PlexRequests.Store/Models/RequestQueue.cs index f68d2140c..e8067a20f 100644 --- a/PlexRequests.Store/Models/RequestQueue.cs +++ b/PlexRequests.Store/Models/RequestQueue.cs @@ -28,7 +28,7 @@ using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("RequestFaultQueue")] public class RequestQueue : Entity diff --git a/PlexRequests.Store/Models/ScheduledJobs.cs b/PlexRequests.Store/Models/ScheduledJobs.cs index 10c6f745c..9255ba1c2 100644 --- a/PlexRequests.Store/Models/ScheduledJobs.cs +++ b/PlexRequests.Store/Models/ScheduledJobs.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("ScheduledJobs")] public class ScheduledJobs : Entity diff --git a/PlexRequests.Store/Models/UsersToNotify.cs b/PlexRequests.Store/Models/UsersToNotify.cs index 521288894..b0c44dd56 100644 --- a/PlexRequests.Store/Models/UsersToNotify.cs +++ b/PlexRequests.Store/Models/UsersToNotify.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store.Models +namespace Ombi.Store.Models { [Table("UsersToNotify")] public class UsersToNotify : Entity diff --git a/PlexRequests.Store/PlexDatabase.cs b/PlexRequests.Store/PlexDatabase.cs index 2635cc22e..abd229258 100644 --- a/PlexRequests.Store/PlexDatabase.cs +++ b/PlexRequests.Store/PlexDatabase.cs @@ -25,17 +25,15 @@ // ************************************************************************/ #endregion -using System; using System.Collections.Generic; using System.Data; -using System.IO; using System.Threading.Tasks; using Dapper; using Dapper.Contrib.Extensions; using Mono.Data.Sqlite; -using PlexRequests.Store.Models.Plex; +using Ombi.Store.Models.Plex; -namespace PlexRequests.Store +namespace Ombi.Store { /// /// We should only ever READ, NEVER WRITE! diff --git a/PlexRequests.Store/Repository/BaseGenericRepository.cs b/PlexRequests.Store/Repository/BaseGenericRepository.cs index 9cafca7fd..c0278972b 100644 --- a/PlexRequests.Store/Repository/BaseGenericRepository.cs +++ b/PlexRequests.Store/Repository/BaseGenericRepository.cs @@ -24,21 +24,19 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Threading.Tasks; - -using Dapper.Contrib.Extensions; using Dapper; - +using Dapper.Contrib.Extensions; using Mono.Data.Sqlite; - using NLog; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public abstract class BaseGenericRepository where T : class { diff --git a/PlexRequests.Store/Repository/GenericRepository.cs b/PlexRequests.Store/Repository/GenericRepository.cs index 916c61b23..4d1d48687 100644 --- a/PlexRequests.Store/Repository/GenericRepository.cs +++ b/PlexRequests.Store/Repository/GenericRepository.cs @@ -30,10 +30,9 @@ using System; using System.Threading.Tasks; using Dapper.Contrib.Extensions; +using Ombi.Helpers; -using PlexRequests.Helpers; - -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public class GenericRepository : BaseGenericRepository, IRepository where T : Entity { diff --git a/PlexRequests.Store/Repository/IRepository.cs b/PlexRequests.Store/Repository/IRepository.cs index 4967d6111..0a989fe9b 100644 --- a/PlexRequests.Store/Repository/IRepository.cs +++ b/PlexRequests.Store/Repository/IRepository.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Data; using System.Threading.Tasks; -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public interface IRepository { diff --git a/PlexRequests.Store/Repository/IRequestRepository.cs b/PlexRequests.Store/Repository/IRequestRepository.cs index ae0e1f78d..0cd4e30db 100644 --- a/PlexRequests.Store/Repository/IRequestRepository.cs +++ b/PlexRequests.Store/Repository/IRequestRepository.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Threading.Tasks; +using Ombi.Store.Models; -using PlexRequests.Store.Models; - -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public interface IRequestRepository { diff --git a/PlexRequests.Store/Repository/ISettingsRepository.cs b/PlexRequests.Store/Repository/ISettingsRepository.cs index 65161950a..09adcfcea 100644 --- a/PlexRequests.Store/Repository/ISettingsRepository.cs +++ b/PlexRequests.Store/Repository/ISettingsRepository.cs @@ -24,11 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Threading.Tasks; -using PlexRequests.Store.Models; +using Ombi.Store.Models; -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public interface ISettingsRepository { diff --git a/PlexRequests.Store/Repository/PlexUserRepository.cs b/PlexRequests.Store/Repository/PlexUserRepository.cs index b706ff201..6ef713014 100644 --- a/PlexRequests.Store/Repository/PlexUserRepository.cs +++ b/PlexRequests.Store/Repository/PlexUserRepository.cs @@ -30,11 +30,10 @@ using System.Collections.Generic; using System.Data; using System.Threading.Tasks; using Dapper; -using Dapper.Contrib.Extensions; -using PlexRequests.Helpers; -using PlexRequests.Store.Models; +using Ombi.Helpers; +using Ombi.Store.Models; -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public class PlexUserRepository : BaseGenericRepository, IPlexUserRepository { diff --git a/PlexRequests.Store/Repository/RequestJsonRepository.cs b/PlexRequests.Store/Repository/RequestJsonRepository.cs index 3be985c28..4582d6295 100644 --- a/PlexRequests.Store/Repository/RequestJsonRepository.cs +++ b/PlexRequests.Store/Repository/RequestJsonRepository.cs @@ -24,16 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Dapper.Contrib.Extensions; +using Ombi.Helpers; +using Ombi.Store.Models; -using PlexRequests.Helpers; -using PlexRequests.Store.Models; - -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public class RequestJsonRepository : IRequestRepository { diff --git a/PlexRequests.Store/Repository/SettingsJsonRepository.cs b/PlexRequests.Store/Repository/SettingsJsonRepository.cs index e2d14dab9..169fb1bc7 100644 --- a/PlexRequests.Store/Repository/SettingsJsonRepository.cs +++ b/PlexRequests.Store/Repository/SettingsJsonRepository.cs @@ -24,15 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Dapper.Contrib.Extensions; +using Ombi.Helpers; +using Ombi.Store.Models; -using PlexRequests.Helpers; -using PlexRequests.Store.Models; - -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public class SettingsJsonRepository : ISettingsRepository { diff --git a/PlexRequests.Store/Repository/UserRepository.cs b/PlexRequests.Store/Repository/UserRepository.cs index 50a513e98..02d699b99 100644 --- a/PlexRequests.Store/Repository/UserRepository.cs +++ b/PlexRequests.Store/Repository/UserRepository.cs @@ -30,10 +30,9 @@ using System.Collections.Generic; using System.Data; using System.Threading.Tasks; using Dapper; -using Dapper.Contrib.Extensions; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.Store.Repository +namespace Ombi.Store.Repository { public class UserRepository : BaseGenericRepository, IUserRepository { diff --git a/PlexRequests.Store/RequestedModel.cs b/PlexRequests.Store/RequestedModel.cs index 1bba98a18..ffd416966 100644 --- a/PlexRequests.Store/RequestedModel.cs +++ b/PlexRequests.Store/RequestedModel.cs @@ -1,10 +1,10 @@ using System; -using Dapper.Contrib.Extensions; using System.Collections.Generic; using System.Linq; +using Dapper.Contrib.Extensions; using Newtonsoft.Json; -namespace PlexRequests.Store +namespace Ombi.Store { [Table("Requested")] public class RequestedModel : Entity diff --git a/PlexRequests.Store/UserEntity.cs b/PlexRequests.Store/UserEntity.cs index 3f9311fec..29becd07b 100644 --- a/PlexRequests.Store/UserEntity.cs +++ b/PlexRequests.Store/UserEntity.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Dapper.Contrib.Extensions; -namespace PlexRequests.Store +namespace Ombi.Store { public class UserEntity { diff --git a/PlexRequests.Store/UserLogins.cs b/PlexRequests.Store/UserLogins.cs index 5ade33acd..476ed728d 100644 --- a/PlexRequests.Store/UserLogins.cs +++ b/PlexRequests.Store/UserLogins.cs @@ -27,9 +27,9 @@ using System; using Dapper.Contrib.Extensions; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.Store +namespace Ombi.Store { [Table("UserLogins")] public class UserLogins : Entity diff --git a/PlexRequests.Store/UserRepository.cs b/PlexRequests.Store/UserRepository.cs index b6c884dbd..416b73551 100644 --- a/PlexRequests.Store/UserRepository.cs +++ b/PlexRequests.Store/UserRepository.cs @@ -24,15 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Dapper.Contrib.Extensions; -using PlexRequests.Helpers; -using PlexRequests.Store.Repository; +using Ombi.Helpers; +using Ombi.Store.Repository; -namespace PlexRequests.Store +namespace Ombi.Store { public class UserRepository : BaseGenericRepository, IRepository where T : UserEntity { diff --git a/PlexRequests.Store/UsersModel.cs b/PlexRequests.Store/UsersModel.cs index 45da08fdc..7bd1d0e6c 100644 --- a/PlexRequests.Store/UsersModel.cs +++ b/PlexRequests.Store/UsersModel.cs @@ -28,7 +28,7 @@ using System; using Dapper.Contrib.Extensions; -namespace PlexRequests.Store +namespace Ombi.Store { [Table("Users")] public class UsersModel : UserEntity diff --git a/PlexRequests.UI.Tests/AdminModuleTests.cs b/PlexRequests.UI.Tests/AdminModuleTests.cs index f2e48b27c..62e4bf514 100644 --- a/PlexRequests.UI.Tests/AdminModuleTests.cs +++ b/PlexRequests.UI.Tests/AdminModuleTests.cs @@ -24,34 +24,28 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using Moq; - using Nancy; using Nancy.Testing; - using Newtonsoft.Json; using Newtonsoft.Json.Linq; - using NUnit.Framework; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Models; -using PlexRequests.UI.Modules; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Services.Jobs; -using PlexRequests.UI.Helpers; - -namespace PlexRequests.UI.Tests +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Models; +using Ombi.UI.Modules.Admin; + +namespace Ombi.UI.Tests { [TestFixture] public class AdminModuleTests diff --git a/PlexRequests.UI.Tests/BootstrapperExtensions.cs b/PlexRequests.UI.Tests/BootstrapperExtensions.cs index c8f0eab3d..05be93c0d 100644 --- a/PlexRequests.UI.Tests/BootstrapperExtensions.cs +++ b/PlexRequests.UI.Tests/BootstrapperExtensions.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using Nancy.Bootstrapper; using Nancy.Session; -namespace PlexRequests.UI.Tests +namespace Ombi.UI.Tests { public static class BootstrapperExtensions { diff --git a/PlexRequests.UI.Tests/LandingPageTests.cs b/PlexRequests.UI.Tests/LandingPageTests.cs index 8789519ee..9bdf8d3aa 100644 --- a/PlexRequests.UI.Tests/LandingPageTests.cs +++ b/PlexRequests.UI.Tests/LandingPageTests.cs @@ -24,14 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; - using NUnit.Framework; +using Ombi.UI.Models; -using PlexRequests.UI.Models; - -namespace PlexRequests.UI.Tests +namespace Ombi.UI.Tests { [TestFixture] public class LandingPageTests diff --git a/PlexRequests.UI.Tests/TestRootPathProvider.cs b/PlexRequests.UI.Tests/TestRootPathProvider.cs index b1682ef6f..c0b001876 100644 --- a/PlexRequests.UI.Tests/TestRootPathProvider.cs +++ b/PlexRequests.UI.Tests/TestRootPathProvider.cs @@ -24,13 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.IO; using System.Linq; - using Nancy; -namespace PlexRequests.UI.Tests +namespace Ombi.UI.Tests { public class TestRootPathProvider : IRootPathProvider { diff --git a/PlexRequests.UI.Tests/TvSenderTests.cs b/PlexRequests.UI.Tests/TvSenderTests.cs index a63ef719b..1f6d337da 100644 --- a/PlexRequests.UI.Tests/TvSenderTests.cs +++ b/PlexRequests.UI.Tests/TvSenderTests.cs @@ -24,25 +24,21 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Moq; - using NUnit.Framework; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; - +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Sonarr; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Store; using Ploeh.AutoFixture; -namespace PlexRequests.UI.Tests +namespace Ombi.UI.Tests { [TestFixture] public class TvSenderTests diff --git a/PlexRequests.UI.Tests/UserLoginModuleTests.cs b/PlexRequests.UI.Tests/UserLoginModuleTests.cs index 703b96036..f7e59e86a 100644 --- a/PlexRequests.UI.Tests/UserLoginModuleTests.cs +++ b/PlexRequests.UI.Tests/UserLoginModuleTests.cs @@ -24,30 +24,24 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Threading.Tasks; - using Moq; - using Nancy; using Nancy.Linker; using Nancy.Testing; - -using Newtonsoft.Json; - using NUnit.Framework; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; using Ombi.UI.Modules; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.UI.Models; -using PlexRequests.UI.Modules; - -namespace PlexRequests.UI.Tests + +namespace Ombi.UI.Tests { [TestFixture] public class UserLoginModuleTests diff --git a/PlexRequests.UI/Authentication/CustomAuthenticationConfiguration.cs b/PlexRequests.UI/Authentication/CustomAuthenticationConfiguration.cs index 274267f36..d730a798e 100644 --- a/PlexRequests.UI/Authentication/CustomAuthenticationConfiguration.cs +++ b/PlexRequests.UI/Authentication/CustomAuthenticationConfiguration.cs @@ -26,9 +26,9 @@ #endregion using Nancy.Cryptography; -using PlexRequests.Store.Repository; +using Ombi.Store.Repository; -namespace PlexRequests.UI.Authentication +namespace Ombi.UI.Authentication { public class CustomAuthenticationConfiguration { diff --git a/PlexRequests.UI/Authentication/CustomAuthenticationProvider.cs b/PlexRequests.UI/Authentication/CustomAuthenticationProvider.cs index 285f9c89e..672161e4e 100644 --- a/PlexRequests.UI/Authentication/CustomAuthenticationProvider.cs +++ b/PlexRequests.UI/Authentication/CustomAuthenticationProvider.cs @@ -35,10 +35,9 @@ using Nancy.Cryptography; using Nancy.Extensions; using Nancy.Helpers; using Nancy.Security; -using PlexRequests.Core; -using PlexRequests.Helpers; +using Ombi.Core; -namespace PlexRequests.UI.Authentication +namespace Ombi.UI.Authentication { public class CustomAuthenticationProvider { diff --git a/PlexRequests.UI/Authentication/CustomModuleExtensions.cs b/PlexRequests.UI/Authentication/CustomModuleExtensions.cs index 5afac1c07..232e75e5f 100644 --- a/PlexRequests.UI/Authentication/CustomModuleExtensions.cs +++ b/PlexRequests.UI/Authentication/CustomModuleExtensions.cs @@ -27,10 +27,9 @@ using System; using Nancy; -using Nancy.Authentication.Forms; using Nancy.Extensions; -namespace PlexRequests.UI.Authentication +namespace Ombi.UI.Authentication { public static class CustomModuleExtensions { diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs index 484854713..3dc10bc00 100644 --- a/PlexRequests.UI/Bootstrapper.cs +++ b/PlexRequests.UI/Bootstrapper.cs @@ -27,33 +27,25 @@ using System.Diagnostics; using System.Net; - using Mono.Data.Sqlite; - using Nancy; using Nancy.Bootstrapper; using Nancy.Bootstrappers.Ninject; using Nancy.Conventions; using Nancy.Cryptography; using Nancy.Diagnostics; -using Nancy.Session; - -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; using Nancy.Json; - +using Nancy.Session; using Ninject; -using PlexRequests.UI.Authentication; -using Nancy.Hosting.Self; - -namespace PlexRequests.UI +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Store; +using Ombi.Store.Repository; +using Ombi.UI.Authentication; +using Ombi.UI.Helpers; + +namespace Ombi.UI { public class Bootstrapper : NinjectNancyBootstrapper { diff --git a/PlexRequests.UI/Helpers/AngularViewBase.cs b/PlexRequests.UI/Helpers/AngularViewBase.cs index 787109040..c2921d226 100644 --- a/PlexRequests.UI/Helpers/AngularViewBase.cs +++ b/PlexRequests.UI/Helpers/AngularViewBase.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.ViewEngines.Razor; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class AngularViewBase : NancyRazorViewBase { diff --git a/PlexRequests.UI/Helpers/BaseUrlHelper.cs b/PlexRequests.UI/Helpers/BaseUrlHelper.cs index 04d627b3f..0d5581838 100644 --- a/PlexRequests.UI/Helpers/BaseUrlHelper.cs +++ b/PlexRequests.UI/Helpers/BaseUrlHelper.cs @@ -24,17 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Text; -using System.Web.UI.WebControls; using Nancy; using Nancy.ViewEngines.Razor; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; - -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public static class BaseUrlHelper { diff --git a/PlexRequests.UI/Helpers/ContravariantBindingResolver.cs b/PlexRequests.UI/Helpers/ContravariantBindingResolver.cs index 0b606429d..94e41170c 100644 --- a/PlexRequests.UI/Helpers/ContravariantBindingResolver.cs +++ b/PlexRequests.UI/Helpers/ContravariantBindingResolver.cs @@ -24,18 +24,17 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Reflection; - using Ninject.Components; using Ninject.Infrastructure; using Ninject.Planning.Bindings; using Ninject.Planning.Bindings.Resolvers; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class ContravariantBindingResolver : NinjectComponent, IBindingResolver { diff --git a/PlexRequests.UI/Helpers/CultureHelper.cs b/PlexRequests.UI/Helpers/CultureHelper.cs index d933d758f..4d6fee7f7 100644 --- a/PlexRequests.UI/Helpers/CultureHelper.cs +++ b/PlexRequests.UI/Helpers/CultureHelper.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Threading; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class CultureHelper { diff --git a/PlexRequests.UI/Helpers/CustomHtmlHelper.cs b/PlexRequests.UI/Helpers/CustomHtmlHelper.cs index 103421c60..1f76cd371 100644 --- a/PlexRequests.UI/Helpers/CustomHtmlHelper.cs +++ b/PlexRequests.UI/Helpers/CustomHtmlHelper.cs @@ -27,9 +27,9 @@ using System.Text; using Nancy.ViewEngines.Razor; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public static class CustomHtmlHelper { diff --git a/PlexRequests.UI/Helpers/DebugRootPathProvider.cs b/PlexRequests.UI/Helpers/DebugRootPathProvider.cs index d7cfee6b6..bc0538a05 100644 --- a/PlexRequests.UI/Helpers/DebugRootPathProvider.cs +++ b/PlexRequests.UI/Helpers/DebugRootPathProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.IO; using System.Reflection; - using Nancy; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class DebugRootPathProvider : IRootPathProvider { diff --git a/PlexRequests.UI/Helpers/EmptyViewBase.cs b/PlexRequests.UI/Helpers/EmptyViewBase.cs index ac8dccdc6..adb66e6f6 100644 --- a/PlexRequests.UI/Helpers/EmptyViewBase.cs +++ b/PlexRequests.UI/Helpers/EmptyViewBase.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.ViewEngines.Razor; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class EmptyViewBase : NancyRazorViewBase { diff --git a/PlexRequests.UI/Helpers/HtmlSecurityHelper.cs b/PlexRequests.UI/Helpers/HtmlSecurityHelper.cs index 1aa6a72a7..1ae398091 100644 --- a/PlexRequests.UI/Helpers/HtmlSecurityHelper.cs +++ b/PlexRequests.UI/Helpers/HtmlSecurityHelper.cs @@ -28,10 +28,10 @@ using Nancy; using Nancy.Security; using Nancy.ViewEngines.Razor; -using PlexRequests.Helpers.Permissions; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Helpers.Permissions; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public static class HtmlSecurityHelper { diff --git a/PlexRequests.UI/Helpers/ServiceLocator.cs b/PlexRequests.UI/Helpers/ServiceLocator.cs index 54abe5bcd..7539d6594 100644 --- a/PlexRequests.UI/Helpers/ServiceLocator.cs +++ b/PlexRequests.UI/Helpers/ServiceLocator.cs @@ -24,13 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; - -using Nancy.TinyIoc; +using System; using Ninject; -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public class ServiceLocator : IServiceLocator { diff --git a/PlexRequests.UI/Helpers/Themes.cs b/PlexRequests.UI/Helpers/Themes.cs index a5e3af613..b298e1cbe 100644 --- a/PlexRequests.UI/Helpers/Themes.cs +++ b/PlexRequests.UI/Helpers/Themes.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public static class Themes { diff --git a/PlexRequests.UI/Helpers/ValidationHelper.cs b/PlexRequests.UI/Helpers/ValidationHelper.cs index 447426157..0f9399147 100644 --- a/PlexRequests.UI/Helpers/ValidationHelper.cs +++ b/PlexRequests.UI/Helpers/ValidationHelper.cs @@ -29,11 +29,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Nancy.Validation; +using Ombi.UI.Models; - -using PlexRequests.UI.Models; - -namespace PlexRequests.UI.Helpers +namespace Ombi.UI.Helpers { public static class ValidationHelper { diff --git a/PlexRequests.UI/Jobs/CustomJobFactory.cs b/PlexRequests.UI/Jobs/CustomJobFactory.cs index 643222844..da5f4e96c 100644 --- a/PlexRequests.UI/Jobs/CustomJobFactory.cs +++ b/PlexRequests.UI/Jobs/CustomJobFactory.cs @@ -24,16 +24,14 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using System; using NLog; - -using PlexRequests.UI.Helpers; - +using Ombi.UI.Helpers; using Quartz; using Quartz.Spi; -namespace PlexRequests.UI.Jobs +namespace Ombi.UI.Jobs { /// /// The custom job factory we are using so we are able to use our IoC container with DI in our JobNames. diff --git a/PlexRequests.UI/Jobs/Scheduler.cs b/PlexRequests.UI/Jobs/Scheduler.cs index c2a4e2ed3..6dd12321f 100644 --- a/PlexRequests.UI/Jobs/Scheduler.cs +++ b/PlexRequests.UI/Jobs/Scheduler.cs @@ -31,14 +31,14 @@ using System; using System.Collections.Generic; using System.Linq; using NLog; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Jobs; -using PlexRequests.UI.Helpers; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Services.Jobs; +using Ombi.UI.Helpers; using Quartz; using Quartz.Impl; -namespace PlexRequests.UI.Jobs +namespace Ombi.UI.Jobs { internal sealed class Scheduler : IJobScheduler { diff --git a/PlexRequests.UI/ModelDataProviders/AuthSettingsDataProvider.cs b/PlexRequests.UI/ModelDataProviders/AuthSettingsDataProvider.cs index b5d14b6f7..32b7ff326 100644 --- a/PlexRequests.UI/ModelDataProviders/AuthSettingsDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/AuthSettingsDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class AuthSettingsDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/CouchPotatoDataProvider.cs b/PlexRequests.UI/ModelDataProviders/CouchPotatoDataProvider.cs index 2e7a82b56..15ef62515 100644 --- a/PlexRequests.UI/ModelDataProviders/CouchPotatoDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/CouchPotatoDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class CouchPotatoDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/HeadphonesDataProvider.cs b/PlexRequests.UI/ModelDataProviders/HeadphonesDataProvider.cs index 36f2acdbf..5c12a2fac 100644 --- a/PlexRequests.UI/ModelDataProviders/HeadphonesDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/HeadphonesDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class HeadphonesDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/PlexSettingsDataProvider.cs b/PlexRequests.UI/ModelDataProviders/PlexSettingsDataProvider.cs index 742114bdb..498263357 100644 --- a/PlexRequests.UI/ModelDataProviders/PlexSettingsDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/PlexSettingsDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class PlexSettingsDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/RequestedModelDataProvider.cs b/PlexRequests.UI/ModelDataProviders/RequestedModelDataProvider.cs index 532097590..89c7e5b1f 100644 --- a/PlexRequests.UI/ModelDataProviders/RequestedModelDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/RequestedModelDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Store; -using PlexRequests.Store; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class RequestedModelDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/SickRageDataProvider.cs b/PlexRequests.UI/ModelDataProviders/SickRageDataProvider.cs index 8906a991f..22b9ab0e2 100644 --- a/PlexRequests.UI/ModelDataProviders/SickRageDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/SickRageDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class SickRageDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/SonarrSettingsDataProvider.cs b/PlexRequests.UI/ModelDataProviders/SonarrSettingsDataProvider.cs index b1019eb58..694973e6a 100644 --- a/PlexRequests.UI/ModelDataProviders/SonarrSettingsDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/SonarrSettingsDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class SonarrSettingsDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/ModelDataProviders/UserUpdateViewModelDataProvider.cs b/PlexRequests.UI/ModelDataProviders/UserUpdateViewModelDataProvider.cs index 5f9823496..325bcb860 100644 --- a/PlexRequests.UI/ModelDataProviders/UserUpdateViewModelDataProvider.cs +++ b/PlexRequests.UI/ModelDataProviders/UserUpdateViewModelDataProvider.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Swagger; using Nancy.Swagger.Services; +using Ombi.UI.Models.UserManagement; -using PlexRequests.UI.Models; - -namespace PlexRequests.UI.ModelDataProviders +namespace Ombi.UI.ModelDataProviders { public class UserUpdateViewModelDataProvider : ISwaggerModelDataProvider { diff --git a/PlexRequests.UI/Models/AboutAdminViewModel.cs b/PlexRequests.UI/Models/AboutAdminViewModel.cs index f84dd358b..dbe93dc4a 100644 --- a/PlexRequests.UI/Models/AboutAdminViewModel.cs +++ b/PlexRequests.UI/Models/AboutAdminViewModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class AboutAdminViewModel { diff --git a/PlexRequests.UI/Models/ApiModel.cs b/PlexRequests.UI/Models/ApiModel.cs index 963a2adc6..9c3864f94 100644 --- a/PlexRequests.UI/Models/ApiModel.cs +++ b/PlexRequests.UI/Models/ApiModel.cs @@ -1,6 +1,4 @@ -using System; - -namespace PlexRequests.UI +namespace Ombi.UI.Models { public class ApiModel { diff --git a/PlexRequests.UI/Models/DatatablesModel.cs b/PlexRequests.UI/Models/DatatablesModel.cs index 3437f2873..24305bc9f 100644 --- a/PlexRequests.UI/Models/DatatablesModel.cs +++ b/PlexRequests.UI/Models/DatatablesModel.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class DatatablesModel { diff --git a/PlexRequests.UI/Models/EpisodeListViewModel.cs b/PlexRequests.UI/Models/EpisodeListViewModel.cs index 33050c84d..76f169d58 100644 --- a/PlexRequests.UI/Models/EpisodeListViewModel.cs +++ b/PlexRequests.UI/Models/EpisodeListViewModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class EpisodeListViewModel { diff --git a/PlexRequests.UI/Models/EpisodeRequestModel.cs b/PlexRequests.UI/Models/EpisodeRequestModel.cs index 1d431e6b3..5f3a6b71c 100644 --- a/PlexRequests.UI/Models/EpisodeRequestModel.cs +++ b/PlexRequests.UI/Models/EpisodeRequestModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class EpisodeRequestModel { diff --git a/PlexRequests.UI/Models/FaultedRequestsViewModel.cs b/PlexRequests.UI/Models/FaultedRequestsViewModel.cs index b9dc96c54..d3c23d477 100644 --- a/PlexRequests.UI/Models/FaultedRequestsViewModel.cs +++ b/PlexRequests.UI/Models/FaultedRequestsViewModel.cs @@ -26,10 +26,8 @@ #endregion using System; -using PlexRequests.Store; -using PlexRequests.Store.Models; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class FaultedRequestsViewModel { diff --git a/PlexRequests.UI/Models/IssuesDetailsViewModel.cs b/PlexRequests.UI/Models/IssuesDetailsViewModel.cs index b2126fd9d..c0f6499d9 100644 --- a/PlexRequests.UI/Models/IssuesDetailsViewModel.cs +++ b/PlexRequests.UI/Models/IssuesDetailsViewModel.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; -using PlexRequests.Core.Models; -using PlexRequests.Store; +using System.Collections.Generic; +using Ombi.Core.Models; +using Ombi.Store; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class IssuesDetailsViewModel { diff --git a/PlexRequests.UI/Models/IssuesViewMOdel.cs b/PlexRequests.UI/Models/IssuesViewMOdel.cs index 00f3c5082..b168f7cd5 100644 --- a/PlexRequests.UI/Models/IssuesViewMOdel.cs +++ b/PlexRequests.UI/Models/IssuesViewMOdel.cs @@ -25,9 +25,7 @@ // ************************************************************************/ #endregion -using PlexRequests.Store; - -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class IssuesViewModel { diff --git a/PlexRequests.UI/Models/JsonResponseModel.cs b/PlexRequests.UI/Models/JsonResponseModel.cs index 9595d3dd8..9fe2de58b 100644 --- a/PlexRequests.UI/Models/JsonResponseModel.cs +++ b/PlexRequests.UI/Models/JsonResponseModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class JsonResponseModel { diff --git a/PlexRequests.UI/Models/JsonUpdateAvailableModel.cs b/PlexRequests.UI/Models/JsonUpdateAvailableModel.cs index 38931f86a..5a145d1df 100644 --- a/PlexRequests.UI/Models/JsonUpdateAvailableModel.cs +++ b/PlexRequests.UI/Models/JsonUpdateAvailableModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class JsonUpdateAvailableModel { diff --git a/PlexRequests.UI/Models/LandingPageViewModel.cs b/PlexRequests.UI/Models/LandingPageViewModel.cs index 300f49762..4b58e1cca 100644 --- a/PlexRequests.UI/Models/LandingPageViewModel.cs +++ b/PlexRequests.UI/Models/LandingPageViewModel.cs @@ -25,9 +25,9 @@ // ************************************************************************/ #endregion -using PlexRequests.Core.SettingModels; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class LandingPageViewModel : LandingPageSettings { diff --git a/PlexRequests.UI/Models/MovieSearchType.cs b/PlexRequests.UI/Models/MovieSearchType.cs index f0484d6c8..bc0bd33c3 100644 --- a/PlexRequests.UI/Models/MovieSearchType.cs +++ b/PlexRequests.UI/Models/MovieSearchType.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public enum MovieSearchType { diff --git a/PlexRequests.UI/Models/PlexAuth.cs b/PlexRequests.UI/Models/PlexAuth.cs index 0b5b33df4..6515694ed 100644 --- a/PlexRequests.UI/Models/PlexAuth.cs +++ b/PlexRequests.UI/Models/PlexAuth.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class PlexAuth { diff --git a/PlexRequests.UI/Models/QualityModel.cs b/PlexRequests.UI/Models/QualityModel.cs index bffa664ea..758c30f00 100644 --- a/PlexRequests.UI/Models/QualityModel.cs +++ b/PlexRequests.UI/Models/QualityModel.cs @@ -1,4 +1,4 @@ -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class QualityModel { diff --git a/PlexRequests.UI/Models/RequestViewModel.cs b/PlexRequests.UI/Models/RequestViewModel.cs index 6d1ecb0c5..b6db27bca 100644 --- a/PlexRequests.UI/Models/RequestViewModel.cs +++ b/PlexRequests.UI/Models/RequestViewModel.cs @@ -24,10 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using PlexRequests.Store; + using System; +using Ombi.Store; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class RequestViewModel { diff --git a/PlexRequests.UI/Models/ScheduledJobsViewModel.cs b/PlexRequests.UI/Models/ScheduledJobsViewModel.cs index da444bd6f..df1a6ef2f 100644 --- a/PlexRequests.UI/Models/ScheduledJobsViewModel.cs +++ b/PlexRequests.UI/Models/ScheduledJobsViewModel.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class ScheduledJobsViewModel : ScheduledJobsSettings { diff --git a/PlexRequests.UI/Models/SearchMovieViewModel.cs b/PlexRequests.UI/Models/SearchMovieViewModel.cs index 67ebee627..d0d71bfd9 100644 --- a/PlexRequests.UI/Models/SearchMovieViewModel.cs +++ b/PlexRequests.UI/Models/SearchMovieViewModel.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class SearchMovieViewModel : SearchViewModel { diff --git a/PlexRequests.UI/Models/SearchMusicViewModel.cs b/PlexRequests.UI/Models/SearchMusicViewModel.cs index 55bcb012c..cdc3152ae 100644 --- a/PlexRequests.UI/Models/SearchMusicViewModel.cs +++ b/PlexRequests.UI/Models/SearchMusicViewModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class SearchMusicViewModel : SearchViewModel { diff --git a/PlexRequests.UI/Models/SearchTvShowViewModel.cs b/PlexRequests.UI/Models/SearchTvShowViewModel.cs index 45bd0c8fd..47af1ba47 100644 --- a/PlexRequests.UI/Models/SearchTvShowViewModel.cs +++ b/PlexRequests.UI/Models/SearchTvShowViewModel.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class SearchTvShowViewModel : SearchViewModel { diff --git a/PlexRequests.UI/Models/SearchViewModel.cs b/PlexRequests.UI/Models/SearchViewModel.cs index 9c11d32ef..b4b95fb5c 100644 --- a/PlexRequests.UI/Models/SearchViewModel.cs +++ b/PlexRequests.UI/Models/SearchViewModel.cs @@ -26,7 +26,7 @@ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models { public class SearchViewModel { diff --git a/PlexRequests.UI/Models/UserManagement/DeleteUserViewModel.cs b/PlexRequests.UI/Models/UserManagement/DeleteUserViewModel.cs index d4ab5cfaf..ed4629658 100644 --- a/PlexRequests.UI/Models/UserManagement/DeleteUserViewModel.cs +++ b/PlexRequests.UI/Models/UserManagement/DeleteUserViewModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models.UserManagement { public class DeleteUserViewModel { diff --git a/PlexRequests.UI/Models/UserManagement/UserManagementUsersViewModel.cs b/PlexRequests.UI/Models/UserManagement/UserManagementUsersViewModel.cs index cdc78a07a..d6074babb 100644 --- a/PlexRequests.UI/Models/UserManagement/UserManagementUsersViewModel.cs +++ b/PlexRequests.UI/Models/UserManagement/UserManagementUsersViewModel.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using Newtonsoft.Json; -using PlexRequests.Helpers; +using Ombi.Helpers; -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models.UserManagement { public class UserManagementUsersViewModel { diff --git a/PlexRequests.UI/Models/UserManagement/UserUpdateViewModel.cs b/PlexRequests.UI/Models/UserManagement/UserUpdateViewModel.cs index 550c2381b..33c0bfffb 100644 --- a/PlexRequests.UI/Models/UserManagement/UserUpdateViewModel.cs +++ b/PlexRequests.UI/Models/UserManagement/UserUpdateViewModel.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Models +namespace Ombi.UI.Models.UserManagement { public class UserUpdateViewModel { diff --git a/PlexRequests.UI/Modules/Admin/AboutModule.cs b/PlexRequests.UI/Modules/Admin/AboutModule.cs index 9f75c1c8b..ecdfea7ea 100644 --- a/PlexRequests.UI/Modules/Admin/AboutModule.cs +++ b/PlexRequests.UI/Modules/Admin/AboutModule.cs @@ -32,15 +32,14 @@ using System.Threading.Tasks; using Nancy; using Nancy.Responses.Negotiation; using NLog; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Models; -using TMDbLib.Utilities; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules.Admin +namespace Ombi.UI.Modules.Admin { public class AboutModule : BaseModule { diff --git a/PlexRequests.UI/Modules/Admin/AdminModule.cs b/PlexRequests.UI/Modules/Admin/AdminModule.cs index 64ac7794f..15dbd81d3 100644 --- a/PlexRequests.UI/Modules/Admin/AdminModule.cs +++ b/PlexRequests.UI/Modules/Admin/AdminModule.cs @@ -29,47 +29,38 @@ #endregion using System; -using System.Diagnostics; -using System.Threading.Tasks; using System.Collections.Generic; using System.Linq; using System.Net; - +using System.Threading.Tasks; using Nancy; using Nancy.Extensions; +using Nancy.Json; using Nancy.ModelBinding; using Nancy.Responses.Negotiation; using Nancy.Validation; -using Nancy.Json; -using Nancy.Security; using NLog; - -using MarkdownSharp; - -using Nancy.Responses; - -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Exceptions; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.Services.Notification; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; +using Ombi.Api; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Exceptions; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.Services.Notification; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Helpers; +using Ombi.UI.Models; using Quartz; -using Action = PlexRequests.Helpers.Analytics.Action; -using HttpStatusCode = Nancy.HttpStatusCode; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Action = Ombi.Helpers.Analytics.Action; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules.Admin { public class AdminModule : BaseModule { diff --git a/PlexRequests.UI/Modules/Admin/CustomizationModule.cs b/PlexRequests.UI/Modules/Admin/CustomizationModule.cs index be009396d..a368e66f4 100644 --- a/PlexRequests.UI/Modules/Admin/CustomizationModule.cs +++ b/PlexRequests.UI/Modules/Admin/CustomizationModule.cs @@ -29,13 +29,13 @@ using System.Threading.Tasks; using Nancy; using Nancy.ModelBinding; using Nancy.Responses.Negotiation; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers.Permissions; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules.Admin +namespace Ombi.UI.Modules.Admin { public class CustomizationModule : BaseModule { diff --git a/PlexRequests.UI/Modules/Admin/FaultQueueModule.cs b/PlexRequests.UI/Modules/Admin/FaultQueueModule.cs index bb79e729d..ab8ddc927 100644 --- a/PlexRequests.UI/Modules/Admin/FaultQueueModule.cs +++ b/PlexRequests.UI/Modules/Admin/FaultQueueModule.cs @@ -25,21 +25,19 @@ // ************************************************************************/ #endregion -using System.Collections.Generic; using System.Linq; using Nancy.Responses.Negotiation; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules.Admin +namespace Ombi.UI.Modules.Admin { public class FaultQueueModule : BaseModule { diff --git a/PlexRequests.UI/Modules/Admin/SystemStatusModule.cs b/PlexRequests.UI/Modules/Admin/SystemStatusModule.cs index 32bc92abe..caf987249 100644 --- a/PlexRequests.UI/Modules/Admin/SystemStatusModule.cs +++ b/PlexRequests.UI/Modules/Admin/SystemStatusModule.cs @@ -35,16 +35,17 @@ using MarkdownSharp; using Nancy; using Nancy.ModelBinding; using Nancy.Responses.Negotiation; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Core.StatusChecker; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules.Admin +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Core.StatusChecker; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.UI.Models; +using Action = Ombi.Helpers.Analytics.Action; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules.Admin { public class SystemStatusModule : BaseModule { @@ -106,7 +107,7 @@ namespace PlexRequests.UI.Modules.Admin var settings = this.Bind(); - Analytics.TrackEventAsync(Category.Admin, PlexRequests.Helpers.Analytics.Action.Update, $"Updated Branch {EnumHelper.GetDisplayValue(settings.Branch)}", Username, CookieHelper.GetAnalyticClientId(Cookies)); + Analytics.TrackEventAsync(Category.Admin, Action.Update, $"Updated Branch {EnumHelper.GetDisplayValue(settings.Branch)}", Username, CookieHelper.GetAnalyticClientId(Cookies)); await SystemSettings.SaveSettingsAsync(settings); // Clear the cache @@ -117,7 +118,7 @@ namespace PlexRequests.UI.Modules.Admin private Response AutoUpdate() { - Analytics.TrackEventAsync(Category.Admin, PlexRequests.Helpers.Analytics.Action.Update, "AutoUpdate", Username, CookieHelper.GetAnalyticClientId(Cookies)); + Analytics.TrackEventAsync(Category.Admin, Action.Update, "AutoUpdate", Username, CookieHelper.GetAnalyticClientId(Cookies)); var url = Request.Form["url"]; var args = (string)Request.Form["args"].ToString(); diff --git a/PlexRequests.UI/Modules/Admin/UserManagementSettingsModule.cs b/PlexRequests.UI/Modules/Admin/UserManagementSettingsModule.cs index 84bede852..12f20f144 100644 --- a/PlexRequests.UI/Modules/Admin/UserManagementSettingsModule.cs +++ b/PlexRequests.UI/Modules/Admin/UserManagementSettingsModule.cs @@ -31,16 +31,14 @@ using Nancy.ModelBinding; using Nancy.Responses.Negotiation; using Nancy.Validation; using NLog; -using NLog.Fluent; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers.Permissions; +using Ombi.UI.Helpers; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules.Admin +namespace Ombi.UI.Modules.Admin { public class UserManagementSettingsModule : BaseModule { diff --git a/PlexRequests.UI/Modules/ApiDocsModule.cs b/PlexRequests.UI/Modules/ApiDocsModule.cs index 552dcdf27..d364945ab 100644 --- a/PlexRequests.UI/Modules/ApiDocsModule.cs +++ b/PlexRequests.UI/Modules/ApiDocsModule.cs @@ -24,16 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Nancy; -using Nancy.Responses.Negotiation; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Nancy.Responses.Negotiation; +using Ombi.Core; +using Ombi.Core.SettingModels; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiDocsModule : BaseModule { diff --git a/PlexRequests.UI/Modules/ApiRequestMetadataModule.cs b/PlexRequests.UI/Modules/ApiRequestMetadataModule.cs index 732ad356e..9be561ea8 100644 --- a/PlexRequests.UI/Modules/ApiRequestMetadataModule.cs +++ b/PlexRequests.UI/Modules/ApiRequestMetadataModule.cs @@ -24,15 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; +using System.Collections.Generic; using Nancy.Metadata.Modules; using Nancy.Swagger; +using Ombi.Store; +using Ombi.UI.Models; +using Ombi.UI.Models.UserManagement; -using PlexRequests.Store; -using PlexRequests.UI.Models; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiRequestMetadataModule: MetadataModule { diff --git a/PlexRequests.UI/Modules/ApiRequestModule.cs b/PlexRequests.UI/Modules/ApiRequestModule.cs index 01c18ba57..353bdbe8d 100644 --- a/PlexRequests.UI/Modules/ApiRequestModule.cs +++ b/PlexRequests.UI/Modules/ApiRequestModule.cs @@ -24,25 +24,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; - using Nancy; using Nancy.Extensions; -using Nancy.ModelBinding; using Nancy.Validation; - using Newtonsoft.Json; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Store; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiRequestModule : BaseApiModule { diff --git a/PlexRequests.UI/Modules/ApiSettingsMetadataModule.cs b/PlexRequests.UI/Modules/ApiSettingsMetadataModule.cs index 1c7e41b38..a25d1b8a3 100644 --- a/PlexRequests.UI/Modules/ApiSettingsMetadataModule.cs +++ b/PlexRequests.UI/Modules/ApiSettingsMetadataModule.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Metadata.Modules; using Nancy.Swagger; +using Ombi.Core.SettingModels; +using Ombi.UI.Models; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiSettingsMetadataModule: MetadataModule { diff --git a/PlexRequests.UI/Modules/ApiSettingsModule.cs b/PlexRequests.UI/Modules/ApiSettingsModule.cs index dc0bbacfd..c8396621a 100644 --- a/PlexRequests.UI/Modules/ApiSettingsModule.cs +++ b/PlexRequests.UI/Modules/ApiSettingsModule.cs @@ -24,24 +24,19 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using System.Web.UI.WebControls; +using System; using Nancy; using Nancy.Extensions; -using Nancy.ModelBinding; using Nancy.Validation; - using Newtonsoft.Json; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiSettingsModule : BaseApiModule { diff --git a/PlexRequests.UI/Modules/ApiUserMetadataModule.cs b/PlexRequests.UI/Modules/ApiUserMetadataModule.cs index b581e7bcd..b1f1fd7ae 100644 --- a/PlexRequests.UI/Modules/ApiUserMetadataModule.cs +++ b/PlexRequests.UI/Modules/ApiUserMetadataModule.cs @@ -24,12 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy.Metadata.Modules; using Nancy.Swagger; +using Ombi.UI.Models; +using Ombi.UI.Models.UserManagement; -using PlexRequests.UI.Models; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiUserMetadataModule: MetadataModule { diff --git a/PlexRequests.UI/Modules/ApiUserModule.cs b/PlexRequests.UI/Modules/ApiUserModule.cs index fa6903e1e..fe994746e 100644 --- a/PlexRequests.UI/Modules/ApiUserModule.cs +++ b/PlexRequests.UI/Modules/ApiUserModule.cs @@ -24,21 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using System.Collections.Generic; using Nancy; using Nancy.ModelBinding; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.UI.Models; +using Ombi.UI.Models.UserManagement; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApiUserModule : BaseApiModule { diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs index ccdbba720..9a3349600 100644 --- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs +++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs @@ -24,26 +24,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.IO; -using Mono.Data.Sqlite; using Nancy; using Nancy.ModelBinding; using Nancy.Security; using Nancy.Validation; using NLog; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.UI.Helpers; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class ApplicationTesterModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/ApprovalModule.cs b/PlexRequests.UI/Modules/ApprovalModule.cs index 54914d795..3e47c3714 100644 --- a/PlexRequests.UI/Modules/ApprovalModule.cs +++ b/PlexRequests.UI/Modules/ApprovalModule.cs @@ -24,29 +24,25 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; -using System.Linq.Expressions; using System.Threading.Tasks; - using Nancy; -using Nancy.Security; - using NLog; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.Queue; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Queue; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Store; +using Ombi.UI.Helpers; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public class ApprovalModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/BaseApiModule.cs b/PlexRequests.UI/Modules/BaseApiModule.cs index 8dfc9ad2e..791c29e70 100644 --- a/PlexRequests.UI/Modules/BaseApiModule.cs +++ b/PlexRequests.UI/Modules/BaseApiModule.cs @@ -24,20 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System.Collections.Generic; using System.Linq; - using Nancy; using Nancy.Validation; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Store; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public abstract class BaseApiModule : BaseModule { diff --git a/PlexRequests.UI/Modules/BaseAuthModule.cs b/PlexRequests.UI/Modules/BaseAuthModule.cs index 5ddf39356..1cc297313 100644 --- a/PlexRequests.UI/Modules/BaseAuthModule.cs +++ b/PlexRequests.UI/Modules/BaseAuthModule.cs @@ -28,12 +28,12 @@ using Nancy; using Nancy.Extensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public abstract class BaseAuthModule : BaseModule { diff --git a/PlexRequests.UI/Modules/BaseModule.cs b/PlexRequests.UI/Modules/BaseModule.cs index 477d2d848..59904dcb6 100644 --- a/PlexRequests.UI/Modules/BaseModule.cs +++ b/PlexRequests.UI/Modules/BaseModule.cs @@ -24,21 +24,21 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Collections.Generic; using System.Linq; using System.Threading; - using Nancy; using Nancy.Security; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.UI.Helpers; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public abstract class BaseModule : NancyModule { diff --git a/PlexRequests.UI/Modules/BetaModule.cs b/PlexRequests.UI/Modules/BetaModule.cs index 2b49d03d3..e14c6bd0d 100644 --- a/PlexRequests.UI/Modules/BetaModule.cs +++ b/PlexRequests.UI/Modules/BetaModule.cs @@ -24,9 +24,10 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Nancy; -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class BetaModule : NancyModule { diff --git a/PlexRequests.UI/Modules/CultureModule.cs b/PlexRequests.UI/Modules/CultureModule.cs index 75426f613..4486b0938 100644 --- a/PlexRequests.UI/Modules/CultureModule.cs +++ b/PlexRequests.UI/Modules/CultureModule.cs @@ -24,22 +24,20 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; -using System.Threading.Tasks; +using System; using Nancy; using Nancy.Extensions; using Nancy.Responses; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.UI.Helpers; +using Action = Ombi.Helpers.Analytics.Action; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class CultureModule : BaseModule { @@ -73,7 +71,7 @@ namespace PlexRequests.UI.Modules var response = Context.GetRedirect(returnUrl); response.WithCookie(CultureCookieName, cookie ?? culture, DateTime.Now.AddYears(1)); - Analytics.TrackEventAsync(Category.Navbar, PlexRequests.Helpers.Analytics.Action.Language, culture, Username, CookieHelper.GetAnalyticClientId(Cookies)); + Analytics.TrackEventAsync(Category.Navbar, Action.Language, culture, Username, CookieHelper.GetAnalyticClientId(Cookies)); return response; } diff --git a/PlexRequests.UI/Modules/DonationLinkModule.cs b/PlexRequests.UI/Modules/DonationLinkModule.cs index 39168dad7..89c7b52e8 100644 --- a/PlexRequests.UI/Modules/DonationLinkModule.cs +++ b/PlexRequests.UI/Modules/DonationLinkModule.cs @@ -1,17 +1,13 @@ using System; using System.Threading.Tasks; - using Nancy; using NLog; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class DonationLinkModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/IndexModule.cs b/PlexRequests.UI/Modules/IndexModule.cs index 96d62149c..e39f50e4b 100644 --- a/PlexRequests.UI/Modules/IndexModule.cs +++ b/PlexRequests.UI/Modules/IndexModule.cs @@ -24,20 +24,16 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Threading.Tasks; -using Nancy; +using System.Threading.Tasks; using Nancy.Extensions; using Nancy.Linker; using Nancy.Responses; +using Ombi.Core; +using Ombi.Core.SettingModels; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class IndexModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/IssuesModule.cs b/PlexRequests.UI/Modules/IssuesModule.cs index 3a09cc2f6..58897355a 100644 --- a/PlexRequests.UI/Modules/IssuesModule.cs +++ b/PlexRequests.UI/Modules/IssuesModule.cs @@ -2,28 +2,22 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using System.Web.UI.WebControls; using Nancy; -using Nancy.Extensions; using Nancy.Responses.Negotiation; -using Nancy.Security; - using NLog; - -using PlexRequests.Api; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Api; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; +using Ombi.Store; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public class IssuesModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/LandingPageModule.cs b/PlexRequests.UI/Modules/LandingPageModule.cs index 8f070764d..5f1076be8 100644 --- a/PlexRequests.UI/Modules/LandingPageModule.cs +++ b/PlexRequests.UI/Modules/LandingPageModule.cs @@ -24,21 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Threading.Tasks; - using Nancy; using Nancy.Linker; +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class LandingPageModule : BaseModule { diff --git a/PlexRequests.UI/Modules/LayoutModule.cs b/PlexRequests.UI/Modules/LayoutModule.cs index 92b797960..f4056ebd8 100644 --- a/PlexRequests.UI/Modules/LayoutModule.cs +++ b/PlexRequests.UI/Modules/LayoutModule.cs @@ -24,26 +24,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Linq; using System.Threading.Tasks; - using Nancy; - using NLog; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Core.StatusChecker; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Core.StatusChecker; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +namespace Ombi.UI.Modules { public class LayoutModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/LoginModule.cs b/PlexRequests.UI/Modules/LoginModule.cs index 27b638eff..1805c38df 100644 --- a/PlexRequests.UI/Modules/LoginModule.cs +++ b/PlexRequests.UI/Modules/LoginModule.cs @@ -35,18 +35,17 @@ using Nancy.Extensions; using Nancy.Linker; using Nancy.Responses.Negotiation; using Nancy.Security; - -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Authentication; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Permissions; +using Ombi.Store; +using Ombi.Store.Repository; +using Ombi.UI.Authentication; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public class LoginModule : BaseModule { diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs index d65ebe9e7..2e30fbc1f 100644 --- a/PlexRequests.UI/Modules/RequestsModule.cs +++ b/PlexRequests.UI/Modules/RequestsModule.cs @@ -26,33 +26,27 @@ #endregion using System; +using System.Collections.Generic; using System.Linq; - +using System.Threading.Tasks; using Nancy; using Nancy.Responses.Negotiation; -using Nancy.Security; - -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.UI.Models; -using PlexRequests.Helpers; -using System.Collections.Generic; -using PlexRequests.Api.Interfaces; -using System.Threading.Tasks; - using NLog; - -using PlexRequests.Core.Models; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Helpers; -using Action = PlexRequests.Helpers.Analytics.Action; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; +using Ombi.Store; +using Ombi.UI.Models; +using Action = Ombi.Helpers.Analytics.Action; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public class RequestsModule : BaseAuthModule { diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index e5ee0e931..5722fc53f 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -37,31 +37,30 @@ using Nancy.Extensions; using Nancy.Responses.Negotiation; using Newtonsoft.Json; using NLog; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Music; -using PlexRequests.Api.Models.Sonarr; -using PlexRequests.Api.Models.Tv; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.Queue; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Models.Plex; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using PlexRequests.UI.Modules; +using Ombi.Api; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Music; +using Ombi.Api.Models.Sonarr; +using Ombi.Api.Models.Tv; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.Queue; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Models.Plex; +using Ombi.Store.Repository; +using Ombi.UI.Helpers; +using Ombi.UI.Models; using TMDbLib.Objects.General; -using Action = PlexRequests.Helpers.Analytics.Action; -using EpisodesModel = PlexRequests.Store.EpisodesModel; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Action = Ombi.Helpers.Analytics.Action; +using EpisodesModel = Ombi.Store.EpisodesModel; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; namespace Ombi.UI.Modules { @@ -715,7 +714,7 @@ namespace Ombi.UI.Modules case "episode": model.Episodes = new List(); - foreach (var ep in episodeModel?.Episodes ?? new PlexRequests.UI.Models.EpisodesModel[0]) + foreach (var ep in episodeModel?.Episodes ?? new Models.EpisodesModel[0]) { model.Episodes.Add(new EpisodesModel { @@ -1343,7 +1342,7 @@ namespace Ombi.UI.Modules return Response.AsJson(new JsonResponseModel { Result = true, Message = message }); } - private IEnumerable GetListDifferences(IEnumerable existing, IEnumerable request) + private IEnumerable GetListDifferences(IEnumerable existing, IEnumerable request) { var newRequest = request .Select(r => diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs index a08dd270d..a425a930d 100644 --- a/PlexRequests.UI/Modules/UserLoginModule.cs +++ b/PlexRequests.UI/Modules/UserLoginModule.cs @@ -32,20 +32,19 @@ using Nancy; using Nancy.Extensions; using Nancy.Linker; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Core.Users; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Authentication; -using PlexRequests.UI.Modules; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Core.Users; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Authentication; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; namespace Ombi.UI.Modules diff --git a/PlexRequests.UI/Modules/UserManagementModule.cs b/PlexRequests.UI/Modules/UserManagementModule.cs index 3066b2c52..5b853f70d 100644 --- a/PlexRequests.UI/Modules/UserManagementModule.cs +++ b/PlexRequests.UI/Modules/UserManagementModule.cs @@ -2,27 +2,27 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; - using Nancy; using Nancy.Extensions; using Nancy.Responses.Negotiation; using Newtonsoft.Json; -using PlexRequests.Api.Interfaces; -using PlexRequests.Api.Models.Plex; -using PlexRequests.Core; -using PlexRequests.Core.Models; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.Store; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Models; -using Action = PlexRequests.Helpers.Analytics.Action; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -namespace PlexRequests.UI.Modules +using Ombi.Api.Interfaces; +using Ombi.Api.Models.Plex; +using Ombi.Core; +using Ombi.Core.Models; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.Store; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Models; +using Ombi.UI.Models.UserManagement; +using Action = Ombi.Helpers.Analytics.Action; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +namespace Ombi.UI.Modules { public class UserManagementModule : BaseModule { diff --git a/PlexRequests.UI/Modules/UserWizardModule.cs b/PlexRequests.UI/Modules/UserWizardModule.cs index c4a90027d..922647a41 100644 --- a/PlexRequests.UI/Modules/UserWizardModule.cs +++ b/PlexRequests.UI/Modules/UserWizardModule.cs @@ -24,29 +24,29 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Linq; using System.Threading.Tasks; - using Nancy; using Nancy.Extensions; using Nancy.ModelBinding; using Nancy.Validation; using NLog; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Helpers.Permissions; -using PlexRequests.UI.Authentication; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Models; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; - -using Action = PlexRequests.Helpers.Analytics.Action; - -namespace PlexRequests.UI.Modules +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Helpers.Analytics; +using Ombi.Helpers.Permissions; +using Ombi.UI.Authentication; +using Ombi.UI.Helpers; +using Ombi.UI.Models; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; + +using Action = Ombi.Helpers.Analytics.Action; + +namespace Ombi.UI.Modules { public class UserWizardModule : BaseModule { diff --git a/PlexRequests.UI/NinjectModules/ApiModule.cs b/PlexRequests.UI/NinjectModules/ApiModule.cs index aad96d22b..891655450 100644 --- a/PlexRequests.UI/NinjectModules/ApiModule.cs +++ b/PlexRequests.UI/NinjectModules/ApiModule.cs @@ -24,12 +24,12 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Ninject.Modules; -using PlexRequests.Api; -using PlexRequests.Api.Interfaces; +using Ninject.Modules; +using Ombi.Api; +using Ombi.Api.Interfaces; -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class ApiModule : NinjectModule { diff --git a/PlexRequests.UI/NinjectModules/ConfigurationModule.cs b/PlexRequests.UI/NinjectModules/ConfigurationModule.cs index b5a379184..46937b65f 100644 --- a/PlexRequests.UI/NinjectModules/ConfigurationModule.cs +++ b/PlexRequests.UI/NinjectModules/ConfigurationModule.cs @@ -24,23 +24,22 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using Mono.Data.Sqlite; using Nancy.Authentication.Forms; -using Nancy.Linker; using Ninject.Modules; +using Ombi.Core; +using Ombi.Core.Migration; +using Ombi.Core.StatusChecker; +using Ombi.Core.Users; +using Ombi.Helpers; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; +using Ombi.Store; +using ISecurityExtensions = Ombi.Core.ISecurityExtensions; +using SecurityExtensions = Ombi.Core.SecurityExtensions; -using PlexRequests.Core; -using PlexRequests.Core.Migration; -using PlexRequests.Core.StatusChecker; -using PlexRequests.Core.Users; -using PlexRequests.Helpers; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Notification; -using PlexRequests.Store; -using ISecurityExtensions = PlexRequests.Core.ISecurityExtensions; -using SecurityExtensions = PlexRequests.Core.SecurityExtensions; - -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class ConfigurationModule : NinjectModule { diff --git a/PlexRequests.UI/NinjectModules/DependancyResolver.cs b/PlexRequests.UI/NinjectModules/DependancyResolver.cs index 3a245eced..448ec664e 100644 --- a/PlexRequests.UI/NinjectModules/DependancyResolver.cs +++ b/PlexRequests.UI/NinjectModules/DependancyResolver.cs @@ -24,13 +24,13 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Linq; using System.Reflection; - using Ninject.Modules; -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class DependancyResolver { diff --git a/PlexRequests.UI/NinjectModules/RepositoryModule.cs b/PlexRequests.UI/NinjectModules/RepositoryModule.cs index 827453601..e443924f1 100644 --- a/PlexRequests.UI/NinjectModules/RepositoryModule.cs +++ b/PlexRequests.UI/NinjectModules/RepositoryModule.cs @@ -24,15 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Ninject.Modules; -using PlexRequests.Core; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.Store; -using PlexRequests.Store.Repository; +using Ninject.Modules; +using Ombi.Core; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.Store; +using Ombi.Store.Repository; -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class RepositoryModule : NinjectModule { diff --git a/PlexRequests.UI/NinjectModules/ServicesModule.cs b/PlexRequests.UI/NinjectModules/ServicesModule.cs index a6a0cd37b..49590be0c 100644 --- a/PlexRequests.UI/NinjectModules/ServicesModule.cs +++ b/PlexRequests.UI/NinjectModules/ServicesModule.cs @@ -24,18 +24,18 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Ninject.Modules; -using PlexRequests.Core.Queue; -using PlexRequests.Helpers.Analytics; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.UI.Jobs; +using Ninject.Modules; +using Ombi.Core.Queue; +using Ombi.Helpers.Analytics; +using Ombi.Services.Interfaces; +using Ombi.Services.Jobs; +using Ombi.UI.Jobs; using Quartz; using Quartz.Impl; using Quartz.Spi; -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class ServicesModule : NinjectModule { diff --git a/PlexRequests.UI/NinjectModules/SettingServiceModule.cs b/PlexRequests.UI/NinjectModules/SettingServiceModule.cs index 309c5e281..607481dd2 100644 --- a/PlexRequests.UI/NinjectModules/SettingServiceModule.cs +++ b/PlexRequests.UI/NinjectModules/SettingServiceModule.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using Ninject.Modules; -using PlexRequests.Core; +using Ninject.Modules; +using Ombi.Core; -namespace PlexRequests.UI.NinjectModules +namespace Ombi.UI.NinjectModules { public class SettingServiceModule : NinjectModule { diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index 76f00396e..58f5c718e 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -24,30 +24,26 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; - -using Microsoft.Owin.Hosting; -using Mono.Data.Sqlite; -using Mono.Unix; -using Mono.Unix.Native; - -using NLog; -using PlexRequests.Core; -using PlexRequests.Core.SettingModels; -using PlexRequests.Helpers; -using PlexRequests.Store; -using PlexRequests.Store.Repository; +using System; using System.Diagnostics; using System.IO; using System.Linq; using System.Windows.Forms; - using CommandLine; - -using PlexRequests.UI.Start; - -namespace PlexRequests.UI +using Microsoft.Owin.Hosting; +using Mono.Data.Sqlite; +using Mono.Unix; +using Mono.Unix.Native; +using NLog; +using Ombi.Core; +using Ombi.Core.SettingModels; +using Ombi.Helpers; +using Ombi.Store; +using Ombi.Store.Repository; +using Ombi.UI.Start; + +namespace Ombi.UI { class Program { diff --git a/PlexRequests.UI/Resources/UI.da.resx b/PlexRequests.UI/Resources/UI.da.resx index 5937e76be..bb2efd6bf 100644 --- a/PlexRequests.UI/Resources/UI.da.resx +++ b/PlexRequests.UI/Resources/UI.da.resx @@ -145,7 +145,7 @@ Fuldført - Plex Requests + Ombi Søg diff --git a/PlexRequests.UI/Resources/UI.de.resx b/PlexRequests.UI/Resources/UI.de.resx index fa6f71547..1cd1d0192 100644 --- a/PlexRequests.UI/Resources/UI.de.resx +++ b/PlexRequests.UI/Resources/UI.de.resx @@ -145,7 +145,7 @@ Erfolg - Plex Requests + Ombi Suche diff --git a/PlexRequests.UI/Resources/UI.es.resx b/PlexRequests.UI/Resources/UI.es.resx index e7908b3f5..dd325f2bb 100644 --- a/PlexRequests.UI/Resources/UI.es.resx +++ b/PlexRequests.UI/Resources/UI.es.resx @@ -145,7 +145,7 @@ ¡Éxito! - Plex Requests + Ombi Buscar diff --git a/PlexRequests.UI/Resources/UI.fr.resx b/PlexRequests.UI/Resources/UI.fr.resx index 5767fb4d2..11f787a36 100644 --- a/PlexRequests.UI/Resources/UI.fr.resx +++ b/PlexRequests.UI/Resources/UI.fr.resx @@ -145,7 +145,7 @@ Succès! - Plex Requests + Ombi Chercher diff --git a/PlexRequests.UI/Resources/UI.it.resx b/PlexRequests.UI/Resources/UI.it.resx index febcf378a..3dd1640c4 100644 --- a/PlexRequests.UI/Resources/UI.it.resx +++ b/PlexRequests.UI/Resources/UI.it.resx @@ -145,7 +145,7 @@ Successo - Plex Requests + Ombi C'è un nuovo aggiornamento disponibile! diff --git a/PlexRequests.UI/Resources/UI.nl.resx b/PlexRequests.UI/Resources/UI.nl.resx index e64511a14..0b85e2aa9 100644 --- a/PlexRequests.UI/Resources/UI.nl.resx +++ b/PlexRequests.UI/Resources/UI.nl.resx @@ -145,7 +145,7 @@ Succes! - Plex Requests + Ombi Zoeken diff --git a/PlexRequests.UI/Resources/UI.pt.resx b/PlexRequests.UI/Resources/UI.pt.resx index efedc0856..b265ea445 100644 --- a/PlexRequests.UI/Resources/UI.pt.resx +++ b/PlexRequests.UI/Resources/UI.pt.resx @@ -145,7 +145,7 @@ Sucesso - Plex Requests + Ombi Buscar diff --git a/PlexRequests.UI/Resources/UI.resx b/PlexRequests.UI/Resources/UI.resx index fc5b4be3b..d24c5ea1c 100644 --- a/PlexRequests.UI/Resources/UI.resx +++ b/PlexRequests.UI/Resources/UI.resx @@ -126,7 +126,7 @@ Success! - Plex Requests + Ombi Search diff --git a/PlexRequests.UI/Resources/UI.sv.resx b/PlexRequests.UI/Resources/UI.sv.resx index 924f2cc70..4c70109c7 100644 --- a/PlexRequests.UI/Resources/UI.sv.resx +++ b/PlexRequests.UI/Resources/UI.sv.resx @@ -145,7 +145,7 @@ Lyckades - Plex Requests + Ombi Sök diff --git a/PlexRequests.UI/Resources/UI1.Designer.cs b/PlexRequests.UI/Resources/UI1.Designer.cs index 2c11fca13..56013a95f 100644 --- a/PlexRequests.UI/Resources/UI1.Designer.cs +++ b/PlexRequests.UI/Resources/UI1.Designer.cs @@ -376,7 +376,7 @@ namespace Ombi.UI.Resources { } /// - /// Looks up a localized string similar to Plex Requests. + /// Looks up a localized string similar to Ombi. /// public static string Layout_Title { get { diff --git a/PlexRequests.UI/Start/StartupOptions.cs b/PlexRequests.UI/Start/StartupOptions.cs index f7d479186..ddb1f4530 100644 --- a/PlexRequests.UI/Start/StartupOptions.cs +++ b/PlexRequests.UI/Start/StartupOptions.cs @@ -27,7 +27,7 @@ using CommandLine; -namespace PlexRequests.UI.Start +namespace Ombi.UI.Start { public class StartupOptions { diff --git a/PlexRequests.UI/Start/UpdateValue.cs b/PlexRequests.UI/Start/UpdateValue.cs index 0a994ed99..319c15500 100644 --- a/PlexRequests.UI/Start/UpdateValue.cs +++ b/PlexRequests.UI/Start/UpdateValue.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace PlexRequests.UI.Start +namespace Ombi.UI.Start { public enum UpdateValue : int { diff --git a/PlexRequests.UI/Startup.cs b/PlexRequests.UI/Startup.cs index 8f3542a29..e366901c1 100644 --- a/PlexRequests.UI/Startup.cs +++ b/PlexRequests.UI/Startup.cs @@ -24,28 +24,27 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion + using System; using System.Diagnostics; using Ninject; using Ninject.Planning.Bindings.Resolvers; using Ninject.Syntax; using NLog; - +using Ombi.Api.Interfaces; +using Ombi.Core; +using Ombi.Core.Migration; +using Ombi.Core.SettingModels; +using Ombi.Services.Interfaces; +using Ombi.Services.Notification; +using Ombi.Store.Models; +using Ombi.Store.Repository; +using Ombi.UI.Helpers; +using Ombi.UI.Jobs; +using Ombi.UI.NinjectModules; using Owin; -using PlexRequests.Api.Interfaces; -using PlexRequests.Core; -using PlexRequests.Core.Migration; -using PlexRequests.Core.SettingModels; -using PlexRequests.Services.Interfaces; -using PlexRequests.Services.Jobs; -using PlexRequests.Services.Notification; -using PlexRequests.Store.Models; -using PlexRequests.Store.Repository; -using PlexRequests.UI.Helpers; -using PlexRequests.UI.Jobs; -using PlexRequests.UI.NinjectModules; - -namespace PlexRequests.UI + +namespace Ombi.UI { public class Startup { diff --git a/PlexRequests.UI/Validators/CouchPotatoValidator.cs b/PlexRequests.UI/Validators/CouchPotatoValidator.cs index 319ac2875..d7330321b 100644 --- a/PlexRequests.UI/Validators/CouchPotatoValidator.cs +++ b/PlexRequests.UI/Validators/CouchPotatoValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class CouchPotatoValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs b/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs index 4418b7ed2..66d29084d 100644 --- a/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs +++ b/PlexRequests.UI/Validators/EmailNotificationSettingsValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class EmailNotificationSettingsValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/HeadphonesValidator.cs b/PlexRequests.UI/Validators/HeadphonesValidator.cs index d42101add..4f2b80651 100644 --- a/PlexRequests.UI/Validators/HeadphonesValidator.cs +++ b/PlexRequests.UI/Validators/HeadphonesValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class HeadphonesValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/PlexRequestsValidator.cs b/PlexRequests.UI/Validators/PlexRequestsValidator.cs index 481364fd9..7e74e463d 100644 --- a/PlexRequests.UI/Validators/PlexRequestsValidator.cs +++ b/PlexRequests.UI/Validators/PlexRequestsValidator.cs @@ -27,10 +27,9 @@ using System; using FluentValidation; +using Ombi.Core.SettingModels; -using PlexRequests.Core.SettingModels; - -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class PlexRequestsValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/PlexValidator.cs b/PlexRequests.UI/Validators/PlexValidator.cs index 0f3d1024c..b5ce5d3bd 100644 --- a/PlexRequests.UI/Validators/PlexValidator.cs +++ b/PlexRequests.UI/Validators/PlexValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class PlexValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/PushbulletSettingsValidator.cs b/PlexRequests.UI/Validators/PushbulletSettingsValidator.cs index 19b534aa6..4f8a6e08d 100644 --- a/PlexRequests.UI/Validators/PushbulletSettingsValidator.cs +++ b/PlexRequests.UI/Validators/PushbulletSettingsValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class PushbulletSettingsValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/PushoverSettingsValidator.cs b/PlexRequests.UI/Validators/PushoverSettingsValidator.cs index b0c205f84..1795a88a6 100644 --- a/PlexRequests.UI/Validators/PushoverSettingsValidator.cs +++ b/PlexRequests.UI/Validators/PushoverSettingsValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class PushoverSettingsValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/RequestedModelValidator.cs b/PlexRequests.UI/Validators/RequestedModelValidator.cs index 1f6f1d171..418563e29 100644 --- a/PlexRequests.UI/Validators/RequestedModelValidator.cs +++ b/PlexRequests.UI/Validators/RequestedModelValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Store; +using FluentValidation; +using Ombi.Store; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class RequestedModelValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/SickRageValidator.cs b/PlexRequests.UI/Validators/SickRageValidator.cs index baf684618..db49935b6 100644 --- a/PlexRequests.UI/Validators/SickRageValidator.cs +++ b/PlexRequests.UI/Validators/SickRageValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class SickRageValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/SlackSettingsValidator.cs b/PlexRequests.UI/Validators/SlackSettingsValidator.cs index c3c477514..080db4297 100644 --- a/PlexRequests.UI/Validators/SlackSettingsValidator.cs +++ b/PlexRequests.UI/Validators/SlackSettingsValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class SlackSettingsValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/SonarrValidator.cs b/PlexRequests.UI/Validators/SonarrValidator.cs index c3db0c2dc..1dd770978 100644 --- a/PlexRequests.UI/Validators/SonarrValidator.cs +++ b/PlexRequests.UI/Validators/SonarrValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.Core.SettingModels; +using FluentValidation; +using Ombi.Core.SettingModels; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class SonarrValidator : AbstractValidator { diff --git a/PlexRequests.UI/Validators/UserViewModelValidator.cs b/PlexRequests.UI/Validators/UserViewModelValidator.cs index 0e4388adc..f59676780 100644 --- a/PlexRequests.UI/Validators/UserViewModelValidator.cs +++ b/PlexRequests.UI/Validators/UserViewModelValidator.cs @@ -24,11 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using FluentValidation; -using PlexRequests.UI.Models; +using FluentValidation; +using Ombi.UI.Models.UserManagement; -namespace PlexRequests.UI.Validators +namespace Ombi.UI.Validators { public class UserViewModelValidator : AbstractValidator { diff --git a/PlexRequests.UI/Views/About/About.cshtml b/PlexRequests.UI/Views/About/About.cshtml index 5b873b623..c2dbf79f3 100644 --- a/PlexRequests.UI/Views/About/About.cshtml +++ b/PlexRequests.UI/Views/About/About.cshtml @@ -1,5 +1,5 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @Html.LoadAsset("/Content/helpers/bootbox.min.js", true) diff --git a/PlexRequests.UI/Views/Admin/Authentication.cshtml b/PlexRequests.UI/Views/Admin/Authentication.cshtml index d8040b3ba..1043886da 100644 --- a/PlexRequests.UI/Views/Admin/Authentication.cshtml +++ b/PlexRequests.UI/Views/Admin/Authentication.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar") @{ diff --git a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml index 2c24670ba..60c21aec0 100644 --- a/PlexRequests.UI/Views/Admin/CouchPotato.cshtml +++ b/PlexRequests.UI/Views/Admin/CouchPotato.cshtml @@ -1,5 +1,5 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml index ff71da313..3dfee8f8b 100644 --- a/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml +++ b/PlexRequests.UI/Views/Admin/EmailNotifications.cshtml @@ -1,7 +1,6 @@ @using System.Linq -@using PlexRequests.Core.Models -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/Headphones.cshtml b/PlexRequests.UI/Views/Admin/Headphones.cshtml index 1b11c3500..904f48f8c 100644 --- a/PlexRequests.UI/Views/Admin/Headphones.cshtml +++ b/PlexRequests.UI/Views/Admin/Headphones.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/LandingPage.cshtml b/PlexRequests.UI/Views/Admin/LandingPage.cshtml index c002b292e..20ad85c53 100644 --- a/PlexRequests.UI/Views/Admin/LandingPage.cshtml +++ b/PlexRequests.UI/Views/Admin/LandingPage.cshtml @@ -1,6 +1,6 @@ -@using PlexRequests.UI.Helpers -@Html.Partial("Shared/Partial/_Sidebar") -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@Html.Partial("Shared/Partial/_Sidebar") +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.LoadDateTimePickerAsset()
diff --git a/PlexRequests.UI/Views/Admin/Logs.cshtml b/PlexRequests.UI/Views/Admin/Logs.cshtml index 3e4916fe3..9ab57f85d 100644 --- a/PlexRequests.UI/Views/Admin/Logs.cshtml +++ b/PlexRequests.UI/Views/Admin/Logs.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar") @Html.LoadTableAssets() diff --git a/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml b/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml index 8ee4ce285..37ed9d27c 100644 --- a/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml +++ b/PlexRequests.UI/Views/Admin/NewsletterSettings.cshtml @@ -1,7 +1,6 @@ @using System.Linq -@using PlexRequests.Core.Models -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml b/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml index 18396e1f6..556bd8023 100644 --- a/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml +++ b/PlexRequests.UI/Views/Admin/NotificationSettings.cshtml @@ -1,7 +1,6 @@ @using System.Linq -@using PlexRequests.Core.Models -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/Plex.cshtml b/PlexRequests.UI/Views/Admin/Plex.cshtml index 9850c1da8..4157d4bfb 100644 --- a/PlexRequests.UI/Views/Admin/Plex.cshtml +++ b/PlexRequests.UI/Views/Admin/Plex.cshtml @@ -1,5 +1,5 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml index 36d8dae24..bca45ab28 100644 --- a/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml +++ b/PlexRequests.UI/Views/Admin/PushbulletNotifications.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml index bd4d6de81..b5df6bdc5 100644 --- a/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml +++ b/PlexRequests.UI/Views/Admin/PushoverNotifications.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml b/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml index 772eb828c..0c0b0200a 100644 --- a/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml +++ b/PlexRequests.UI/Views/Admin/SchedulerSettings.cshtml @@ -1,5 +1,4 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/Settings.cshtml b/PlexRequests.UI/Views/Admin/Settings.cshtml index fb27fee20..559373e9a 100644 --- a/PlexRequests.UI/Views/Admin/Settings.cshtml +++ b/PlexRequests.UI/Views/Admin/Settings.cshtml @@ -1,5 +1,5 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/Sickrage.cshtml b/PlexRequests.UI/Views/Admin/Sickrage.cshtml index 0178b35a1..52749a06c 100644 --- a/PlexRequests.UI/Views/Admin/Sickrage.cshtml +++ b/PlexRequests.UI/Views/Admin/Sickrage.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml b/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml index 879834852..c7297e4aa 100644 --- a/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml +++ b/PlexRequests.UI/Views/Admin/SlackNotifications.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Admin/Sonarr.cshtml b/PlexRequests.UI/Views/Admin/Sonarr.cshtml index 04964b2a8..f2b4ca49a 100644 --- a/PlexRequests.UI/Views/Admin/Sonarr.cshtml +++ b/PlexRequests.UI/Views/Admin/Sonarr.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @Html.Partial("Shared/Partial/_Sidebar") @{ int port; diff --git a/PlexRequests.UI/Views/Customization/Customization.cshtml b/PlexRequests.UI/Views/Customization/Customization.cshtml index d0e2d4720..112fb6e44 100644 --- a/PlexRequests.UI/Views/Customization/Customization.cshtml +++ b/PlexRequests.UI/Views/Customization/Customization.cshtml @@ -1,5 +1,5 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase +@using Ombi.UI.Helpers +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @Html.Partial("Shared/Partial/_Sidebar") @{ var plexTheme = string.Empty; diff --git a/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml b/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml index bf44e6626..59f2dde6b 100644 --- a/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml +++ b/PlexRequests.UI/Views/FaultQueue/RequestFaultQueue.cshtml @@ -1,5 +1,4 @@ -@using PlexRequests.UI.Helpers -@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> +@inherits Nancy.ViewEngines.Razor.NancyRazorViewBase> @Html.Partial("Shared/Partial/_Sidebar")
diff --git a/PlexRequests.UI/Views/Issues/Details.cshtml b/PlexRequests.UI/Views/Issues/Details.cshtml index c1c8c684f..c2d1e5f8e 100644 --- a/PlexRequests.UI/Views/Issues/Details.cshtml +++ b/PlexRequests.UI/Views/Issues/Details.cshtml @@ -1,8 +1,8 @@ @using System.Linq -@using PlexRequests.Core.Models -@using PlexRequests.Helpers -@using PlexRequests.Helpers.Permissions -@using PlexRequests.UI.Helpers +@using Ombi.Core.Models +@using Ombi.Helpers +@using Ombi.Helpers.Permissions +@using Ombi.UI.Helpers @{ var baseUrl = Html.GetBaseUrl(); var formAction = string.Empty; diff --git a/PlexRequests.UI/Views/Issues/Index.cshtml b/PlexRequests.UI/Views/Issues/Index.cshtml index 9f8b15bd1..a61359f1e 100644 --- a/PlexRequests.UI/Views/Issues/Index.cshtml +++ b/PlexRequests.UI/Views/Issues/Index.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @{ var baseUrl = Html.GetBaseUrl(); var formAction = string.Empty; diff --git a/PlexRequests.UI/Views/Landing/Index.cshtml b/PlexRequests.UI/Views/Landing/Index.cshtml index af535fedc..21feaf7eb 100644 --- a/PlexRequests.UI/Views/Landing/Index.cshtml +++ b/PlexRequests.UI/Views/Landing/Index.cshtml @@ -1,6 +1,5 @@ - -@using PlexRequests.UI.Helpers -@inherits PlexRequests.UI.Helpers.EmptyViewBase +@using Ombi.UI.Helpers +@inherits Ombi.UI.Helpers.EmptyViewBase @{ var baseUrl = Html.GetBaseUrl(); var formAction = string.Empty; diff --git a/PlexRequests.UI/Views/Login/Index.cshtml b/PlexRequests.UI/Views/Login/Index.cshtml index 704b542c9..632d5c7a6 100644 --- a/PlexRequests.UI/Views/Login/Index.cshtml +++ b/PlexRequests.UI/Views/Login/Index.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @{ var baseUrl = Html.GetBaseUrl().ToHtmlString(); var url = string.Empty; diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml index d42203059..5ac6294ab 100644 --- a/PlexRequests.UI/Views/Requests/Index.cshtml +++ b/PlexRequests.UI/Views/Requests/Index.cshtml @@ -1,7 +1,7 @@ @using Nancy.Security @using Nancy.Security -@using PlexRequests.Helpers.Permissions -@using PlexRequests.UI.Helpers +@using Ombi.Helpers.Permissions +@using Ombi.UI.Helpers @using PlexRequests.UI.Resources @{ var baseUrl = Html.GetBaseUrl(); diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index b565ba234..0d7c0d040 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -1,4 +1,4 @@ -@using PlexRequests.UI.Helpers +@using Ombi.UI.Helpers @using PlexRequests.UI.Resources @{ var baseUrl = Html.GetBaseUrl(); diff --git a/PlexRequests.UI/Views/Shared/Blank.cshtml b/PlexRequests.UI/Views/Shared/Blank.cshtml index 3c61858c0..5bb008260 100644 --- a/PlexRequests.UI/Views/Shared/Blank.cshtml +++ b/PlexRequests.UI/Views/Shared/Blank.cshtml @@ -1,7 +1,6 @@ @using Nancy.Security @using Nancy.Session -@using PlexRequests.UI.Helpers -@using PlexRequests.UI.Models +@using Ombi.UI.Helpers @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @{ var baseUrl = Html.GetBaseUrl(); diff --git a/PlexRequests.UI/Views/Shared/Partial/_Head.cshtml b/PlexRequests.UI/Views/Shared/Partial/_Head.cshtml index 3524f3379..f2e175af8 100644 --- a/PlexRequests.UI/Views/Shared/Partial/_Head.cshtml +++ b/PlexRequests.UI/Views/Shared/Partial/_Head.cshtml @@ -1,7 +1,7 @@ @using Nancy.Security @using Nancy.Session -@using PlexRequests.UI.Helpers -@using PlexRequests.UI.Models +@using Ombi.UI.Helpers +@using Ombi.UI.Resources @using PlexRequests.UI.Resources @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase @{ diff --git a/PlexRequests.UI/Views/Shared/Partial/_LayoutScripts.cshtml b/PlexRequests.UI/Views/Shared/Partial/_LayoutScripts.cshtml index 62e946479..29ef95277 100644 --- a/PlexRequests.UI/Views/Shared/Partial/_LayoutScripts.cshtml +++ b/PlexRequests.UI/Views/Shared/Partial/_LayoutScripts.cshtml @@ -1,7 +1,6 @@ @using Nancy.Security @using Nancy.Session -@using PlexRequests.UI.Helpers -@using PlexRequests.UI.Models +@using Ombi.UI.Helpers @using PlexRequests.UI.Resources @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase \ No newline at end of file From 0773aafb897fde4798ce8e1c4fc18f9e8d2a0eeb Mon Sep 17 00:00:00 2001 From: mhann Date: Tue, 27 Dec 2016 19:23:54 +0000 Subject: [PATCH 10/46] Fix small typo in ticket overview page --- Ombi.UI/Views/Issues/Details.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ombi.UI/Views/Issues/Details.cshtml b/Ombi.UI/Views/Issues/Details.cshtml index c2d1e5f8e..da025b9cc 100644 --- a/Ombi.UI/Views/Issues/Details.cshtml +++ b/Ombi.UI/Views/Issues/Details.cshtml @@ -57,7 +57,7 @@
Type: @StringHelper.ToCamelCaseWords(issue.Issue.ToString())
User Reported: @issue.UserReported
User Note: @issue.UserNote
-
Admin Note:@issue.AdminNote
+
Admin Note: @issue.AdminNote
@if (isAdmin) { @@ -100,4 +100,4 @@
-@Html.LoadIssueDetailsAssets() \ No newline at end of file +@Html.LoadIssueDetailsAssets() From e56e244efbc0a6f6e56e0bceb3c0c321d2066572 Mon Sep 17 00:00:00 2001 From: Marcus Hann Date: Tue, 27 Dec 2016 23:05:44 +0000 Subject: [PATCH 11/46] Implement simple button --- Ombi.UI/Content/search.js | 5 ++-- Ombi.UI/Models/SearchTvShowViewModel.cs | 1 + Ombi.UI/Modules/SearchModule.cs | 3 +- Ombi.UI/Views/Search/Index.cshtml | 40 ++++++++++++++----------- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Ombi.UI/Content/search.js b/Ombi.UI/Content/search.js index d05f3b4e6..443b1c050 100644 --- a/Ombi.UI/Content/search.js +++ b/Ombi.UI/Content/search.js @@ -83,7 +83,7 @@ $(function () { }); // Click TV dropdown option - $(document).on("click", ".dropdownTv", function (e) { + $(document).on("click", ".requestTv", function (e) { e.preventDefault(); var buttonId = e.target.id; if ($("#" + buttonId).attr('disabled')) { @@ -429,7 +429,8 @@ $(function () { url: result.plexUrl, tvPartialAvailable: result.tvPartialAvailable, disableTvRequestsByEpisode: result.disableTvRequestsByEpisode, - disableTvRequestsBySeason: result.disableTvRequestsBySeason + disableTvRequestsBySeason: result.disableTvRequestsBySeason, + enableTvRequestsForOnlySeries: result.enableTvRequestsForOnlySeries }; return context; diff --git a/Ombi.UI/Models/SearchTvShowViewModel.cs b/Ombi.UI/Models/SearchTvShowViewModel.cs index 47af1ba47..faa6333ba 100644 --- a/Ombi.UI/Models/SearchTvShowViewModel.cs +++ b/Ombi.UI/Models/SearchTvShowViewModel.cs @@ -57,5 +57,6 @@ namespace Ombi.UI.Models public bool TvFullyAvailable { get; set; } public bool DisableTvRequestsByEpisode { get; set; } public bool DisableTvRequestsBySeason { get; set; } + public bool EnableTvRequestsForOnlySeries { get; set; } } } \ No newline at end of file diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs index 5722fc53f..f77e880e9 100644 --- a/Ombi.UI/Modules/SearchModule.cs +++ b/Ombi.UI/Modules/SearchModule.cs @@ -363,7 +363,8 @@ namespace Ombi.UI.Modules SeriesName = t.show.name, Status = t.show.status, DisableTvRequestsByEpisode = prSettings.DisableTvRequestsByEpisode, - DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason + DisableTvRequestsBySeason = prSettings.DisableTvRequestsBySeason, + EnableTvRequestsForOnlySeries = (prSettings.DisableTvRequestsByEpisode && prSettings.DisableTvRequestsBySeason) }; diff --git a/Ombi.UI/Views/Search/Index.cshtml b/Ombi.UI/Views/Search/Index.cshtml index ffd6553d4..48da09b02 100644 --- a/Ombi.UI/Views/Search/Index.cshtml +++ b/Ombi.UI/Views/Search/Index.cshtml @@ -107,7 +107,7 @@ } - \ No newline at end of file diff --git a/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml b/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml index 82a78674a..0a2a64e86 100644 --- a/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml +++ b/Ombi.UI/Views/Shared/Partial/_Sidebar.cshtml @@ -9,6 +9,7 @@ @Html.GetSidebarUrl(Context, "/admin/usermanagementsettings", "User Management Settings") @Html.GetSidebarUrl(Context, "/admin/plex", "Plex") @Html.GetSidebarUrl(Context, "/admin/couchpotato", "CouchPotato") + @Html.GetSidebarUrl(Context, "/admin/watcher", "Watcher") @Html.GetSidebarUrl(Context, "/admin/sonarr", "Sonarr") @Html.GetSidebarUrl(Context, "/admin/sickrage", "SickRage") @Html.GetSidebarUrl(Context, "/admin/headphones", "Headphones (Beta)") From b2e53c05af028f5dd8ed64a66fed22eb9103935b Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Thu, 29 Dec 2016 09:44:16 +0000 Subject: [PATCH 21/46] Fixed a dependancy issue with #844 --- Ombi.UI/NinjectModules/ServicesModule.cs | 2 ++ Ombi.UI/Ombi.UI.csproj | 2 +- Ombi.UI/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Ombi.UI/NinjectModules/ServicesModule.cs b/Ombi.UI/NinjectModules/ServicesModule.cs index 63d5ade86..42a40e430 100644 --- a/Ombi.UI/NinjectModules/ServicesModule.cs +++ b/Ombi.UI/NinjectModules/ServicesModule.cs @@ -26,6 +26,7 @@ #endregion using Ninject.Modules; +using Ombi.Core; using Ombi.Core.Queue; using Ombi.Helpers.Analytics; using Ombi.Services.Interfaces; @@ -49,6 +50,7 @@ namespace Ombi.UI.NinjectModules Bind().To(); Bind().To(); Bind().To(); + Bind().To(); Bind().To(); Bind().To(); diff --git a/Ombi.UI/Ombi.UI.csproj b/Ombi.UI/Ombi.UI.csproj index 766485f1c..74904233c 100644 --- a/Ombi.UI/Ombi.UI.csproj +++ b/Ombi.UI/Ombi.UI.csproj @@ -8,7 +8,7 @@ Exe Properties Ombi.UI - Ombi.UI + Ombi v4.5 512 ..\..\ diff --git a/Ombi.UI/Properties/AssemblyInfo.cs b/Ombi.UI/Properties/AssemblyInfo.cs index f92c8cfc9..aec8df16e 100644 --- a/Ombi.UI/Properties/AssemblyInfo.cs +++ b/Ombi.UI/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Ombi.UI")] +[assembly: AssemblyTitle("Ombi")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Ombi.UI")] +[assembly: AssemblyProduct("Ombi")] [assembly: AssemblyCopyright("Copyright © 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] From 262a90e05ce2977115c169b0c1c1ffbbde433341 Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Thu, 29 Dec 2016 09:45:41 +0000 Subject: [PATCH 22/46] another #844 --- Ombi.UI/NinjectModules/ServicesModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ombi.UI/NinjectModules/ServicesModule.cs b/Ombi.UI/NinjectModules/ServicesModule.cs index 42a40e430..7c5f9095a 100644 --- a/Ombi.UI/NinjectModules/ServicesModule.cs +++ b/Ombi.UI/NinjectModules/ServicesModule.cs @@ -44,7 +44,7 @@ namespace Ombi.UI.NinjectModules { Bind().To(); Bind().To(); - Bind().To(); + Bind().To(); Bind().To(); Bind().To(); Bind().To(); From ad2169ca17ac10ea2a650341fa17193bf37bb5b1 Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Thu, 29 Dec 2016 10:02:52 +0000 Subject: [PATCH 23/46] More for #844 --- Ombi.UI/Modules/Admin/IntegrationModule.cs | 1 + Ombi.UI/Modules/LayoutModule.cs | 3 ++- Ombi.UI/Views/UserLogin/Username.cshtml | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Ombi.UI/Modules/Admin/IntegrationModule.cs b/Ombi.UI/Modules/Admin/IntegrationModule.cs index 75c1f48c9..9cc718e40 100644 --- a/Ombi.UI/Modules/Admin/IntegrationModule.cs +++ b/Ombi.UI/Modules/Admin/IntegrationModule.cs @@ -57,6 +57,7 @@ namespace Ombi.UI.Modules.Admin WatcherSettings = watcher; Analytics = a; + CpSettings = cp; Before += (ctx) => Security.AdminLoginRedirect(Permissions.Administrator, ctx); diff --git a/Ombi.UI/Modules/LayoutModule.cs b/Ombi.UI/Modules/LayoutModule.cs index 41daba2fc..7c784a715 100644 --- a/Ombi.UI/Modules/LayoutModule.cs +++ b/Ombi.UI/Modules/LayoutModule.cs @@ -101,7 +101,8 @@ namespace Ombi.UI.Modules || x.Name.Equals(JobNames.PlexChecker) || x.Name.Equals(JobNames.SonarrCacher) || x.Name.Equals(JobNames.SrCacher) - || x.Name.Equals(JobNames.PlexCacher)); + || x.Name.Equals(JobNames.PlexCacher) + || x.Name.Equals(JobNames.WatcherCacher)); return Response.AsJson(cacherJobs.Any() diff --git a/Ombi.UI/Views/UserLogin/Username.cshtml b/Ombi.UI/Views/UserLogin/Username.cshtml index d90b42607..bb6783120 100644 --- a/Ombi.UI/Views/UserLogin/Username.cshtml +++ b/Ombi.UI/Views/UserLogin/Username.cshtml @@ -1,4 +1,5 @@ -@using Ombi.UI.Resources +@using Ombi.UI.Helpers +@using Ombi.UI.Resources @inherits Nancy.ViewEngines.Razor.NancyRazorViewBase
@@ -30,7 +31,7 @@