From dc5f458005e4c0be54c97b152f739c262ebb9107 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Wed, 15 Aug 2018 15:29:14 +0200 Subject: [PATCH] Optimize imports in Blacklight namespace --- Blacklight/AniDB.php | 2 +- Blacklight/Binaries.php | 12 ++++---- Blacklight/Books.php | 16 +++++----- Blacklight/Categorize.php | 2 +- Blacklight/ColorCLI.php | 2 -- Blacklight/Console.php | 20 ++++++------- Blacklight/Contents.php | 2 +- Blacklight/Games.php | 8 ++--- Blacklight/Genres.php | 4 +-- Blacklight/Movie.php | 24 +++++++-------- Blacklight/Music.php | 18 +++++------ Blacklight/NNTP.php | 2 +- Blacklight/NZB.php | 2 +- Blacklight/NZBContents.php | 2 +- Blacklight/NZBGet.php | 4 +-- Blacklight/NZBImport.php | 1 - Blacklight/NZBVortex.php | 2 +- Blacklight/NameFixer.php | 4 +-- Blacklight/Nfo.php | 6 ++-- Blacklight/Regexes.php | 4 +-- Blacklight/ReleaseExtra.php | 8 ++--- Blacklight/ReleaseImage.php | 2 +- Blacklight/Releases.php | 4 +-- Blacklight/SABnzbd.php | 2 +- Blacklight/SphinxSearch.php | 2 +- Blacklight/Tmux.php | 2 +- Blacklight/XXX.php | 10 +++---- Blacklight/db/populate/AniDB.php | 6 ++-- Blacklight/http/API.php | 4 +-- Blacklight/http/Capabilities.php | 2 +- Blacklight/http/RSS.php | 4 +-- Blacklight/libraries/Forking.php | 8 ++--- Blacklight/libraries/TraktAPI.php | 2 +- Blacklight/processing/PostProcess.php | 28 ++++++++--------- Blacklight/processing/ProcessReleases.php | 30 +++++++++---------- .../processing/ProcessReleasesMultiGroup.php | 2 +- Blacklight/processing/Videos.php | 4 +-- Blacklight/processing/post/AniDB.php | 6 ++-- .../processing/post/ProcessAdditional.php | 20 ++++++------- Blacklight/processing/tv/TMDB.php | 6 ++-- Blacklight/processing/tv/TV.php | 8 ++--- Blacklight/processing/tv/TVDB.php | 8 ++--- Blacklight/processing/tv/TraktTv.php | 2 +- Blacklight/utility/SmartyUtils.php | 1 + Blacklight/utility/Utility.php | 4 +-- Changelog | 1 + 46 files changed, 156 insertions(+), 157 deletions(-) diff --git a/Blacklight/AniDB.php b/Blacklight/AniDB.php index b1ed472cf..504ae18c3 100755 --- a/Blacklight/AniDB.php +++ b/Blacklight/AniDB.php @@ -2,8 +2,8 @@ namespace Blacklight; -use App\Models\Category; use App\Models\AnidbTitle; +use App\Models\Category; use Illuminate\Support\Facades\DB; class AniDB diff --git a/Blacklight/Binaries.php b/Blacklight/Binaries.php index 2cd5588a9..7919c42a4 100755 --- a/Blacklight/Binaries.php +++ b/Blacklight/Binaries.php @@ -2,16 +2,16 @@ namespace Blacklight; -use App\Models\Group; -use App\Models\Settings; -use Illuminate\Support\Carbon; use App\Models\BinaryBlacklist; +use App\Models\Group; use App\Models\MultigroupPoster; +use App\Models\Settings; +use Blacklight\processing\ProcessReleasesMultiGroup; +use Illuminate\Database\QueryException; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Cache; -use Illuminate\Database\QueryException; -use Blacklight\processing\ProcessReleasesMultiGroup; /** * Class Binaries. diff --git a/Blacklight/Books.php b/Blacklight/Books.php index 70bd1cc14..e19ce4554 100755 --- a/Blacklight/Books.php +++ b/Blacklight/Books.php @@ -3,18 +3,18 @@ namespace Blacklight; use ApaiIO\ApaiIO; -use GuzzleHttp\Client; -use App\Models\Release; +use ApaiIO\Configuration\Country; +use ApaiIO\Configuration\GenericConfiguration; +use ApaiIO\Operations\Search; +use ApaiIO\Request\GuzzleRequest; +use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject; use App\Models\BookInfo; use App\Models\Category; +use App\Models\Release; use App\Models\Settings; -use ApaiIO\Operations\Search; -use ApaiIO\Configuration\Country; -use ApaiIO\Request\GuzzleRequest; -use Illuminate\Support\Facades\DB; +use GuzzleHttp\Client; use Illuminate\Support\Facades\Cache; -use ApaiIO\Configuration\GenericConfiguration; -use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject; +use Illuminate\Support\Facades\DB; class Books { diff --git a/Blacklight/Categorize.php b/Blacklight/Categorize.php index c495af22d..ff21cf88e 100755 --- a/Blacklight/Categorize.php +++ b/Blacklight/Categorize.php @@ -2,8 +2,8 @@ namespace Blacklight; -use App\Models\Group; use App\Models\Category; +use App\Models\Group; use App\Models\Settings; /** diff --git a/Blacklight/ColorCLI.php b/Blacklight/ColorCLI.php index 0e3811884..b01542bfe 100755 --- a/Blacklight/ColorCLI.php +++ b/Blacklight/ColorCLI.php @@ -2,8 +2,6 @@ namespace Blacklight; -use Colors\Color; - class ColorCLI { /** diff --git a/Blacklight/Console.php b/Blacklight/Console.php index f9987cea5..2931a4127 100755 --- a/Blacklight/Console.php +++ b/Blacklight/Console.php @@ -3,19 +3,19 @@ namespace Blacklight; use ApaiIO\ApaiIO; -use App\Models\Genre; -use GuzzleHttp\Client; -use App\Models\Release; -use App\Models\Category; -use App\Models\Settings; -use App\Models\ConsoleInfo; -use ApaiIO\Operations\Search; use ApaiIO\Configuration\Country; -use ApaiIO\Request\GuzzleRequest; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Cache; use ApaiIO\Configuration\GenericConfiguration; +use ApaiIO\Operations\Search; +use ApaiIO\Request\GuzzleRequest; use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject; +use App\Models\Category; +use App\Models\ConsoleInfo; +use App\Models\Genre; +use App\Models\Release; +use App\Models\Settings; +use GuzzleHttp\Client; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Class Console. diff --git a/Blacklight/Contents.php b/Blacklight/Contents.php index b04f3116a..6bd15c18a 100755 --- a/Blacklight/Contents.php +++ b/Blacklight/Contents.php @@ -2,8 +2,8 @@ namespace Blacklight; -use App\Models\User; use App\Models\Content; +use App\Models\User; class Contents { diff --git a/Blacklight/Games.php b/Blacklight/Games.php index 6bbfcf3be..cff40815a 100755 --- a/Blacklight/Games.php +++ b/Blacklight/Games.php @@ -2,16 +2,16 @@ namespace Blacklight; +use App\Models\Category; +use App\Models\GamesInfo; use App\Models\Genre; use App\Models\Release; -use App\Models\Category; use App\Models\Settings; -use App\Models\GamesInfo; -use Illuminate\Support\Carbon; use DBorsatto\GiantBomb\Client; use DBorsatto\GiantBomb\Config; -use Illuminate\Support\Facades\DB; +use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; class Games { diff --git a/Blacklight/Genres.php b/Blacklight/Genres.php index 462ede02c..18f823bd8 100755 --- a/Blacklight/Genres.php +++ b/Blacklight/Genres.php @@ -2,10 +2,10 @@ namespace Blacklight; -use App\Models\Genre; use App\Models\Category; -use Illuminate\Support\Facades\DB; +use App\Models\Genre; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; class Genres { diff --git a/Blacklight/Movie.php b/Blacklight/Movie.php index d224d9c89..612a2e87a 100755 --- a/Blacklight/Movie.php +++ b/Blacklight/Movie.php @@ -2,24 +2,24 @@ namespace Blacklight; -use Imdb\Title; -use Imdb\Config; -use Tmdb\ApiToken; use aharen\OMDbAPI; -use GuzzleHttp\Client; -use App\Models\Release; use App\Models\Category; -use App\Models\Settings; use App\Models\MovieInfo; -use Tmdb\Helper\ImageHelper; -use Illuminate\Support\Carbon; -use Tmdb\Client as TmdbClient; -use Blacklight\utility\Utility; +use App\Models\Release; +use App\Models\Settings; use Blacklight\libraries\FanartTV; -use Illuminate\Support\Facades\DB; -use Tmdb\Exception\TmdbApiException; use Blacklight\processing\tv\TraktTv; +use Blacklight\utility\Utility; +use GuzzleHttp\Client; +use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; +use Imdb\Config; +use Imdb\Title; +use Tmdb\ApiToken; +use Tmdb\Client as TmdbClient; +use Tmdb\Exception\TmdbApiException; +use Tmdb\Helper\ImageHelper; use Tmdb\Repository\ConfigurationRepository; /** diff --git a/Blacklight/Music.php b/Blacklight/Music.php index e1cb2c058..65c25cfb5 100755 --- a/Blacklight/Music.php +++ b/Blacklight/Music.php @@ -3,18 +3,18 @@ namespace Blacklight; use ApaiIO\ApaiIO; -use App\Models\Genre; -use GuzzleHttp\Client; -use App\Models\Release; -use App\Models\Category; -use App\Models\Settings; -use App\Models\MusicInfo; +use ApaiIO\Configuration\GenericConfiguration; use ApaiIO\Operations\Search; use ApaiIO\Request\GuzzleRequest; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Cache; -use ApaiIO\Configuration\GenericConfiguration; use ApaiIO\ResponseTransformer\XmlToSimpleXmlObject; +use App\Models\Category; +use App\Models\Genre; +use App\Models\MusicInfo; +use App\Models\Release; +use App\Models\Settings; +use GuzzleHttp\Client; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Class Music. diff --git a/Blacklight/NNTP.php b/Blacklight/NNTP.php index 7c2ed54d2..55c49f5c5 100755 --- a/Blacklight/NNTP.php +++ b/Blacklight/NNTP.php @@ -2,8 +2,8 @@ namespace Blacklight; -use App\Models\Settings; use App\Extensions\util\Yenc; +use App\Models\Settings; /** * Class for connecting to the usenet, retrieving articles and article headers, diff --git a/Blacklight/NZB.php b/Blacklight/NZB.php index 1d138242b..d83a1e222 100755 --- a/Blacklight/NZB.php +++ b/Blacklight/NZB.php @@ -2,9 +2,9 @@ namespace Blacklight; +use App\Extensions\util\Versions; use App\Models\Settings; use Blacklight\utility\Utility; -use App\Extensions\util\Versions; use Illuminate\Support\Facades\DB; /** diff --git a/Blacklight/NZBContents.php b/Blacklight/NZBContents.php index 193627f2c..4f5688879 100755 --- a/Blacklight/NZBContents.php +++ b/Blacklight/NZBContents.php @@ -4,8 +4,8 @@ namespace Blacklight; use App\Models\Release; use App\Models\Settings; -use Blacklight\utility\Utility; use Blacklight\processing\PostProcess; +use Blacklight\utility\Utility; /** * Gets information contained within the NZB. diff --git a/Blacklight/NZBGet.php b/Blacklight/NZBGet.php index f270b3819..fd4cf3690 100755 --- a/Blacklight/NZBGet.php +++ b/Blacklight/NZBGet.php @@ -2,10 +2,10 @@ namespace Blacklight; -use GuzzleHttp\Client; use App\Models\Release; -use GuzzleHttp\Psr7\Request; use Blacklight\utility\Utility; +use GuzzleHttp\Client; +use GuzzleHttp\Psr7\Request; /** * Class NZBGet. diff --git a/Blacklight/NZBImport.php b/Blacklight/NZBImport.php index ec3f5f810..c2f0a316f 100755 --- a/Blacklight/NZBImport.php +++ b/Blacklight/NZBImport.php @@ -6,7 +6,6 @@ use App\Models\Group; use App\Models\Release; use App\Models\Settings; use Blacklight\utility\Utility; -use Illuminate\Support\Facades\DB; /** * Import NZB files into the database. diff --git a/Blacklight/NZBVortex.php b/Blacklight/NZBVortex.php index 62a5df978..53a606ae9 100755 --- a/Blacklight/NZBVortex.php +++ b/Blacklight/NZBVortex.php @@ -2,8 +2,8 @@ namespace Blacklight; -use Page; use App\Models\User; +use Page; final class NZBVortex { diff --git a/Blacklight/NameFixer.php b/Blacklight/NameFixer.php index ad6817205..26271db8f 100755 --- a/Blacklight/NameFixer.php +++ b/Blacklight/NameFixer.php @@ -2,13 +2,13 @@ namespace Blacklight; +use App\Models\Category; use App\Models\Group; use App\Models\Predb; use App\Models\Release; -use App\Models\Category; +use Blacklight\processing\PostProcess; use Blacklight\utility\Utility; use Illuminate\Support\Facades\DB; -use Blacklight\processing\PostProcess; /** * Class NameFixer. diff --git a/Blacklight/Nfo.php b/Blacklight/Nfo.php index c7fc02c42..bee83fba9 100755 --- a/Blacklight/Nfo.php +++ b/Blacklight/Nfo.php @@ -4,13 +4,13 @@ namespace Blacklight; use App\Models\Group; use App\Models\Release; -use App\Models\Settings; use App\Models\ReleaseNfo; -use dariusiii\rarinfo\SfvInfo; +use App\Models\Settings; +use Blacklight\processing\PostProcess; use Blacklight\utility\Utility; use dariusiii\rarinfo\Par2Info; +use dariusiii\rarinfo\SfvInfo; use Illuminate\Support\Facades\DB; -use Blacklight\processing\PostProcess; /** * Class Nfo diff --git a/Blacklight/Regexes.php b/Blacklight/Regexes.php index e4adbf5c2..82c3cfeb5 100755 --- a/Blacklight/Regexes.php +++ b/Blacklight/Regexes.php @@ -2,11 +2,11 @@ namespace Blacklight; -use App\Models\Group; -use App\Models\Release; use App\Models\Category; use App\Models\CategoryRegex; use App\Models\CollectionRegex; +use App\Models\Group; +use App\Models\Release; use App\Models\ReleaseNamingRegex; use Illuminate\Support\Facades\DB; diff --git a/Blacklight/ReleaseExtra.php b/Blacklight/ReleaseExtra.php index 69df7f400..ca145b342 100755 --- a/Blacklight/ReleaseExtra.php +++ b/Blacklight/ReleaseExtra.php @@ -3,11 +3,11 @@ namespace Blacklight; use App\Models\AudioData; -use App\Models\VideoData; -use App\Models\ReleaseUnique; -use App\Models\ReleaseSubtitle; -use Blacklight\utility\Utility; use App\Models\ReleaseExtraFull; +use App\Models\ReleaseSubtitle; +use App\Models\ReleaseUnique; +use App\Models\VideoData; +use Blacklight\utility\Utility; use Illuminate\Support\Facades\DB; class ReleaseExtra diff --git a/Blacklight/ReleaseImage.php b/Blacklight/ReleaseImage.php index b844ba065..e3f875e9f 100755 --- a/Blacklight/ReleaseImage.php +++ b/Blacklight/ReleaseImage.php @@ -3,12 +3,12 @@ namespace Blacklight; use Illuminate\Support\Facades\File; -use Intervention\Image\Facades\Image; use Illuminate\Support\Facades\Storage; use Intervention\Image\Exception\ImageException; use Intervention\Image\Exception\NotFoundException; use Intervention\Image\Exception\NotReadableException; use Intervention\Image\Exception\NotWritableException; +use Intervention\Image\Facades\Image; /** * Resize/save/delete images to disk. diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php index 67a066e63..1fbe5c28d 100755 --- a/Blacklight/Releases.php +++ b/Blacklight/Releases.php @@ -2,13 +2,13 @@ namespace Blacklight; +use App\Models\Category; use App\Models\Group; use App\Models\Release; -use App\Models\Category; use App\Models\Settings; use Blacklight\utility\Utility; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Class Releases. diff --git a/Blacklight/SABnzbd.php b/Blacklight/SABnzbd.php index 9ea8fa98b..3e35352e6 100755 --- a/Blacklight/SABnzbd.php +++ b/Blacklight/SABnzbd.php @@ -2,8 +2,8 @@ namespace Blacklight; -use GuzzleHttp\Client; use App\Models\Settings; +use GuzzleHttp\Client; /** * Class SABnzbd. diff --git a/Blacklight/SphinxSearch.php b/Blacklight/SphinxSearch.php index 33056e2de..81786b337 100755 --- a/Blacklight/SphinxSearch.php +++ b/Blacklight/SphinxSearch.php @@ -3,10 +3,10 @@ namespace Blacklight; use App\Models\Release; +use Foolz\SphinxQL\Drivers\Pdo\Connection; use Foolz\SphinxQL\Helper; use Foolz\SphinxQL\SphinxQL; use Illuminate\Support\Facades\DB; -use Foolz\SphinxQL\Drivers\Pdo\Connection; class SphinxSearch { diff --git a/Blacklight/Tmux.php b/Blacklight/Tmux.php index ccd597661..5fa93c86b 100755 --- a/Blacklight/Tmux.php +++ b/Blacklight/Tmux.php @@ -2,9 +2,9 @@ namespace Blacklight; +use App\Extensions\util\Versions; use App\Models\Category; use App\Models\Settings; -use App\Extensions\util\Versions; use Illuminate\Support\Facades\DB; /** diff --git a/Blacklight/XXX.php b/Blacklight/XXX.php index 899c2df1d..2f1181110 100755 --- a/Blacklight/XXX.php +++ b/Blacklight/XXX.php @@ -2,18 +2,18 @@ namespace Blacklight; +use App\Models\Category; use App\Models\Genre; use App\Models\Release; -use App\Models\XxxInfo; -use App\Models\Category; use App\Models\Settings; -use Illuminate\Support\Facades\DB; +use App\Models\XxxInfo; use Blacklight\processing\adult\ADE; use Blacklight\processing\adult\ADM; use Blacklight\processing\adult\AEBN; -use Illuminate\Support\Facades\Cache; -use Blacklight\processing\adult\Popporn; use Blacklight\processing\adult\Hotmovies; +use Blacklight\processing\adult\Popporn; +use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Class XXX. diff --git a/Blacklight/db/populate/AniDB.php b/Blacklight/db/populate/AniDB.php index e2777b6a8..87062bd54 100755 --- a/Blacklight/db/populate/AniDB.php +++ b/Blacklight/db/populate/AniDB.php @@ -2,11 +2,11 @@ namespace Blacklight\db\populate; -use App\Models\Settings; -use Blacklight\ColorCLI; +use App\Models\AnidbEpisode; use App\Models\AnidbInfo; use App\Models\AnidbTitle; -use App\Models\AnidbEpisode; +use App\Models\Settings; +use Blacklight\ColorCLI; use Blacklight\ReleaseImage; use Illuminate\Support\Carbon; diff --git a/Blacklight/http/API.php b/Blacklight/http/API.php index ab5c22a4d..5bc5e4a1c 100755 --- a/Blacklight/http/API.php +++ b/Blacklight/http/API.php @@ -21,9 +21,9 @@ namespace Blacklight\http; -use App\Models\Group; -use App\Models\Category; use App\Models\AudioData; +use App\Models\Category; +use App\Models\Group; use Blacklight\utility\Utility; /** diff --git a/Blacklight/http/Capabilities.php b/Blacklight/http/Capabilities.php index 91f3ab693..e3cc409d6 100755 --- a/Blacklight/http/Capabilities.php +++ b/Blacklight/http/Capabilities.php @@ -21,10 +21,10 @@ namespace Blacklight\http; +use App\Extensions\util\Versions; use App\Models\Category; use App\Models\Settings; use Blacklight\utility\Utility; -use App\Extensions\util\Versions; use Illuminate\Support\Facades\DB; /** diff --git a/Blacklight/http/RSS.php b/Blacklight/http/RSS.php index aa107ae3f..e5f8f8e65 100755 --- a/Blacklight/http/RSS.php +++ b/Blacklight/http/RSS.php @@ -2,11 +2,11 @@ namespace Blacklight\http; -use Blacklight\NZB; use App\Models\Category; +use Blacklight\NZB; use Blacklight\Releases; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Class RSS -- contains specific functions for RSS. diff --git a/Blacklight/libraries/Forking.php b/Blacklight/libraries/Forking.php index e92dcfd2a..7885818d3 100755 --- a/Blacklight/libraries/Forking.php +++ b/Blacklight/libraries/Forking.php @@ -2,13 +2,13 @@ namespace Blacklight\libraries; -use Blacklight\Nfo; -use Blacklight\NZB; -use Blacklight\NNTP; use App\Models\Settings; use Blacklight\ColorCLI; -use Illuminate\Support\Facades\DB; +use Blacklight\Nfo; +use Blacklight\NNTP; +use Blacklight\NZB; use Blacklight\processing\PostProcess; +use Illuminate\Support\Facades\DB; /** * Class Forking. diff --git a/Blacklight/libraries/TraktAPI.php b/Blacklight/libraries/TraktAPI.php index 85e4d54d4..a4906dd13 100755 --- a/Blacklight/libraries/TraktAPI.php +++ b/Blacklight/libraries/TraktAPI.php @@ -2,8 +2,8 @@ namespace Blacklight\libraries; -use GuzzleHttp\Client; use Blacklight\ColorCLI; +use GuzzleHttp\Client; use GuzzleHttp\Exception\RequestException; /** diff --git a/Blacklight/processing/PostProcess.php b/Blacklight/processing/PostProcess.php index 6ca6771d9..4ffc308c4 100755 --- a/Blacklight/processing/PostProcess.php +++ b/Blacklight/processing/PostProcess.php @@ -2,29 +2,29 @@ namespace Blacklight\processing; -use Blacklight\Nfo; -use Blacklight\XXX; -use Blacklight\NNTP; +use App\Models\Category; use App\Models\Group; +use App\Models\Release; +use App\Models\ReleaseFile; +use App\Models\Settings; use Blacklight\Books; +use Blacklight\Console; use Blacklight\Games; use Blacklight\Movie; use Blacklight\Music; -use App\Models\Release; -use Blacklight\Console; -use Blacklight\Sharing; -use App\Models\Category; -use App\Models\Settings; use Blacklight\NameFixer; -use App\Models\ReleaseFile; -use Illuminate\Support\Carbon; -use dariusiii\rarinfo\Par2Info; +use Blacklight\Nfo; +use Blacklight\NNTP; +use Blacklight\processing\post\AniDB; +use Blacklight\processing\post\ProcessAdditional; use Blacklight\processing\tv\TMDB; +use Blacklight\processing\tv\TraktTv; use Blacklight\processing\tv\TVDB; use Blacklight\processing\tv\TVMaze; -use Blacklight\processing\post\AniDB; -use Blacklight\processing\tv\TraktTv; -use Blacklight\processing\post\ProcessAdditional; +use Blacklight\Sharing; +use Blacklight\XXX; +use dariusiii\rarinfo\Par2Info; +use Illuminate\Support\Carbon; class PostProcess { diff --git a/Blacklight/processing/ProcessReleases.php b/Blacklight/processing/ProcessReleases.php index bf1ee447e..80663a4e4 100755 --- a/Blacklight/processing/ProcessReleases.php +++ b/Blacklight/processing/ProcessReleases.php @@ -2,23 +2,23 @@ namespace Blacklight\processing; -use Blacklight\NZB; -use Blacklight\NNTP; -use App\Models\Group; -use App\Models\Predb; -use Blacklight\Genres; -use App\Models\Release; use App\Models\Category; -use App\Models\Settings; -use Blacklight\ColorCLI; -use Blacklight\Releases; -use Blacklight\Categorize; -use App\Models\ReleaseRegex; -use Blacklight\ConsoleTools; -use Blacklight\ReleaseImage; -use App\Models\ReleasesGroups; -use Blacklight\ReleaseCleaning; +use App\Models\Group; use App\Models\MultigroupPoster; +use App\Models\Predb; +use App\Models\Release; +use App\Models\ReleaseRegex; +use App\Models\ReleasesGroups; +use App\Models\Settings; +use Blacklight\Categorize; +use Blacklight\ColorCLI; +use Blacklight\ConsoleTools; +use Blacklight\Genres; +use Blacklight\NNTP; +use Blacklight\NZB; +use Blacklight\ReleaseCleaning; +use Blacklight\ReleaseImage; +use Blacklight\Releases; use Illuminate\Support\Facades\DB; class ProcessReleases diff --git a/Blacklight/processing/ProcessReleasesMultiGroup.php b/Blacklight/processing/ProcessReleasesMultiGroup.php index 3b00cdf9c..84dc6d60e 100644 --- a/Blacklight/processing/ProcessReleasesMultiGroup.php +++ b/Blacklight/processing/ProcessReleasesMultiGroup.php @@ -2,8 +2,8 @@ namespace Blacklight\processing; -use Blacklight\NZBMultiGroup; use App\Models\MultigroupPoster; +use Blacklight\NZBMultiGroup; class ProcessReleasesMultiGroup extends ProcessReleases { diff --git a/Blacklight/processing/Videos.php b/Blacklight/processing/Videos.php index 015fa491c..68a2dcc45 100755 --- a/Blacklight/processing/Videos.php +++ b/Blacklight/processing/Videos.php @@ -21,11 +21,11 @@ namespace Blacklight\processing; -use App\Models\Video; use App\Models\TvInfo; +use App\Models\Video; use App\Models\VideoAlias; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Cache; +use Illuminate\Support\Facades\DB; /** * Parent class for TV/Film and any similar classes to inherit from. diff --git a/Blacklight/processing/post/AniDB.php b/Blacklight/processing/post/AniDB.php index 91e7fa387..88dc9e86b 100755 --- a/Blacklight/processing/post/AniDB.php +++ b/Blacklight/processing/post/AniDB.php @@ -2,13 +2,13 @@ namespace Blacklight\processing\post; -use Blacklight\NZB; +use App\Models\AnidbEpisode; use App\Models\Category; use App\Models\Settings; use Blacklight\ColorCLI; -use App\Models\AnidbEpisode; -use Illuminate\Support\Facades\DB; use Blacklight\db\populate\AniDB as PaDb; +use Blacklight\NZB; +use Illuminate\Support\Facades\DB; class AniDB { diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 1abfef726..33ff893fe 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -2,24 +2,24 @@ namespace Blacklight\processing\post; -use Blacklight\Nfo; -use Blacklight\NZB; -use Blacklight\NNTP; +use App\Models\Category; use App\Models\Group; use App\Models\Release; -use App\Models\Category; -use App\Models\Settings; -use Blacklight\ColorCLI; -use Blacklight\Releases; -use Blacklight\NameFixer; -use Blacklight\Categorize; use App\Models\ReleaseFile; +use App\Models\Settings; +use Blacklight\Categorize; +use Blacklight\ColorCLI; +use Blacklight\NameFixer; +use Blacklight\Nfo; +use Blacklight\NNTP; +use Blacklight\NZB; use Blacklight\ReleaseExtra; use Blacklight\ReleaseImage; +use Blacklight\Releases; use Blacklight\SphinxSearch; use Blacklight\utility\Utility; -use dariusiii\rarinfo\Par2Info; use dariusiii\rarinfo\ArchiveInfo; +use dariusiii\rarinfo\Par2Info; use Illuminate\Support\Facades\DB; class ProcessAdditional diff --git a/Blacklight/processing/tv/TMDB.php b/Blacklight/processing/tv/TMDB.php index 88eb332de..95cd7b931 100755 --- a/Blacklight/processing/tv/TMDB.php +++ b/Blacklight/processing/tv/TMDB.php @@ -2,13 +2,13 @@ namespace Blacklight\processing\tv; -use Tmdb\Client; -use Tmdb\ApiToken; use App\Models\Settings; use Blacklight\ColorCLI; use Blacklight\ReleaseImage; -use Tmdb\Helper\ImageHelper; +use Tmdb\ApiToken; +use Tmdb\Client; use Tmdb\Exception\TmdbApiException; +use Tmdb\Helper\ImageHelper; use Tmdb\Repository\ConfigurationRepository; class TMDB extends TV diff --git a/Blacklight/processing/tv/TV.php b/Blacklight/processing/tv/TV.php index f582aa0ad..9e6692172 100755 --- a/Blacklight/processing/tv/TV.php +++ b/Blacklight/processing/tv/TV.php @@ -2,14 +2,14 @@ namespace Blacklight\processing\tv; -use App\Models\Video; -use App\Models\TvInfo; -use App\Models\Release; use App\Models\Category; +use App\Models\Release; use App\Models\Settings; use App\Models\TvEpisode; -use Blacklight\utility\Country; +use App\Models\TvInfo; +use App\Models\Video; use Blacklight\processing\Videos; +use Blacklight\utility\Country; use Illuminate\Support\Facades\DB; /** diff --git a/Blacklight/processing/tv/TVDB.php b/Blacklight/processing/tv/TVDB.php index b24351743..45f58f107 100755 --- a/Blacklight/processing/tv/TVDB.php +++ b/Blacklight/processing/tv/TVDB.php @@ -2,14 +2,14 @@ namespace Blacklight\processing\tv; -use Blacklight\ColorCLI; use Adrenth\Thetvdb\Client; -use Blacklight\ReleaseImage; -use Adrenth\Thetvdb\Exception\UnauthorizedException; use Adrenth\Thetvdb\Exception\CouldNotLoginException; -use Adrenth\Thetvdb\Exception\RequestFailedException; use Adrenth\Thetvdb\Exception\InvalidArgumentException; use Adrenth\Thetvdb\Exception\InvalidJsonInResponseException; +use Adrenth\Thetvdb\Exception\RequestFailedException; +use Adrenth\Thetvdb\Exception\UnauthorizedException; +use Blacklight\ColorCLI; +use Blacklight\ReleaseImage; /** * Class TVDB -- functions used to post process releases against TVDB. diff --git a/Blacklight/processing/tv/TraktTv.php b/Blacklight/processing/tv/TraktTv.php index 3bbf4e059..d3b5c06c0 100755 --- a/Blacklight/processing/tv/TraktTv.php +++ b/Blacklight/processing/tv/TraktTv.php @@ -4,9 +4,9 @@ namespace Blacklight\processing\tv; use App\Models\Settings; use Blacklight\ColorCLI; +use Blacklight\libraries\TraktAPI; use Blacklight\ReleaseImage; use Blacklight\utility\Time; -use Blacklight\libraries\TraktAPI; /** * Class TraktTv. diff --git a/Blacklight/utility/SmartyUtils.php b/Blacklight/utility/SmartyUtils.php index d55465ed8..cf312480a 100755 --- a/Blacklight/utility/SmartyUtils.php +++ b/Blacklight/utility/SmartyUtils.php @@ -18,6 +18,7 @@ * @author niel * @copyright 2014 nZEDb */ + use App\Models\Category; /** diff --git a/Blacklight/utility/Utility.php b/Blacklight/utility/Utility.php index 63627b34e..6b9c675fb 100755 --- a/Blacklight/utility/Utility.php +++ b/Blacklight/utility/Utility.php @@ -2,12 +2,12 @@ namespace Blacklight\utility; +use App\Extensions\util\Versions; use App\Models\Settings; use Blacklight\ColorCLI; -use App\Extensions\util\Versions; +use Illuminate\Contracts\Pagination\LengthAwarePaginator; use Illuminate\Support\Facades\DB; use Symfony\Component\Process\Process; -use Illuminate\Contracts\Pagination\LengthAwarePaginator; /** * Class Utility. diff --git a/Changelog b/Changelog index 0f1727a94..8521f6e30 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-08-15 DariusIII + * Chg: Optimize imports in Blacklight namespace * Fix: Fix another error and bad match check * Fix: Fix anidb matching error 2018-08-14 DariusIII