diff --git a/README.md b/README.md index 107b60d8b..1dee19564 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Request Plex! +# Plex Requests .NET! [![Gitter](https://badges.gitter.im/tidusjar/RequestPlex.svg)](https://gitter.im/tidusjar/RequestPlex?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) diff --git a/RequestPlex.Api.Interfaces/IApiRequest.cs b/RequestPlex.Api.Interfaces/IApiRequest.cs index 015757f8e..602fc14f8 100644 --- a/RequestPlex.Api.Interfaces/IApiRequest.cs +++ b/RequestPlex.Api.Interfaces/IApiRequest.cs @@ -1,12 +1,34 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: IApiRequest.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using System; using RestSharp; -namespace RequestPlex.Api.Interfaces +namespace PlexRequests.Api.Interfaces { public interface IApiRequest { diff --git a/RequestPlex.Api.Interfaces/RequestPlex.Api.Interfaces.csproj b/RequestPlex.Api.Interfaces/PlexRequests.Api.Interfaces.csproj similarity index 93% rename from RequestPlex.Api.Interfaces/RequestPlex.Api.Interfaces.csproj rename to RequestPlex.Api.Interfaces/PlexRequests.Api.Interfaces.csproj index 04c2ffc52..a3096d86e 100644 --- a/RequestPlex.Api.Interfaces/RequestPlex.Api.Interfaces.csproj +++ b/RequestPlex.Api.Interfaces/PlexRequests.Api.Interfaces.csproj @@ -7,8 +7,8 @@ {95834072-A675-415D-AA8F-877C91623810} Library Properties - RequestPlex.Api.Interfaces - RequestPlex.Api.Interfaces + PlexRequests.Api.Interfaces + PlexRequests.Api.Interfaces v4.5.2 512 diff --git a/RequestPlex.Api/ApiRequest.cs b/RequestPlex.Api/ApiRequest.cs index 974e4e9c5..add96c3da 100644 --- a/RequestPlex.Api/ApiRequest.cs +++ b/RequestPlex.Api/ApiRequest.cs @@ -1,14 +1,36 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: ApiRequest.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using System; -using RequestPlex.Api.Interfaces; +using PlexRequests.Api.Interfaces; using RestSharp; -namespace RequestPlex.Api +namespace PlexRequests.Api { public class ApiRequest : IApiRequest { diff --git a/RequestPlex.Api/Models/PlexAuthentication.cs b/RequestPlex.Api/Models/PlexAuthentication.cs index cd0dcf76f..36f65c1b8 100644 --- a/RequestPlex.Api/Models/PlexAuthentication.cs +++ b/RequestPlex.Api/Models/PlexAuthentication.cs @@ -1,11 +1,32 @@ -using System; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexAuthentication.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Newtonsoft.Json; -namespace RequestPlex.Api.Models +namespace PlexRequests.Api.Models { public class PlexAuthentication { @@ -38,3 +59,4 @@ namespace RequestPlex.Api.Models public int forum_id { get; set; } } } + diff --git a/RequestPlex.Api/Models/PlexFriends.cs b/RequestPlex.Api/Models/PlexFriends.cs index 77bafa637..a35c712d6 100644 --- a/RequestPlex.Api/Models/PlexFriends.cs +++ b/RequestPlex.Api/Models/PlexFriends.cs @@ -1,12 +1,33 @@ -using System; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexFriends.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Serialization; -using RestSharp.Deserializers; -namespace RequestPlex.Api.Models +namespace PlexRequests.Api.Models { [XmlRoot(ElementName = "Server")] public class Server diff --git a/RequestPlex.Api/Models/PlexUserRequest.cs b/RequestPlex.Api/Models/PlexUserRequest.cs index 34177a4ba..eaa517000 100644 --- a/RequestPlex.Api/Models/PlexUserRequest.cs +++ b/RequestPlex.Api/Models/PlexUserRequest.cs @@ -1,5 +1,31 @@ - -namespace RequestPlex.Api.Models +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexUserRequest.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion + +namespace PlexRequests.Api.Models { public class PlexUserRequest { diff --git a/RequestPlex.Api/Models/Tv/Authentication.cs b/RequestPlex.Api/Models/Tv/Authentication.cs index 93b4d6d8b..ca2cb1d62 100644 --- a/RequestPlex.Api/Models/Tv/Authentication.cs +++ b/RequestPlex.Api/Models/Tv/Authentication.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.Api.Models.Tv +namespace PlexRequests.Api.Models.Tv { public class Authentication { diff --git a/RequestPlex.Api/Models/Tv/TvSearchResult.cs b/RequestPlex.Api/Models/Tv/TvSearchResult.cs index 1920ad2e6..a8bd9d35f 100644 --- a/RequestPlex.Api/Models/Tv/TvSearchResult.cs +++ b/RequestPlex.Api/Models/Tv/TvSearchResult.cs @@ -26,7 +26,7 @@ #endregion using System.Collections.Generic; -namespace RequestPlex.Api.Models.Tv +namespace PlexRequests.Api.Models.Tv { public class TvShowSearchResult { diff --git a/RequestPlex.Api/Models/Tv/TvShow.cs b/RequestPlex.Api/Models/Tv/TvShow.cs index 30205b5f8..5de2d5aa0 100644 --- a/RequestPlex.Api/Models/Tv/TvShow.cs +++ b/RequestPlex.Api/Models/Tv/TvShow.cs @@ -26,7 +26,7 @@ #endregion using System.Collections.Generic; -namespace RequestPlex.Api.Models.Tv +namespace PlexRequests.Api.Models.Tv { public class TvShow { diff --git a/RequestPlex.Api/MovieBase.cs b/RequestPlex.Api/MovieBase.cs index af8e920e3..d3d69fbd1 100644 --- a/RequestPlex.Api/MovieBase.cs +++ b/RequestPlex.Api/MovieBase.cs @@ -24,11 +24,9 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using PlexRequests.Helpers; -using RequestPlex.Helpers; - -namespace RequestPlex.Api +namespace PlexRequests.Api { public abstract class MovieBase { diff --git a/RequestPlex.Api/PlexApi.cs b/RequestPlex.Api/PlexApi.cs index 6668b5185..95e71700f 100644 --- a/RequestPlex.Api/PlexApi.cs +++ b/RequestPlex.Api/PlexApi.cs @@ -26,11 +26,11 @@ #endregion using System; -using RequestPlex.Api.Models; +using PlexRequests.Api.Models; using RestSharp; -namespace RequestPlex.Api +namespace PlexRequests.Api { public class PlexApi { diff --git a/RequestPlex.Api/RequestPlex.Api.csproj b/RequestPlex.Api/PlexRequests.Api.csproj similarity index 90% rename from RequestPlex.Api/RequestPlex.Api.csproj rename to RequestPlex.Api/PlexRequests.Api.csproj index 8b1f02364..334769be8 100644 --- a/RequestPlex.Api/RequestPlex.Api.csproj +++ b/RequestPlex.Api/PlexRequests.Api.csproj @@ -7,8 +7,8 @@ {8CB8D235-2674-442D-9C6A-35FCAEEB160D} Library Properties - RequestPlex.Api - RequestPlex.Api + PlexRequests.Api + PlexRequests.Api v4.5.2 512 @@ -79,13 +79,13 @@ - + {95834072-A675-415D-AA8F-877C91623810} - RequestPlex.Api.Interfaces + PlexRequests.Api.Interfaces - + {1252336D-42A3-482A-804C-836E60173DFA} - RequestPlex.Helpers + PlexRequests.Helpers diff --git a/RequestPlex.Api/TheMovieDbApi.cs b/RequestPlex.Api/TheMovieDbApi.cs index 2fe1c2f6c..6d8fa31ef 100644 --- a/RequestPlex.Api/TheMovieDbApi.cs +++ b/RequestPlex.Api/TheMovieDbApi.cs @@ -1,4 +1,30 @@ -using System; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: TheMovieDbApi.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using System; using System.Collections.Generic; using System.Threading.Tasks; @@ -8,7 +34,7 @@ using TMDbLib.Objects.Movies; using TMDbLib.Objects.Search; using TMDbLib.Objects.TvShows; -namespace RequestPlex.Api +namespace PlexRequests.Api { public class TheMovieDbApi : MovieBase { diff --git a/RequestPlex.Api/TheTvDbApi.cs b/RequestPlex.Api/TheTvDbApi.cs index 1b669eac0..ca361c50d 100644 --- a/RequestPlex.Api/TheTvDbApi.cs +++ b/RequestPlex.Api/TheTvDbApi.cs @@ -24,14 +24,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion - -using Newtonsoft.Json; - -using RequestPlex.Api.Models.Tv; +using PlexRequests.Api.Models.Tv; using RestSharp; -namespace RequestPlex.Api +namespace PlexRequests.Api { public class TheTvDbApi : TvBase { diff --git a/RequestPlex.Api/TvBase.cs b/RequestPlex.Api/TvBase.cs index 7ea97031a..43555fede 100644 --- a/RequestPlex.Api/TvBase.cs +++ b/RequestPlex.Api/TvBase.cs @@ -26,9 +26,9 @@ #endregion using System; -using RequestPlex.Helpers; +using PlexRequests.Helpers; -namespace RequestPlex.Api +namespace PlexRequests.Api { public abstract class TvBase { diff --git a/RequestPlex.Core/CacheKeys.cs b/RequestPlex.Core/CacheKeys.cs index ff826d135..c76e20034 100644 --- a/RequestPlex.Core/CacheKeys.cs +++ b/RequestPlex.Core/CacheKeys.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.Core +namespace PlexRequests.Core { public class CacheKeys { diff --git a/RequestPlex.Core/ISettingsService.cs b/RequestPlex.Core/ISettingsService.cs index 78e4a07ef..9687d920e 100644 --- a/RequestPlex.Core/ISettingsService.cs +++ b/RequestPlex.Core/ISettingsService.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.Core +namespace PlexRequests.Core { public interface ISettingsService { diff --git a/RequestPlex.Core/RequestPlex.Core.csproj b/RequestPlex.Core/PlexRequests.Core.csproj similarity index 89% rename from RequestPlex.Core/RequestPlex.Core.csproj rename to RequestPlex.Core/PlexRequests.Core.csproj index c277b1166..0a7837abc 100644 --- a/RequestPlex.Core/RequestPlex.Core.csproj +++ b/RequestPlex.Core/PlexRequests.Core.csproj @@ -7,8 +7,8 @@ {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} Library Properties - RequestPlex.Core - RequestPlex.Core + PlexRequests.Core + PlexRequests.Core v4.5.2 512 @@ -82,17 +82,17 @@ - + {8CB8D235-2674-442D-9C6A-35FCAEEB160D} - RequestPlex.Api + PlexRequests.Api - + {1252336D-42A3-482A-804C-836E60173DFA} - RequestPlex.Helpers + PlexRequests.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - RequestPlex.Store + PlexRequests.Store diff --git a/RequestPlex.Core/RequestService.cs b/RequestPlex.Core/RequestService.cs index de81fbb2a..e8e2ca049 100644 --- a/RequestPlex.Core/RequestService.cs +++ b/RequestPlex.Core/RequestService.cs @@ -26,9 +26,9 @@ #endregion using System.Linq; -using RequestPlex.Store; +using PlexRequests.Store; -namespace RequestPlex.Core +namespace PlexRequests.Core { public class RequestService { diff --git a/RequestPlex.Core/SettingModels/CouchPotatoSettings.cs b/RequestPlex.Core/SettingModels/CouchPotatoSettings.cs index ffa6c5896..9ff8a3117 100644 --- a/RequestPlex.Core/SettingModels/CouchPotatoSettings.cs +++ b/RequestPlex.Core/SettingModels/CouchPotatoSettings.cs @@ -1,4 +1,30 @@ -namespace RequestPlex.Core.SettingModels +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: CouchPotatoSettings.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +namespace PlexRequests.Core.SettingModels { public class CouchPotatoSettings : Settings { diff --git a/RequestPlex.Core/SettingModels/RequestPlexSettings.cs b/RequestPlex.Core/SettingModels/RequestPlexSettings.cs index 0e603b91a..61edffa5d 100644 --- a/RequestPlex.Core/SettingModels/RequestPlexSettings.cs +++ b/RequestPlex.Core/SettingModels/RequestPlexSettings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.Core.SettingModels +namespace PlexRequests.Core.SettingModels { public class RequestPlexSettings : Settings { diff --git a/RequestPlex.Core/SettingModels/Settings.cs b/RequestPlex.Core/SettingModels/Settings.cs index af3194b42..4eb005707 100644 --- a/RequestPlex.Core/SettingModels/Settings.cs +++ b/RequestPlex.Core/SettingModels/Settings.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.Core.SettingModels +namespace PlexRequests.Core.SettingModels { public class Settings { diff --git a/RequestPlex.Core/SettingModels/SickRageSettings.cs b/RequestPlex.Core/SettingModels/SickRageSettings.cs index be1dd6d85..b06801db4 100644 --- a/RequestPlex.Core/SettingModels/SickRageSettings.cs +++ b/RequestPlex.Core/SettingModels/SickRageSettings.cs @@ -1,4 +1,30 @@ -namespace RequestPlex.Core.SettingModels +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SickRageSettings.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +namespace PlexRequests.Core.SettingModels { public class SickRageSettings : Settings { diff --git a/RequestPlex.Core/SettingModels/SonarrSettings.cs b/RequestPlex.Core/SettingModels/SonarrSettings.cs index fb6f8ecfa..7982fac05 100644 --- a/RequestPlex.Core/SettingModels/SonarrSettings.cs +++ b/RequestPlex.Core/SettingModels/SonarrSettings.cs @@ -1,4 +1,30 @@ -namespace RequestPlex.Core.SettingModels +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SonarrSettings.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +namespace PlexRequests.Core.SettingModels { public class SonarrSettings : Settings { diff --git a/RequestPlex.Core/SettingsService.cs b/RequestPlex.Core/SettingsService.cs index 76fd71362..720ced03d 100644 --- a/RequestPlex.Core/SettingsService.cs +++ b/RequestPlex.Core/SettingsService.cs @@ -29,12 +29,11 @@ using System.Linq; using Mono.Data.Sqlite; -using RequestPlex.Api; -using RequestPlex.Api.Models.Tv; -using RequestPlex.Helpers; -using RequestPlex.Store; +using PlexRequests.Api; +using PlexRequests.Helpers; +using PlexRequests.Store; -namespace RequestPlex.Core +namespace PlexRequests.Core { public class SettingsService { diff --git a/RequestPlex.Core/SettingsServiceV2.cs b/RequestPlex.Core/SettingsServiceV2.cs index e0245e8a8..067b3b44b 100644 --- a/RequestPlex.Core/SettingsServiceV2.cs +++ b/RequestPlex.Core/SettingsServiceV2.cs @@ -26,14 +26,12 @@ #endregion using Newtonsoft.Json; -using Omu.ValueInjecter; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Store; +using PlexRequests.Store.Models; -using RequestPlex.Core.SettingModels; -using RequestPlex.Helpers; -using RequestPlex.Store; -using RequestPlex.Store.Models; - -namespace RequestPlex.Core +namespace PlexRequests.Core { public class SettingsServiceV2 : ISettingsService where T : Settings, new() diff --git a/RequestPlex.Core/Setup.cs b/RequestPlex.Core/Setup.cs index 5321b67fd..d97708cce 100644 --- a/RequestPlex.Core/Setup.cs +++ b/RequestPlex.Core/Setup.cs @@ -1,8 +1,34 @@ -using Mono.Data.Sqlite; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: Setup.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using Mono.Data.Sqlite; -using RequestPlex.Store; +using PlexRequests.Store; -namespace RequestPlex.Core +namespace PlexRequests.Core { public class Setup { diff --git a/RequestPlex.Core/UserIdentity.cs b/RequestPlex.Core/UserIdentity.cs index 7d5c38d7c..5c5f7302c 100644 --- a/RequestPlex.Core/UserIdentity.cs +++ b/RequestPlex.Core/UserIdentity.cs @@ -1,12 +1,34 @@ -using System; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: UserIdentity.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Nancy.Security; -namespace RequestPlex.Core +namespace PlexRequests.Core { public class UserIdentity : IUserIdentity { diff --git a/RequestPlex.Core/UserMapper.cs b/RequestPlex.Core/UserMapper.cs index ae70167a1..35c5c3781 100644 --- a/RequestPlex.Core/UserMapper.cs +++ b/RequestPlex.Core/UserMapper.cs @@ -31,9 +31,9 @@ using Nancy; using Nancy.Authentication.Forms; using Nancy.Security; -using RequestPlex.Store; +using PlexRequests.Store; -namespace RequestPlex.Core +namespace PlexRequests.Core { public class UserMapper : IUserMapper { diff --git a/RequestPlex.Helpers/AssemblyHelper.cs b/RequestPlex.Helpers/AssemblyHelper.cs index fe6a281b8..a2a1b6163 100644 --- a/RequestPlex.Helpers/AssemblyHelper.cs +++ b/RequestPlex.Helpers/AssemblyHelper.cs @@ -1,7 +1,33 @@ -using System.Diagnostics; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: AssemblyHelper.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using System.Diagnostics; using System.Reflection; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { public class AssemblyHelper { diff --git a/RequestPlex.Helpers/ICacheProvider.cs b/RequestPlex.Helpers/ICacheProvider.cs index 0706502c5..3e3a920bb 100644 --- a/RequestPlex.Helpers/ICacheProvider.cs +++ b/RequestPlex.Helpers/ICacheProvider.cs @@ -26,7 +26,7 @@ #endregion using System; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { public interface ICacheProvider { diff --git a/RequestPlex.Helpers/MemoryCacheProvider.cs b/RequestPlex.Helpers/MemoryCacheProvider.cs index cf125dec8..30863c19f 100644 --- a/RequestPlex.Helpers/MemoryCacheProvider.cs +++ b/RequestPlex.Helpers/MemoryCacheProvider.cs @@ -28,7 +28,7 @@ using System; using System.Linq; using System.Runtime.Caching; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { public class MemoryCacheProvider : ICacheProvider { diff --git a/RequestPlex.Helpers/ObjectCopier.cs b/RequestPlex.Helpers/ObjectCopier.cs index dca1fa3aa..2c4ffc2b4 100644 --- a/RequestPlex.Helpers/ObjectCopier.cs +++ b/RequestPlex.Helpers/ObjectCopier.cs @@ -26,7 +26,7 @@ #endregion using Newtonsoft.Json; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { /// /// Provides a method for performing a deep copy of an object. diff --git a/RequestPlex.Helpers/RequestPlex.Helpers.csproj b/RequestPlex.Helpers/PlexRequests.Helpers.csproj similarity index 94% rename from RequestPlex.Helpers/RequestPlex.Helpers.csproj rename to RequestPlex.Helpers/PlexRequests.Helpers.csproj index 271cce512..5c665f1c5 100644 --- a/RequestPlex.Helpers/RequestPlex.Helpers.csproj +++ b/RequestPlex.Helpers/PlexRequests.Helpers.csproj @@ -7,8 +7,8 @@ {1252336D-42A3-482A-804C-836E60173DFA} Library Properties - RequestPlex.Helpers - RequestPlex.Helpers + PlexRequests.Helpers + PlexRequests.Helpers v4.5.2 512 diff --git a/RequestPlex.Helpers/SerializerSettings.cs b/RequestPlex.Helpers/SerializerSettings.cs index f89668047..71cbdc0e3 100644 --- a/RequestPlex.Helpers/SerializerSettings.cs +++ b/RequestPlex.Helpers/SerializerSettings.cs @@ -28,7 +28,7 @@ using System.Runtime.Serialization.Formatters; using Newtonsoft.Json; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { public static class SerializerSettings { diff --git a/RequestPlex.Helpers/StringCipher.cs b/RequestPlex.Helpers/StringCipher.cs index 47847fffe..8fb48e589 100644 --- a/RequestPlex.Helpers/StringCipher.cs +++ b/RequestPlex.Helpers/StringCipher.cs @@ -30,7 +30,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text; -namespace RequestPlex.Helpers +namespace PlexRequests.Helpers { public class StringCipher { diff --git a/RequestPlex.Store/DbConfiguration.cs b/RequestPlex.Store/DbConfiguration.cs index e3f33fb33..d345616da 100644 --- a/RequestPlex.Store/DbConfiguration.cs +++ b/RequestPlex.Store/DbConfiguration.cs @@ -30,7 +30,7 @@ using System.IO; using Mono.Data.Sqlite; -namespace RequestPlex.Store +namespace PlexRequests.Store { public class DbConfiguration : ISqliteConfiguration { diff --git a/RequestPlex.Store/Entity.cs b/RequestPlex.Store/Entity.cs index 9f849518c..3730d4b5a 100644 --- a/RequestPlex.Store/Entity.cs +++ b/RequestPlex.Store/Entity.cs @@ -26,7 +26,7 @@ #endregion using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { public class Entity { diff --git a/RequestPlex.Store/GenericRepository.cs b/RequestPlex.Store/GenericRepository.cs index 526c2bc96..977dfc293 100644 --- a/RequestPlex.Store/GenericRepository.cs +++ b/RequestPlex.Store/GenericRepository.cs @@ -29,7 +29,7 @@ using System.Collections.Generic; using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { public class GenericRepository : IRepository where T : Entity { diff --git a/RequestPlex.Store/IRepository.cs b/RequestPlex.Store/IRepository.cs index 09ff3715d..4df329a1b 100644 --- a/RequestPlex.Store/IRepository.cs +++ b/RequestPlex.Store/IRepository.cs @@ -26,7 +26,7 @@ #endregion using System.Collections.Generic; -namespace RequestPlex.Store +namespace PlexRequests.Store { public interface IRepository { diff --git a/RequestPlex.Store/ISettingsRepository.cs b/RequestPlex.Store/ISettingsRepository.cs index e85bb49f9..c0a8a866a 100644 --- a/RequestPlex.Store/ISettingsRepository.cs +++ b/RequestPlex.Store/ISettingsRepository.cs @@ -26,9 +26,9 @@ #endregion using System.Collections.Generic; -using RequestPlex.Store.Models; +using PlexRequests.Store.Models; -namespace RequestPlex.Store +namespace PlexRequests.Store { public interface ISettingsRepository { diff --git a/RequestPlex.Store/ISqliteConfiguration.cs b/RequestPlex.Store/ISqliteConfiguration.cs index 0be19d593..d0ac8427a 100644 --- a/RequestPlex.Store/ISqliteConfiguration.cs +++ b/RequestPlex.Store/ISqliteConfiguration.cs @@ -26,7 +26,7 @@ #endregion using System.Data; -namespace RequestPlex.Store +namespace PlexRequests.Store { public interface ISqliteConfiguration { diff --git a/RequestPlex.Store/Models/GlobalSettings.cs b/RequestPlex.Store/Models/GlobalSettings.cs index 26fce6a19..a98d0e614 100644 --- a/RequestPlex.Store/Models/GlobalSettings.cs +++ b/RequestPlex.Store/Models/GlobalSettings.cs @@ -26,7 +26,7 @@ #endregion using Dapper.Contrib.Extensions; -namespace RequestPlex.Store.Models +namespace PlexRequests.Store.Models { [Table("GlobalSettings")] diff --git a/RequestPlex.Store/RequestPlex.Store.csproj b/RequestPlex.Store/PlexRequests.Store.csproj similarity index 92% rename from RequestPlex.Store/RequestPlex.Store.csproj rename to RequestPlex.Store/PlexRequests.Store.csproj index e7a782019..d615e911e 100644 --- a/RequestPlex.Store/RequestPlex.Store.csproj +++ b/RequestPlex.Store/PlexRequests.Store.csproj @@ -7,8 +7,8 @@ {92433867-2B7B-477B-A566-96C382427525} Library Properties - RequestPlex.Store - RequestPlex.Store + PlexRequests.Store + PlexRequests.Store v4.5.2 512 @@ -87,9 +87,9 @@ - + {1252336D-42A3-482A-804C-836E60173DFA} - RequestPlex.Helpers + PlexRequests.Helpers diff --git a/RequestPlex.Store/Repository/JsonRepository.cs b/RequestPlex.Store/Repository/JsonRepository.cs index 94dddf511..5b7e2e992 100644 --- a/RequestPlex.Store/Repository/JsonRepository.cs +++ b/RequestPlex.Store/Repository/JsonRepository.cs @@ -24,17 +24,15 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion - - using System.Collections.Generic; using System.Linq; using Dapper.Contrib.Extensions; -using RequestPlex.Helpers; -using RequestPlex.Store.Models; +using PlexRequests.Helpers; +using PlexRequests.Store.Models; -namespace RequestPlex.Store.Repository +namespace PlexRequests.Store.Repository { public class JsonRepository : ISettingsRepository { diff --git a/RequestPlex.Store/RequestedModel.cs b/RequestPlex.Store/RequestedModel.cs index b336fc073..415baf7d5 100644 --- a/RequestPlex.Store/RequestedModel.cs +++ b/RequestPlex.Store/RequestedModel.cs @@ -2,7 +2,7 @@ using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { [Table("Requested")] public class RequestedModel : Entity diff --git a/RequestPlex.Store/SettingsModel.cs b/RequestPlex.Store/SettingsModel.cs index 573f3dfec..3c8913cd3 100644 --- a/RequestPlex.Store/SettingsModel.cs +++ b/RequestPlex.Store/SettingsModel.cs @@ -1,8 +1,32 @@ -using System; - +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SettingsModel.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { [Table("Settings")] public class SettingsModel : Entity diff --git a/RequestPlex.Store/Sql.Designer.cs b/RequestPlex.Store/Sql.Designer.cs index f128bcb5e..21da4fd5f 100644 --- a/RequestPlex.Store/Sql.Designer.cs +++ b/RequestPlex.Store/Sql.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace RequestPlex.Store { +namespace PlexRequests.Store { using System; @@ -39,7 +39,7 @@ namespace RequestPlex.Store { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RequestPlex.Store.Sql", typeof(Sql).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PlexRequests.Store.Sql", typeof(Sql).Assembly); resourceMan = temp; } return resourceMan; @@ -65,10 +65,22 @@ namespace RequestPlex.Store { /// ///CREATE TABLE IF NOT EXISTS User ///( - /// UserID varchar PRIMARY KEY, + /// Id INTEGER PRIMARY KEY AUTOINCREMENT, + /// User varchar(50) NOT NULL , /// UserName varchar(50) NOT NULL, /// Password varchar(100) NOT NULL - ///);. + ///); + /// + ///CREATE TABLE IF NOT EXISTS Settings + ///( + /// 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]";. /// internal static string SqlTables { get { diff --git a/RequestPlex.Store/TableCreation.cs b/RequestPlex.Store/TableCreation.cs index 7a0e76293..437105ffc 100644 --- a/RequestPlex.Store/TableCreation.cs +++ b/RequestPlex.Store/TableCreation.cs @@ -29,7 +29,7 @@ using System.Data; using Dapper; using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { public static class TableCreation { diff --git a/RequestPlex.Store/UserModel.cs b/RequestPlex.Store/UserModel.cs index 70530b29b..8bf3e0fc3 100644 --- a/RequestPlex.Store/UserModel.cs +++ b/RequestPlex.Store/UserModel.cs @@ -1,8 +1,32 @@ -using System; - +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: UserModel.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { [Table("User")] public class UserModel : Entity diff --git a/RequestPlex.Store/UserRepository.cs b/RequestPlex.Store/UserRepository.cs index ca7bae605..f921cff00 100644 --- a/RequestPlex.Store/UserRepository.cs +++ b/RequestPlex.Store/UserRepository.cs @@ -30,7 +30,7 @@ using System.Linq; using Dapper.Contrib.Extensions; -namespace RequestPlex.Store +namespace PlexRequests.Store { public class UserRepository : IRepository where T : UserModel { @@ -94,3 +94,4 @@ namespace RequestPlex.Store } } } + diff --git a/RequestPlex.UI/Bootstrapper.cs b/RequestPlex.UI/Bootstrapper.cs index 169a601f5..db4c3bda8 100644 --- a/RequestPlex.UI/Bootstrapper.cs +++ b/RequestPlex.UI/Bootstrapper.cs @@ -1,4 +1,30 @@ -using Mono.Data.Sqlite; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: Bootstrapper.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using Mono.Data.Sqlite; using Nancy; using Nancy.Authentication.Forms; @@ -7,15 +33,13 @@ using Nancy.Diagnostics; using Nancy.Session; using Nancy.TinyIoc; -using RequestPlex.Core; -using RequestPlex.Core.SettingModels; -using RequestPlex.Helpers; -using RequestPlex.Store; -using RequestPlex.Store.Repository; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Store; +using PlexRequests.Store.Repository; -using FormsAuthentication = Nancy.Authentication.Forms.FormsAuthentication; - -namespace RequestPlex.UI +namespace PlexRequests.UI { public class Bootstrapper : DefaultNancyBootstrapper { diff --git a/RequestPlex.UI/Models/PlexAuth.cs b/RequestPlex.UI/Models/PlexAuth.cs index 3c90b131e..a97cc8799 100644 --- a/RequestPlex.UI/Models/PlexAuth.cs +++ b/RequestPlex.UI/Models/PlexAuth.cs @@ -1,10 +1,30 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace RequestPlex.UI.Models +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: PlexAuth.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +namespace PlexRequests.UI.Models { public class PlexAuth { diff --git a/RequestPlex.UI/Models/RequestViewModel.cs b/RequestPlex.UI/Models/RequestViewModel.cs index 809223d71..2958ea5a5 100644 --- a/RequestPlex.UI/Models/RequestViewModel.cs +++ b/RequestPlex.UI/Models/RequestViewModel.cs @@ -24,11 +24,9 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System; +using PlexRequests.Store; -using RequestPlex.Store; - -namespace RequestPlex.UI.Models +namespace PlexRequests.UI.Models { public class RequestViewModel { diff --git a/RequestPlex.UI/Models/Sessionkeys.cs b/RequestPlex.UI/Models/Sessionkeys.cs index d7cbc0f24..66c766039 100644 --- a/RequestPlex.UI/Models/Sessionkeys.cs +++ b/RequestPlex.UI/Models/Sessionkeys.cs @@ -24,7 +24,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -namespace RequestPlex.UI.Models +namespace PlexRequests.UI.Models { public class SessionKeys { diff --git a/RequestPlex.UI/Modules/AdminModule.cs b/RequestPlex.UI/Modules/AdminModule.cs index 04c09ba88..2917e1431 100644 --- a/RequestPlex.UI/Modules/AdminModule.cs +++ b/RequestPlex.UI/Modules/AdminModule.cs @@ -33,12 +33,12 @@ using Nancy.ModelBinding; using Nancy.Responses.Negotiation; using Nancy.Security; -using RequestPlex.Api; -using RequestPlex.Core; -using RequestPlex.Core.SettingModels; -using RequestPlex.UI.Models; +using PlexRequests.Api; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.UI.Models; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { public class AdminModule : NancyModule { diff --git a/RequestPlex.UI/Modules/IndexModule.cs b/RequestPlex.UI/Modules/IndexModule.cs index e71f1077e..52ca759c4 100644 --- a/RequestPlex.UI/Modules/IndexModule.cs +++ b/RequestPlex.UI/Modules/IndexModule.cs @@ -1,8 +1,33 @@ -using Nancy; +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: IndexModule.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion +using Nancy; using Nancy.Extensions; -using Nancy.Responses; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { public class IndexModule : NancyModule { diff --git a/RequestPlex.UI/Modules/LoginModule.cs b/RequestPlex.UI/Modules/LoginModule.cs index 4ea2c0c1c..8fec8815e 100644 --- a/RequestPlex.UI/Modules/LoginModule.cs +++ b/RequestPlex.UI/Modules/LoginModule.cs @@ -1,3 +1,29 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: LoginModule.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using System; using System.Dynamic; @@ -5,9 +31,9 @@ using Nancy; using Nancy.Authentication.Forms; using Nancy.Extensions; -using RequestPlex.Core; +using PlexRequests.Core; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { public class LoginModule : NancyModule { diff --git a/RequestPlex.UI/Modules/RequestsModule.cs b/RequestPlex.UI/Modules/RequestsModule.cs index 9ef381f78..88f0c158f 100644 --- a/RequestPlex.UI/Modules/RequestsModule.cs +++ b/RequestPlex.UI/Modules/RequestsModule.cs @@ -24,7 +24,6 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // ************************************************************************/ #endregion -using System.Collections.Generic; using System.Linq; using Humanizer; @@ -32,10 +31,10 @@ using Humanizer; using Nancy; using Nancy.Responses.Negotiation; -using RequestPlex.Store; -using RequestPlex.UI.Models; +using PlexRequests.Store; +using PlexRequests.UI.Models; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { public class RequestsModule : NancyModule { diff --git a/RequestPlex.UI/Modules/SearchModule.cs b/RequestPlex.UI/Modules/SearchModule.cs index 3e73a170f..cc32ff19c 100644 --- a/RequestPlex.UI/Modules/SearchModule.cs +++ b/RequestPlex.UI/Modules/SearchModule.cs @@ -1,13 +1,38 @@ +#region Copyright +// /************************************************************************ +// Copyright (c) 2016 Jamie Rees +// File: SearchModule.cs +// Created By: Jamie Rees +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ************************************************************************/ +#endregion using Nancy; using Nancy.Responses.Negotiation; -using RequestPlex.Api; -using RequestPlex.Api.Models.Tv; -using RequestPlex.Core; -using RequestPlex.Helpers; -using RequestPlex.Store; +using PlexRequests.Api; +using PlexRequests.Core; +using PlexRequests.Helpers; +using PlexRequests.Store; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { public class SearchModule : NancyModule { diff --git a/RequestPlex.UI/Modules/UserLoginModule.cs b/RequestPlex.UI/Modules/UserLoginModule.cs index 3acb55b34..b26447d3c 100644 --- a/RequestPlex.UI/Modules/UserLoginModule.cs +++ b/RequestPlex.UI/Modules/UserLoginModule.cs @@ -26,9 +26,9 @@ #endregion using Nancy; -using RequestPlex.UI.Models; +using PlexRequests.UI.Models; -namespace RequestPlex.UI.Modules +namespace PlexRequests.UI.Modules { // TODO: Check the settings to see if we need to authenticate // TODO: Add ability to logout diff --git a/RequestPlex.UI/RequestPlex.UI.csproj b/RequestPlex.UI/PlexRequests.UI.csproj similarity index 93% rename from RequestPlex.UI/RequestPlex.UI.csproj rename to RequestPlex.UI/PlexRequests.UI.csproj index 535c3e9f8..b1ec95a30 100644 --- a/RequestPlex.UI/RequestPlex.UI.csproj +++ b/RequestPlex.UI/PlexRequests.UI.csproj @@ -7,8 +7,8 @@ {68F5F5F3-B8BB-4911-875F-6F00AAE04EA6} Exe Properties - RequestPlex.UI - RequestPlex + PlexRequests.UI + PlexRequests v4.5.2 512 ..\..\ @@ -233,21 +233,21 @@ - + {8cb8d235-2674-442d-9c6a-35fcaeeb160d} - RequestPlex.Api + PlexRequests.Api - + {DD7DC444-D3BF-4027-8AB9-EFC71F5EC581} - RequestPlex.Core + PlexRequests.Core - + {1252336D-42A3-482A-804C-836E60173DFA} - RequestPlex.Helpers + PlexRequests.Helpers - + {92433867-2B7B-477B-A566-96C382427525} - RequestPlex.Store + PlexRequests.Store diff --git a/RequestPlex.UI/Program.cs b/RequestPlex.UI/Program.cs index 8af87e2cb..1b36772b8 100644 --- a/RequestPlex.UI/Program.cs +++ b/RequestPlex.UI/Program.cs @@ -30,13 +30,13 @@ using Microsoft.Owin.Hosting; using Mono.Data.Sqlite; -using RequestPlex.Core; -using RequestPlex.Core.SettingModels; -using RequestPlex.Helpers; -using RequestPlex.Store; -using RequestPlex.Store.Repository; +using PlexRequests.Core; +using PlexRequests.Core.SettingModels; +using PlexRequests.Helpers; +using PlexRequests.Store; +using PlexRequests.Store.Repository; -namespace RequestPlex.UI +namespace PlexRequests.UI { class Program { diff --git a/RequestPlex.UI/Startup.cs b/RequestPlex.UI/Startup.cs index cf85c2572..ca4b5fa89 100644 --- a/RequestPlex.UI/Startup.cs +++ b/RequestPlex.UI/Startup.cs @@ -28,7 +28,7 @@ using System; using Owin; -namespace RequestPlex.UI +namespace PlexRequests.UI { public class Startup { diff --git a/RequestPlex.sln b/RequestPlex.sln index 7ae8c0377..4fef3eacc 100644 --- a/RequestPlex.sln +++ b/RequestPlex.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.UI", "RequestPlex.UI\RequestPlex.UI.csproj", "{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.UI", "RequestPlex.UI\PlexRequests.UI.csproj", "{68F5F5F3-B8BB-4911-875F-6F00AAE04EA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.Api", "RequestPlex.Api\RequestPlex.Api.csproj", "{8CB8D235-2674-442D-9C6A-35FCAEEB160D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api", "RequestPlex.Api\PlexRequests.Api.csproj", "{8CB8D235-2674-442D-9C6A-35FCAEEB160D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.Api.Interfaces", "RequestPlex.Api.Interfaces\RequestPlex.Api.Interfaces.csproj", "{95834072-A675-415D-AA8F-877C91623810}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api.Interfaces", "RequestPlex.Api.Interfaces\PlexRequests.Api.Interfaces.csproj", "{95834072-A675-415D-AA8F-877C91623810}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.Core", "RequestPlex.Core\RequestPlex.Core.csproj", "{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Core", "RequestPlex.Core\PlexRequests.Core.csproj", "{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.Store", "RequestPlex.Store\RequestPlex.Store.csproj", "{92433867-2B7B-477B-A566-96C382427525}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Store", "RequestPlex.Store\PlexRequests.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 @@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RequestPlex.Helpers", "RequestPlex.Helpers\RequestPlex.Helpers.csproj", "{1252336D-42A3-482A-804C-836E60173DFA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Helpers", "RequestPlex.Helpers\PlexRequests.Helpers.csproj", "{1252336D-42A3-482A-804C-836E60173DFA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution