Merge branch 'develop'

app2641 · Feb 20, 2016 · 15a20cf · 15a20cf
2 parents 7eb0f81 + 49979e2
commit 15a20cf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/data/crawler/plugins.yml b/data/crawler/plugins.yml
@@ -44,7 +44,7 @@ Plugins:
     enable: true
 
   HentaiAnime:
-    enable: true
+    enable: false
 
   Ichizen:
     enable: false
@@ -59,7 +59,7 @@ Plugins:
     enable: true
 
   MuryoEro:
-    enable: true
+    enable: false
 
   Rakuen:
     enable: true

diff --git a/src/Bootstrap.php b/src/Bootstrap.php
@@ -5,7 +5,7 @@
 defined('APP') || define('APP', 'Midnight');
 
 $is_ec2 = (is_dir('/home/ec2-user')) ? true: false;
-//$is_ec2 = (is_dir('/home/ec2-user')) ? true: true;
+// $is_ec2 = (is_dir('/home/ec2-user')) ? true: true;
 defined('IS_EC2') || define('IS_EC2', $is_ec2);
 
 $loader = require_once ROOT.'/vendor/autoload.php';

diff --git a/src/Midnight/Crawler/ContentsBuilder.php b/src/Midnight/Crawler/ContentsBuilder.php
@@ -219,7 +219,7 @@ private function _uploadConents ($from_path, $to_path)
 
         try {
             $this->S3->upload($from_path, $to_path);
-        
+
         } catch (\Exception $e) {
             Logger::addLog($from_path.' -> '.$to_path);
             Logger::addLog('S3へのアップロードに失敗した'.PHP_EOL);

diff --git a/src/Midnight/Crawler/Plugin/Youskbe.php b/src/Midnight/Crawler/Plugin/Youskbe.php
@@ -92,6 +92,7 @@ public function getEyeCatchUrl ($html)
         if (is_null($el)) throw new CrawlerException('アイキャッチを取得出来ませんでした');
 
         $img_el = $el->nextSibling()->firstChild()->firstChild();
+        if (!$img_el) throw new CrawlerException('img要素が見つかりませんでした');
         if (!$img_el->hasAttribute('src')) throw new CrawlerException('src属性が見つかりませんでした');
 
         return $img_el->getAttribute('src');