Leisuretimedock/blessing-skin-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor SkinlibController

Browse Source
This commit is contained in:
Pig Fang 2020-08-20 08:48:53 +08:00
parent d10bcae197
commit 5b738ffe6f
No known key found for this signature in database
GPG Key ID: A8198F548DADA9E2
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/SkinlibController.php
View File

@ -77,21 +77,16 @@ class SkinlibController extends Controller
->paginate(20); ->paginate(20);
} }
public function show(Filter $filter, $tid) public function show(Filter $filter, Texture $texture)
{ {
$texture = Texture::find($tid);
/** @var User */ /** @var User */
$user = Auth::user(); $user = Auth::user();
/** @var FilesystemAdapter */ /** @var FilesystemAdapter */
$disk = Storage::disk('textures'); $disk = Storage::disk('textures');
if (!$texture || $texture && $disk->missing($texture->hash)) { if ($disk->missing($texture->hash)) {
if (option('auto_del_invalid_texture')) { if (option('auto_del_invalid_texture')) {
if ($texture) { $texture->delete();
$texture->delete();
}
abort(404, trans('skinlib.show.deleted'));
} }
abort(404, trans('skinlib.show.deleted')); abort(404, trans('skinlib.show.deleted'));
} }

2
routes/web.php
View File

@ -103,7 +103,7 @@ Route::prefix('texture')->name('texture.')->group(function () {
Route::prefix('skinlib')->name('skinlib.')->group(function () { Route::prefix('skinlib')->name('skinlib.')->group(function () {
Route::view('', 'skinlib.index')->name('home'); Route::view('', 'skinlib.index')->name('home');
Route::get('info/{texture}', 'SkinlibController@info')->name('info'); Route::get('info/{texture}', 'SkinlibController@info')->name('info');
Route::get('show/{tid}', 'SkinlibController@show')->name('show'); Route::get('show/{texture}', 'SkinlibController@show')->name('show');
Route::get('list', 'SkinlibController@library')->name('list'); Route::get('list', 'SkinlibController@library')->name('list');
Route::middleware(['authorize', 'verified'])->group(function () { Route::middleware(['authorize', 'verified'])->group(function () {

4
tests/HttpTest/ControllersTest/SkinlibControllerTest.php
View File

@ -136,10 +136,6 @@ class SkinlibControllerTest extends TestCase
Storage::fake('textures'); Storage::fake('textures');
$filter = Fakes\Filter::fake(); $filter = Fakes\Filter::fake();
// Cannot find texture
$this->get('/skinlib/show/1')
->assertSee(trans('skinlib.show.deleted'));
// Invalid texture // Invalid texture
option(['auto_del_invalid_texture' => false]); option(['auto_del_invalid_texture' => false]);
$texture = factory(Texture::class)->create(); $texture = factory(Texture::class)->create();