zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

Move Player::getBinaryTexture method to TextureController

Browse Source
This commit is contained in:
printempw 2018-06-29 22:45:00 +08:00
parent 815fef7f3d
commit 3d9478a75c
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/TextureController.php
View File

@ -73,7 +73,7 @@ class TextureController extends Controller
$model_preference = ($player->getPreference() == "default") ? "steve" : "alex"; $model_preference = ($player->getPreference() == "default") ? "steve" : "alex";
$model = ($model == "") ? $model_preference : $model; $model = ($model == "") ? $model_preference : $model;
return $player->getBinaryTexture($model); return $this->getBinaryTextureFromPlayer($player_name, $model);
} }
public function skinWithModel($model, $player_name) public function skinWithModel($model, $player_name)
@ -82,10 +82,35 @@ class TextureController extends Controller
} }
public function cape($player_name) public function cape($player_name)
{
return $this->getBinaryTextureFromPlayer($player_name, 'cape');
}
/**
* Get the texture image of given type and player.
*
* @param string $player_name
* @param string $type "steve" or "alex" or "cape".
* @return void|Response
*/
protected function getBinaryTextureFromPlayer($player_name, $type)
{ {
$player = $this->getPlayerInstance($player_name); $player = $this->getPlayerInstance($player_name);
return $player->getBinaryTexture('cape'); if ($hash = $player->getTexture($type)) {
if (Storage::disk('textures')->has($hash)) {
// Cache friendly
return Response::png(Storage::disk('textures')->read($hash), 200, [
'Last-Modified' => $player->getLastModified(),
'Accept-Ranges' => 'bytes',
'Content-Length' => Storage::disk('textures')->size($hash),
]);
} else {
abort(404, trans('general.texture-deleted'));
}
} else {
abort(404, trans('general.texture-not-uploaded', ['type' => $type]));
}
} }
public function avatar($base64_email, UserRepository $users, $size = 128) public function avatar($base64_email, UserRepository $users, $size = 128)

28
app/Models/Player.php
View File

@ -4,14 +4,12 @@ namespace App\Models;
use Event; use Event;
use Utils; use Utils;
use Storage;
use Response; use Response;
use App\Models\User; use App\Models\User;
use App\Events\GetPlayerJson; use App\Events\GetPlayerJson;
use App\Events\PlayerProfileUpdated; use App\Events\PlayerProfileUpdated;
use App\Exceptions\PrettyPageException; use App\Exceptions\PrettyPageException;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class Player extends Model class Player extends Model
{ {
@ -151,32 +149,6 @@ class Player extends Model
return $this; return $this;
} }
/**
* Get binary texture by type.
*
* @param string $type steve|alex|cape
* @return \Illuminate\Http\Response
*/
public function getBinaryTexture($type)
{
if ($this->getTexture($type)) {
$hash = $this->getTexture($type);
if (Storage::disk('textures')->has($hash)) {
// Cache friendly
return Response::png(Storage::disk('textures')->get($hash), 200, [
'Last-Modified' => $this->getLastModified(),
'Accept-Ranges' => 'bytes',
'Content-Length' => Storage::disk('textures')->size($hash),
]);
} else {
throw new NotFoundHttpException(trans('general.texture-deleted'));
}
} else {
throw new NotFoundHttpException(trans('general.texture-not-uploaded', ['type' => $type]));
}
}
/** /**
* Set preferred model for the player. * Set preferred model for the player.
* *