Merge pull request #1361 from shikorism/develop

Release 2024.12.0

Author: shibafu528

app/MetadataResolver/DLsiteResolver.php

@@ -33,16 +33,11 @@ public function extractTags(string $html): array
         @$dom->loadHTML(Formatter::htmlEntities($html, 'UTF-8'));
         $xpath = new \DOMXPath($dom);
 
-        $genreNode = $xpath->query("//div[@class='main_genre'][1]");
-        if ($genreNode->length === 0) {
-            return [];
-        }
-
-        $tagsNode = $genreNode->item(0)->getElementsByTagName('a');
+        $tagsNode = $xpath->query("//div[@class='main_genre']/a");
         $tags = [];
 
-        for ($i = 0; $i <= $tagsNode->length - 1; $i++) {
-            $tags[] = $tagsNode->item($i)->textContent;
+        foreach ($tagsNode as $node) {
+            $tags[] = $node->textContent;
         }
 
         // 重複削除

app/MetadataResolver/NarouResolver.php

@@ -51,8 +51,8 @@ public function resolve(string $url): Metadata
         // タグ
         $keywordNodeList = $xpath->query('//th[contains(text(), "キーワード")]/following-sibling::td[1]');
         if ($keywordNodeList->length !== 0) {
-            $keyword =  trim($keywordNodeList->item(0)->textContent);
-            $metadata->tags = explode(' ', $keyword);
+            $keyword = trim($keywordNodeList->item(0)->textContent);
+            $metadata->tags = preg_split('/\s+/u', $keyword);
         }
 
         // 作者名

composer.lock

@@ -12,20 +12,18 @@
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
-
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
-
         <testsuite name="MetadataResolver">
             <directory suffix="Test.php">./tests/Unit/MetadataResolver</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
     <php>
         <env name="APP_ENV" value="testing" force="true"/>
         <env name="BCRYPT_ROUNDS" value="4" force="true"/>

phpunit.xml

@@ -162,6 +162,22 @@ public function testGirlsDrama()
         }
     }
 
+    public function testGirlsCoupling()
+    {
+        $responseText = $this->fetchSnapshot(__DIR__ . '/../../fixture/DLsite/testGirlsCoupling.html');
+
+        $this->createResolver(DLsiteResolver::class, $responseText);
+
+        $metadata = $this->resolver->resolve('https://www.dlsite.com/girls/work/=/product_id/RJ01008713.html');
+        $this->assertEquals('♂が受け。ネコちゃん×ネコくん', $metadata->title);
+        $this->assertEquals('サークル名: pink carrot' . PHP_EOL . '同級生のネコ♂くんをえっちに攻めるネコ♀ちゃんのすけべ漫画。', $metadata->description);
+        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ01009000/RJ01008713_img_main.jpg', $metadata->image);
+        $this->assertEquals(['フェラチオ', '乳首/乳輪', '制服', '同級生/同僚', '女×男', '焦らし', '獣耳', '男性受け', '逆転無し'], $metadata->tags);
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://www.dlsite.com/girls/work/=/product_id/RJ01008713.html', (string) $this->handler->getLastRequest()->getUri());
+        }
+    }
+
     public function testBL()
     {
         $responseText = $this->fetchSnapshot(__DIR__ . '/../../fixture/DLsite/testBL.html');

tests/Unit/MetadataResolver/DLsiteResolverTest.php

@@ -62,4 +62,19 @@ public function testLongDescriptionNovel()
             $this->assertSame('https://novel18.syosetu.com/novelview/infotop/ncode/n0477gn/', (string) $this->handler->getLastRequest()->getUri());
         }
     }
+
+    public function testFeaturesInKeyword()
+    {
+        $responseText = $this->fetchSnapshot(__DIR__ . '/../../fixture/Narou/testFeaturesInKeyword.html');
+
+        $this->createResolver(NarouResolver::class, $responseText);
+
+        $metadata = $this->resolver->resolve('https://novel18.syosetu.com/n6404hk/');
+        $this->assertEquals('王子繁殖促進計画「王子の性欲を刺激せよ」　～よってたかって性欲を刺激される小国王子の異世界奮闘記～', $metadata->title);
+        $this->assertEquals("作者: ひもの\n小国だが王子に転生した俺。　\n意外に甘くない現実に戸惑いつつも、いつかはエロエロハーレムが作れたらいいな、と思っていたが……　\n\n幼馴染が、いとこのお姉ちゃんが、周りの美少女達が、恥じらいながらも一生懸命、俺の性欲を刺激してくる。　\n\nえ？　俺の性欲を刺激するために、国家プロジェクトが立ち上がった？……", $metadata->description);
+        $this->assertEquals(['残酷な描写あり', '異世界転生', '男主人公', 'ハーレム', '魔法', 'オリジナル戦記', '戦記', '淫語', '羞恥', '美少女', 'イチャラブ', '♡喘ぎ', '孕ませ', '巨乳'], $metadata->tags);
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://novel18.syosetu.com/novelview/infotop/ncode/n6404hk/', (string) $this->handler->getLastRequest()->getUri());
+        }
+    }
 }