Merge pull request #17 from feelinglucky/master

同步 master 的代码

Author: 明城

LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) [year] [fullname]
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

README.md

@@ -1,14 +1,19 @@
 # PHP Readability Library
 
+If you want to use an up-to-date version of this algorithm,check this newer project: 
+
+https://github.com/andreskrey/readability.php
+
+
 ## Back the fun of reading
 
-The PHP port of [[http://code.google.com/p/arc90labs-readability/|Readability.js by Arc90]].
+The PHP port of [Readability.js by Arc90](http://code.google.com/p/arc90labs-readability/).
 
 
 ## Requirements
 
 * PHP Version >= 5
-* [[http://www.php.net/manual/en/book.dom.php|PHP has builded with DOM(Document Object Model)]]
+* [PHP has builded with DOM(Document Object Model)](http://www.php.net/manual/en/book.dom.php)
 
 
 ## Live demo 
@@ -31,5 +36,5 @@ echo $ReadabilityData['content'];
 
 
 
-PS: For Node.js port, You can [[https://github.com/arrix/node-readability/|check this]].
+PS: For Node.js port, You can [check this](https://github.com/arrix/node-readability/).
 

lib/Readability.inc.php

@@ -1,12 +1,13 @@
 <?php
-// vim: set et sw=4 ts=4 sts=4 fdm=marker ff=unix fenc=utf8 nobomb:
+// vim: set et sw=4 ts=4 sts=4 ft=php fdm=marker ff=unix fenc=utf8 nobomb:
 /**
  * PHP Readability
  *
  * Readability PHP 版本，详见
  *      http://code.google.com/p/arc90labs-readability/
  *
  * ChangeLog:
+ *      [+] 2014-02-08 Add lead image param and improved get title function.
  *      [+] 2013-12-04 Better error handling and junk tag removal.
  *      [+] 2011-02-17 初始化版本
  *
@@ -19,7 +20,7 @@
  * @link   http://tuxion.nl/
  */
 
-define("READABILITY_VERSION", 0.13);
+define("READABILITY_VERSION", 0.21);
 
 class Readability {
     // 保存判定结果的标记位名称
@@ -103,6 +104,10 @@ private function preparSource($string) {
         $string = preg_replace("/<br\/?>[ \r\n\s]*<br\/?>/i", "</p><p>", $string);
         $string = preg_replace("/<\/?font[^>]*>/i", "", $string);
 
+        // @see https://github.com/feelinglucky/php-readability/issues/7
+        //   - from http://stackoverflow.com/questions/7130867/remove-script-tag-from-html-content
+        $string = preg_replace("#<script(.*?)>(.*?)</script>#is", "", $string);
+
         return trim($string);
     }
 
@@ -163,7 +168,7 @@ private function getTopBox() {
             if (preg_match("/(comment|meta|footer|footnote)/i", $className)) {
                 $contentScore -= 50;
             } else if(preg_match(
-                "/((^|\\s)(post|hentry|entry[-]?(content|text|body)?|article[-]?(content|text|body)?)(\\s|$))/i",
+                "/((^|\\s)(section|post|hentry|entry[-]?(content|text|body)?|article[-]?(content|text|body)?)(\\s|$))/i",
                 $className)) {
                 $contentScore += 25;
             }
@@ -191,23 +196,39 @@ private function getTopBox() {
         }
 
         $topBox = null;
-        
+
         // Assignment from index for performance. 
         //     See http://www.peachpit.com/articles/article.aspx?p=31567&seqNum=5 
         for ($i = 0, $len = sizeof($this->parentNodes); $i < $len; $i++) {
             $parentNode      = $this->parentNodes[$i];
             $contentScore    = intval($parentNode->getAttribute(Readability::ATTR_CONTENT_SCORE));
             $orgContentScore = intval($topBox ? $topBox->getAttribute(Readability::ATTR_CONTENT_SCORE) : 0);
 
-            if ($contentScore && $contentScore > $orgContentScore) {
-                $topBox = $parentNode;
+            // by raywill, 2016-9-2
+            // for case: <div><p>xxx</p></div><div><p>yyy</p></div>
+            if ($parentNode && $topBox && $topBox->parentNode
+              && $parentNode !== $topBox
+              && $parentNode->parentNode === $topBox->parentNode
+              && $this->scoreMatch($parentNode, $topBox)) { // trust same level
+
+              $topScore = intval($topBox->getAttribute(Readability::ATTR_CONTENT_SCORE));
+              $topBox = $topBox->parentNode;
+              $topBox->setAttribute(Readability::ATTR_CONTENT_SCORE, $topScore + $contentScore);
+            } else if ($contentScore && $contentScore > $orgContentScore) {
+
+              $topBox = $parentNode;
             }
         }
-        
+
         // 此时，$topBox 应为已经判定后的页面内容主元素
         return $topBox;
     }
 
+    protected function scoreMatch($n1, $n2) {
+      $n1Score = intval($n1->getAttribute(Readability::ATTR_CONTENT_SCORE));
+      $n2Score = intval($n2->getAttribute(Readability::ATTR_CONTENT_SCORE));
+      return ($n1Score > 0 && $n2Score > 0);
+    }
 
     /**
      * 获取 HTML 页面标题
@@ -238,9 +259,19 @@ public function getTitle() {
     public function getLeadImageUrl($node) {
         $images = $node->getElementsByTagName("img");
 
-        if ($images->length && $leadImage = $images->item(0)) {
-            return $leadImage->getAttribute("src");
-        }
+        if ($images->length){
+			$i = 0;
+			while($leadImage = $images->item($i++)) {
+				$imgsrc = $leadImage->getAttribute("src");
+				$imgdatasrc = $leadImage->getAttribute("data-src");
+				$imgsrclast =  $imgsrc ? $imgsrc : $imgdatasrc;
+				list($img['width'],$img['height'])=getimagesize($imgsrclast);
+				if($img['width'] > 150 && $img['height'] >150){
+					return $imgsrclast;
+				}
+				
+			}
+		}
 
         return null;
     }