Merge pull request #235 from ORelio/master

Add 2 bridges, Update t411, CNET

bridges/CNETBridge.php

@@ -9,7 +9,7 @@ class CNETBridge extends BridgeAbstract {
         $this->name = 'CNET News';
         $this->uri = 'http://www.cnet.com/';
         $this->description = 'Returns the newest articles. <br /> You may specify a topic found in some section URLs, else all topics are selected.';
-        $this->update = '2016-02-06';
+        $this->update = '2016-03-16';
 
         $this->parameters[] =
         '[
@@ -76,7 +76,7 @@ class CNETBridge extends BridgeAbstract {
                     if (is_object($article_thumbnail))
                         $article_thumbnail = $article_thumbnail->find('img', 0)->src;
 
-                    $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '</div></div></div><div class="col-8">', '<footer>')));
+                    $article_content = trim(CleanArticle(ExtractFromDelimiters($article_html, '<div class="articleContent', '<footer>')));
 
                     $item = new \Item();
                     $item->uri = $article_uri;

bridges/FuturaSciencesBridge.php

@@ -0,0 +1,219 @@
+<?php
+class FuturaSciencesBridge extends BridgeAbstract {
+
+    public function loadMetadatas() {
+
+        $this->maintainer = 'ORelio';
+        $this->name = $this->getName();
+        $this->uri = $this->getURI();
+        $this->description = 'Returns the newest articles.';
+        $this->update = '2016-03-20';
+
+        $this->parameters[] =
+        '[
+            {
+                "name" : "Feed",
+                "type" : "list",
+                "identifier" : "feed",
+                "values" :
+                [
+                    { "name" : "---- Select ----", "value" : "" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux multi-magazines", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Sciences", "value" : "actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Sciences", "value" : "definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières photos de Futura-Sciences", "value" : "photos" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions - réponses de Futura-Sciences", "value" : "questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Sciences", "value" : "dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Services", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les cartes virtuelles de Futura-Sciences", "value" : "services/cartes-virtuelles" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les fonds d\'écran de Futura-Sciences", "value" : "services/fonds-ecran" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Santé", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Santé", "value" : "sante/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Santé", "value" : "sante/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions-réponses de Futura-Santé", "value" : "sante/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Santé", "value" : "sante/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux High-Tech", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura High-Tech", "value" : "high-tech/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières astuces de Futura High-Tech", "value" : "high-tech/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura High-Tech", "value" : "high-tech/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura High-Tech", "value" : "high-tech/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Espace", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Espace", "value" : "espace/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Espace", "value" : "espace/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions-réponses de Futura-Espace", "value" : "espace/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Espace", "value" : "espace/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Environnement", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Environnement", "value" : "environnement/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Environnement", "value" : "environnement/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions - réponses de Futura-Environnement", "value" : "environnement/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Environnement", "value" : "environnement/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Maison", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Maison", "value" : "maison/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières astuces de Futura-Maison", "value" : "maison/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Maison", "value" : "maison/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Maison", "value" : "maison/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Nature", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Nature", "value" : "nature/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Nature", "value" : "nature/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions-réponses de Futura-Nature", "value" : "nature/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Nature", "value" : "nature/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Terre", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Terre", "value" : "terre/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Terre", "value" : "terre/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions-réponses de Futura-Terre", "value" : "terre/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Terre", "value" : "terre/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Matière", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Matière", "value" : "matiere/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières définitions de Futura-Matière", "value" : "matiere/definitions" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières questions-réponses de Futura-Matière", "value" : "matiere/questions-reponses" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Matière", "value" : "matiere/dossiers" },
+
+                    { "name" : "", "value" : "" },
+                    { "name" : "Les flux Mathématiques", "value" : "" },
+
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les dernières actualités de Futura-Mathématiques", "value" : "mathematiques/actualites" },
+                    { "name" : "&nbsp;&nbsp;&nbsp;&nbsp;Les derniers dossiers de Futura-Mathématiques", "value" : "mathematiques/dossiers" }
+                ]
+            }
+        ]';
+
+    }
+
+    public function collectData(array $param) {
+
+        function StripCDATA($string) {
+            $string = str_replace('<![CDATA[', '', $string);
+            $string = str_replace(']]>', '', $string);
+            return $string;
+        }
+
+        function StripWithDelimiters($string, $start, $end) {
+            while (strpos($string, $start) !== false) {
+                $section_to_remove = substr($string, strpos($string, $start));
+                $section_to_remove = substr($section_to_remove, 0, strpos($section_to_remove, $end) + strlen($end));
+                $string = str_replace($section_to_remove, '', $string);
+            } return $string;
+        }
+
+        function StripRecursiveHTMLSection($string, $tag_name, $tag_start) {
+            $open_tag = '<'.$tag_name;
+            $close_tag = '</'.$tag_name.'>';
+            $close_tag_length = strlen($close_tag);
+            if (strpos($tag_start, $open_tag) === 0) {
+                while (strpos($string, $tag_start) !== false) {
+                    $max_recursion = 100;
+                    $section_to_remove = null;
+                    $section_start = strpos($string, $tag_start);
+                    $search_offset = $section_start;
+                    do {
+                        $max_recursion--;
+                        $section_end = strpos($string, $close_tag, $search_offset);
+                        $search_offset = $section_end + $close_tag_length;
+                        $section_to_remove = substr($string, $section_start, $section_end - $section_start + $close_tag_length);
+                        $open_tag_count = substr_count($section_to_remove, $open_tag);
+                        $close_tag_count = substr_count($section_to_remove, $close_tag);
+                    } while ($open_tag_count > $close_tag_count && $max_recursion > 0);
+                    $string = str_replace($section_to_remove, '', $string);
+                }
+            }
+            return $string;
+        }
+
+        if (empty($param['feed']))
+            $this->returnError('Please select a feed to display.'.$url, 400);
+        if ($param['feed'] !== preg_replace('/[^a-zA-Z-\/]+/', '', $param['feed']) || substr_count($param['feed'], '/') > 1 || strlen($param['feed'] > 64))
+            $this->returnError('Invalid "feed" parameter.'.$url, 400);
+
+        $url = $this->getURI().'rss/'.$param['feed'].'.xml';
+        $html = file_get_html($url) or $this->returnError('Could not request Futura-Sciences: '.$url, 500);
+        $limit = 0;
+
+        foreach($html->find('item') as $element) {
+            if ($limit < 10) {
+                $article_url = str_replace('#xtor=RSS-8', '', StripCDATA($element->find('guid', 0)->plaintext));
+                $article = file_get_html($article_url) or $this->returnError('Could not request Futura-Sciences: '.$article_url, 500);
+                $contents = $article->find('div.content', 0)->innertext;
+                $author = trim(str_replace(', Futura-Sciences', '', $article->find('span.author', 0)->plaintext));
+                if (empty($author))
+                    $author = StripCDATA($element->find('author', 0)->plaintext);
+
+                foreach (array(
+                    '<div class="clear',
+                    '<div class="sharebar2',
+                    '<div class="diaporamafullscreen"',
+                    '<div style="margin-bottom:10px;" class="noprint"',
+                    '<div class="ficheprevnext',
+                    '<div class="bar noprint',
+                    '<div class="toolbar noprint',
+                    '<div class="addthis_toolbox',
+                    '<div class="noprint',
+                    '<div class="bg bglight border border-full noprint',
+                    '<div class="httplogbar-wrapper noprint',
+                    '<div id="forumcomments'
+                ) as $div_start) {
+                    $contents = StripRecursiveHTMLSection($contents , 'div', $div_start);
+                }
+
+                $contents = StripWithDelimiters($contents, '<hr ', '/>');
+                $contents = StripWithDelimiters($contents, '<p class="content-date', '</p>');
+                $contents = StripWithDelimiters($contents, '<h1 class="content-title', '</h1>');
+                $contents = StripWithDelimiters($contents, 'fs:definition="', '"');
+                $contents = StripWithDelimiters($contents, 'fs:xt:clicktype="', '"');
+                $contents = StripWithDelimiters($contents, 'fs:xt:clickname="', '"');
+
+                $item = new \Item();
+                $item->author = $author;
+                $item->uri = $article_url;
+                $item->title = StripCDATA($element->find('title', 0)->innertext);
+                $item->thumbnailUri = StripCDATA($element->find('enclosure', 0)->url);
+                $item->timestamp = strtotime(StripCDATA($element->find('pubDate', 0)->plaintext));
+                $item->content = trim($contents);
+                $this->items[] = $item;
+                $limit++;
+            }
+        }
+
+    }
+
+    public function getName() {
+        return 'Futura-Sciences Bridge';
+    }
+
+    public function getURI() {
+        return 'http://www.futura-sciences.com/';
+    }
+
+    public function getCacheDuration() {
+        return 3600;
+    }
+}

bridges/T411Bridge.php

@@ -5,7 +5,7 @@ class T411Bridge extends BridgeAbstract {
 
         $this->maintainer = "ORelio";
         $this->name = "T411";
-        $this->uri = "https://t411.in/";
+        $this->uri = $this->getURI();
         $this->description = "Returns the 5 newest torrents with specified search terms <br /> Use url part after '?' mark when using their search engine";
         $this->update = "2016-02-06";
 
@@ -34,8 +34,8 @@ class T411Bridge extends BridgeAbstract {
             $this->returnError('You must specify a search criteria', 400);
         }
 
-        //Retrieve torrent listing as truncated rss, which does not contain torrent description
+        //Retrieve torrent listing from search results, which does not contain torrent description
-        $url = 'http://www.t411.in/torrents/search/?'.$param['search'].'&order=added&type=desc';
+        $url = $this->getURI().'torrents/search/?'.$param['search'].'&order=added&type=desc';
         $html = file_get_html($url) or $this->returnError('Could not request t411: '.$url, 500);
         $results = $html->find('table.results', 0);
         if (is_null($results))
@@ -52,7 +52,7 @@ class T411Bridge extends BridgeAbstract {
                 usleep(500000); //So we need to wait (500ms)
 
                 //Retrieve data from RSS entry
-                $item_uri = 'http://'.ExtractFromDelimiters($element->outertext, '<a href="//', '"');
+                $item_uri = $this->getURI().'torrents/details/?id='.ExtractFromDelimiters($element->find('a.nfo', 0)->outertext, '?id=', '"');
                 $item_title = ExtractFromDelimiters($element->outertext, '" title="', '"');
                 $item_date = strtotime($element->find('dd', 0)->plaintext);
 
@@ -64,7 +64,7 @@ class T411Bridge extends BridgeAbstract {
                     $item_author = $item_html->find('a.profile', 0)->innertext;
 
                     //Retrieve image for thumbnail or generic logo fallback
-                    $item_image = 'http://www.t411.in/themes/blue/images/logo.png';
+                    $item_image = $this->getURI().'themes/blue/images/logo.png';
                     foreach ($item_desc->find('img') as $img) {
                         if (strpos($img->src, 'prez') === false) {
                             $item_image = $img->src;
@@ -92,7 +92,7 @@ class T411Bridge extends BridgeAbstract {
     }
 
     public function getURI() {
-        return 'https://t411.in';
+        return 'https://t411.ch/';
     }
 
     public function getCacheDuration() {

bridges/ZoneTelechargementBridge.php

@@ -0,0 +1,58 @@
+<?php
+class ZoneTelechargementBridge extends BridgeAbstract {
+
+    public function loadMetadatas() {
+
+        $this->maintainer = 'ORelio';
+        $this->name = $this->getName();
+        $this->uri = $this->getURI();
+        $this->description = 'RSS proxy returning the newest releases.<br />You may specify a category found in RSS URLs, else main feed is selected.';
+        $this->update = "2016-03-16";
+
+        $this->parameters[] =
+        '[
+            {
+                "name" : "Category",
+                "identifier" : "category"
+            }
+        ]';
+    }
+
+    public function collectData(array $param) {
+
+        function StripCDATA($string) {
+            $string = str_replace('<![CDATA[', '', $string);
+            $string = str_replace(']]>', '', $string);
+            return $string;
+        }
+
+        $category = '/';
+        if (!empty($param['category']))
+            $category = '/'.$param['category'].'/';
+
+        $url = $this->getURI().$category.'rss.xml';
+        $html = file_get_html($url) or $this->returnError('Could not request Zone Telechargement: '.$url, 500);
+
+        foreach($html->find('item') as $element) {
+            $item = new \Item();
+            $item->title = $element->find('title', 0)->plaintext;
+            $item->uri = str_replace('http://', 'https://', $element->find('guid', 0)->plaintext);
+            $item->timestamp = strtotime($element->find('pubDate', 0)->plaintext);
+            $item->content = StripCDATA($element->find('description', 0)->innertext);
+            $this->items[] = $item;
+            $limit++;
+        }
+    }
+
+    public function getName() {
+        return 'Zone Telechargement Bridge';
+    }
+
+    public function getURI() {
+        return 'https://www.zone-telechargement.com/';
+    }
+
+    public function getCacheDuration() {
+        return 3600;
+    }
+}