From d7a1dca0048b6a4eef59600e3064a47dc0b3f82c Mon Sep 17 00:00:00 2001 From: sysadminstory Date: Tue, 19 Sep 2017 02:08:22 +0200 Subject: [PATCH] [DealabsBridge] Conform to coding policy - If no there are no results, an explicit message is now returned - Commas are now following the coding policy - Lines are no longer more than 80 chars when possible --- bridges/DealabsBridge.php | 57 ++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/bridges/DealabsBridge.php b/bridges/DealabsBridge.php index bb2bfff0..ee6bd1a4 100644 --- a/bridges/DealabsBridge.php +++ b/bridges/DealabsBridge.php @@ -2,12 +2,24 @@ class DealabsBridge extends BridgeAbstract { const NAME = 'Dealabs search bridge'; const URI = 'https://www.dealabs.com/'; - const DESCRIPTION = 'Return the Dealabs search result using keywords, with/without expired deals, with/without shop deals and by category'; + const DESCRIPTION = 'Return the Dealabs search result using keywords,' + . ' with/without expired deals, with/without shop deals and by' + . ' category'; const MAINTAINER = 'sysadminstory'; const PARAMETERS = array( array ( - 'q' => array('name' => 'Mot(s) clé(s)', 'type' => 'text', 'required' => true ), - 'expired_choice' => array('name' => 'Afficher deals expirés', 'type' => 'checkbox'), - 'instore_choice' => array('name' => 'Afficher deals en magasin', 'type' => 'checkbox'), + 'q' => array( + 'name' => 'Mot(s) clé(s)', + 'type' => 'text', + 'required' => true + ), + 'expired_choice' => array( + 'name' => 'Afficher deals expirés', + 'type' => 'checkbox' + ), + 'instore_choice' => array( + 'name' => 'Afficher deals en magasin', + 'type' => 'checkbox' + ), 'cat' => array( 'name' => 'Catégorie', 'type' => 'list', @@ -74,6 +86,7 @@ class DealabsBridge extends BridgeAbstract { )); + const CACHE_TIMEOUT = 3600; public function collectData(){ @@ -93,16 +106,24 @@ class DealabsBridge extends BridgeAbstract { or returnServerError('Could not request Dealabs.'); $list = $html->find('article'); if($list === null) { - return; + returnClientError('Your combination of parameters returned no results'); } foreach($list as $deal) { $item = array(); - $item['uri'] = $deal->find('a.title',0)->href; + $item['uri'] = $deal->find('a.title', 0)->href; $item['title'] = $deal->find('a.title', 0)->plaintext; $item['author'] = $deal->find('a.poster_link', 0)->plaintext; - $item['content'] = '
' .$deal->find('div.image_part',0)->outertext . ''. $deal->find('a.title',0)->outertext . $deal->find('p.description',0)->outertext .''. $deal->find('div.vote_part',0)->outertext . '
'; - $item['timestamp'] = $this->relativeDateToTimestamp($deal->find('p.date_deal',0)->plaintext); + $item['content'] = '
' + . $deal->find('div.image_part', 0)->outertext + . '' + . $deal->find('a.title', 0)->outertext + . $deal->find('p.description', 0)->outertext + . '' + . $deal->find('div.vote_part', 0)->outertext + . '
'; + $item['timestamp'] = $this->relativeDateToTimestamp( + $deal->find('p.date_deal', 0)->plaintext); $this->items[] = $item; } @@ -110,7 +131,25 @@ class DealabsBridge extends BridgeAbstract { private function relativeDateToTimestamp($str) { $date = new DateTime(); - $date->modify(str_replace(array('il y a ', 'min' , 'h', 'jour', 'jours', 'mois', 'ans'), array('-', 'minute', 'hour', 'day', 'month', 'year'), $str)); + $search = array( + 'il y a ', + 'min', + 'h', + 'jour', + 'jours', + 'mois', + 'ans' + ); + $replace = array( + '-', + 'minute', + 'hour', + 'day', + 'month', + 'year' + ); + + $date->modify(str_replace($search, $replace, $str)); return $date->getTimestamp(); }