From 3e5e48c3a03423c0a3c654997ea1e515ff50ab00 Mon Sep 17 00:00:00 2001 From: flightlevel Date: Sat, 10 Mar 2018 19:05:56 +1100 Subject: [PATCH] Change namespace to Jackett.Common (#2691) Really hope I don't break anything with this Went to have a go at .NET core and it just became too confusing for me with 'Jackett' namespace referring to both Jackett.Common and Jackett --- src/CurlSharp/Callbacks/CurlEasyCallbacks.cs | 3 +- src/CurlSharp/Callbacks/CurlShareCallbacks.cs | 3 +- src/CurlSharp/Curl.cs | 1 + src/CurlSharp/CurlEasy.cs | 2 + src/CurlSharp/CurlHttpMultiPartForm.cs | 1 + src/CurlSharp/CurlMulti.cs | 1 + src/CurlSharp/CurlMultiInfo.cs | 2 + src/CurlSharp/CurlShare.cs | 2 + src/CurlSharp/CurlSlist.cs | 1 + src/CurlSharp/CurlSslContext.cs | 1 + src/CurlSharp/CurlVersionInfoData.cs | 2 +- src/CurlSharp/Enums/CurlClosePolicy.cs | 2 +- src/CurlSharp/Enums/CurlCode.cs | 2 +- src/CurlSharp/Enums/CurlFormCode.cs | 2 +- src/CurlSharp/Enums/CurlFormOption.cs | 2 +- src/CurlSharp/Enums/CurlFtpAuth.cs | 2 +- src/CurlSharp/Enums/CurlFtpSsl.cs | 2 +- src/CurlSharp/Enums/CurlHttpAuth.cs | 2 +- src/CurlSharp/Enums/CurlHttpVersion.cs | 2 +- src/CurlSharp/Enums/CurlInfo.cs | 2 +- src/CurlSharp/Enums/CurlInfoType.cs | 2 +- src/CurlSharp/Enums/CurlInitFlag.cs | 2 +- src/CurlSharp/Enums/CurlIoCommand.cs | 2 +- src/CurlSharp/Enums/CurlIoError.cs | 2 +- src/CurlSharp/Enums/CurlIpResolve.cs | 2 +- src/CurlSharp/Enums/CurlLockAccess.cs | 2 +- src/CurlSharp/Enums/CurlLockData.cs | 2 +- src/CurlSharp/Enums/CurlMessage.cs | 2 +- src/CurlSharp/Enums/CurlMultiCode.cs | 2 +- src/CurlSharp/Enums/CurlMultiOption.cs | 2 +- src/CurlSharp/Enums/CurlNetrcOption.cs | 2 +- src/CurlSharp/Enums/CurlOptType.cs | 2 +- src/CurlSharp/Enums/CurlOption.cs | 4 +- src/CurlSharp/Enums/CurlPipelining.cs | 2 +- src/CurlSharp/Enums/CurlProxyType.cs | 2 +- src/CurlSharp/Enums/CurlShareCode.cs | 2 +- src/CurlSharp/Enums/CurlShareOption.cs | 2 +- src/CurlSharp/Enums/CurlSslVersion.cs | 2 +- src/CurlSharp/Enums/CurlTimeCond.cs | 2 +- src/CurlSharp/Enums/CurlVersion.cs | 2 +- .../Enums/CurlVersionFeatureBitmask.cs | 2 +- src/CurlSharp/NativeMethods.cs | 1 + src/CurlSharp/SSLFix.cs | 8 +--- src/DateTimeRoutines/DateTimeRoutines.cs | 9 ++--- src/Jackett.Common/CurlHelper.cs | 17 ++++----- src/Jackett.Common/Engine.cs | 29 +++++++-------- src/Jackett.Common/ExceptionWithConfigData.cs | 11 ++---- .../Helpers/CookieContainerExtensions.cs | 13 ++----- .../Helpers/HttpClientExtensions.cs | 5 +-- .../Helpers/WebUtilityHelpers.cs | 6 +-- src/Jackett.Common/IndexerException.cs | 10 ++--- src/Jackett.Common/Indexers/7tor.cs | 12 +++--- src/Jackett.Common/Indexers/Abnormal.cs | 13 +++---- .../Indexers/Abstract/AvistazTracker.cs | 18 ++++----- .../Indexers/Abstract/CouchPotatoTracker.cs | 17 ++++----- .../Indexers/Abstract/GazelleTracker.cs | 27 ++++++-------- src/Jackett.Common/Indexers/AlphaRatio.cs | 10 ++--- src/Jackett.Common/Indexers/Andraste.cs | 12 +++--- src/Jackett.Common/Indexers/AnimeBytes.cs | 14 +++---- src/Jackett.Common/Indexers/AnimeTorrents.cs | 12 +++--- src/Jackett.Common/Indexers/Apollo.cs | 10 ++--- src/Jackett.Common/Indexers/Avistaz.cs | 7 ++-- src/Jackett.Common/Indexers/BB.cs | 12 +++--- src/Jackett.Common/Indexers/BJShare.cs | 12 +++--- src/Jackett.Common/Indexers/BakaBT.cs | 11 +++--- src/Jackett.Common/Indexers/BaseIndexer.cs | 12 +++--- src/Jackett.Common/Indexers/BeyondHD.cs | 12 +++--- .../Indexers/BitCityReloaded.cs | 12 +++--- src/Jackett.Common/Indexers/BitHdtv.cs | 12 +++--- src/Jackett.Common/Indexers/BitMeTV.cs | 12 +++--- src/Jackett.Common/Indexers/BitSoup.cs | 12 +++--- .../Indexers/BroadcastTheNet.cs | 12 +++--- src/Jackett.Common/Indexers/BrokenStones.cs | 10 ++--- .../Indexers/CardigannIndexer.cs | 37 +++++++++---------- src/Jackett.Common/Indexers/CinemaZ.cs | 7 ++-- src/Jackett.Common/Indexers/DanishBits.cs | 12 +++--- src/Jackett.Common/Indexers/Demonoid.cs | 12 +++--- src/Jackett.Common/Indexers/DigitalHive.cs | 12 +++--- src/Jackett.Common/Indexers/EliteTracker.cs | 12 +++--- .../Indexers/Feeds/AnimeTosho.cs | 12 +++--- .../Indexers/Feeds/BaseFeedIndexer.cs | 12 +++--- .../Indexers/Feeds/BaseNewznabIndexer.cs | 12 +++--- src/Jackett.Common/Indexers/FileList.cs | 12 +++--- src/Jackett.Common/Indexers/FunFile.cs | 12 +++--- src/Jackett.Common/Indexers/Fuzer.cs | 15 +++----- src/Jackett.Common/Indexers/GFTracker.cs | 12 +++--- src/Jackett.Common/Indexers/GazelleGames.cs | 12 +++--- src/Jackett.Common/Indexers/GhostCity.cs | 12 +++--- src/Jackett.Common/Indexers/GimmePeers.cs | 12 +++--- src/Jackett.Common/Indexers/HDForever.cs | 10 ++--- src/Jackett.Common/Indexers/HDOnly.cs | 10 ++--- src/Jackett.Common/Indexers/HDSpace.cs | 12 +++--- src/Jackett.Common/Indexers/HDTorrents.cs | 12 +++--- src/Jackett.Common/Indexers/Hardbay.cs | 12 +++--- src/Jackett.Common/Indexers/Hebits.cs | 15 +++----- src/Jackett.Common/Indexers/IIndexer.cs | 6 +-- src/Jackett.Common/Indexers/IPTorrents.cs | 13 +++---- src/Jackett.Common/Indexers/ImmortalSeed.cs | 12 +++--- src/Jackett.Common/Indexers/LostFilm.cs | 14 +++---- .../Indexers/Meta/BaseMetaIndexer.cs | 12 +++--- src/Jackett.Common/Indexers/Meta/Fallbacks.cs | 12 +++--- .../Indexers/Meta/MetaIndexers.cs | 16 +++----- .../Indexers/Meta/ResultFilters.cs | 9 ++--- src/Jackett.Common/Indexers/MoreThanTV.cs | 12 +++--- src/Jackett.Common/Indexers/MyAnonamouse.cs | 12 +++--- src/Jackett.Common/Indexers/NCore.cs | 12 +++--- src/Jackett.Common/Indexers/NewRealWorld.cs | 12 +++--- src/Jackett.Common/Indexers/Norbits.cs | 15 ++++---- src/Jackett.Common/Indexers/PassThePopcorn.cs | 10 ++--- src/Jackett.Common/Indexers/PiXELHD.cs | 12 +++--- src/Jackett.Common/Indexers/PirateTheNet.cs | 12 +++--- src/Jackett.Common/Indexers/PolishTracker.cs | 13 +++---- src/Jackett.Common/Indexers/Pretome.cs | 12 +++--- src/Jackett.Common/Indexers/PrivateHD.cs | 7 ++-- src/Jackett.Common/Indexers/Psytorrents.cs | 10 ++--- src/Jackett.Common/Indexers/Rarbg.cs | 14 +++---- src/Jackett.Common/Indexers/Redacted.cs | 10 ++--- src/Jackett.Common/Indexers/RevolutionTT.cs | 12 +++--- src/Jackett.Common/Indexers/SceneTime.cs | 12 +++--- src/Jackett.Common/Indexers/SecretCinema.cs | 10 ++--- src/Jackett.Common/Indexers/Shazbat.cs | 12 +++--- src/Jackett.Common/Indexers/ShowRSS.cs | 12 +++--- src/Jackett.Common/Indexers/SpeedCD.cs | 12 +++--- src/Jackett.Common/Indexers/Superbits.cs | 12 +++--- src/Jackett.Common/Indexers/Synthesiz3r.cs | 10 ++--- src/Jackett.Common/Indexers/TVChaosUK.cs | 12 +++--- src/Jackett.Common/Indexers/TVVault.cs | 12 +++--- src/Jackett.Common/Indexers/TorrentBytes.cs | 12 +++--- src/Jackett.Common/Indexers/TorrentDay.cs | 15 ++++---- src/Jackett.Common/Indexers/TorrentHeaven.cs | 12 +++--- src/Jackett.Common/Indexers/TorrentLeech.cs | 12 +++--- src/Jackett.Common/Indexers/TorrentNetwork.cs | 14 +++---- .../Indexers/TorrentSyndikat.cs | 12 +++--- src/Jackett.Common/Indexers/Torrentech.cs | 13 +++---- src/Jackett.Common/Indexers/TransmitheNet.cs | 12 +++--- src/Jackett.Common/Indexers/WiHD.cs | 12 +++--- src/Jackett.Common/Indexers/XSpeeds.cs | 16 ++++---- src/Jackett.Common/Indexers/Xthor.cs | 13 +++---- src/Jackett.Common/Indexers/cgpeers.cs | 10 ++--- src/Jackett.Common/Indexers/myAmity.cs | 12 +++--- src/Jackett.Common/Indexers/notwhatcd.cs | 10 ++--- src/Jackett.Common/Indexers/rutracker.cs | 16 ++++---- src/Jackett.Common/Indexers/x264.cs | 12 +++--- src/Jackett.Common/Indexers/yify.cs | 12 +++--- src/Jackett.Common/Indexers/yts.cs | 12 +++--- .../JackettProtectedAttribute.cs | 6 +-- src/Jackett.Common/Models/CachedLog.cs | 9 +---- .../Models/CachedQueryResult.cs | 5 +-- src/Jackett.Common/Models/CachedResult.cs | 6 +-- src/Jackett.Common/Models/CategoryMapping.cs | 8 +--- src/Jackett.Common/Models/ChannelInfo.cs | 6 +-- .../Models/Config/ConsoleOptions.cs | 4 -- src/Jackett.Common/Models/Config/ProxyType.cs | 6 +-- .../Models/Config/RuntimeSettings.cs | 2 - .../Models/Config/ServerConfig.cs | 11 ++---- src/Jackett.Common/Models/DTO/ApiSearch.cs | 4 +- src/Jackett.Common/Models/DTO/Config.cs | 3 +- src/Jackett.Common/Models/DTO/Indexer.cs | 4 +- .../Models/DTO/ManualSearchResult.cs | 9 +---- src/Jackett.Common/Models/DTO/ServerConfig.cs | 6 +-- .../Models/DTO/TorrentPotatoRequest.cs | 2 +- .../Models/DTO/TorrentPotatoResponse.cs | 2 +- .../Models/DTO/TorrentPotatoResponseItem.cs | 2 +- .../Models/DTO/TorznabRequest.cs | 7 ++-- src/Jackett.Common/Models/GitHub/Asset.cs | 8 +--- src/Jackett.Common/Models/GitHub/Release.cs | 5 +-- .../Bespoke/ConfigurationDataAbnormal.cs | 2 +- .../Bespoke/ConfigurationDataAnimeBytes.cs | 9 +---- .../Bespoke/ConfigurationDataFileList.cs | 9 +---- .../Bespoke/ConfigurationDataNCore.cs | 8 +--- .../Bespoke/ConfigurationDataNorbits.cs | 2 +- .../Bespoke/ConfigurationDataRutracker.cs | 9 +---- .../Bespoke/ConfigurationDataSceneFZ.cs | 2 +- .../Bespoke/ConfigurationDataWiHD.cs | 2 +- .../Bespoke/ConfigurationDataXthor.cs | 2 +- .../Models/IndexerConfig/ConfigurationData.cs | 11 +++--- .../IndexerConfig/ConfigurationDataAPIKey.cs | 8 +--- .../ConfigurationDataBasicLogin.cs | 9 +---- .../ConfigurationDataBasicLoginWithFilter.cs | 9 +---- ...ationDataBasicLoginWithFilterAndPasskey.cs | 9 +---- .../ConfigurationDataBasicLoginWithRSS.cs | 9 +---- ...gurationDataBasicLoginWithRSSAndDisplay.cs | 9 +---- .../ConfigurationDataCaptchaLogin.cs | 8 +--- .../IndexerConfig/ConfigurationDataCookie.cs | 8 +--- .../ConfigurationDataLoginLink.cs | 9 +---- .../ConfigurationDataLoginTokin.cs | 10 ++--- .../ConfigurationDataPinNumber.cs | 8 +--- .../ConfigurationDataRecaptchaLogin.cs | 9 +---- .../IndexerConfig/ConfigurationDataUrl.cs | 6 +-- .../ConfigurationDataUserPasskey.cs | 2 +- .../IndexerConfig/ISerializableConfig.cs | 7 +--- .../Models/IndexerConfigurationStatus.cs | 8 +--- .../Models/IndexerDefinition.cs | 2 +- src/Jackett.Common/Models/ReleaseInfo.cs | 8 ++-- src/Jackett.Common/Models/ResultPage.cs | 6 +-- .../Models/TorznabCapabilities.cs | 7 +--- src/Jackett.Common/Models/TorznabCatType.cs | 2 +- .../Models/TorznabCatType.generated.cs | 2 +- src/Jackett.Common/Models/TorznabCategory.cs | 9 ++--- src/Jackett.Common/Models/TorznabQuery.cs | 9 ++--- src/Jackett.Common/Models/TrackerCache.cs | 8 +--- .../Models/TrackerCacheResult.cs | 6 +-- src/Jackett.Common/Plumbing/JackettModule.cs | 19 +++------- src/Jackett.Common/Services/CacheService.cs | 14 +++---- .../Services/ConfigurationService.cs | 13 +++---- src/Jackett.Common/Services/ImdbResolver.cs | 16 +++----- .../Services/IndexerConfigurationService.cs | 6 +-- .../Services/IndexerManagerService.cs | 21 +++++------ .../Services/Interfaces/ICacheService.cs | 8 ++-- .../Interfaces/IConfigurationService.cs | 2 +- .../Services/Interfaces/IImdbResolver.cs | 4 +- .../IIndexerConfigurationService.cs | 4 +- .../Interfaces/IIndexerManagerService.cs | 6 +-- .../Services/Interfaces/ILogCacheService.cs | 6 +-- .../Services/Interfaces/IProcessService.cs | 2 +- .../Services/Interfaces/IProtectionService.cs | 2 +- .../Services/Interfaces/IRunTimeService.cs | 2 +- .../Services/Interfaces/ISecuityService.cs | 2 +- .../Services/Interfaces/ISerializeService.cs | 2 +- .../Services/Interfaces/IServerService.cs | 2 +- .../Interfaces/IServiceConfigService.cs | 2 +- .../Services/Interfaces/ITrayLockService.cs | 2 +- .../Services/Interfaces/IUpdateService.cs | 2 +- .../Services/LogCacheService.cs | 13 +++---- src/Jackett.Common/Services/ProcessService.cs | 12 ++---- .../Services/SerializeService.cs | 11 ++---- src/Jackett.Common/Services/SpinService.cs | 11 ++---- .../Services/TrayLockService.cs | 8 +--- src/Jackett.Common/Services/UpdateService.cs | 22 +++++------ src/Jackett.Common/Utils/BrowserUtil.cs | 6 +-- .../Utils/Clients/BaseWebResult.cs | 8 +--- .../Utils/Clients/HttpWebClient.cs | 12 +++--- .../Utils/Clients/HttpWebClient2.cs | 19 +++------- .../Utils/Clients/UnixLibCurlWebClient.cs | 22 ++++------- .../Utils/Clients/UnixSafeCurlWebClient.cs | 17 +++------ .../Utils/Clients/WebByteResult.cs | 9 +---- src/Jackett.Common/Utils/Clients/WebClient.cs | 15 +++----- .../Utils/Clients/WebClientResult.cs | 9 +---- .../Utils/Clients/WebRequest.cs | 4 +- src/Jackett.Common/Utils/DataUrl.cs | 7 +--- src/Jackett.Common/Utils/DateTimeUtil.cs | 17 +++------ src/Jackett.Common/Utils/EnvironmentUtil.cs | 2 +- src/Jackett.Common/Utils/Extensions.cs | 2 +- src/Jackett.Common/Utils/JsonContent.cs | 14 ++----- src/Jackett.Common/Utils/JsonUtil.cs | 2 +- src/Jackett.Common/Utils/ParseUtil.cs | 3 +- src/Jackett.Common/Utils/ServerUtil.cs | 11 ++---- src/Jackett.Common/Utils/StringCipher.cs | 4 +- src/Jackett.Common/Utils/StringUtil.cs | 13 +++---- src/Jackett.Common/Utils/TorznabCapsUtil.cs | 12 ++---- src/Jackett.Common/Utils/TvCategoryParser.cs | 4 +- src/Jackett.Console/Jackett.Console.csproj | 2 +- src/Jackett.Console/Program.cs | 19 ++++------ .../Properties/AssemblyInfo.cs | 1 - src/Jackett.Service/Program.cs | 7 +--- .../Properties/AssemblyInfo.cs | 1 - src/Jackett.Service/Service.cs | 9 +---- .../Services/ProtectionServiceTests.cs | 12 ++---- src/Jackett.Test/TestBase.cs | 5 --- .../TestIIndexerManagerServiceHelper.cs | 9 ++--- src/Jackett.Test/TestUtil.cs | 10 +---- src/Jackett.Test/TestWebClient.cs | 8 ++-- src/Jackett.Test/Util/ParseUtilTests.cs | 7 +--- src/Jackett.Test/Util/ServerUtilTests.cs | 16 ++------ .../Util/TvCategoryParserTests.cs | 4 +- src/Jackett.Test/WebUtilityHelpersTests.cs | 8 ++-- src/Jackett.Tray/Main.Designer.cs | 2 +- src/Jackett.Tray/Main.cs | 25 +++++++------ src/Jackett.Tray/Program.cs | 4 +- src/Jackett.Tray/Properties/AssemblyInfo.cs | 1 - src/Jackett.Updater/Program.cs | 5 +-- .../Properties/AssemblyInfo.cs | 1 - src/Jackett.Updater/UpdaterConsoleOptions.cs | 5 --- src/Jackett/CacheControlAttribute.cs | 7 +--- .../Controllers/BlackholeController.cs | 8 ++-- src/Jackett/Controllers/DownloadController.cs | 6 +-- .../Controllers/IndexerApiController.cs | 16 ++++---- src/Jackett/Controllers/ResultsController.cs | 23 ++++++------ .../ServerConfigurationController.cs | 18 ++++----- src/Jackett/Controllers/UIController.cs | 9 ++--- src/Jackett/Properties/AssemblyInfo.cs | 1 - src/Jackett/Services/ProtectionService.cs | 9 ++--- src/Jackett/Services/SecuityService.cs | 7 +--- src/Jackett/Services/ServerService.cs | 16 ++++---- src/Jackett/Services/ServiceConfigService.cs | 5 +-- src/Jackett/Startup.cs | 4 +- .../Utils/JackettAuthorizedAttribute.cs | 1 + src/Jackett/Utils/RedirectMiddleware.cs | 3 +- src/Jackett/Utils/WebAPIRequestLogger.cs | 7 +--- src/Jackett/Utils/WebAPIToNLogTracer.cs | 8 +--- src/Jackett/WebApi2Module.cs | 5 --- 291 files changed, 987 insertions(+), 1468 deletions(-) diff --git a/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs b/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs index 6f9cfb6bf..3efa655c0 100644 --- a/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs +++ b/src/CurlSharp/Callbacks/CurlEasyCallbacks.cs @@ -1,7 +1,8 @@ using System; using System.Runtime.InteropServices; +using CurlSharp.Enums; -namespace CurlSharp +namespace CurlSharp.Callbacks { /// /// Called when cURL has debug information for the client. diff --git a/src/CurlSharp/Callbacks/CurlShareCallbacks.cs b/src/CurlSharp/Callbacks/CurlShareCallbacks.cs index 9efb7e6ae..9f6b56f06 100644 --- a/src/CurlSharp/Callbacks/CurlShareCallbacks.cs +++ b/src/CurlSharp/Callbacks/CurlShareCallbacks.cs @@ -1,6 +1,7 @@ using System; +using CurlSharp.Enums; -namespace CurlSharp +namespace CurlSharp.Callbacks { /// /// Called when cURL wants to lock a shared resource. diff --git a/src/CurlSharp/Curl.cs b/src/CurlSharp/Curl.cs index dd85332f0..366aff7fc 100644 --- a/src/CurlSharp/Curl.cs +++ b/src/CurlSharp/Curl.cs @@ -19,6 +19,7 @@ using System; using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlEasy.cs b/src/CurlSharp/CurlEasy.cs index 320e080d4..e4f2789aa 100644 --- a/src/CurlSharp/CurlEasy.cs +++ b/src/CurlSharp/CurlEasy.cs @@ -19,6 +19,8 @@ using System; using System.Runtime.InteropServices; +using CurlSharp.Callbacks; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlHttpMultiPartForm.cs b/src/CurlSharp/CurlHttpMultiPartForm.cs index 5d99cd2eb..57a2a8e00 100644 --- a/src/CurlSharp/CurlHttpMultiPartForm.cs +++ b/src/CurlSharp/CurlHttpMultiPartForm.cs @@ -19,6 +19,7 @@ using System; using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlMulti.cs b/src/CurlSharp/CurlMulti.cs index b49a2891d..175df67db 100644 --- a/src/CurlSharp/CurlMulti.cs +++ b/src/CurlSharp/CurlMulti.cs @@ -20,6 +20,7 @@ using System; using System.Collections; using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlMultiInfo.cs b/src/CurlSharp/CurlMultiInfo.cs index febd8f7df..f7d963dea 100644 --- a/src/CurlSharp/CurlMultiInfo.cs +++ b/src/CurlSharp/CurlMultiInfo.cs @@ -17,6 +17,8 @@ * **************************************************************************/ +using CurlSharp.Enums; + namespace CurlSharp { /// diff --git a/src/CurlSharp/CurlShare.cs b/src/CurlSharp/CurlShare.cs index 237f06507..fdcdce892 100644 --- a/src/CurlSharp/CurlShare.cs +++ b/src/CurlSharp/CurlShare.cs @@ -19,6 +19,8 @@ using System; using System.Runtime.InteropServices; +using CurlSharp.Callbacks; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlSlist.cs b/src/CurlSharp/CurlSlist.cs index afa9a207f..b566f3d9f 100644 --- a/src/CurlSharp/CurlSlist.cs +++ b/src/CurlSharp/CurlSlist.cs @@ -20,6 +20,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/CurlSslContext.cs b/src/CurlSharp/CurlSslContext.cs index 90fecd625..2847563ad 100644 --- a/src/CurlSharp/CurlSslContext.cs +++ b/src/CurlSharp/CurlSslContext.cs @@ -18,6 +18,7 @@ **************************************************************************/ using System; +using CurlSharp.Callbacks; namespace CurlSharp { diff --git a/src/CurlSharp/CurlVersionInfoData.cs b/src/CurlSharp/CurlVersionInfoData.cs index aa8124fe3..3a07d2732 100644 --- a/src/CurlSharp/CurlVersionInfoData.cs +++ b/src/CurlSharp/CurlVersionInfoData.cs @@ -18,7 +18,7 @@ **************************************************************************/ using System; -using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/Enums/CurlClosePolicy.cs b/src/CurlSharp/Enums/CurlClosePolicy.cs index a40b591c9..b2d98a43b 100644 --- a/src/CurlSharp/Enums/CurlClosePolicy.cs +++ b/src/CurlSharp/Enums/CurlClosePolicy.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to specify the order in which cached connections diff --git a/src/CurlSharp/Enums/CurlCode.cs b/src/CurlSharp/Enums/CurlCode.cs index fc158c0eb..0bb0c4d30 100644 --- a/src/CurlSharp/Enums/CurlCode.cs +++ b/src/CurlSharp/Enums/CurlCode.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Status code returned from functions. diff --git a/src/CurlSharp/Enums/CurlFormCode.cs b/src/CurlSharp/Enums/CurlFormCode.cs index 037ec5803..edee2e5df 100644 --- a/src/CurlSharp/Enums/CurlFormCode.cs +++ b/src/CurlSharp/Enums/CurlFormCode.cs @@ -17,7 +17,7 @@ * $Id: Enums.cs,v 1.1 2005/02/17 22:47:25 jeffreyphillips Exp $ **************************************************************************/ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// One of these is returned by . diff --git a/src/CurlSharp/Enums/CurlFormOption.cs b/src/CurlSharp/Enums/CurlFormOption.cs index ed78393fb..10b327f35 100644 --- a/src/CurlSharp/Enums/CurlFormOption.cs +++ b/src/CurlSharp/Enums/CurlFormOption.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// These are options available to build a multi-part form section diff --git a/src/CurlSharp/Enums/CurlFtpAuth.cs b/src/CurlSharp/Enums/CurlFtpAuth.cs index 52f862dd1..4a0cb6782 100644 --- a/src/CurlSharp/Enums/CurlFtpAuth.cs +++ b/src/CurlSharp/Enums/CurlFtpAuth.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration contains values used to specify the FTP Ssl diff --git a/src/CurlSharp/Enums/CurlFtpSsl.cs b/src/CurlSharp/Enums/CurlFtpSsl.cs index 982f158d1..0f7dc53d8 100644 --- a/src/CurlSharp/Enums/CurlFtpSsl.cs +++ b/src/CurlSharp/Enums/CurlFtpSsl.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration contains values used to specify the FTP Ssl level diff --git a/src/CurlSharp/Enums/CurlHttpAuth.cs b/src/CurlSharp/Enums/CurlHttpAuth.cs index 6cd0619cc..0ea660f21 100644 --- a/src/CurlSharp/Enums/CurlHttpAuth.cs +++ b/src/CurlSharp/Enums/CurlHttpAuth.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration contains values used to specify the HTTP authentication diff --git a/src/CurlSharp/Enums/CurlHttpVersion.cs b/src/CurlSharp/Enums/CurlHttpVersion.cs index 962dedf87..c16df8d83 100644 --- a/src/CurlSharp/Enums/CurlHttpVersion.cs +++ b/src/CurlSharp/Enums/CurlHttpVersion.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to specify the HTTP version level when using diff --git a/src/CurlSharp/Enums/CurlInfo.cs b/src/CurlSharp/Enums/CurlInfo.cs index 6d41e2c20..44776185f 100644 --- a/src/CurlSharp/Enums/CurlInfo.cs +++ b/src/CurlSharp/Enums/CurlInfo.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration is used to extract information associated with an diff --git a/src/CurlSharp/Enums/CurlInfoType.cs b/src/CurlSharp/Enums/CurlInfoType.cs index bbef37891..0199999e2 100644 --- a/src/CurlSharp/Enums/CurlInfoType.cs +++ b/src/CurlSharp/Enums/CurlInfoType.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// A member of this enumeration is passed as the first parameter to the diff --git a/src/CurlSharp/Enums/CurlInitFlag.cs b/src/CurlSharp/Enums/CurlInitFlag.cs index 9106d92b2..9efa8972d 100644 --- a/src/CurlSharp/Enums/CurlInitFlag.cs +++ b/src/CurlSharp/Enums/CurlInitFlag.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to initialize libcurl internally. One of diff --git a/src/CurlSharp/Enums/CurlIoCommand.cs b/src/CurlSharp/Enums/CurlIoCommand.cs index 6e15fbb30..142fcae4e 100644 --- a/src/CurlSharp/Enums/CurlIoCommand.cs +++ b/src/CurlSharp/Enums/CurlIoCommand.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Your handler for the diff --git a/src/CurlSharp/Enums/CurlIoError.cs b/src/CurlSharp/Enums/CurlIoError.cs index e1baeccb7..feb7c556b 100644 --- a/src/CurlSharp/Enums/CurlIoError.cs +++ b/src/CurlSharp/Enums/CurlIoError.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Your handler for the delegate diff --git a/src/CurlSharp/Enums/CurlIpResolve.cs b/src/CurlSharp/Enums/CurlIpResolve.cs index 847786512..11071fba2 100644 --- a/src/CurlSharp/Enums/CurlIpResolve.cs +++ b/src/CurlSharp/Enums/CurlIpResolve.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration contains values used to specify the IP resolution diff --git a/src/CurlSharp/Enums/CurlLockAccess.cs b/src/CurlSharp/Enums/CurlLockAccess.cs index 2214585c7..38bb84b63 100644 --- a/src/CurlSharp/Enums/CurlLockAccess.cs +++ b/src/CurlSharp/Enums/CurlLockAccess.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Values containing the type of shared access requested when libcurl diff --git a/src/CurlSharp/Enums/CurlLockData.cs b/src/CurlSharp/Enums/CurlLockData.cs index 63e7247e6..fe2485ce9 100644 --- a/src/CurlSharp/Enums/CurlLockData.cs +++ b/src/CurlSharp/Enums/CurlLockData.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Members of this enumeration should be passed to diff --git a/src/CurlSharp/Enums/CurlMessage.cs b/src/CurlSharp/Enums/CurlMessage.cs index d374e18f1..5c2464c9a 100644 --- a/src/CurlSharp/Enums/CurlMessage.cs +++ b/src/CurlSharp/Enums/CurlMessage.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// The status code associated with an object in a diff --git a/src/CurlSharp/Enums/CurlMultiCode.cs b/src/CurlSharp/Enums/CurlMultiCode.cs index 053d270a5..9d1d4660f 100644 --- a/src/CurlSharp/Enums/CurlMultiCode.cs +++ b/src/CurlSharp/Enums/CurlMultiCode.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains return codes for many of the functions in the diff --git a/src/CurlSharp/Enums/CurlMultiOption.cs b/src/CurlSharp/Enums/CurlMultiOption.cs index 53ef4c030..f9fac998d 100644 --- a/src/CurlSharp/Enums/CurlMultiOption.cs +++ b/src/CurlSharp/Enums/CurlMultiOption.cs @@ -8,7 +8,7 @@ // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -namespace CurlSharp +namespace CurlSharp.Enums { public enum CurlMultiOption { diff --git a/src/CurlSharp/Enums/CurlNetrcOption.cs b/src/CurlSharp/Enums/CurlNetrcOption.cs index 9f24cc37e..c50591460 100644 --- a/src/CurlSharp/Enums/CurlNetrcOption.cs +++ b/src/CurlSharp/Enums/CurlNetrcOption.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to specify the preference of libcurl between diff --git a/src/CurlSharp/Enums/CurlOptType.cs b/src/CurlSharp/Enums/CurlOptType.cs index 8cb996a39..1b1c74dc8 100644 --- a/src/CurlSharp/Enums/CurlOptType.cs +++ b/src/CurlSharp/Enums/CurlOptType.cs @@ -8,7 +8,7 @@ // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -namespace CurlSharp +namespace CurlSharp.Enums { public enum CurlOptType { diff --git a/src/CurlSharp/Enums/CurlOption.cs b/src/CurlSharp/Enums/CurlOption.cs index 78a7fe3e3..5b49139a2 100644 --- a/src/CurlSharp/Enums/CurlOption.cs +++ b/src/CurlSharp/Enums/CurlOption.cs @@ -17,7 +17,9 @@ * **************************************************************************/ -namespace CurlSharp +using CurlSharp.Callbacks; + +namespace CurlSharp.Enums { /// /// One of these is passed as the first parameter to diff --git a/src/CurlSharp/Enums/CurlPipelining.cs b/src/CurlSharp/Enums/CurlPipelining.cs index a176f6261..b29b891f5 100644 --- a/src/CurlSharp/Enums/CurlPipelining.cs +++ b/src/CurlSharp/Enums/CurlPipelining.cs @@ -8,7 +8,7 @@ // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -namespace CurlSharp +namespace CurlSharp.Enums { /* bitmask bits for CURLMOPT_PIPELINING */ diff --git a/src/CurlSharp/Enums/CurlProxyType.cs b/src/CurlSharp/Enums/CurlProxyType.cs index 8b9b7c96e..b74013584 100644 --- a/src/CurlSharp/Enums/CurlProxyType.cs +++ b/src/CurlSharp/Enums/CurlProxyType.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// This enumeration contains values used to specify the proxy type when diff --git a/src/CurlSharp/Enums/CurlShareCode.cs b/src/CurlSharp/Enums/CurlShareCode.cs index 4e0919d5a..f7ca69a0d 100644 --- a/src/CurlSharp/Enums/CurlShareCode.cs +++ b/src/CurlSharp/Enums/CurlShareCode.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains return codes from many of the functions in the diff --git a/src/CurlSharp/Enums/CurlShareOption.cs b/src/CurlSharp/Enums/CurlShareOption.cs index d887e2899..c0da76580 100644 --- a/src/CurlSharp/Enums/CurlShareOption.cs +++ b/src/CurlSharp/Enums/CurlShareOption.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// A member of this enumeration is passed to the function diff --git a/src/CurlSharp/Enums/CurlSslVersion.cs b/src/CurlSharp/Enums/CurlSslVersion.cs index 0e9b67203..761885a3e 100644 --- a/src/CurlSharp/Enums/CurlSslVersion.cs +++ b/src/CurlSharp/Enums/CurlSslVersion.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to specify the Ssl version level when using diff --git a/src/CurlSharp/Enums/CurlTimeCond.cs b/src/CurlSharp/Enums/CurlTimeCond.cs index a070ca989..d62221f1c 100644 --- a/src/CurlSharp/Enums/CurlTimeCond.cs +++ b/src/CurlSharp/Enums/CurlTimeCond.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// Contains values used to specify the time condition when using diff --git a/src/CurlSharp/Enums/CurlVersion.cs b/src/CurlSharp/Enums/CurlVersion.cs index 264afd272..4a3b2b002 100644 --- a/src/CurlSharp/Enums/CurlVersion.cs +++ b/src/CurlSharp/Enums/CurlVersion.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// A member of this enumeration is passed to the function diff --git a/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs b/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs index 98cf2f597..fe7369b8d 100644 --- a/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs +++ b/src/CurlSharp/Enums/CurlVersionFeatureBitmask.cs @@ -1,4 +1,4 @@ -namespace CurlSharp +namespace CurlSharp.Enums { /// /// A bitmask of libcurl features OR'd together as the value of the diff --git a/src/CurlSharp/NativeMethods.cs b/src/CurlSharp/NativeMethods.cs index 0d9243288..d3304a386 100644 --- a/src/CurlSharp/NativeMethods.cs +++ b/src/CurlSharp/NativeMethods.cs @@ -24,6 +24,7 @@ using System; using System.IO; using System.Reflection; using System.Runtime.InteropServices; +using CurlSharp.Enums; namespace CurlSharp { diff --git a/src/CurlSharp/SSLFix.cs b/src/CurlSharp/SSLFix.cs index 940767f93..db1009e04 100644 --- a/src/CurlSharp/SSLFix.cs +++ b/src/CurlSharp/SSLFix.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace CurlSharp +namespace CurlSharp { public class SSLFix { diff --git a/src/DateTimeRoutines/DateTimeRoutines.cs b/src/DateTimeRoutines/DateTimeRoutines.cs index a5b337454..1ab43ee92 100644 --- a/src/DateTimeRoutines/DateTimeRoutines.cs +++ b/src/DateTimeRoutines/DateTimeRoutines.cs @@ -5,14 +5,11 @@ // sergey.stoyan@gmail.com // 27 February 2007 //******************************************************************************************** + using System; -using System.Collections.Generic; -using System.Text; -using System.IO; using System.Text.RegularExpressions; -using System.Threading; -using System.Collections; -namespace Cliver + +namespace DateTimeRoutines { /// /// Miscellaneous and parsing methods for DateTime diff --git a/src/Jackett.Common/CurlHelper.cs b/src/Jackett.Common/CurlHelper.cs index 5c3551557..acde3b001 100644 --- a/src/Jackett.Common/CurlHelper.cs +++ b/src/Jackett.Common/CurlHelper.cs @@ -1,19 +1,16 @@ -using CurlSharp; -using System; -using System.Collections.Concurrent; +using System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using System.Net.Http.Headers; -using Jackett.Utils; -using System.Net; -using System.Threading; -using Jacket.Common; -using Jackett.Models.Config; +using CurlSharp; +using CurlSharp.Enums; +using Jackett.Common.Models.Config; +using Jackett.Common.Utils; -namespace Jackett +namespace Jackett.Common { public class CurlHelper { diff --git a/src/Jackett.Common/Engine.cs b/src/Jackett.Common/Engine.cs index 450985206..892a7ce8d 100644 --- a/src/Jackett.Common/Engine.cs +++ b/src/Jackett.Common/Engine.cs @@ -1,23 +1,22 @@ -using Autofac; -using AutoMapper; -using Jackett.Common.Models.Config; -using Jackett.Common.Plumbing; -using Jackett.Models; -using Jackett.Models.Config; -using Jackett.Services; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; -using NLog; -using NLog.Config; -using NLog.LayoutRenderers; -using NLog.Targets; -using System; +using System; using System.Diagnostics; using System.IO; using System.Linq; using System.Text; +using Autofac; +using AutoMapper; +using Jackett.Common.Models; +using Jackett.Common.Models.Config; +using Jackett.Common.Plumbing; +using Jackett.Common.Services; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; +using NLog; +using NLog.Config; +using NLog.LayoutRenderers; +using NLog.Targets; -namespace Jackett +namespace Jackett.Common { public class Engine { diff --git a/src/Jackett.Common/ExceptionWithConfigData.cs b/src/Jackett.Common/ExceptionWithConfigData.cs index e987eb81a..6c985f685 100644 --- a/src/Jackett.Common/ExceptionWithConfigData.cs +++ b/src/Jackett.Common/ExceptionWithConfigData.cs @@ -1,12 +1,7 @@ -using Jackett.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Jackett.Models.IndexerConfig; +using System; +using Jackett.Common.Models.IndexerConfig; -namespace Jackett +namespace Jackett.Common { public class ExceptionWithConfigData : Exception diff --git a/src/Jackett.Common/Helpers/CookieContainerExtensions.cs b/src/Jackett.Common/Helpers/CookieContainerExtensions.cs index 070a326fa..baf4af270 100644 --- a/src/Jackett.Common/Helpers/CookieContainerExtensions.cs +++ b/src/Jackett.Common/Helpers/CookieContainerExtensions.cs @@ -1,14 +1,9 @@ -using Newtonsoft.Json.Linq; -using NLog; -using System; -using System.Collections.Generic; -using System.Linq; +using System; using System.Net; -using System.Text; -using System.Threading.Tasks; -using System.Web; +using Newtonsoft.Json.Linq; +using NLog; -namespace Jackett +namespace Jackett.Common.Helpers { public static class CookieContainerExtensions { diff --git a/src/Jackett.Common/Helpers/HttpClientExtensions.cs b/src/Jackett.Common/Helpers/HttpClientExtensions.cs index a44f285ef..5303bbc92 100644 --- a/src/Jackett.Common/Helpers/HttpClientExtensions.cs +++ b/src/Jackett.Common/Helpers/HttpClientExtensions.cs @@ -1,11 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Net.Http; -using System.Text; using System.Threading.Tasks; -namespace Jackett +namespace Jackett.Common.Helpers { public static class HttpClientExtensions { diff --git a/src/Jackett.Common/Helpers/WebUtilityHelpers.cs b/src/Jackett.Common/Helpers/WebUtilityHelpers.cs index 8167a2d59..24ca057ff 100644 --- a/src/Jackett.Common/Helpers/WebUtilityHelpers.cs +++ b/src/Jackett.Common/Helpers/WebUtilityHelpers.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Net; +using System.Net; using System.Text; -namespace Jacket.Common.Helpers +namespace Jackett.Common.Helpers { public static class WebUtilityHelpers { diff --git a/src/Jackett.Common/IndexerException.cs b/src/Jackett.Common/IndexerException.cs index 1b1a73ed3..3140e54f8 100644 --- a/src/Jackett.Common/IndexerException.cs +++ b/src/Jackett.Common/IndexerException.cs @@ -1,11 +1,7 @@ -using Jackett.Indexers; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; +using Jackett.Common.Indexers; -namespace Jackett +namespace Jackett.Common { public class IndexerException : Exception { diff --git a/src/Jackett.Common/Indexers/7tor.cs b/src/Jackett.Common/Indexers/7tor.cs index dc2266844..b421bbe9f 100644 --- a/src/Jackett.Common/Indexers/7tor.cs +++ b/src/Jackett.Common/Indexers/7tor.cs @@ -4,15 +4,15 @@ using System.Collections.Specialized; using System.Text; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class SevenTor : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Abnormal.cs b/src/Jackett.Common/Indexers/Abnormal.cs index a1908aa44..858233527 100644 --- a/src/Jackett.Common/Indexers/Abnormal.cs +++ b/src/Jackett.Common/Indexers/Abnormal.cs @@ -9,18 +9,17 @@ using System.Reflection; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { /// /// Provider for Abnormal Private French Tracker diff --git a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs index 31dc6811f..db5e724c7 100644 --- a/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/AvistazTracker.cs @@ -1,21 +1,19 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Net; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; -using Jackett.Models; +using CsQuery; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -using Jackett.Utils; -using CsQuery; -using System.Web; -using Jackett.Utils.Clients; -using System.Text.RegularExpressions; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using System.Net; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers.Abstract { public abstract class AvistazTracker : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs index ec36c60a3..f729c3c6b 100644 --- a/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/CouchPotatoTracker.cs @@ -1,17 +1,16 @@ -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services; -using Jackett.Utils; -using Jackett.Utils.Clients; -using Newtonsoft.Json.Linq; -using NLog; using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; +using Newtonsoft.Json.Linq; +using NLog; -namespace Jackett.Indexers.Abstract +namespace Jackett.Common.Indexers.Abstract { public abstract class CouchPotatoTracker : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs index 6e278f595..3d62e8cf2 100644 --- a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs +++ b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs @@ -1,23 +1,20 @@ -using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Utils; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; -using Newtonsoft.Json.Linq; -using NLog; -using System; +using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Globalization; using System.Linq; +using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; -using System.Net; -using static Jackett.Models.IndexerConfig.ConfigurationData; +using AngleSharp.Parser.Html; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Newtonsoft.Json.Linq; +using NLog; -namespace Jackett.Indexers.Abstract +namespace Jackett.Common.Indexers.Abstract { public abstract class GazelleTracker : BaseWebIndexer { @@ -50,7 +47,7 @@ namespace Jackett.Indexers.Abstract if (supportsFreeleechTokens) { - var useTokenItem = new BoolItem { Value = false }; + var useTokenItem = new ConfigurationData.BoolItem { Value = false }; useTokenItem.Name = "Use Freeleech Tokens when available"; configData.AddDynamic("usetoken", useTokenItem); } @@ -60,7 +57,7 @@ namespace Jackett.Indexers.Abstract { LoadValuesFromJson(configJson); - var useTokenItem = (BoolItem)configData.GetDynamic("usetoken"); + var useTokenItem = (ConfigurationData.BoolItem)configData.GetDynamic("usetoken"); if (useTokenItem != null) { useTokens = useTokenItem.Value; diff --git a/src/Jackett.Common/Indexers/AlphaRatio.cs b/src/Jackett.Common/Indexers/AlphaRatio.cs index 06c94e4b8..56e784b07 100644 --- a/src/Jackett.Common/Indexers/AlphaRatio.cs +++ b/src/Jackett.Common/Indexers/AlphaRatio.cs @@ -1,10 +1,10 @@ -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class AlphaRatio : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/Andraste.cs b/src/Jackett.Common/Indexers/Andraste.cs index a2c9c326c..5b8e72edd 100644 --- a/src/Jackett.Common/Indexers/Andraste.cs +++ b/src/Jackett.Common/Indexers/Andraste.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Andraste : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/AnimeBytes.cs b/src/Jackett.Common/Indexers/AnimeBytes.cs index 9d6189ace..886663aab 100644 --- a/src/Jackett.Common/Indexers/AnimeBytes.cs +++ b/src/Jackett.Common/Indexers/AnimeBytes.cs @@ -5,18 +5,16 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -using Jackett.Models.IndexerConfig; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class AnimeBytes : BaseCachingWebIndexer { diff --git a/src/Jackett.Common/Indexers/AnimeTorrents.cs b/src/Jackett.Common/Indexers/AnimeTorrents.cs index 8047382b9..4dc8a2d1a 100644 --- a/src/Jackett.Common/Indexers/AnimeTorrents.cs +++ b/src/Jackett.Common/Indexers/AnimeTorrents.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class AnimeTorrents : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Apollo.cs b/src/Jackett.Common/Indexers/Apollo.cs index 706ee555b..d0ba91169 100644 --- a/src/Jackett.Common/Indexers/Apollo.cs +++ b/src/Jackett.Common/Indexers/Apollo.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Apollo : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/Avistaz.cs b/src/Jackett.Common/Indexers/Avistaz.cs index c87c078ba..3f4935709 100644 --- a/src/Jackett.Common/Indexers/Avistaz.cs +++ b/src/Jackett.Common/Indexers/Avistaz.cs @@ -1,8 +1,9 @@ -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Avistaz : AvistazTracker { diff --git a/src/Jackett.Common/Indexers/BB.cs b/src/Jackett.Common/Indexers/BB.cs index 7de771d56..186a8d732 100644 --- a/src/Jackett.Common/Indexers/BB.cs +++ b/src/Jackett.Common/Indexers/BB.cs @@ -6,15 +6,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { // To comply with the rules for this tracker, only the acronym is used and no publicly displayed URLs to the site. diff --git a/src/Jackett.Common/Indexers/BJShare.cs b/src/Jackett.Common/Indexers/BJShare.cs index e20860ea2..f0194ee51 100644 --- a/src/Jackett.Common/Indexers/BJShare.cs +++ b/src/Jackett.Common/Indexers/BJShare.cs @@ -8,15 +8,15 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Dom; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BJShare : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BakaBT.cs b/src/Jackett.Common/Indexers/BakaBT.cs index 2b028b419..e678b625b 100644 --- a/src/Jackett.Common/Indexers/BakaBT.cs +++ b/src/Jackett.Common/Indexers/BakaBT.cs @@ -4,16 +4,15 @@ using System.Globalization; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BakaBT : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BaseIndexer.cs b/src/Jackett.Common/Indexers/BaseIndexer.cs index 7113fd059..678462342 100644 --- a/src/Jackett.Common/Indexers/BaseIndexer.cs +++ b/src/Jackett.Common/Indexers/BaseIndexer.cs @@ -4,16 +4,16 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AutoMapper; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public abstract class BaseIndexer : IIndexer { diff --git a/src/Jackett.Common/Indexers/BeyondHD.cs b/src/Jackett.Common/Indexers/BeyondHD.cs index af201ae5f..14f6e3ec6 100644 --- a/src/Jackett.Common/Indexers/BeyondHD.cs +++ b/src/Jackett.Common/Indexers/BeyondHD.cs @@ -6,15 +6,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BeyondHD : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BitCityReloaded.cs b/src/Jackett.Common/Indexers/BitCityReloaded.cs index 84d38cfa9..838a2b98c 100644 --- a/src/Jackett.Common/Indexers/BitCityReloaded.cs +++ b/src/Jackett.Common/Indexers/BitCityReloaded.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BitCityReloaded : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BitHdtv.cs b/src/Jackett.Common/Indexers/BitHdtv.cs index 431f4ab23..a49455a23 100644 --- a/src/Jackett.Common/Indexers/BitHdtv.cs +++ b/src/Jackett.Common/Indexers/BitHdtv.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BitHdtv : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BitMeTV.cs b/src/Jackett.Common/Indexers/BitMeTV.cs index e20a5ca8d..f7b8c3650 100644 --- a/src/Jackett.Common/Indexers/BitMeTV.cs +++ b/src/Jackett.Common/Indexers/BitMeTV.cs @@ -6,17 +6,15 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BitMeTV : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BitSoup.cs b/src/Jackett.Common/Indexers/BitSoup.cs index bedec85c6..afbdfddba 100644 --- a/src/Jackett.Common/Indexers/BitSoup.cs +++ b/src/Jackett.Common/Indexers/BitSoup.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BitSoup : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BroadcastTheNet.cs b/src/Jackett.Common/Indexers/BroadcastTheNet.cs index 199c0e85e..214a0c669 100644 --- a/src/Jackett.Common/Indexers/BroadcastTheNet.cs +++ b/src/Jackett.Common/Indexers/BroadcastTheNet.cs @@ -3,16 +3,16 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BroadcastTheNet : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/BrokenStones.cs b/src/Jackett.Common/Indexers/BrokenStones.cs index acace0b7a..c312787a6 100644 --- a/src/Jackett.Common/Indexers/BrokenStones.cs +++ b/src/Jackett.Common/Indexers/BrokenStones.cs @@ -1,10 +1,10 @@ -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class BrokenStones : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs index 899605ace..bddfecaaa 100644 --- a/src/Jackett.Common/Indexers/CardigannIndexer.cs +++ b/src/Jackett.Common/Indexers/CardigannIndexer.cs @@ -1,28 +1,27 @@ -using Jackett.Utils.Clients; -using NLog; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Models; -using System.Threading.Tasks; -using Newtonsoft.Json.Linq; +using System; +using System.Collections; using System.Collections.Generic; -using System; -using Jackett.Models.IndexerConfig; using System.Collections.Specialized; -using System.Text; -using static Jackett.Models.IndexerConfig.ConfigurationData; -using AngleSharp.Parser.Html; -using System.Text.RegularExpressions; -using System.Web; -using AngleSharp.Dom; -using AngleSharp.Dom.Html; using System.Linq; using System.Net; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using AngleSharp.Dom; +using AngleSharp.Dom.Html; +using AngleSharp.Parser.Html; +using Jackett.Common.Helpers; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using static Jackett.Common.Models.IndexerConfig.ConfigurationData; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Microsoft.AspNetCore.WebUtilities; -using Jacket.Common.Helpers; -using System.Collections; +using Newtonsoft.Json.Linq; +using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class CardigannIndexer : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/CinemaZ.cs b/src/Jackett.Common/Indexers/CinemaZ.cs index 0053a2926..083bd0fa5 100644 --- a/src/Jackett.Common/Indexers/CinemaZ.cs +++ b/src/Jackett.Common/Indexers/CinemaZ.cs @@ -1,8 +1,9 @@ -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class CinemaZ : AvistazTracker { diff --git a/src/Jackett.Common/Indexers/DanishBits.cs b/src/Jackett.Common/Indexers/DanishBits.cs index f4863bb20..8387a6818 100644 --- a/src/Jackett.Common/Indexers/DanishBits.cs +++ b/src/Jackett.Common/Indexers/DanishBits.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class DanishBits : CouchPotatoTracker { diff --git a/src/Jackett.Common/Indexers/Demonoid.cs b/src/Jackett.Common/Indexers/Demonoid.cs index ed382b12f..e660e2b31 100644 --- a/src/Jackett.Common/Indexers/Demonoid.cs +++ b/src/Jackett.Common/Indexers/Demonoid.cs @@ -5,18 +5,16 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Microsoft.AspNetCore.WebUtilities; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Demonoid : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/DigitalHive.cs b/src/Jackett.Common/Indexers/DigitalHive.cs index 617330d8d..b6bb198b9 100644 --- a/src/Jackett.Common/Indexers/DigitalHive.cs +++ b/src/Jackett.Common/Indexers/DigitalHive.cs @@ -5,15 +5,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class DigitalHive : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/EliteTracker.cs b/src/Jackett.Common/Indexers/EliteTracker.cs index b1a6751e7..9af2ca9cf 100644 --- a/src/Jackett.Common/Indexers/EliteTracker.cs +++ b/src/Jackett.Common/Indexers/EliteTracker.cs @@ -6,15 +6,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { internal class EliteTracker : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs b/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs index 5a1169ffa..b197bbbbd 100644 --- a/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs +++ b/src/Jackett.Common/Indexers/Feeds/AnimeTosho.cs @@ -2,14 +2,14 @@ using System.Linq; using System.Text; using System.Xml.Linq; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers.Newznab +namespace Jackett.Common.Indexers.Feeds { public class AnimeTosho : BaseNewznabIndexer { diff --git a/src/Jackett.Common/Indexers/Feeds/BaseFeedIndexer.cs b/src/Jackett.Common/Indexers/Feeds/BaseFeedIndexer.cs index 137f34f3d..77ae642ed 100644 --- a/src/Jackett.Common/Indexers/Feeds/BaseFeedIndexer.cs +++ b/src/Jackett.Common/Indexers/Feeds/BaseFeedIndexer.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers.Feeds { public abstract class BaseFeedIndexer : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs index 11da47330..940991b55 100644 --- a/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs +++ b/src/Jackett.Common/Indexers/Feeds/BaseNewznabIndexer.cs @@ -2,14 +2,14 @@ using System.Collections.Generic; using System.Linq; using System.Xml.Linq; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers.Feeds { public abstract class BaseNewznabIndexer : BaseFeedIndexer { diff --git a/src/Jackett.Common/Indexers/FileList.cs b/src/Jackett.Common/Indexers/FileList.cs index 4dc0a9810..4257477c3 100644 --- a/src/Jackett.Common/Indexers/FileList.cs +++ b/src/Jackett.Common/Indexers/FileList.cs @@ -7,15 +7,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class FileList : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/FunFile.cs b/src/Jackett.Common/Indexers/FunFile.cs index 22a042796..2a734020f 100644 --- a/src/Jackett.Common/Indexers/FunFile.cs +++ b/src/Jackett.Common/Indexers/FunFile.cs @@ -4,15 +4,15 @@ using System.Collections.Specialized; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class FunFile : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Fuzer.cs b/src/Jackett.Common/Indexers/Fuzer.cs index eb184d50f..77e1db088 100644 --- a/src/Jackett.Common/Indexers/Fuzer.cs +++ b/src/Jackett.Common/Indexers/Fuzer.cs @@ -3,22 +3,19 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Globalization; using System.Linq; -using System.Net; using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jacket.Common.Helpers; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Helpers; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Fuzer : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/GFTracker.cs b/src/Jackett.Common/Indexers/GFTracker.cs index 23f745f4a..bf08d6237 100644 --- a/src/Jackett.Common/Indexers/GFTracker.cs +++ b/src/Jackett.Common/Indexers/GFTracker.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { // // Quick and dirty indexer for GFTracker. diff --git a/src/Jackett.Common/Indexers/GazelleGames.cs b/src/Jackett.Common/Indexers/GazelleGames.cs index 90037de2c..52dac1928 100644 --- a/src/Jackett.Common/Indexers/GazelleGames.cs +++ b/src/Jackett.Common/Indexers/GazelleGames.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class GazelleGames : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/GhostCity.cs b/src/Jackett.Common/Indexers/GhostCity.cs index f0d317811..e70399a20 100644 --- a/src/Jackett.Common/Indexers/GhostCity.cs +++ b/src/Jackett.Common/Indexers/GhostCity.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class GhostCity : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/GimmePeers.cs b/src/Jackett.Common/Indexers/GimmePeers.cs index 130b6b87c..9974a4e46 100644 --- a/src/Jackett.Common/Indexers/GimmePeers.cs +++ b/src/Jackett.Common/Indexers/GimmePeers.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { // ReSharper disable once InconsistentNaming public class GimmePeers : BaseWebIndexer diff --git a/src/Jackett.Common/Indexers/HDForever.cs b/src/Jackett.Common/Indexers/HDForever.cs index 84f1d1336..f82a73c91 100644 --- a/src/Jackett.Common/Indexers/HDForever.cs +++ b/src/Jackett.Common/Indexers/HDForever.cs @@ -1,10 +1,10 @@ -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class HDForever : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/HDOnly.cs b/src/Jackett.Common/Indexers/HDOnly.cs index d0da28262..677e0642f 100644 --- a/src/Jackett.Common/Indexers/HDOnly.cs +++ b/src/Jackett.Common/Indexers/HDOnly.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class HDOnly : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/HDSpace.cs b/src/Jackett.Common/Indexers/HDSpace.cs index 351449ffd..8e67dfa73 100644 --- a/src/Jackett.Common/Indexers/HDSpace.cs +++ b/src/Jackett.Common/Indexers/HDSpace.cs @@ -7,15 +7,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class HDSpace : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/HDTorrents.cs b/src/Jackett.Common/Indexers/HDTorrents.cs index 8d2671f51..213eff885 100644 --- a/src/Jackett.Common/Indexers/HDTorrents.cs +++ b/src/Jackett.Common/Indexers/HDTorrents.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class HDTorrents : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Hardbay.cs b/src/Jackett.Common/Indexers/Hardbay.cs index c31c91265..75ce4581c 100644 --- a/src/Jackett.Common/Indexers/Hardbay.cs +++ b/src/Jackett.Common/Indexers/Hardbay.cs @@ -4,16 +4,16 @@ using System.Collections.Specialized; using System.Globalization; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Hardbay : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Hebits.cs b/src/Jackett.Common/Indexers/Hebits.cs index 32a138e88..f9cd05941 100644 --- a/src/Jackett.Common/Indexers/Hebits.cs +++ b/src/Jackett.Common/Indexers/Hebits.cs @@ -1,22 +1,19 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jacket.Common.Helpers; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Helpers; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Hebits : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/IIndexer.cs b/src/Jackett.Common/Indexers/IIndexer.cs index 7b7a4f008..1d761a4e6 100644 --- a/src/Jackett.Common/Indexers/IIndexer.cs +++ b/src/Jackett.Common/Indexers/IIndexer.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; using Newtonsoft.Json.Linq; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class IndexerResult { diff --git a/src/Jackett.Common/Indexers/IPTorrents.cs b/src/Jackett.Common/Indexers/IPTorrents.cs index 509c1597c..df459382d 100644 --- a/src/Jackett.Common/Indexers/IPTorrents.cs +++ b/src/Jackett.Common/Indexers/IPTorrents.cs @@ -5,17 +5,16 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class IPTorrents : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/ImmortalSeed.cs b/src/Jackett.Common/Indexers/ImmortalSeed.cs index 6f8c757e9..cce237892 100644 --- a/src/Jackett.Common/Indexers/ImmortalSeed.cs +++ b/src/Jackett.Common/Indexers/ImmortalSeed.cs @@ -5,17 +5,15 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class ImmortalSeed : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/LostFilm.cs b/src/Jackett.Common/Indexers/LostFilm.cs index 6458550f9..b593fface 100644 --- a/src/Jackett.Common/Indexers/LostFilm.cs +++ b/src/Jackett.Common/Indexers/LostFilm.cs @@ -6,19 +6,17 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; - -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Utils; -using Jackett.Utils.Clients; -using Jackett.Services.Interfaces; - using AngleSharp.Dom; using AngleSharp.Parser.Html; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { class LostFilm : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs b/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs index a8fbabf45..544fc0835 100644 --- a/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs +++ b/src/Jackett.Common/Indexers/Meta/BaseMetaIndexer.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers.Meta +namespace Jackett.Common.Indexers.Meta { public abstract class BaseMetaIndexer : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Meta/Fallbacks.cs b/src/Jackett.Common/Indexers/Meta/Fallbacks.cs index ec31f6d60..db98b38d3 100644 --- a/src/Jackett.Common/Indexers/Meta/Fallbacks.cs +++ b/src/Jackett.Common/Indexers/Meta/Fallbacks.cs @@ -1,13 +1,11 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Services; -using Jackett.Services.Interfaces; -using Jackett.Utils; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; -namespace Jackett.Indexers.Meta +namespace Jackett.Common.Indexers.Meta { public interface IFallbackStrategy { diff --git a/src/Jackett.Common/Indexers/Meta/MetaIndexers.cs b/src/Jackett.Common/Indexers/Meta/MetaIndexers.cs index b9d5d632a..fdffe33ad 100644 --- a/src/Jackett.Common/Indexers/Meta/MetaIndexers.cs +++ b/src/Jackett.Common/Indexers/Meta/MetaIndexers.cs @@ -1,16 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Jackett.Models; -using Newtonsoft.Json.Linq; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -using Jackett.Models.IndexerConfig; -namespace Jackett.Indexers.Meta +namespace Jackett.Common.Indexers.Meta { public class AggregateIndexer : BaseMetaIndexer { diff --git a/src/Jackett.Common/Indexers/Meta/ResultFilters.cs b/src/Jackett.Common/Indexers/Meta/ResultFilters.cs index 7fb5495fa..3917ca582 100644 --- a/src/Jackett.Common/Indexers/Meta/ResultFilters.cs +++ b/src/Jackett.Common/Indexers/Meta/ResultFilters.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Services; -using Jackett.Services.Interfaces; -using Jackett.Utils; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; -namespace Jackett.Indexers.Meta +namespace Jackett.Common.Indexers.Meta { public interface IResultFilter { diff --git a/src/Jackett.Common/Indexers/MoreThanTV.cs b/src/Jackett.Common/Indexers/MoreThanTV.cs index 1538a7879..61ddf0506 100644 --- a/src/Jackett.Common/Indexers/MoreThanTV.cs +++ b/src/Jackett.Common/Indexers/MoreThanTV.cs @@ -6,19 +6,17 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using AngleSharp.Dom; using AngleSharp.Parser.Html; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class MoreThanTV : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/MyAnonamouse.cs b/src/Jackett.Common/Indexers/MyAnonamouse.cs index 7a7f182e3..78d220b29 100644 --- a/src/Jackett.Common/Indexers/MyAnonamouse.cs +++ b/src/Jackett.Common/Indexers/MyAnonamouse.cs @@ -5,15 +5,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Myanonamouse : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/NCore.cs b/src/Jackett.Common/Indexers/NCore.cs index b1936f16c..eceafb727 100644 --- a/src/Jackett.Common/Indexers/NCore.cs +++ b/src/Jackett.Common/Indexers/NCore.cs @@ -6,15 +6,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class NCore : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/NewRealWorld.cs b/src/Jackett.Common/Indexers/NewRealWorld.cs index 57bcaa76d..00071cced 100644 --- a/src/Jackett.Common/Indexers/NewRealWorld.cs +++ b/src/Jackett.Common/Indexers/NewRealWorld.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class NewRealWorld : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Norbits.cs b/src/Jackett.Common/Indexers/Norbits.cs index 6ab045cc4..7f001168b 100644 --- a/src/Jackett.Common/Indexers/Norbits.cs +++ b/src/Jackett.Common/Indexers/Norbits.cs @@ -4,23 +4,22 @@ using System.Collections.Specialized; using System.Globalization; using System.IO; using System.Linq; -using System.Net; using System.Reflection; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jacket.Common.Helpers; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Helpers; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { /// s /// Provider for Norbits Private Tracker diff --git a/src/Jackett.Common/Indexers/PassThePopcorn.cs b/src/Jackett.Common/Indexers/PassThePopcorn.cs index 532800b33..b990eb1ed 100644 --- a/src/Jackett.Common/Indexers/PassThePopcorn.cs +++ b/src/Jackett.Common/Indexers/PassThePopcorn.cs @@ -5,15 +5,13 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PassThePopcorn : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/PiXELHD.cs b/src/Jackett.Common/Indexers/PiXELHD.cs index 0bcb58465..19950834d 100644 --- a/src/Jackett.Common/Indexers/PiXELHD.cs +++ b/src/Jackett.Common/Indexers/PiXELHD.cs @@ -5,15 +5,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PiXELHD : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/PirateTheNet.cs b/src/Jackett.Common/Indexers/PirateTheNet.cs index bac13f915..fbacb25f5 100644 --- a/src/Jackett.Common/Indexers/PirateTheNet.cs +++ b/src/Jackett.Common/Indexers/PirateTheNet.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PirateTheNet : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/PolishTracker.cs b/src/Jackett.Common/Indexers/PolishTracker.cs index 6dcc49ecf..3e77e8da4 100644 --- a/src/Jackett.Common/Indexers/PolishTracker.cs +++ b/src/Jackett.Common/Indexers/PolishTracker.cs @@ -1,18 +1,17 @@ using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PolishTracker : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Pretome.cs b/src/Jackett.Common/Indexers/Pretome.cs index 72ea35e63..7570b3705 100644 --- a/src/Jackett.Common/Indexers/Pretome.cs +++ b/src/Jackett.Common/Indexers/Pretome.cs @@ -6,15 +6,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Pretome : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/PrivateHD.cs b/src/Jackett.Common/Indexers/PrivateHD.cs index d2b795559..fce100680 100644 --- a/src/Jackett.Common/Indexers/PrivateHD.cs +++ b/src/Jackett.Common/Indexers/PrivateHD.cs @@ -1,8 +1,9 @@ -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PrivateHD : AvistazTracker, IIndexer { diff --git a/src/Jackett.Common/Indexers/Psytorrents.cs b/src/Jackett.Common/Indexers/Psytorrents.cs index 5787bfa3e..a0c32263b 100644 --- a/src/Jackett.Common/Indexers/Psytorrents.cs +++ b/src/Jackett.Common/Indexers/Psytorrents.cs @@ -1,10 +1,10 @@ -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Psytorrents : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/Rarbg.cs b/src/Jackett.Common/Indexers/Rarbg.cs index 65526b5ce..9d5f98219 100644 --- a/src/Jackett.Common/Indexers/Rarbg.cs +++ b/src/Jackett.Common/Indexers/Rarbg.cs @@ -5,17 +5,15 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; -using Jacket.Common; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -using Jacket.Common.Utils; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Rarbg : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Redacted.cs b/src/Jackett.Common/Indexers/Redacted.cs index 77367b2c1..a7d6405c1 100644 --- a/src/Jackett.Common/Indexers/Redacted.cs +++ b/src/Jackett.Common/Indexers/Redacted.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class PassTheHeadphones : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/RevolutionTT.cs b/src/Jackett.Common/Indexers/RevolutionTT.cs index fef49b7ad..e97335c56 100644 --- a/src/Jackett.Common/Indexers/RevolutionTT.cs +++ b/src/Jackett.Common/Indexers/RevolutionTT.cs @@ -6,18 +6,16 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using System.Xml.Linq; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class RevolutionTT : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/SceneTime.cs b/src/Jackett.Common/Indexers/SceneTime.cs index 388fa7b58..791160479 100644 --- a/src/Jackett.Common/Indexers/SceneTime.cs +++ b/src/Jackett.Common/Indexers/SceneTime.cs @@ -5,15 +5,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class SceneTime : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/SecretCinema.cs b/src/Jackett.Common/Indexers/SecretCinema.cs index a8b49a9cd..b49707ff5 100644 --- a/src/Jackett.Common/Indexers/SecretCinema.cs +++ b/src/Jackett.Common/Indexers/SecretCinema.cs @@ -1,12 +1,12 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class SecretCinema : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/Shazbat.cs b/src/Jackett.Common/Indexers/Shazbat.cs index cd825b99f..0df469d91 100644 --- a/src/Jackett.Common/Indexers/Shazbat.cs +++ b/src/Jackett.Common/Indexers/Shazbat.cs @@ -5,15 +5,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Shazbat : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/ShowRSS.cs b/src/Jackett.Common/Indexers/ShowRSS.cs index 5231bc2dc..f32052112 100644 --- a/src/Jackett.Common/Indexers/ShowRSS.cs +++ b/src/Jackett.Common/Indexers/ShowRSS.cs @@ -5,15 +5,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class ShowRSS : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/SpeedCD.cs b/src/Jackett.Common/Indexers/SpeedCD.cs index eac138a2e..01c9175d6 100644 --- a/src/Jackett.Common/Indexers/SpeedCD.cs +++ b/src/Jackett.Common/Indexers/SpeedCD.cs @@ -6,15 +6,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class SpeedCD : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Superbits.cs b/src/Jackett.Common/Indexers/Superbits.cs index f6d5014fa..2a7d56e90 100644 --- a/src/Jackett.Common/Indexers/Superbits.cs +++ b/src/Jackett.Common/Indexers/Superbits.cs @@ -4,16 +4,16 @@ using System.Collections.Specialized; using System.Globalization; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Superbits : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Synthesiz3r.cs b/src/Jackett.Common/Indexers/Synthesiz3r.cs index 19149b0bf..d1ee4332f 100644 --- a/src/Jackett.Common/Indexers/Synthesiz3r.cs +++ b/src/Jackett.Common/Indexers/Synthesiz3r.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Synthesiz3r : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/TVChaosUK.cs b/src/Jackett.Common/Indexers/TVChaosUK.cs index e24294b9c..77fda5da7 100644 --- a/src/Jackett.Common/Indexers/TVChaosUK.cs +++ b/src/Jackett.Common/Indexers/TVChaosUK.cs @@ -7,15 +7,15 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TVChaosUK : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TVVault.cs b/src/Jackett.Common/Indexers/TVVault.cs index 592494a03..cdadb2f85 100644 --- a/src/Jackett.Common/Indexers/TVVault.cs +++ b/src/Jackett.Common/Indexers/TVVault.cs @@ -5,15 +5,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TVVault : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentBytes.cs b/src/Jackett.Common/Indexers/TorrentBytes.cs index c0b8ab8e4..49a25e644 100644 --- a/src/Jackett.Common/Indexers/TorrentBytes.cs +++ b/src/Jackett.Common/Indexers/TorrentBytes.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentBytes : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentDay.cs b/src/Jackett.Common/Indexers/TorrentDay.cs index 8398aeb22..5e9f6f2b1 100644 --- a/src/Jackett.Common/Indexers/TorrentDay.cs +++ b/src/Jackett.Common/Indexers/TorrentDay.cs @@ -1,21 +1,20 @@ using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jacket.Common.Helpers; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Helpers; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentDay : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentHeaven.cs b/src/Jackett.Common/Indexers/TorrentHeaven.cs index 5514cf47a..33ede38de 100644 --- a/src/Jackett.Common/Indexers/TorrentHeaven.cs +++ b/src/Jackett.Common/Indexers/TorrentHeaven.cs @@ -7,15 +7,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentHeaven : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs index 0a51debdd..6eca27713 100644 --- a/src/Jackett.Common/Indexers/TorrentLeech.cs +++ b/src/Jackett.Common/Indexers/TorrentLeech.cs @@ -5,17 +5,15 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentLeech : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentNetwork.cs b/src/Jackett.Common/Indexers/TorrentNetwork.cs index 92c9311b0..3f4f404d8 100644 --- a/src/Jackett.Common/Indexers/TorrentNetwork.cs +++ b/src/Jackett.Common/Indexers/TorrentNetwork.cs @@ -3,17 +3,17 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -using static Jackett.Models.IndexerConfig.ConfigurationData; +using static Jackett.Common.Models.IndexerConfig.ConfigurationData; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentNetwork : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TorrentSyndikat.cs b/src/Jackett.Common/Indexers/TorrentSyndikat.cs index d59ca180b..f3f0bf8cf 100644 --- a/src/Jackett.Common/Indexers/TorrentSyndikat.cs +++ b/src/Jackett.Common/Indexers/TorrentSyndikat.cs @@ -7,15 +7,15 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TorrentSyndikat : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Torrentech.cs b/src/Jackett.Common/Indexers/Torrentech.cs index c9d8553c1..da64600c2 100644 --- a/src/Jackett.Common/Indexers/Torrentech.cs +++ b/src/Jackett.Common/Indexers/Torrentech.cs @@ -5,19 +5,18 @@ using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; -using System.Web; using AngleSharp.Dom; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Microsoft.AspNetCore.WebUtilities; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Torrentech : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/TransmitheNet.cs b/src/Jackett.Common/Indexers/TransmitheNet.cs index adb90d76f..0d666c03b 100644 --- a/src/Jackett.Common/Indexers/TransmitheNet.cs +++ b/src/Jackett.Common/Indexers/TransmitheNet.cs @@ -5,17 +5,15 @@ using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using System.Web; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class TransmitheNet : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/WiHD.cs b/src/Jackett.Common/Indexers/WiHD.cs index 5616279e3..36fac3efe 100644 --- a/src/Jackett.Common/Indexers/WiHD.cs +++ b/src/Jackett.Common/Indexers/WiHD.cs @@ -8,16 +8,16 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { /// /// Provider for WiHD Private French Tracker diff --git a/src/Jackett.Common/Indexers/XSpeeds.cs b/src/Jackett.Common/Indexers/XSpeeds.cs index 290f72051..75b342119 100644 --- a/src/Jackett.Common/Indexers/XSpeeds.cs +++ b/src/Jackett.Common/Indexers/XSpeeds.cs @@ -7,17 +7,17 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Xml.Linq; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -using static Jackett.Models.IndexerConfig.ConfigurationData; -using static Jackett.Utils.ParseUtil; +using static Jackett.Common.Models.IndexerConfig.ConfigurationData; +using static Jackett.Common.Utils.ParseUtil; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class XSpeeds : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/Xthor.cs b/src/Jackett.Common/Indexers/Xthor.cs index 419affdaf..16bd48360 100644 --- a/src/Jackett.Common/Indexers/Xthor.cs +++ b/src/Jackett.Common/Indexers/Xthor.cs @@ -7,17 +7,16 @@ using System.Net; using System.Reflection; using System.Text; using System.Threading.Tasks; -using System.Web; -using Jackett.Models; -using Jackett.Models.IndexerConfig.Bespoke; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { /// /// Provider for Xthor Private French Tracker diff --git a/src/Jackett.Common/Indexers/cgpeers.cs b/src/Jackett.Common/Indexers/cgpeers.cs index d8712de7e..2f026b76e 100644 --- a/src/Jackett.Common/Indexers/cgpeers.cs +++ b/src/Jackett.Common/Indexers/cgpeers.cs @@ -1,10 +1,10 @@ -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class CGPeers : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/myAmity.cs b/src/Jackett.Common/Indexers/myAmity.cs index 2a7197638..36ac7ba6d 100644 --- a/src/Jackett.Common/Indexers/myAmity.cs +++ b/src/Jackett.Common/Indexers/myAmity.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class myAmity : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/notwhatcd.cs b/src/Jackett.Common/Indexers/notwhatcd.cs index a4b654296..d6a4d212b 100644 --- a/src/Jackett.Common/Indexers/notwhatcd.cs +++ b/src/Jackett.Common/Indexers/notwhatcd.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; -using Jackett.Indexers.Abstract; -using Jackett.Models; -using Jackett.Services.Interfaces; -using Jackett.Utils.Clients; +using Jackett.Common.Indexers.Abstract; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class notwhatcd : GazelleTracker { diff --git a/src/Jackett.Common/Indexers/rutracker.cs b/src/Jackett.Common/Indexers/rutracker.cs index 5c889a9cf..0f42a41eb 100644 --- a/src/Jackett.Common/Indexers/rutracker.cs +++ b/src/Jackett.Common/Indexers/rutracker.cs @@ -2,19 +2,19 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using AngleSharp.Parser.Html; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Models.IndexerConfig.Bespoke; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -using System.Text.RegularExpressions; -using Jackett.Models.IndexerConfig.Bespoke; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class RuTracker : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/x264.cs b/src/Jackett.Common/Indexers/x264.cs index fea1ce5b5..247a3804e 100644 --- a/src/Jackett.Common/Indexers/x264.cs +++ b/src/Jackett.Common/Indexers/x264.cs @@ -5,15 +5,15 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using CsQuery; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class x264 : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/yify.cs b/src/Jackett.Common/Indexers/yify.cs index 3cc58b9ce..4a89e7f1c 100644 --- a/src/Jackett.Common/Indexers/yify.cs +++ b/src/Jackett.Common/Indexers/yify.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Yify : BaseWebIndexer { diff --git a/src/Jackett.Common/Indexers/yts.cs b/src/Jackett.Common/Indexers/yts.cs index 7e43cfae4..5ac1e0efa 100644 --- a/src/Jackett.Common/Indexers/yts.cs +++ b/src/Jackett.Common/Indexers/yts.cs @@ -5,15 +5,15 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; -using Jackett.Models; -using Jackett.Models.IndexerConfig; -using Jackett.Services.Interfaces; -using Jackett.Utils; -using Jackett.Utils.Clients; +using Jackett.Common.Models; +using Jackett.Common.Models.IndexerConfig; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Indexers +namespace Jackett.Common.Indexers { public class Yts : BaseWebIndexer { diff --git a/src/Jackett.Common/JackettProtectedAttribute.cs b/src/Jackett.Common/JackettProtectedAttribute.cs index a4e0d521d..98260cf1f 100644 --- a/src/Jackett.Common/JackettProtectedAttribute.cs +++ b/src/Jackett.Common/JackettProtectedAttribute.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett +namespace Jackett.Common { public class JackettProtectedAttribute : Attribute { diff --git a/src/Jackett.Common/Models/CachedLog.cs b/src/Jackett.Common/Models/CachedLog.cs index 970c16242..741ff3c40 100644 --- a/src/Jackett.Common/Models/CachedLog.cs +++ b/src/Jackett.Common/Models/CachedLog.cs @@ -1,11 +1,6 @@ -using NLog; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System; -namespace Jackett.Models +namespace Jackett.Common.Models { public class CachedLog { diff --git a/src/Jackett.Common/Models/CachedQueryResult.cs b/src/Jackett.Common/Models/CachedQueryResult.cs index 63bf70336..ab6695afe 100644 --- a/src/Jackett.Common/Models/CachedQueryResult.cs +++ b/src/Jackett.Common/Models/CachedQueryResult.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models +namespace Jackett.Common.Models { public class CachedQueryResult { diff --git a/src/Jackett.Common/Models/CachedResult.cs b/src/Jackett.Common/Models/CachedResult.cs index 85331ebf8..d419b5bd4 100644 --- a/src/Jackett.Common/Models/CachedResult.cs +++ b/src/Jackett.Common/Models/CachedResult.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models +namespace Jackett.Common.Models { public class CachedResult { diff --git a/src/Jackett.Common/Models/CategoryMapping.cs b/src/Jackett.Common/Models/CategoryMapping.cs index 3fb1e5066..2b3a7011e 100644 --- a/src/Jackett.Common/Models/CategoryMapping.cs +++ b/src/Jackett.Common/Models/CategoryMapping.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models +namespace Jackett.Common.Models { class CategoryMapping { diff --git a/src/Jackett.Common/Models/ChannelInfo.cs b/src/Jackett.Common/Models/ChannelInfo.cs index e9afa5112..3375b4286 100644 --- a/src/Jackett.Common/Models/ChannelInfo.cs +++ b/src/Jackett.Common/Models/ChannelInfo.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models +namespace Jackett.Common.Models { public class ChannelInfo { diff --git a/src/Jackett.Common/Models/Config/ConsoleOptions.cs b/src/Jackett.Common/Models/Config/ConsoleOptions.cs index 5ec12f2eb..744695a27 100644 --- a/src/Jackett.Common/Models/Config/ConsoleOptions.cs +++ b/src/Jackett.Common/Models/Config/ConsoleOptions.cs @@ -1,9 +1,5 @@ using CommandLine; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Jackett.Common.Models.Config { diff --git a/src/Jackett.Common/Models/Config/ProxyType.cs b/src/Jackett.Common/Models/Config/ProxyType.cs index 6552a61fd..226d1e703 100644 --- a/src/Jackett.Common/Models/Config/ProxyType.cs +++ b/src/Jackett.Common/Models/Config/ProxyType.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Jackett.Common.Models.Config +namespace Jackett.Common.Models.Config { public enum ProxyType { diff --git a/src/Jackett.Common/Models/Config/RuntimeSettings.cs b/src/Jackett.Common/Models/Config/RuntimeSettings.cs index a6c42c09a..16888202f 100644 --- a/src/Jackett.Common/Models/Config/RuntimeSettings.cs +++ b/src/Jackett.Common/Models/Config/RuntimeSettings.cs @@ -1,7 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Text; namespace Jackett.Common.Models.Config { diff --git a/src/Jackett.Common/Models/Config/ServerConfig.cs b/src/Jackett.Common/Models/Config/ServerConfig.cs index 31937d1b1..c5ce5637e 100644 --- a/src/Jackett.Common/Models/Config/ServerConfig.cs +++ b/src/Jackett.Common/Models/Config/ServerConfig.cs @@ -1,13 +1,8 @@ -using Jackett.Common.Models.Config; -using Newtonsoft.Json; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; +using Newtonsoft.Json; -namespace Jackett.Models.Config +namespace Jackett.Common.Models.Config { public class ServerConfig : IObservable { diff --git a/src/Jackett.Common/Models/DTO/ApiSearch.cs b/src/Jackett.Common/Models/DTO/ApiSearch.cs index bbfad89bd..58d7a001a 100644 --- a/src/Jackett.Common/Models/DTO/ApiSearch.cs +++ b/src/Jackett.Common/Models/DTO/ApiSearch.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; -using Jackett.Utils; +using Jackett.Common.Utils; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class ApiSearch { diff --git a/src/Jackett.Common/Models/DTO/Config.cs b/src/Jackett.Common/Models/DTO/Config.cs index 73849743b..0dc85d157 100644 --- a/src/Jackett.Common/Models/DTO/Config.cs +++ b/src/Jackett.Common/Models/DTO/Config.cs @@ -1,5 +1,4 @@ -using System; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class ConfigItem { diff --git a/src/Jackett.Common/Models/DTO/Indexer.cs b/src/Jackett.Common/Models/DTO/Indexer.cs index d481a9df6..278fef9f4 100644 --- a/src/Jackett.Common/Models/DTO/Indexer.cs +++ b/src/Jackett.Common/Models/DTO/Indexer.cs @@ -1,8 +1,8 @@ using System.Collections.Generic; using System.Linq; -using Jackett.Indexers; +using Jackett.Common.Indexers; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class Capability { diff --git a/src/Jackett.Common/Models/DTO/ManualSearchResult.cs b/src/Jackett.Common/Models/DTO/ManualSearchResult.cs index 34ab6a441..b390663d3 100644 --- a/src/Jackett.Common/Models/DTO/ManualSearchResult.cs +++ b/src/Jackett.Common/Models/DTO/ManualSearchResult.cs @@ -1,11 +1,6 @@ -using Jackett.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public enum ManualSearchResultIndexerStatus { Unknown = 0, Error = 1, OK = 2 }; diff --git a/src/Jackett.Common/Models/DTO/ServerConfig.cs b/src/Jackett.Common/Models/DTO/ServerConfig.cs index 0c8fd04bd..460dd9846 100644 --- a/src/Jackett.Common/Models/DTO/ServerConfig.cs +++ b/src/Jackett.Common/Models/DTO/ServerConfig.cs @@ -1,11 +1,7 @@ using System.Collections.Generic; -using Jacket.Common; -using Jackett.Services; -using Jackett.Models.Config; using Jackett.Common.Models.Config; -using Jackett.Common.Plumbing; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class ServerConfig { diff --git a/src/Jackett.Common/Models/DTO/TorrentPotatoRequest.cs b/src/Jackett.Common/Models/DTO/TorrentPotatoRequest.cs index 1adfaa86f..713ba487c 100644 --- a/src/Jackett.Common/Models/DTO/TorrentPotatoRequest.cs +++ b/src/Jackett.Common/Models/DTO/TorrentPotatoRequest.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class TorrentPotatoRequest { diff --git a/src/Jackett.Common/Models/DTO/TorrentPotatoResponse.cs b/src/Jackett.Common/Models/DTO/TorrentPotatoResponse.cs index 8b165d45a..32f7123c0 100644 --- a/src/Jackett.Common/Models/DTO/TorrentPotatoResponse.cs +++ b/src/Jackett.Common/Models/DTO/TorrentPotatoResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class TorrentPotatoResponse { diff --git a/src/Jackett.Common/Models/DTO/TorrentPotatoResponseItem.cs b/src/Jackett.Common/Models/DTO/TorrentPotatoResponseItem.cs index f9779a0e9..3bef64cf9 100644 --- a/src/Jackett.Common/Models/DTO/TorrentPotatoResponseItem.cs +++ b/src/Jackett.Common/Models/DTO/TorrentPotatoResponseItem.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class TorrentPotatoResponseItem { diff --git a/src/Jackett.Common/Models/DTO/TorznabRequest.cs b/src/Jackett.Common/Models/DTO/TorznabRequest.cs index dd8aa75a5..ca10e9b87 100644 --- a/src/Jackett.Common/Models/DTO/TorznabRequest.cs +++ b/src/Jackett.Common/Models/DTO/TorznabRequest.cs @@ -1,8 +1,7 @@ -using System; -using System.Linq; -using Jackett.Utils; +using System.Linq; +using Jackett.Common.Utils; -namespace Jackett.Models.DTO +namespace Jackett.Common.Models.DTO { public class TorznabRequest { diff --git a/src/Jackett.Common/Models/GitHub/Asset.cs b/src/Jackett.Common/Models/GitHub/Asset.cs index a89a10c3e..13bd5cf22 100644 --- a/src/Jackett.Common/Models/GitHub/Asset.cs +++ b/src/Jackett.Common/Models/GitHub/Asset.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.GitHub +namespace Jackett.Common.Models.GitHub { public class Asset { diff --git a/src/Jackett.Common/Models/GitHub/Release.cs b/src/Jackett.Common/Models/GitHub/Release.cs index 886afc902..94850f1be 100644 --- a/src/Jackett.Common/Models/GitHub/Release.cs +++ b/src/Jackett.Common/Models/GitHub/Release.cs @@ -1,10 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models.GitHub +namespace Jackett.Common.Models.GitHub { public class Release { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs index 412a40681..1328364ea 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAbnormal.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataAbnormal : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs index 6ab66a951..133dac424 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataAnimeBytes.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataAnimeBytes : ConfigurationDataCaptchaLogin { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs index c3d01bb96..32b4a35b8 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataFileList.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataFileList : ConfigurationDataBasicLogin { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs index 3fe1c1df5..b18345ed4 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNCore.cs @@ -1,13 +1,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { public class ConfigurationDataNCore : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs index 709cd27a6..348d0288f 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataNorbits.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { internal class ConfigurationDataNorbits : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs index 8e21e501e..6ea14bd03 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataRutracker.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataRutracker : ConfigurationDataCaptchaLogin { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneFZ.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneFZ.cs index 628abcadf..de03abb56 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneFZ.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataSceneFZ.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataSceneFZ : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataWiHD.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataWiHD.cs index d6f0eb64f..fb51e9136 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataWiHD.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataWiHD.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataWiHD : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs index d05c350ac..61edfedb5 100644 --- a/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs +++ b/src/Jackett.Common/Models/IndexerConfig/Bespoke/ConfigurationDataXthor.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig.Bespoke +namespace Jackett.Common.Models.IndexerConfig.Bespoke { class ConfigurationDataXthor : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs index b7242b0d6..578b75862 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationData.cs @@ -1,12 +1,11 @@ -using Jackett.Services; -using Jackett.Utils; -using Newtonsoft.Json.Linq; -using System; +using System; using System.Collections.Generic; using System.Linq; -using Jackett.Services.Interfaces; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Newtonsoft.Json.Linq; -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs index ace73475b..fc2107193 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataAPIKey.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataAPIKey : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs index 3f28b09a6..0ba168710 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLogin.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataBasicLogin : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs index 8409121a9..53d77d7dd 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilter.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataBasicLoginWithFilter : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilterAndPasskey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilterAndPasskey.cs index 87320f983..bca6bee76 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilterAndPasskey.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithFilterAndPasskey.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataBasicLoginWithFilterAndPasskey : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs index 5eede176a..b116b5a21 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSS.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataBasicLoginWithRSS : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs index 74275f419..5c7def71b 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataBasicLoginWithRSSAndDisplay.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataBasicLoginWithRSSAndDisplay : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs index d19c90443..572aacfd1 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCaptchaLogin.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { class ConfigurationDataCaptchaLogin : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs index bb1e06322..ca8f51f3e 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataCookie.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataCookie : ConfigurationData diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginLink.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginLink.cs index 030589f93..990a5effa 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginLink.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginLink.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataLoginLink : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginTokin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginTokin.cs index b9e697332..9d0e7a876 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginTokin.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataLoginTokin.cs @@ -1,12 +1,8 @@ -using Jackett.Utils; -using System; -using System.Collections.Generic; +using System; using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Jackett.Common.Utils; -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataLoginTokin : ConfigurationDataBasicLogin { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs index f67002a84..fb5a1fe82 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataPinNumber.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { class ConfigurationDataPinNumber : ConfigurationDataBasicLogin { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataRecaptchaLogin.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataRecaptchaLogin.cs index cdac1a64a..81bce1e3d 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataRecaptchaLogin.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataRecaptchaLogin.cs @@ -1,11 +1,4 @@ -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataRecaptchaLogin : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUrl.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUrl.cs index 71c23eaeb..a43947198 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUrl.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUrl.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataUrl : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs index 38511ea3f..f6f422caf 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ConfigurationDataUserPasskey.cs @@ -1,4 +1,4 @@ -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public class ConfigurationDataUserPasskey : ConfigurationData { diff --git a/src/Jackett.Common/Models/IndexerConfig/ISerializableConfig.cs b/src/Jackett.Common/Models/IndexerConfig/ISerializableConfig.cs index c96756300..bf9787248 100644 --- a/src/Jackett.Common/Models/IndexerConfig/ISerializableConfig.cs +++ b/src/Jackett.Common/Models/IndexerConfig/ISerializableConfig.cs @@ -1,11 +1,6 @@ using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models.IndexerConfig +namespace Jackett.Common.Models.IndexerConfig { public interface ISerializableConfig { diff --git a/src/Jackett.Common/Models/IndexerConfigurationStatus.cs b/src/Jackett.Common/Models/IndexerConfigurationStatus.cs index b5c4843af..ef62da451 100644 --- a/src/Jackett.Common/Models/IndexerConfigurationStatus.cs +++ b/src/Jackett.Common/Models/IndexerConfigurationStatus.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Models +namespace Jackett.Common.Models { public enum IndexerConfigurationStatus { diff --git a/src/Jackett.Common/Models/IndexerDefinition.cs b/src/Jackett.Common/Models/IndexerDefinition.cs index 87e184013..3c402caaf 100644 --- a/src/Jackett.Common/Models/IndexerDefinition.cs +++ b/src/Jackett.Common/Models/IndexerDefinition.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Jackett.Models +namespace Jackett.Common.Models { // A Dictionary allowing the same key multiple times public class KeyValuePairList : List>, IDictionary diff --git a/src/Jackett.Common/Models/ReleaseInfo.cs b/src/Jackett.Common/Models/ReleaseInfo.cs index 78bf7b23a..bc057d45e 100644 --- a/src/Jackett.Common/Models/ReleaseInfo.cs +++ b/src/Jackett.Common/Models/ReleaseInfo.cs @@ -1,11 +1,11 @@ -using Jackett.Utils; -using System; +using System; using System.Collections.Generic; using System.Linq; -using Jackett.Indexers; +using Jackett.Common.Indexers; +using Jackett.Common.Utils; using Newtonsoft.Json; -namespace Jackett.Models +namespace Jackett.Common.Models { public class ReleaseInfo : ICloneable diff --git a/src/Jackett.Common/Models/ResultPage.cs b/src/Jackett.Common/Models/ResultPage.cs index 6d694b71a..d43997c26 100644 --- a/src/Jackett.Common/Models/ResultPage.cs +++ b/src/Jackett.Common/Models/ResultPage.cs @@ -1,15 +1,11 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.IO; using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; -using System.Xml; using System.Xml.Linq; -namespace Jackett.Models +namespace Jackett.Common.Models { public class ResultPage { diff --git a/src/Jackett.Common/Models/TorznabCapabilities.cs b/src/Jackett.Common/Models/TorznabCapabilities.cs index 5da0f1339..49e12d1e8 100644 --- a/src/Jackett.Common/Models/TorznabCapabilities.cs +++ b/src/Jackett.Common/Models/TorznabCapabilities.cs @@ -1,12 +1,9 @@ -using Newtonsoft.Json.Linq; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; -namespace Jackett.Models +namespace Jackett.Common.Models { public class TorznabCapabilities { diff --git a/src/Jackett.Common/Models/TorznabCatType.cs b/src/Jackett.Common/Models/TorznabCatType.cs index 9f1a7f3a6..1131359f6 100644 --- a/src/Jackett.Common/Models/TorznabCatType.cs +++ b/src/Jackett.Common/Models/TorznabCatType.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -namespace Jackett.Models +namespace Jackett.Common.Models { public static partial class TorznabCatType { diff --git a/src/Jackett.Common/Models/TorznabCatType.generated.cs b/src/Jackett.Common/Models/TorznabCatType.generated.cs index 14dcf5da8..c3c1bdcef 100644 --- a/src/Jackett.Common/Models/TorznabCatType.generated.cs +++ b/src/Jackett.Common/Models/TorznabCatType.generated.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Jackett.Models +namespace Jackett.Common.Models { public static partial class TorznabCatType diff --git a/src/Jackett.Common/Models/TorznabCategory.cs b/src/Jackett.Common/Models/TorznabCategory.cs index adea35488..905737834 100644 --- a/src/Jackett.Common/Models/TorznabCategory.cs +++ b/src/Jackett.Common/Models/TorznabCategory.cs @@ -1,11 +1,8 @@ -using Newtonsoft.Json.Linq; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using Newtonsoft.Json.Linq; -namespace Jackett.Models +namespace Jackett.Common.Models { public class TorznabCategory { diff --git a/src/Jackett.Common/Models/TorznabQuery.cs b/src/Jackett.Common/Models/TorznabQuery.cs index 1f9eab556..ddfb64684 100644 --- a/src/Jackett.Common/Models/TorznabQuery.cs +++ b/src/Jackett.Common/Models/TorznabQuery.cs @@ -1,14 +1,11 @@ -using Jackett.Utils; -using System; +using System; using System.Collections.Generic; -using System.Collections.Specialized; using System.Globalization; using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; +using Jackett.Common.Utils; -namespace Jackett.Models +namespace Jackett.Common.Models { public class TorznabQuery { diff --git a/src/Jackett.Common/Models/TrackerCache.cs b/src/Jackett.Common/Models/TrackerCache.cs index 9b9dc9022..f8311fc2c 100644 --- a/src/Jackett.Common/Models/TrackerCache.cs +++ b/src/Jackett.Common/Models/TrackerCache.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; -namespace Jackett.Models +namespace Jackett.Common.Models { class TrackerCache { diff --git a/src/Jackett.Common/Models/TrackerCacheResult.cs b/src/Jackett.Common/Models/TrackerCacheResult.cs index 01a7b4368..f44561886 100644 --- a/src/Jackett.Common/Models/TrackerCacheResult.cs +++ b/src/Jackett.Common/Models/TrackerCacheResult.cs @@ -1,10 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Models +namespace Jackett.Common.Models { public class TrackerCacheResult : ReleaseInfo { diff --git a/src/Jackett.Common/Plumbing/JackettModule.cs b/src/Jackett.Common/Plumbing/JackettModule.cs index feebbce31..f84e31b7a 100644 --- a/src/Jackett.Common/Plumbing/JackettModule.cs +++ b/src/Jackett.Common/Plumbing/JackettModule.cs @@ -1,22 +1,15 @@ using Autofac; using System; -using System.Linq; -using System.Text; -using Jackett.Indexers; -using Jackett.Utils.Clients; -using AutoMapper; -using Jackett.Models; using System.Reflection; -using Jackett.Services; -using Jackett.Indexers.Meta; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; using System.IO; using Newtonsoft.Json.Linq; -using Jackett.Utils; -using System.Collections.Generic; +using Jackett.Common.Indexers; +using Jackett.Common.Indexers.Meta; using Jackett.Common.Models.Config; +using Jackett.Common.Services; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; namespace Jackett.Common.Plumbing { diff --git a/src/Jackett.Common/Services/CacheService.cs b/src/Jackett.Common/Services/CacheService.cs index 7030f920f..ea26e3abb 100644 --- a/src/Jackett.Common/Services/CacheService.cs +++ b/src/Jackett.Common/Services/CacheService.cs @@ -1,14 +1,12 @@ -using AutoMapper; -using Jackett.Indexers; -using Jackett.Models; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using AutoMapper; +using Jackett.Common.Indexers; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; -namespace Jackett.Services +namespace Jackett.Common.Services { public class CacheService : ICacheService diff --git a/src/Jackett.Common/Services/ConfigurationService.cs b/src/Jackett.Common/Services/ConfigurationService.cs index 177e27fe8..b0006a167 100644 --- a/src/Jackett.Common/Services/ConfigurationService.cs +++ b/src/Jackett.Common/Services/ConfigurationService.cs @@ -1,18 +1,15 @@ -using Jackett.Utils; -using NLog; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Reflection; using System.Security.AccessControl; using System.Security.Principal; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jacket.Common.Utils; using Jackett.Common.Models.Config; -using Jackett.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using NLog; -namespace Jackett.Services +namespace Jackett.Common.Services { public class ConfigurationService : IConfigurationService diff --git a/src/Jackett.Common/Services/ImdbResolver.cs b/src/Jackett.Common/Services/ImdbResolver.cs index a06061f7d..500dce03e 100644 --- a/src/Jackett.Common/Services/ImdbResolver.cs +++ b/src/Jackett.Common/Services/ImdbResolver.cs @@ -1,16 +1,12 @@ using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using System.Web; -using CsQuery; -using Jackett.Utils; -using Jackett.Utils.Clients; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Jackett.Services.Interfaces; using System.Text; +using System.Threading.Tasks; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; +using Newtonsoft.Json; -namespace Jackett.Services +namespace Jackett.Common.Services { public struct Movie diff --git a/src/Jackett.Common/Services/IndexerConfigurationService.cs b/src/Jackett.Common/Services/IndexerConfigurationService.cs index 2bef1f58f..3140da16d 100644 --- a/src/Jackett.Common/Services/IndexerConfigurationService.cs +++ b/src/Jackett.Common/Services/IndexerConfigurationService.cs @@ -1,11 +1,11 @@ using System; using System.IO; -using Jackett.Indexers; +using Jackett.Common.Indexers; +using Jackett.Common.Services.Interfaces; using Newtonsoft.Json.Linq; using NLog; -using Jackett.Services.Interfaces; -namespace Jackett.Services +namespace Jackett.Common.Services { public class IndexerConfigurationService : IIndexerConfigurationService diff --git a/src/Jackett.Common/Services/IndexerManagerService.cs b/src/Jackett.Common/Services/IndexerManagerService.cs index 76fa429e1..0d7f623d4 100644 --- a/src/Jackett.Common/Services/IndexerManagerService.cs +++ b/src/Jackett.Common/Services/IndexerManagerService.cs @@ -1,21 +1,20 @@ -using Jackett.Indexers; -using Jackett.Models; -using Jackett.Utils; -using Jackett.Utils.Clients; -using Newtonsoft.Json.Linq; -using NLog; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using Jackett.Indexers.Meta; +using Jackett.Common.Indexers; +using Jackett.Common.Indexers.Meta; +using Jackett.Common.Models; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; +using NLog; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; -namespace Jackett.Services +namespace Jackett.Common.Services { public class IndexerManagerService : IIndexerManagerService diff --git a/src/Jackett.Common/Services/Interfaces/ICacheService.cs b/src/Jackett.Common/Services/Interfaces/ICacheService.cs index bc879db41..26f18eb87 100644 --- a/src/Jackett.Common/Services/Interfaces/ICacheService.cs +++ b/src/Jackett.Common/Services/Interfaces/ICacheService.cs @@ -1,8 +1,8 @@ -using Jackett.Indexers; -using Jackett.Models; -using System.Collections.Generic; +using System.Collections.Generic; +using Jackett.Common.Indexers; +using Jackett.Common.Models; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface ICacheService { diff --git a/src/Jackett.Common/Services/Interfaces/IConfigurationService.cs b/src/Jackett.Common/Services/Interfaces/IConfigurationService.cs index 8b944d4d0..7a6db3085 100644 --- a/src/Jackett.Common/Services/Interfaces/IConfigurationService.cs +++ b/src/Jackett.Common/Services/Interfaces/IConfigurationService.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IConfigurationService { diff --git a/src/Jackett.Common/Services/Interfaces/IImdbResolver.cs b/src/Jackett.Common/Services/Interfaces/IImdbResolver.cs index 0c0de42d9..bf7820e3f 100644 --- a/src/Jackett.Common/Services/Interfaces/IImdbResolver.cs +++ b/src/Jackett.Common/Services/Interfaces/IImdbResolver.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using Jackett.Utils; +using Jackett.Common.Utils; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IImdbResolver { diff --git a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs index 6295630e0..eea2c35b0 100644 --- a/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs +++ b/src/Jackett.Common/Services/Interfaces/IIndexerConfigurationService.cs @@ -1,7 +1,7 @@ -using Jackett.Indexers; +using Jackett.Common.Indexers; using Newtonsoft.Json.Linq; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IIndexerConfigurationService { diff --git a/src/Jackett.Common/Services/Interfaces/IIndexerManagerService.cs b/src/Jackett.Common/Services/Interfaces/IIndexerManagerService.cs index ab1dc41b9..cbb73f698 100644 --- a/src/Jackett.Common/Services/Interfaces/IIndexerManagerService.cs +++ b/src/Jackett.Common/Services/Interfaces/IIndexerManagerService.cs @@ -1,8 +1,8 @@ -using Jackett.Indexers; -using System.Collections.Generic; +using System.Collections.Generic; using System.Threading.Tasks; +using Jackett.Common.Indexers; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IIndexerManagerService { diff --git a/src/Jackett.Common/Services/Interfaces/ILogCacheService.cs b/src/Jackett.Common/Services/Interfaces/ILogCacheService.cs index 9c2b5a35e..36487fd11 100644 --- a/src/Jackett.Common/Services/Interfaces/ILogCacheService.cs +++ b/src/Jackett.Common/Services/Interfaces/ILogCacheService.cs @@ -1,7 +1,7 @@ -using Jackett.Models; -using System.Collections.Generic; +using System.Collections.Generic; +using Jackett.Common.Models; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface ILogCacheService { diff --git a/src/Jackett.Common/Services/Interfaces/IProcessService.cs b/src/Jackett.Common/Services/Interfaces/IProcessService.cs index 745a65886..20fabb4d9 100644 --- a/src/Jackett.Common/Services/Interfaces/IProcessService.cs +++ b/src/Jackett.Common/Services/Interfaces/IProcessService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IProcessService { diff --git a/src/Jackett.Common/Services/Interfaces/IProtectionService.cs b/src/Jackett.Common/Services/Interfaces/IProtectionService.cs index c3be529ea..3d107c290 100644 --- a/src/Jackett.Common/Services/Interfaces/IProtectionService.cs +++ b/src/Jackett.Common/Services/Interfaces/IProtectionService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IProtectionService { diff --git a/src/Jackett.Common/Services/Interfaces/IRunTimeService.cs b/src/Jackett.Common/Services/Interfaces/IRunTimeService.cs index f0463480c..74b2c034a 100644 --- a/src/Jackett.Common/Services/Interfaces/IRunTimeService.cs +++ b/src/Jackett.Common/Services/Interfaces/IRunTimeService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IRunTimeService { diff --git a/src/Jackett.Common/Services/Interfaces/ISecuityService.cs b/src/Jackett.Common/Services/Interfaces/ISecuityService.cs index 1495d3912..0e2a04807 100644 --- a/src/Jackett.Common/Services/Interfaces/ISecuityService.cs +++ b/src/Jackett.Common/Services/Interfaces/ISecuityService.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface ISecuityService { diff --git a/src/Jackett.Common/Services/Interfaces/ISerializeService.cs b/src/Jackett.Common/Services/Interfaces/ISerializeService.cs index 7ed940f44..52ab94090 100644 --- a/src/Jackett.Common/Services/Interfaces/ISerializeService.cs +++ b/src/Jackett.Common/Services/Interfaces/ISerializeService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface ISerializeService { diff --git a/src/Jackett.Common/Services/Interfaces/IServerService.cs b/src/Jackett.Common/Services/Interfaces/IServerService.cs index 508c8623f..9f28a9e4d 100644 --- a/src/Jackett.Common/Services/Interfaces/IServerService.cs +++ b/src/Jackett.Common/Services/Interfaces/IServerService.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Net.Http; -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IServerService { diff --git a/src/Jackett.Common/Services/Interfaces/IServiceConfigService.cs b/src/Jackett.Common/Services/Interfaces/IServiceConfigService.cs index c964373ab..4d16cf125 100644 --- a/src/Jackett.Common/Services/Interfaces/IServiceConfigService.cs +++ b/src/Jackett.Common/Services/Interfaces/IServiceConfigService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IServiceConfigService { diff --git a/src/Jackett.Common/Services/Interfaces/ITrayLockService.cs b/src/Jackett.Common/Services/Interfaces/ITrayLockService.cs index c2f51531e..bcc55086b 100644 --- a/src/Jackett.Common/Services/Interfaces/ITrayLockService.cs +++ b/src/Jackett.Common/Services/Interfaces/ITrayLockService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface ITrayLockService { diff --git a/src/Jackett.Common/Services/Interfaces/IUpdateService.cs b/src/Jackett.Common/Services/Interfaces/IUpdateService.cs index a39bb3290..ff1e505b9 100644 --- a/src/Jackett.Common/Services/Interfaces/IUpdateService.cs +++ b/src/Jackett.Common/Services/Interfaces/IUpdateService.cs @@ -1,4 +1,4 @@ -namespace Jackett.Services.Interfaces +namespace Jackett.Common.Services.Interfaces { public interface IUpdateService { diff --git a/src/Jackett.Common/Services/LogCacheService.cs b/src/Jackett.Common/Services/LogCacheService.cs index 8326ab47d..268739fca 100644 --- a/src/Jackett.Common/Services/LogCacheService.cs +++ b/src/Jackett.Common/Services/LogCacheService.cs @@ -1,14 +1,11 @@ -using Jackett.Models; +using System.Collections.Generic; +using System.Linq; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; using NLog; using NLog.Targets; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; -namespace Jackett.Services +namespace Jackett.Common.Services { [Target("LogService")] diff --git a/src/Jackett.Common/Services/ProcessService.cs b/src/Jackett.Common/Services/ProcessService.cs index 790a62ae0..a8fcec88f 100644 --- a/src/Jackett.Common/Services/ProcessService.cs +++ b/src/Jackett.Common/Services/ProcessService.cs @@ -1,13 +1,9 @@ -using NLog; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; +using System.Diagnostics; using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Services +namespace Jackett.Common.Services { public class ProcessService : IProcessService diff --git a/src/Jackett.Common/Services/SerializeService.cs b/src/Jackett.Common/Services/SerializeService.cs index 4a0f82d3a..7c6574abc 100644 --- a/src/Jackett.Common/Services/SerializeService.cs +++ b/src/Jackett.Common/Services/SerializeService.cs @@ -1,12 +1,7 @@ -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using Jackett.Common.Services.Interfaces; +using Newtonsoft.Json; -namespace Jackett.Services +namespace Jackett.Common.Services { class SerializeService : ISerializeService diff --git a/src/Jackett.Common/Services/SpinService.cs b/src/Jackett.Common/Services/SpinService.cs index d309e4362..52bccb02f 100644 --- a/src/Jackett.Common/Services/SpinService.cs +++ b/src/Jackett.Common/Services/SpinService.cs @@ -1,12 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using System.Threading; +using Jackett.Common.Services.Interfaces; -namespace Jackett.Services +namespace Jackett.Common.Services { class RunTimeService : IRunTimeService diff --git a/src/Jackett.Common/Services/TrayLockService.cs b/src/Jackett.Common/Services/TrayLockService.cs index b6181767e..a267a3f99 100644 --- a/src/Jackett.Common/Services/TrayLockService.cs +++ b/src/Jackett.Common/Services/TrayLockService.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using Jackett.Common.Services.Interfaces; -namespace Jackett.Services +namespace Jackett.Common.Services { public class TrayLockService : ITrayLockService diff --git a/src/Jackett.Common/Services/UpdateService.cs b/src/Jackett.Common/Services/UpdateService.cs index b8cbc68d4..25d39a849 100644 --- a/src/Jackett.Common/Services/UpdateService.cs +++ b/src/Jackett.Common/Services/UpdateService.cs @@ -1,11 +1,4 @@ -using ICSharpCode.SharpZipLib.GZip; -using ICSharpCode.SharpZipLib.Tar; -using ICSharpCode.SharpZipLib.Zip; -using Jackett.Models.GitHub; -using Jackett.Utils.Clients; -using Newtonsoft.Json; -using NLog; -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -16,11 +9,16 @@ using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; +using ICSharpCode.SharpZipLib.GZip; +using ICSharpCode.SharpZipLib.Tar; +using ICSharpCode.SharpZipLib.Zip; +using Jackett.Common.Models.GitHub; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; +using Newtonsoft.Json; +using NLog; -namespace Jackett.Services +namespace Jackett.Common.Services { public class UpdateService: IUpdateService diff --git a/src/Jackett.Common/Utils/BrowserUtil.cs b/src/Jackett.Common/Utils/BrowserUtil.cs index 36b58f2f5..56c1ae314 100644 --- a/src/Jackett.Common/Utils/BrowserUtil.cs +++ b/src/Jackett.Common/Utils/BrowserUtil.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class BrowserUtil { diff --git a/src/Jackett.Common/Utils/Clients/BaseWebResult.cs b/src/Jackett.Common/Utils/Clients/BaseWebResult.cs index 1ce6f1b8b..a186b186b 100644 --- a/src/Jackett.Common/Utils/Clients/BaseWebResult.cs +++ b/src/Jackett.Common/Utils/Clients/BaseWebResult.cs @@ -1,11 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using System.Collections.Generic; using System.Net; -using System.Text; -using System.Threading.Tasks; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public abstract class BaseWebResult { diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs index 3bb59ddbe..66a79df40 100644 --- a/src/Jackett.Common/Utils/Clients/HttpWebClient.cs +++ b/src/Jackett.Common/Utils/Clients/HttpWebClient.cs @@ -1,5 +1,4 @@ -using NLog; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -8,15 +7,14 @@ using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; -using CloudFlareUtilities; using com.LandonKey.SocksWebProxy; using com.LandonKey.SocksWebProxy.Proxy; +using CloudFlareUtilities; using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class HttpWebClient : WebClient { diff --git a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs index f109170b9..d69891626 100644 --- a/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs +++ b/src/Jackett.Common/Utils/Clients/HttpWebClient2.cs @@ -1,27 +1,20 @@ -using AutoMapper; -using CloudFlareUtilities; -using Jackett.Models; -using Jackett.Services; -using NLog; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; using System.Net.Http; -using System.Net.Http.Headers; using System.Net.Security; using System.Security.Cryptography.X509Certificates; using System.Text; -using System.Text.RegularExpressions; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; -using com.LandonKey.SocksWebProxy.Proxy; using com.LandonKey.SocksWebProxy; +using com.LandonKey.SocksWebProxy.Proxy; +using CloudFlareUtilities; using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { // Compared to HttpWebClient this implementation will reuse the HttpClient instance (one per indexer). // This should improve performance and avoid problems with too man open file handles. diff --git a/src/Jackett.Common/Utils/Clients/UnixLibCurlWebClient.cs b/src/Jackett.Common/Utils/Clients/UnixLibCurlWebClient.cs index cbee1dc44..5969accaa 100644 --- a/src/Jackett.Common/Utils/Clients/UnixLibCurlWebClient.cs +++ b/src/Jackett.Common/Utils/Clients/UnixLibCurlWebClient.cs @@ -1,22 +1,16 @@ -using AutoMapper; -using CurlSharp; -using Jackett.Models; -using Jackett.Services; -using NLog; -using System; -using System.Collections.Generic; -using System.IO; +using System; using System.Linq; using System.Net; -using System.Net.Http; using System.Text; using System.Threading.Tasks; using CloudFlareUtilities; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; +using CurlSharp; +using CurlSharp.Enums; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class UnixLibCurlWebClient : WebClient { @@ -101,7 +95,7 @@ namespace Jackett.Utils.Clients protected async Task RunCurl(WebRequest request) { - Jackett.CurlHelper.CurlResponse response; + CurlHelper.CurlResponse response; if (request.Type == RequestType.GET) { response = await CurlHelper.GetAsync(request.Url, serverConfig, request.Cookies, request.Referer, request.Headers); diff --git a/src/Jackett.Common/Utils/Clients/UnixSafeCurlWebClient.cs b/src/Jackett.Common/Utils/Clients/UnixSafeCurlWebClient.cs index 4d48fc89a..dece80ce7 100644 --- a/src/Jackett.Common/Utils/Clients/UnixSafeCurlWebClient.cs +++ b/src/Jackett.Common/Utils/Clients/UnixSafeCurlWebClient.cs @@ -1,21 +1,16 @@ -using AutoMapper; -using CurlSharp; -using Jackett.Models; -using Jackett.Services; -using NLog; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; -using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jacket.Common; -using Jackett.Models.Config; +using CurlSharp; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class UnixSafeCurlWebClient : WebClient { diff --git a/src/Jackett.Common/Utils/Clients/WebByteResult.cs b/src/Jackett.Common/Utils/Clients/WebByteResult.cs index f0ae9de90..4f95003fe 100644 --- a/src/Jackett.Common/Utils/Clients/WebByteResult.cs +++ b/src/Jackett.Common/Utils/Clients/WebByteResult.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class WebClientByteResult : BaseWebResult { diff --git a/src/Jackett.Common/Utils/Clients/WebClient.cs b/src/Jackett.Common/Utils/Clients/WebClient.cs index e5191996d..2ca428a62 100644 --- a/src/Jackett.Common/Utils/Clients/WebClient.cs +++ b/src/Jackett.Common/Utils/Clients/WebClient.cs @@ -1,17 +1,14 @@ -using AutoMapper; -using Jackett.Models; -using Jackett.Services; -using NLog; -using System; +using System; using System.Collections.Generic; -using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; +using AutoMapper; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using NLog; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public abstract class WebClient : IObserver { diff --git a/src/Jackett.Common/Utils/Clients/WebClientResult.cs b/src/Jackett.Common/Utils/Clients/WebClientResult.cs index 2898e05eb..fdb25e791 100644 --- a/src/Jackett.Common/Utils/Clients/WebClientResult.cs +++ b/src/Jackett.Common/Utils/Clients/WebClientResult.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading.Tasks; - -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class WebClientStringResult: BaseWebResult { diff --git a/src/Jackett.Common/Utils/Clients/WebRequest.cs b/src/Jackett.Common/Utils/Clients/WebRequest.cs index 66c8c770b..e50c969a1 100644 --- a/src/Jackett.Common/Utils/Clients/WebRequest.cs +++ b/src/Jackett.Common/Utils/Clients/WebRequest.cs @@ -1,11 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Net.Http; using System.Text; -using System.Threading.Tasks; -namespace Jackett.Utils.Clients +namespace Jackett.Common.Utils.Clients { public class WebRequest { diff --git a/src/Jackett.Common/Utils/DataUrl.cs b/src/Jackett.Common/Utils/DataUrl.cs index 8c9251752..a20ad8448 100644 --- a/src/Jackett.Common/Utils/DataUrl.cs +++ b/src/Jackett.Common/Utils/DataUrl.cs @@ -1,13 +1,8 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Web; using MimeMapping; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class DataUrlUtils { diff --git a/src/Jackett.Common/Utils/DateTimeUtil.cs b/src/Jackett.Common/Utils/DateTimeUtil.cs index 46d629c25..ec8f36114 100644 --- a/src/Jackett.Common/Utils/DateTimeUtil.cs +++ b/src/Jackett.Common/Utils/DateTimeUtil.cs @@ -1,13 +1,8 @@ -using Cliver; -using System; -using System.Collections.Generic; +using System; using System.Globalization; -using System.Linq; -using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class DateTimeUtil { @@ -110,14 +105,14 @@ namespace Jackett.Utils // http://www.codeproject.com/Articles/33298/C-Date-Time-Parser public static DateTime FromFuzzyTime(string str, string format = null) { - DateTimeRoutines.DateTimeFormat dt_format = DateTimeRoutines.DateTimeFormat.USA_DATE; + DateTimeRoutines.DateTimeRoutines.DateTimeFormat dt_format = DateTimeRoutines.DateTimeRoutines.DateTimeFormat.USA_DATE; if (format == "UK") { - dt_format = DateTimeRoutines.DateTimeFormat.UK_DATE; + dt_format = DateTimeRoutines.DateTimeRoutines.DateTimeFormat.UK_DATE; } - DateTimeRoutines.ParsedDateTime dt; - if (DateTimeRoutines.TryParseDateOrTime(str, dt_format, out dt)) + DateTimeRoutines.DateTimeRoutines.ParsedDateTime dt; + if (DateTimeRoutines.DateTimeRoutines.TryParseDateOrTime(str, dt_format, out dt)) { return dt.DateTime; } diff --git a/src/Jackett.Common/Utils/EnvironmentUtil.cs b/src/Jackett.Common/Utils/EnvironmentUtil.cs index f8f2c609d..63b801beb 100644 --- a/src/Jackett.Common/Utils/EnvironmentUtil.cs +++ b/src/Jackett.Common/Utils/EnvironmentUtil.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; -namespace Jacket.Common.Utils +namespace Jackett.Common.Utils { public static class EnvironmentUtil { diff --git a/src/Jackett.Common/Utils/Extensions.cs b/src/Jackett.Common/Utils/Extensions.cs index db632226b..6422bf5b4 100644 --- a/src/Jackett.Common/Utils/Extensions.cs +++ b/src/Jackett.Common/Utils/Extensions.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Threading.Tasks; using System.Xml.Linq; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class NonNullException : Exception { diff --git a/src/Jackett.Common/Utils/JsonContent.cs b/src/Jackett.Common/Utils/JsonContent.cs index 83bfe1873..3e2bb9f54 100644 --- a/src/Jackett.Common/Utils/JsonContent.cs +++ b/src/Jackett.Common/Utils/JsonContent.cs @@ -1,16 +1,8 @@ -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net; -using System.Net.Http; -using System.Net.Http.Headers; +using System.Net.Http; using System.Text; -using System.Threading.Tasks; +using Newtonsoft.Json; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class JsonContent : StringContent { diff --git a/src/Jackett.Common/Utils/JsonUtil.cs b/src/Jackett.Common/Utils/JsonUtil.cs index 9718faeee..144f6891b 100644 --- a/src/Jackett.Common/Utils/JsonUtil.cs +++ b/src/Jackett.Common/Utils/JsonUtil.cs @@ -2,7 +2,7 @@ using System.Text; using Newtonsoft.Json; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class EncodingJsonConverter : JsonConverter { diff --git a/src/Jackett.Common/Utils/ParseUtil.cs b/src/Jackett.Common/Utils/ParseUtil.cs index d3f5fc52d..bb35e57ac 100644 --- a/src/Jackett.Common/Utils/ParseUtil.cs +++ b/src/Jackett.Common/Utils/ParseUtil.cs @@ -1,10 +1,9 @@ using System.Globalization; using System.Linq; using System.Text.RegularExpressions; -using System.Web; using Microsoft.AspNetCore.WebUtilities; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class ParseUtil { diff --git a/src/Jackett.Common/Utils/ServerUtil.cs b/src/Jackett.Common/Utils/ServerUtil.cs index a176e810f..dbc332121 100644 --- a/src/Jackett.Common/Utils/ServerUtil.cs +++ b/src/Jackett.Common/Utils/ServerUtil.cs @@ -1,13 +1,8 @@ -using Jackett.Utils.Clients; -using System; -using System.Collections.Generic; -using System.Linq; +using System; using System.Security.Principal; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using Jackett.Common.Utils.Clients; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class ServerUtil { diff --git a/src/Jackett.Common/Utils/StringCipher.cs b/src/Jackett.Common/Utils/StringCipher.cs index ea4acd33f..f206968de 100644 --- a/src/Jackett.Common/Utils/StringCipher.cs +++ b/src/Jackett.Common/Utils/StringCipher.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class StringCipher { diff --git a/src/Jackett.Common/Utils/StringUtil.cs b/src/Jackett.Common/Utils/StringUtil.cs index 720b12ef6..73c5fb83b 100644 --- a/src/Jackett.Common/Utils/StringUtil.cs +++ b/src/Jackett.Common/Utils/StringUtil.cs @@ -1,6 +1,4 @@ -using AngleSharp.Dom; -using AngleSharp.Html; -using System; +using System; using System.Collections.Generic; using System.Collections.Specialized; using System.Globalization; @@ -10,12 +8,11 @@ using System.Net.Http; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Web; -using System.Net; -using Jacket.Common.Helpers; +using AngleSharp.Dom; +using AngleSharp.Html; +using Jackett.Common.Helpers; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class StringUtil { diff --git a/src/Jackett.Common/Utils/TorznabCapsUtil.cs b/src/Jackett.Common/Utils/TorznabCapsUtil.cs index 2e6676f81..5fa604b5e 100644 --- a/src/Jackett.Common/Utils/TorznabCapsUtil.cs +++ b/src/Jackett.Common/Utils/TorznabCapsUtil.cs @@ -1,13 +1,7 @@ -using Jackett.Models; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; +using System.Text.RegularExpressions; +using Jackett.Common.Models; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public class TorznabUtil { diff --git a/src/Jackett.Common/Utils/TvCategoryParser.cs b/src/Jackett.Common/Utils/TvCategoryParser.cs index a45902f97..c7fcb68b8 100644 --- a/src/Jackett.Common/Utils/TvCategoryParser.cs +++ b/src/Jackett.Common/Utils/TvCategoryParser.cs @@ -1,9 +1,9 @@ //Regex sourced from Sonarr - https://github.com/Sonarr/Sonarr/blob/develop/src/NzbDrone.Core/Parser/QualityParser.cs using System.Text.RegularExpressions; -using Jackett.Models; +using Jackett.Common.Models; -namespace Jackett.Utils +namespace Jackett.Common.Utils { public static class TvCategoryParser { diff --git a/src/Jackett.Console/Jackett.Console.csproj b/src/Jackett.Console/Jackett.Console.csproj index 9fe7183e7..a538372ba 100644 --- a/src/Jackett.Console/Jackett.Console.csproj +++ b/src/Jackett.Console/Jackett.Console.csproj @@ -38,7 +38,7 @@ jackett.ico - JackettConsole.Program + Jackett.Console.Program diff --git a/src/Jackett.Console/Program.cs b/src/Jackett.Console/Program.cs index a12a6509d..92a2b2b9a 100644 --- a/src/Jackett.Console/Program.cs +++ b/src/Jackett.Console/Program.cs @@ -1,9 +1,10 @@ -using CommandLine; +using System; +using CommandLine; using CommandLine.Text; -using Jackett; -using Jackett.Indexers; +using Jackett.Common; +using Jackett.Common.Models.Config; +using Jackett.Common.Utils; using Jackett.Utils; -using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; @@ -14,12 +15,8 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using Jacket.Common; -using Jackett.Common.Models.Config; -using Jacket.Common.Utils; -using Jackett.Common.Plumbing; -namespace JackettConsole +namespace Jackett.Console { public class Program { @@ -33,7 +30,7 @@ namespace JackettConsole var text = HelpText.AutoBuild(optionsResult); text.Copyright = " "; text.Heading = "Jackett v" + EnvironmentUtil.JackettVersion + " options:"; - Console.WriteLine(text); + System.Console.WriteLine(text); Environment.ExitCode = 1; return; }); @@ -130,7 +127,7 @@ namespace JackettConsole // Show Version if (options.ShowVersion) { - Console.WriteLine("Jackett v" + EnvironmentUtil.JackettVersion); + System.Console.WriteLine("Jackett v" + EnvironmentUtil.JackettVersion); return; } diff --git a/src/Jackett.Console/Properties/AssemblyInfo.cs b/src/Jackett.Console/Properties/AssemblyInfo.cs index 3d235b7a2..8ad58d305 100644 --- a/src/Jackett.Console/Properties/AssemblyInfo.cs +++ b/src/Jackett.Console/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Jackett.Service/Program.cs b/src/Jackett.Service/Program.cs index 22c25af4b..fa6f91492 100644 --- a/src/Jackett.Service/Program.cs +++ b/src/Jackett.Service/Program.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.ServiceProcess; -using System.Text; -using System.Threading.Tasks; +using System.ServiceProcess; namespace Jackett.Service { diff --git a/src/Jackett.Service/Properties/AssemblyInfo.cs b/src/Jackett.Service/Properties/AssemblyInfo.cs index 6cd08debd..4cfe725f1 100644 --- a/src/Jackett.Service/Properties/AssemblyInfo.cs +++ b/src/Jackett.Service/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Jackett.Service/Service.cs b/src/Jackett.Service/Service.cs index b4caf7eef..c985d3640 100644 --- a/src/Jackett.Service/Service.cs +++ b/src/Jackett.Service/Service.cs @@ -1,13 +1,6 @@ using Jackett.Common.Models.Config; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; -using System.Linq; using System.ServiceProcess; -using System.Text; -using System.Threading.Tasks; +using Jackett.Common; namespace Jackett.Service { diff --git a/src/Jackett.Test/Services/ProtectionServiceTests.cs b/src/Jackett.Test/Services/ProtectionServiceTests.cs index 5975ff8d3..e01e93137 100644 --- a/src/Jackett.Test/Services/ProtectionServiceTests.cs +++ b/src/Jackett.Test/Services/ProtectionServiceTests.cs @@ -1,13 +1,7 @@ -using Jackett.Services; -using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using NUnit.Framework; using Autofac; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; namespace Jackett.Test.Services { diff --git a/src/Jackett.Test/TestBase.cs b/src/Jackett.Test/TestBase.cs index 0a8202ed2..717d6abed 100644 --- a/src/Jackett.Test/TestBase.cs +++ b/src/Jackett.Test/TestBase.cs @@ -1,9 +1,4 @@ using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Jackett.Test { diff --git a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs index 5b6cc75f6..9f601795f 100644 --- a/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs +++ b/src/Jackett.Test/TestIIndexerManagerServiceHelper.cs @@ -1,12 +1,9 @@ -using Jackett.Services; -using System; +using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; -using Jackett.Indexers; +using Jackett.Common.Indexers; +using Jackett.Common.Services.Interfaces; using Newtonsoft.Json.Linq; -using Jackett.Services.Interfaces; namespace Jackett.Test { diff --git a/src/Jackett.Test/TestUtil.cs b/src/Jackett.Test/TestUtil.cs index 96359cf35..4717cf392 100644 --- a/src/Jackett.Test/TestUtil.cs +++ b/src/Jackett.Test/TestUtil.cs @@ -1,18 +1,12 @@ using Autofac; -using Jackett; -using Jackett.Services; -using Jackett.Utils.Clients; using NLog; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; using Jackett.Common.Plumbing; using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; namespace Jackett.Test { diff --git a/src/Jackett.Test/TestWebClient.cs b/src/Jackett.Test/TestWebClient.cs index 4821dfdb2..7d8173d5c 100644 --- a/src/Jackett.Test/TestWebClient.cs +++ b/src/Jackett.Test/TestWebClient.cs @@ -1,13 +1,11 @@ -using Jackett.Services; -using Jackett.Utils.Clients; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; using NLog; using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Threading.Tasks; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; namespace Jackett.Test { diff --git a/src/Jackett.Test/Util/ParseUtilTests.cs b/src/Jackett.Test/Util/ParseUtilTests.cs index 9506fb468..9f11c6ffd 100644 --- a/src/Jackett.Test/Util/ParseUtilTests.cs +++ b/src/Jackett.Test/Util/ParseUtilTests.cs @@ -1,14 +1,9 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; using System.Xml.Linq; using System.Xml.XPath; using FluentAssertions; -using Jackett.Utils; +using Jackett.Common.Utils; using NUnit.Framework; namespace Jackett.Test.Util diff --git a/src/Jackett.Test/Util/ServerUtilTests.cs b/src/Jackett.Test/Util/ServerUtilTests.cs index 2f1f44cbb..44d179ddb 100644 --- a/src/Jackett.Test/Util/ServerUtilTests.cs +++ b/src/Jackett.Test/Util/ServerUtilTests.cs @@ -1,18 +1,8 @@ -using Jackett.Utils.Clients; +using Jackett.Common.Utils; +using Jackett.Common.Utils.Clients; using NUnit.Framework; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Autofac; -using Jackett.Indexers; -using Newtonsoft.Json.Linq; -using Jackett; -using Newtonsoft.Json; -using Jackett.Utils; -namespace Jackett.Test.Indexers +namespace Jackett.Test.Util { [TestFixture] class ServerUtilTests : TestBase diff --git a/src/Jackett.Test/Util/TvCategoryParserTests.cs b/src/Jackett.Test/Util/TvCategoryParserTests.cs index 4076d3908..de9723462 100644 --- a/src/Jackett.Test/Util/TvCategoryParserTests.cs +++ b/src/Jackett.Test/Util/TvCategoryParserTests.cs @@ -1,5 +1,5 @@ -using NUnit.Framework; -using Jackett.Utils; +using Jackett.Common.Utils; +using NUnit.Framework; namespace Jackett.Test.Util { diff --git a/src/Jackett.Test/WebUtilityHelpersTests.cs b/src/Jackett.Test/WebUtilityHelpersTests.cs index ff1055df4..b1d37f49d 100644 --- a/src/Jackett.Test/WebUtilityHelpersTests.cs +++ b/src/Jackett.Test/WebUtilityHelpersTests.cs @@ -1,11 +1,9 @@ -using System; -using System.Net.Http; -using System.Text; +using System.Text; using System.Web; -using Jacket.Common.Helpers; +using Jackett.Common.Helpers; using Microsoft.VisualStudio.TestTools.UnitTesting; -namespace Jacket.Common.Tests +namespace Jackett.Test { [TestClass] public class WebUtilityHelpersTests diff --git a/src/Jackett.Tray/Main.Designer.cs b/src/Jackett.Tray/Main.Designer.cs index 1c3a770d1..2479706db 100644 --- a/src/Jackett.Tray/Main.Designer.cs +++ b/src/Jackett.Tray/Main.Designer.cs @@ -1,4 +1,4 @@ -namespace JackettTray +namespace Jackett.Tray { partial class Main { diff --git a/src/Jackett.Tray/Main.cs b/src/Jackett.Tray/Main.cs index 8393b4a01..04e6382df 100644 --- a/src/Jackett.Tray/Main.cs +++ b/src/Jackett.Tray/Main.cs @@ -1,21 +1,24 @@ -using Jackett; -using Jackett.Common.Models.Config; -using Jackett.Utils; -using Microsoft.Win32; -using System; -using System.Collections.Generic; +using System; using System.ComponentModel; -using System.Data; using System.Diagnostics; -using System.Drawing; using System.IO; -using System.Linq; using System.Reflection; -using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Jackett.Common; +using Jackett.Common.Models.Config; +using Jackett.Common.Utils; +using Microsoft.Win32; +using Jackett; +using Jackett.Utils; +using System.Collections.Generic; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; -namespace JackettTray + +namespace Jackett.Tray { public partial class Main : Form { diff --git a/src/Jackett.Tray/Program.cs b/src/Jackett.Tray/Program.cs index 2feab00ca..75ad47e4d 100644 --- a/src/Jackett.Tray/Program.cs +++ b/src/Jackett.Tray/Program.cs @@ -1,11 +1,9 @@ using System; -using System.Collections.Generic; using System.Diagnostics; using System.Linq; -using System.Threading.Tasks; using System.Windows.Forms; -namespace JackettTray +namespace Jackett.Tray { static class Program { diff --git a/src/Jackett.Tray/Properties/AssemblyInfo.cs b/src/Jackett.Tray/Properties/AssemblyInfo.cs index 9069a7196..337be9771 100644 --- a/src/Jackett.Tray/Properties/AssemblyInfo.cs +++ b/src/Jackett.Tray/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Jackett.Updater/Program.cs b/src/Jackett.Updater/Program.cs index 87c5d4502..7c0386360 100644 --- a/src/Jackett.Updater/Program.cs +++ b/src/Jackett.Updater/Program.cs @@ -3,15 +3,12 @@ using CommandLine.Text; using Jackett.Common.Models.Config; using Jackett.Services; using System; -using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; -using System.Text; -using System.Threading; -using System.Threading.Tasks; using System.Web; +using Jackett.Common; namespace Jackett.Updater { diff --git a/src/Jackett.Updater/Properties/AssemblyInfo.cs b/src/Jackett.Updater/Properties/AssemblyInfo.cs index a8201c4ad..abbc39bda 100644 --- a/src/Jackett.Updater/Properties/AssemblyInfo.cs +++ b/src/Jackett.Updater/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Jackett.Updater/UpdaterConsoleOptions.cs b/src/Jackett.Updater/UpdaterConsoleOptions.cs index 9147c7942..92cc06330 100644 --- a/src/Jackett.Updater/UpdaterConsoleOptions.cs +++ b/src/Jackett.Updater/UpdaterConsoleOptions.cs @@ -1,9 +1,4 @@ using CommandLine; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Jackett.Updater { diff --git a/src/Jackett/CacheControlAttribute.cs b/src/Jackett/CacheControlAttribute.cs index d60afba6b..71b329412 100644 --- a/src/Jackett/CacheControlAttribute.cs +++ b/src/Jackett/CacheControlAttribute.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Web.Http.Filters; +using System.Web.Http.Filters; namespace Jackett { diff --git a/src/Jackett/Controllers/BlackholeController.cs b/src/Jackett/Controllers/BlackholeController.cs index 1a3584c50..d802416b0 100644 --- a/src/Jackett/Controllers/BlackholeController.cs +++ b/src/Jackett/Controllers/BlackholeController.cs @@ -1,5 +1,4 @@ -using Jackett.Utils; -using Newtonsoft.Json.Linq; +using Newtonsoft.Json.Linq; using NLog; using System; using System.IO; @@ -7,8 +6,9 @@ using System.Text; using System.Threading.Tasks; using System.Web; using System.Web.Http; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; namespace Jackett.Controllers { diff --git a/src/Jackett/Controllers/DownloadController.cs b/src/Jackett/Controllers/DownloadController.cs index a3f25822f..00bf2bbe1 100644 --- a/src/Jackett/Controllers/DownloadController.cs +++ b/src/Jackett/Controllers/DownloadController.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using System.Web; using System.Web.Http; using BencodeNET.Parsing; -using Jackett.Models.Config; -using Jackett.Services.Interfaces; -using Jackett.Utils; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using NLog; namespace Jackett.Controllers diff --git a/src/Jackett/Controllers/IndexerApiController.cs b/src/Jackett/Controllers/IndexerApiController.cs index 28f7cfa18..46703e1b5 100644 --- a/src/Jackett/Controllers/IndexerApiController.cs +++ b/src/Jackett/Controllers/IndexerApiController.cs @@ -5,15 +5,17 @@ using System.Threading.Tasks; using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; -using Jackett.Indexers; -using Jackett.Models; -using Jackett.Services.Interfaces; +using Jackett.Common; +using Jackett.Common.Indexers; +using Jackett.Common.Models; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Jackett.Utils; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -namespace Jackett.Controllers.V20 +namespace Jackett.Controllers { public interface IIndexerController { @@ -78,7 +80,7 @@ namespace Jackett.Controllers.V20 [HttpPost] [ActionName("Config")] [RequiresIndexer] - public async Task UpdateConfig([FromBody]Models.DTO.ConfigItem[] config) + public async Task UpdateConfig([FromBody]Common.Models.DTO.ConfigItem[] config) { try { @@ -102,9 +104,9 @@ namespace Jackett.Controllers.V20 [HttpGet] [Route("")] - public IEnumerable Indexers() + public IEnumerable Indexers() { - var dto = IndexerService.GetAllIndexers().Select(i => new Models.DTO.Indexer(i)); + var dto = IndexerService.GetAllIndexers().Select(i => new Common.Models.DTO.Indexer(i)); return dto; } diff --git a/src/Jackett/Controllers/ResultsController.cs b/src/Jackett/Controllers/ResultsController.cs index b65c80a5b..5a25488b4 100644 --- a/src/Jackett/Controllers/ResultsController.cs +++ b/src/Jackett/Controllers/ResultsController.cs @@ -10,14 +10,15 @@ using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; using System.Xml.Linq; -using Jackett.Indexers; -using Jackett.Models; -using Jackett.Utils; +using Jackett.Common; +using Jackett.Common.Indexers; +using Jackett.Common.Models; +using Jackett.Common.Models.DTO; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using NLog; -using Jackett.Models.DTO; -using Jackett.Services.Interfaces; -namespace Jackett.Controllers.V20 +namespace Jackett.Controllers { public class RequiresApiKeyAttribute : AuthorizationFilterAttribute { @@ -154,7 +155,7 @@ namespace Jackett.Controllers.V20 } [HttpGet] - public async Task Results([FromUri]Models.DTO.ApiSearch request) + public async Task Results([FromUri]ApiSearch request) { var manualResult = new ManualSearchResult(); var trackers = IndexerService.GetAllIndexers().Where(t => t.IsConfigured); @@ -237,7 +238,7 @@ namespace Jackett.Controllers.V20 } [HttpGet] - public async Task Torznab([FromUri]Models.DTO.TorznabRequest request) + public async Task Torznab([FromUri]Common.Models.DTO.TorznabRequest request) { if (string.Equals(CurrentQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase)) { @@ -353,7 +354,7 @@ namespace Jackett.Controllers.V20 [HttpGet] [JsonResponse] - public async Task Potato([FromUri]Models.DTO.TorrentPotatoRequest request) + public async Task Potato([FromUri]TorrentPotatoRequest request) { var result = await CurrentIndexer.ResultsForQuery(CurrentQuery); @@ -372,7 +373,7 @@ namespace Jackett.Controllers.V20 { var release = AutoMapper.Mapper.Map(r); release.Link = serverService.ConvertToProxyLink(release.Link, serverUrl, CurrentIndexer.ID, "dl", release.Title); - var item = new Models.DTO.TorrentPotatoResponseItem() + var item = new TorrentPotatoResponseItem() { release_name = release.Title + "[" + CurrentIndexer.DisplayName + "]", // Suffix the indexer so we can see which tracker we are using in CPS as it just says torrentpotato >.> torrent_id = release.Guid.ToString(), @@ -389,7 +390,7 @@ namespace Jackett.Controllers.V20 return item; }); - var potatoResponse = new Models.DTO.TorrentPotatoResponse() + var potatoResponse = new TorrentPotatoResponse() { results = potatoReleases.ToList() }; diff --git a/src/Jackett/Controllers/ServerConfigurationController.cs b/src/Jackett/Controllers/ServerConfigurationController.cs index 1f9ef1c38..04d7bf1b4 100644 --- a/src/Jackett/Controllers/ServerConfigurationController.cs +++ b/src/Jackett/Controllers/ServerConfigurationController.cs @@ -4,15 +4,15 @@ using System.IO; using System.Linq; using System.Threading; using System.Web.Http; -using Jacket.Common; -using Jackett.Models; -using Jackett.Models.Config; -using Jackett.Services; -using Jackett.Services.Interfaces; +using Jackett.Common; +using Jackett.Common.Models; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; using Jackett.Utils; using NLog; -namespace Jackett.Controllers.V20 +namespace Jackett.Controllers { [RoutePrefix("api/v2.0/server")] [JackettAuthorized] @@ -63,16 +63,16 @@ namespace Jackett.Controllers.V20 } [HttpGet] - public Models.DTO.ServerConfig Config() + public Common.Models.DTO.ServerConfig Config() { - var dto = new Models.DTO.ServerConfig(serverService.notices, serverConfig, configService.GetVersion()); + var dto = new Common.Models.DTO.ServerConfig(serverService.notices, serverConfig, configService.GetVersion()); return dto; } [ActionName("Config")] [HttpPost] - public void UpdateConfig([FromBody]Models.DTO.ServerConfig config) + public void UpdateConfig([FromBody]Common.Models.DTO.ServerConfig config) { var originalPort = serverConfig.Port; var originalAllowExternal = serverConfig.AllowExternal; diff --git a/src/Jackett/Controllers/UIController.cs b/src/Jackett/Controllers/UIController.cs index 8f53c512b..3d0cca1f9 100644 --- a/src/Jackett/Controllers/UIController.cs +++ b/src/Jackett/Controllers/UIController.cs @@ -1,14 +1,11 @@ -using System; -using System.IO; +using System.IO; using System.Net; using System.Net.Http; using System.Net.Http.Headers; using System.Threading.Tasks; -using System.Web; using System.Web.Http; -using Jackett.Models.Config; -using Jackett.Services; -using Jackett.Services.Interfaces; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; using Jackett.Utils; using MimeMapping; using NLog; diff --git a/src/Jackett/Properties/AssemblyInfo.cs b/src/Jackett/Properties/AssemblyInfo.cs index ba021bc71..353aa2212 100644 --- a/src/Jackett/Properties/AssemblyInfo.cs +++ b/src/Jackett/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Jackett/Services/ProtectionService.cs b/src/Jackett/Services/ProtectionService.cs index 685fd0dc1..737b1c2ac 100644 --- a/src/Jackett/Services/ProtectionService.cs +++ b/src/Jackett/Services/ProtectionService.cs @@ -1,14 +1,13 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; -using Jackett.Utils; -using Jackett.Services.Interfaces; -using Jackett.Models.Config; +using Jackett.Common; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils; namespace Jackett.Services { diff --git a/src/Jackett/Services/SecuityService.cs b/src/Jackett/Services/SecuityService.cs index 5d52ae456..0f0ee8d7d 100644 --- a/src/Jackett/Services/SecuityService.cs +++ b/src/Jackett/Services/SecuityService.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Net.Http; using System.Security.Cryptography; using System.Text; -using System.Threading.Tasks; -using System.Web; -using Jackett.Models.Config; -using Jackett.Services.Interfaces; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; namespace Jackett.Services { diff --git a/src/Jackett/Services/ServerService.cs b/src/Jackett/Services/ServerService.cs index 46ff7a517..1b362126e 100644 --- a/src/Jackett/Services/ServerService.cs +++ b/src/Jackett/Services/ServerService.cs @@ -1,8 +1,4 @@ -using Jackett.Models.Config; -using Jackett.Utils; -using Jackett.Utils.Clients; -using Microsoft.Owin.Hosting; -using Newtonsoft.Json.Linq; +using Microsoft.Owin.Hosting; using NLog; using System; using System.Collections.Generic; @@ -17,10 +13,12 @@ using System.Runtime.InteropServices; using System.Text; using System.Threading; using System.Web; -using Jackett.Services.Interfaces; -using Jacket.Common; using System.Collections; using System.Text.RegularExpressions; +using Jackett.Common; +using Jackett.Common.Models.Config; +using Jackett.Common.Services.Interfaces; +using Jackett.Common.Utils.Clients; namespace Jackett.Services { @@ -34,13 +32,13 @@ namespace Jackett.Services private ISerializeService serializeService; private IConfigurationService configService; private Logger logger; - private Utils.Clients.WebClient client; + private Common.Utils.Clients.WebClient client; private IUpdateService updater; private List _notices = new List(); private ServerConfig config; IProtectionService _protectionService; - public ServerService(IIndexerManagerService i, IProcessService p, ISerializeService s, IConfigurationService c, Logger l, Utils.Clients.WebClient w, IUpdateService u, IProtectionService protectionService, ServerConfig serverConfig) + public ServerService(IIndexerManagerService i, IProcessService p, ISerializeService s, IConfigurationService c, Logger l, Common.Utils.Clients.WebClient w, IUpdateService u, IProtectionService protectionService, ServerConfig serverConfig) { indexerService = i; processService = p; diff --git a/src/Jackett/Services/ServiceConfigService.cs b/src/Jackett/Services/ServiceConfigService.cs index e4eb8c781..961c2c917 100644 --- a/src/Jackett/Services/ServiceConfigService.cs +++ b/src/Jackett/Services/ServiceConfigService.cs @@ -1,15 +1,12 @@ using NLog; using System; -using System.Collections.Generic; using System.Collections.Specialized; using System.Configuration.Install; using System.Diagnostics; using System.IO; using System.Linq; using System.ServiceProcess; -using System.Text; -using System.Threading.Tasks; -using Jackett.Services.Interfaces; +using Jackett.Common.Services.Interfaces; namespace Jackett.Services { diff --git a/src/Jackett/Startup.cs b/src/Jackett/Startup.cs index 6245179ec..4e282cb11 100644 --- a/src/Jackett/Startup.cs +++ b/src/Jackett/Startup.cs @@ -13,9 +13,9 @@ using System.Net.Http; using System.Threading; using System.Web.Http.Filters; using Newtonsoft.Json.Linq; -using Jacket.Common; -using System.Text; using Autofac.Integration.WebApi; +using Jackett.Common; +using Jackett.Common.Utils; [assembly: OwinStartup(typeof(Startup))] namespace Jackett diff --git a/src/Jackett/Utils/JackettAuthorizedAttribute.cs b/src/Jackett/Utils/JackettAuthorizedAttribute.cs index 77f0b0769..922213e58 100644 --- a/src/Jackett/Utils/JackettAuthorizedAttribute.cs +++ b/src/Jackett/Utils/JackettAuthorizedAttribute.cs @@ -4,6 +4,7 @@ using System.Net.Http; using System.Web.Http; using System.Web.Http.Controllers; using System.Web.Http.Filters; +using Jackett.Common; namespace Jackett.Utils { diff --git a/src/Jackett/Utils/RedirectMiddleware.cs b/src/Jackett/Utils/RedirectMiddleware.cs index e1abf8ed6..a31f02f9e 100644 --- a/src/Jackett/Utils/RedirectMiddleware.cs +++ b/src/Jackett/Utils/RedirectMiddleware.cs @@ -1,8 +1,7 @@ using Microsoft.Owin; using System; using System.Threading.Tasks; -using Jacket.Common; -using Jackett.Models.Config; +using Jackett.Common; namespace Jackett.Utils { diff --git a/src/Jackett/Utils/WebAPIRequestLogger.cs b/src/Jackett/Utils/WebAPIRequestLogger.cs index 9cda729c6..2b019abe5 100644 --- a/src/Jackett/Utils/WebAPIRequestLogger.cs +++ b/src/Jackett/Utils/WebAPIRequestLogger.cs @@ -1,11 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; +using System.Diagnostics; using System.Net.Http; -using System.Text; using System.Threading; using System.Threading.Tasks; +using Jackett.Common; namespace Jackett.Utils { diff --git a/src/Jackett/Utils/WebAPIToNLogTracer.cs b/src/Jackett/Utils/WebAPIToNLogTracer.cs index 528cf54d0..8846b0e32 100644 --- a/src/Jackett/Utils/WebAPIToNLogTracer.cs +++ b/src/Jackett/Utils/WebAPIToNLogTracer.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Net.Http; -using System.Text; -using System.Threading.Tasks; using System.Web.Http.Tracing; -using Jacket.Common; -using Jackett.Models.Config; +using Jackett.Common; +using Jackett.Common.Models.Config; namespace Jackett.Utils { diff --git a/src/Jackett/WebApi2Module.cs b/src/Jackett/WebApi2Module.cs index dddc6c033..71e948906 100644 --- a/src/Jackett/WebApi2Module.cs +++ b/src/Jackett/WebApi2Module.cs @@ -1,10 +1,5 @@ using Autofac; using Autofac.Integration.WebApi; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Jackett {