pepepper
/
tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gifとmp4の場合はサムネイルを取得させない

This commit is contained in:
shibafu 2018-04-15 22:27:38 +09:00
parent 3b2e81818b
commit d224e6bba4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/MetadataResolver/NijieResolver.php
View File

@ -23,7 +23,7 @@ class NijieResolver implements Resolver
foreach ($dataNode as $node) {
// 改行がそのまま入っていることがあるのでデコード前にエスケープが必要
$imageData = json_decode(preg_replace('/\r?\n/', '\n', $node->nodeValue), true);
if (isset($imageData['thumbnailUrl'])) {
if (isset($imageData['thumbnailUrl']) && !ends_with($imageData['thumbnailUrl'], '.gif') && !ends_with($imageData['thumbnailUrl'], '.mp4')) {
$metadata->image = preg_replace('~nijie\\.info/.*/nijie_picture/~', 'nijie.info/nijie_picture/', $imageData['thumbnailUrl']);
break;
}

12
tests/Unit/MetadataResolver/NijieResolverTest.php
View File

@ -39,8 +39,7 @@ class NijieResolverTest extends TestCase
$metadata = $resolver->resolve('https://nijie.info/view.php?id=258078');
$this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title);
$this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description);
$this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
$this->assertNotRegExp('~/diff/main/~', $metadata->image);
$this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
}
public function testMp4Movie()
@ -51,8 +50,7 @@ class NijieResolverTest extends TestCase
$metadata = $resolver->resolve('https://nijie.info/view.php?id=256283');
$this->assertEquals('てすと | ニジエ運営', $metadata->title);
$this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description);
$this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
$this->assertNotRegExp('~/diff/main/~', $metadata->image);
$this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
}
public function testStandardPictureSp()
@ -87,8 +85,7 @@ class NijieResolverTest extends TestCase
$metadata = $resolver->resolve('https://sp.nijie.info/view.php?id=258078');
$this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title);
$this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description);
$this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
$this->assertNotRegExp('~/diff/main/~', $metadata->image);
$this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
}
public function testMp4MovieSp()
@ -99,7 +96,6 @@ class NijieResolverTest extends TestCase
$metadata = $resolver->resolve('https://sp.nijie.info/view.php?id=256283');
$this->assertEquals('てすと | ニジエ運営', $metadata->title);
$this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description);
$this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
$this->assertNotRegExp('~/diff/main/~', $metadata->image);
$this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
}
}