11 changed files with 233 additions and 260 deletions
Split View
Diff Options
-
+1 -0app/appConf/routes.php
-
+9 -7composer.json
-
+14 -13public/js/scripts-authed.min.js
-
+1 -1public/js/scripts-authed.min.js.map
-
+1 -1public/js/scripts.min.js
-
+1 -1public/js/scripts.min.js.map
-
+2 -2public/js/src/index.js
-
+3 -3src/AnimeClient.php
-
+197 -197src/Controller/Images.php
-
+0 -8src/Util.php
-
+4 -27sw.js
+ 1
- 0
app/appConf/routes.php
View File
+ 9
- 7
composer.json
View File
+ 14
- 13
public/js/scripts-authed.min.js
View File
+ 1
- 1
public/js/scripts-authed.min.js.map
File diff suppressed because it is too large
View File
+ 1
- 1
public/js/scripts.min.js
View File
+ 1
- 1
public/js/scripts.min.js.map
File diff suppressed because it is too large
View File
+ 2
- 2
public/js/src/index.js
View File
| @ -1,10 +1,10 @@ | |||
| import './base/events.js'; | |||
| /* if ('serviceWorker' in navigator) { | |||
| if ('serviceWorker' in navigator) { | |||
| navigator.serviceWorker.register('/sw.js').then(reg => { | |||
| console.log('Service worker registered', reg.scope); | |||
| }).catch(error => { | |||
| console.error('Failed to register service worker', error); | |||
| }); | |||
| } */ | |||
| } | |||
+ 3
- 3
src/AnimeClient.php
View File
+ 197
- 197
src/Controller/Images.php
View File
| @ -1,198 +1,198 @@ | |||
| <?php declare(strict_types=1); | |||
| /** | |||
| * Hummingbird Anime List Client | |||
| * | |||
| * An API client for Kitsu to manage anime and manga watch lists | |||
| * | |||
| * PHP version 7.1 | |||
| * | |||
| * @package HummingbirdAnimeClient | |||
| * @author Timothy J. Warren <tim@timshomepage.net> | |||
| * @copyright 2015 - 2018 Timothy J. Warren | |||
| * @license http://www.opensource.org/licenses/mit-license.html MIT License | |||
| * @version 4.1 | |||
| * @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient | |||
| */ | |||
| namespace Aviat\AnimeClient\Controller; | |||
| use function Aviat\AnimeClient\createPlaceholderImage; | |||
| use function Amp\Promise\wait; | |||
| use Aviat\AnimeClient\Controller as BaseController; | |||
| use Aviat\AnimeClient\API\{HummingbirdClient, JsonAPI}; | |||
| use Aviat\Ion\Di\ContainerInterface; | |||
| use Aviat\Ion\View\HtmlView; | |||
| /** | |||
| * Controller for handling routes that don't fit elsewhere | |||
| */ | |||
| final class Images extends BaseController { | |||
| /** | |||
| * Get image covers from kitsu | |||
| * | |||
| * @param string $type The category of image | |||
| * @param string $file The filename to look for | |||
| * @param bool $display Whether to output the image to the server | |||
| * @throws \Aviat\Ion\Di\ContainerException | |||
| * @throws \Aviat\Ion\Di\NotFoundException | |||
| * @throws \InvalidArgumentException | |||
| * @throws \TypeError | |||
| * @throws \Error | |||
| * @throws \Throwable | |||
| * @return void | |||
| */ | |||
| public function cache(string $type, string $file, $display = TRUE): void | |||
| { | |||
| $currentUrl = $this->request->getUri()->__toString(); | |||
| $kitsuUrl = 'https://media.kitsu.io/'; | |||
| $fileName = str_replace('-original', '', $file); | |||
| [$id, $ext] = explode('.', basename($fileName)); | |||
| $baseSavePath = $this->config->get('img_cache_path'); | |||
| // Kitsu doesn't serve webp, but for most use cases, | |||
| // jpg is a safe assumption | |||
| $tryJpg = ['anime','characters','manga','people']; | |||
| if ($ext === 'webp' && in_array($type, $tryJpg, TRUE)) | |||
| { | |||
| $ext = 'jpg'; | |||
| $currentUrl = str_replace('webp', 'jpg', $currentUrl); | |||
| } | |||
| $typeMap = [ | |||
| 'anime' => [ | |||
| 'kitsuUrl' => "anime/poster_images/{$id}/medium.{$ext}", | |||
| 'width' => 220, | |||
| 'height' => 312, | |||
| ], | |||
| 'avatars' => [ | |||
| 'kitsuUrl' => "users/avatars/{$id}/original.{$ext}", | |||
| 'width' => null, | |||
| 'height' => null, | |||
| ], | |||
| 'characters' => [ | |||
| 'kitsuUrl' => "characters/images/{$id}/original.{$ext}", | |||
| 'width' => 225, | |||
| 'height' => 350, | |||
| ], | |||
| 'manga' => [ | |||
| 'kitsuUrl' => "manga/poster_images/{$id}/medium.{$ext}", | |||
| 'width' => 220, | |||
| 'height' => 312, | |||
| ], | |||
| 'people' => [ | |||
| 'kitsuUrl' => "people/images/{$id}/original.{$ext}", | |||
| 'width' => null, | |||
| 'height' => null, | |||
| ], | |||
| ]; | |||
| $imageType = $typeMap[$type] ?? NULL; | |||
| if (NULL === $imageType) | |||
| { | |||
| $this->getPlaceholder($baseSavePath, 200, 200); | |||
| return; | |||
| } | |||
| $kitsuUrl .= $imageType['kitsuUrl']; | |||
| $width = $imageType['width']; | |||
| $height = $imageType['height']; | |||
| $filePrefix = "{$baseSavePath}/{$type}/{$id}"; | |||
| $promise = (new HummingbirdClient)->request($kitsuUrl); | |||
| $response = wait($promise); | |||
| if ($response->getStatus() !== 200) | |||
| { | |||
| // Try a few different file types before giving up | |||
| // webm => jpg => png => gif | |||
| $nextType = [ | |||
| 'jpg' => 'png', | |||
| 'png' => 'gif', | |||
| ]; | |||
| if (array_key_exists($ext, $nextType)) | |||
| { | |||
| $newUrl = str_replace($ext, $nextType[$ext], $currentUrl); | |||
| $this->redirect($newUrl, 303); | |||
| return; | |||
| } | |||
| if ($display) | |||
| { | |||
| $this->getPlaceholder("{$baseSavePath}/{$type}", $width, $height); | |||
| } | |||
| else | |||
| { | |||
| createPlaceholderImage("{$baseSavePath}/{$type}", $width, $height); | |||
| } | |||
| return; | |||
| } | |||
| $data = wait($response->getBody()); | |||
| [$origWidth] = getimagesizefromstring($data); | |||
| $gdImg = imagecreatefromstring($data); | |||
| $resizedImg = imagescale($gdImg, $width ?? $origWidth); | |||
| if ($ext === 'gif') | |||
| { | |||
| file_put_contents("{$filePrefix}.gif", $data); | |||
| imagepalletetotruecolor($gdImg); | |||
| } | |||
| // save the webp versions | |||
| imagewebp($gdImg, "{$filePrefix}-original.webp"); | |||
| imagewebp($resizedImg, "{$filePrefix}.webp"); | |||
| // save the scaled jpeg file | |||
| imagejpeg($resizedImg, "{$filePrefix}.jpg"); | |||
| // And the original | |||
| file_put_contents("{$filePrefix}-original.jpg", $data); | |||
| imagedestroy($gdImg); | |||
| imagedestroy($resizedImg); | |||
| if ($display) | |||
| { | |||
| $contentType = ($ext === 'webp') | |||
| ? "image/webp" | |||
| : $response->getHeader('content-type')[0]; | |||
| $outputFile = (strpos($file, '-original') !== FALSE) | |||
| ? "{$filePrefix}-original.{$ext}" | |||
| : "{$filePrefix}.{$ext}"; | |||
| header("Content-Type: {$contentType}"); | |||
| echo file_get_contents($outputFile); | |||
| } | |||
| } | |||
| /** | |||
| * Get a placeholder for a missing image | |||
| * | |||
| * @param string $path | |||
| * @param int|null $width | |||
| * @param int|null $height | |||
| */ | |||
| private function getPlaceholder (string $path, ?int $width = 200, ?int $height = NULL): void | |||
| { | |||
| $height = $height ?? $width; | |||
| $filename = $path . '/placeholder.png'; | |||
| if ( ! file_exists($path . '/placeholder.png')) | |||
| { | |||
| createPlaceholderImage($path, $width, $height); | |||
| } | |||
| header('Content-Type: image/png'); | |||
| echo file_get_contents($filename); | |||
| } | |||
| <?php declare(strict_types=1); | |||
| /** | |||
| * Hummingbird Anime List Client | |||
| * | |||
| * An API client for Kitsu to manage anime and manga watch lists | |||
| * | |||
| * PHP version 7.1 | |||
| * | |||
| * @package HummingbirdAnimeClient | |||
| * @author Timothy J. Warren <tim@timshomepage.net> | |||
| * @copyright 2015 - 2018 Timothy J. Warren | |||
| * @license http://www.opensource.org/licenses/mit-license.html MIT License | |||
| * @version 4.1 | |||
| * @link https://git.timshomepage.net/timw4mail/HummingBirdAnimeClient | |||
| */ | |||
| namespace Aviat\AnimeClient\Controller; | |||
| use function Aviat\AnimeClient\createPlaceholderImage; | |||
| use function Amp\Promise\wait; | |||
| use Aviat\AnimeClient\Controller as BaseController; | |||
| use Aviat\AnimeClient\API\{HummingbirdClient, JsonAPI}; | |||
| use Aviat\Ion\Di\ContainerInterface; | |||
| use Aviat\Ion\View\HtmlView; | |||
| /** | |||
| * Controller for handling routes that don't fit elsewhere | |||
| */ | |||
| final class Images extends BaseController { | |||
| /** | |||
| * Get image covers from kitsu | |||
| * | |||
| * @param string $type The category of image | |||
| * @param string $file The filename to look for | |||
| * @param bool $display Whether to output the image to the server | |||
| * @throws \Aviat\Ion\Di\ContainerException | |||
| * @throws \Aviat\Ion\Di\NotFoundException | |||
| * @throws \InvalidArgumentException | |||
| * @throws \TypeError | |||
| * @throws \Error | |||
| * @throws \Throwable | |||
| * @return void | |||
| */ | |||
| public function cache(string $type, string $file, $display = TRUE): void | |||
| { | |||
| $currentUrl = $this->request->getUri()->__toString(); | |||
| $kitsuUrl = 'https://media.kitsu.io/'; | |||
| $fileName = str_replace('-original', '', $file); | |||
| [$id, $ext] = explode('.', basename($fileName)); | |||
| $baseSavePath = $this->config->get('img_cache_path'); | |||
| // Kitsu doesn't serve webp, but for most use cases, | |||
| // jpg is a safe assumption | |||
| $tryJpg = ['anime','characters','manga','people']; | |||
| if ($ext === 'webp' && in_array($type, $tryJpg, TRUE)) | |||
| { | |||
| $ext = 'jpg'; | |||
| $currentUrl = str_replace('webp', 'jpg', $currentUrl); | |||
| } | |||
| $typeMap = [ | |||
| 'anime' => [ | |||
| 'kitsuUrl' => "anime/poster_images/{$id}/medium.{$ext}", | |||
| 'width' => 220, | |||
| 'height' => 312, | |||
| ], | |||
| 'avatars' => [ | |||
| 'kitsuUrl' => "users/avatars/{$id}/original.{$ext}", | |||
| 'width' => null, | |||
| 'height' => null, | |||
| ], | |||
| 'characters' => [ | |||
| 'kitsuUrl' => "characters/images/{$id}/original.{$ext}", | |||
| 'width' => 225, | |||
| 'height' => 350, | |||
| ], | |||
| 'manga' => [ | |||
| 'kitsuUrl' => "manga/poster_images/{$id}/medium.{$ext}", | |||
| 'width' => 220, | |||
| 'height' => 312, | |||
| ], | |||
| 'people' => [ | |||
| 'kitsuUrl' => "people/images/{$id}/original.{$ext}", | |||
| 'width' => null, | |||
| 'height' => null, | |||
| ], | |||
| ]; | |||
| $imageType = $typeMap[$type] ?? NULL; | |||
| if (NULL === $imageType) | |||
| { | |||
| $this->getPlaceholder($baseSavePath, 200, 200); | |||
| return; | |||
| } | |||
| $kitsuUrl .= $imageType['kitsuUrl']; | |||
| $width = $imageType['width']; | |||
| $height = $imageType['height']; | |||
| $filePrefix = "{$baseSavePath}/{$type}/{$id}"; | |||
| $promise = (new HummingbirdClient)->request($kitsuUrl); | |||
| $response = wait($promise); | |||
| if ($response->getStatus() !== 200) | |||
| { | |||
| // Try a few different file types before giving up | |||
| // webm => jpg => png => gif | |||
| $nextType = [ | |||
| 'jpg' => 'png', | |||
| 'png' => 'gif', | |||
| ]; | |||
| if (array_key_exists($ext, $nextType)) | |||
| { | |||
| $newUrl = str_replace($ext, $nextType[$ext], $currentUrl); | |||
| $this->redirect($newUrl, 303); | |||
| return; | |||
| } | |||
| if ($display) | |||
| { | |||
| $this->getPlaceholder("{$baseSavePath}/{$type}", $width, $height); | |||
| } | |||
| else | |||
| { | |||
| createPlaceholderImage("{$baseSavePath}/{$type}", $width, $height); | |||
| } | |||
| return; | |||
| } | |||
| $data = wait($response->getBody()); | |||
| [$origWidth] = getimagesizefromstring($data); | |||
| $gdImg = imagecreatefromstring($data); | |||
| $resizedImg = imagescale($gdImg, $width ?? $origWidth); | |||
| if ($ext === 'gif') | |||
| { | |||
| file_put_contents("{$filePrefix}.gif", $data); | |||
| \imagepalletetotruecolor($gdImg); | |||
| } | |||
| // save the webp versions | |||
| imagewebp($gdImg, "{$filePrefix}-original.webp"); | |||
| imagewebp($resizedImg, "{$filePrefix}.webp"); | |||
| // save the scaled jpeg file | |||
| imagejpeg($resizedImg, "{$filePrefix}.jpg"); | |||
| // And the original | |||
| file_put_contents("{$filePrefix}-original.jpg", $data); | |||
| imagedestroy($gdImg); | |||
| imagedestroy($resizedImg); | |||
| if ($display) | |||
| { | |||
| $contentType = ($ext === 'webp') | |||
| ? "image/webp" | |||
| : $response->getHeader('content-type')[0]; | |||
| $outputFile = (strpos($file, '-original') !== FALSE) | |||
| ? "{$filePrefix}-original.{$ext}" | |||
| : "{$filePrefix}.{$ext}"; | |||
| header("Content-Type: {$contentType}"); | |||
| echo file_get_contents($outputFile); | |||
| } | |||
| } | |||
| /** | |||
| * Get a placeholder for a missing image | |||
| * | |||
| * @param string $path | |||
| * @param int|null $width | |||
| * @param int|null $height | |||
| */ | |||
| private function getPlaceholder (string $path, ?int $width = 200, ?int $height = NULL): void | |||
| { | |||
| $height = $height ?? $width; | |||
| $filename = $path . '/placeholder.png'; | |||
| if ( ! file_exists($path . '/placeholder.png')) | |||
| { | |||
| createPlaceholderImage($path, $width, $height); | |||
| } | |||
| header('Content-Type: image/png'); | |||
| echo file_get_contents($filename); | |||
| } | |||
| } | |||