From 32c1d3ff9d1470e3ceec03609c2351571861821f Mon Sep 17 00:00:00 2001 From: eai04191 Date: Sun, 16 Jun 2019 05:50:22 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BA=88=E5=91=8A=E4=BD=9C=E5=93=81=E3=81=AB?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/DLsiteResolver.php | 4 ++-- app/MetadataResolver/MetadataResolver.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/MetadataResolver/DLsiteResolver.php b/app/MetadataResolver/DLsiteResolver.php index 3f2850a..32e2769 100644 --- a/app/MetadataResolver/DLsiteResolver.php +++ b/app/MetadataResolver/DLsiteResolver.php @@ -69,7 +69,7 @@ class DLsiteResolver implements Resolver // OGPタイトルから[]に囲まれているmakerを取得する // 複数の作者がいる場合スペース区切りになるためexplodeしている // スペースを含むmakerの場合名前の一部しか取れないが動作には問題ない - preg_match('~ \[([^\[\]]*)\] \| DLsite(がるまに)?$~', $metadata->title, $match); + preg_match('~ \[([^\[\]]*)\] (予告作品 )?\| DLsite(がるまに)?$~', $metadata->title, $match); $makers = explode(' ', $match[1]); //フォローボタン(.btn_follow)はテキストを含んでしまうことがあるので要素を削除しておく @@ -93,7 +93,7 @@ class DLsiteResolver implements Resolver // 余分な文を消す // OGPタイトルから作者名とサイト名を消す - $metadata->title = trim(preg_replace('~ \[([^\[\]]*)\] \| DLsite(がるまに)?$~', '', $metadata->title)); + $metadata->title = trim(preg_replace('~ \[[^\[\]]*\] (予告作品 )?\| DLsite(がるまに)?$~', '', $metadata->title)); // OGP説明文から定型文を消す if (strpos($url, 'dlsite.com/eng/') || strpos($url, 'dlsite.com/ecchi-eng/')) { diff --git a/app/MetadataResolver/MetadataResolver.php b/app/MetadataResolver/MetadataResolver.php index c47608a..adb2720 100644 --- a/app/MetadataResolver/MetadataResolver.php +++ b/app/MetadataResolver/MetadataResolver.php @@ -15,7 +15,7 @@ class MetadataResolver implements Resolver '~www\.melonbooks\.co\.jp/detail/detail\.php~' => MelonbooksResolver::class, '~ec\.toranoana\.(jp|shop)/(tora|joshi)(_[rd]+)?/(ec|digi)/item/~' => ToranoanaResolver::class, '~iwara\.tv/videos/.*~' => IwaraResolver::class, - '~www\.dlsite\.com/.*/work/=/product_id/..\d+(\.html)?~' => DLsiteResolver::class, + '~www\.dlsite\.com/.*/(work|announce)/=/product_id/..\d+(\.html)?~' => DLsiteResolver::class, '~dlsite\.jp/mawtw/..\d+~' => DLsiteResolver::class, '~www\.pixiv\.net/member_illust\.php\?illust_id=\d+~' => PixivResolver::class, '~www\.pixiv\.net/user/\d+/series/\d+~' => PixivResolver::class,