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