From 1f72a34b42df7eb0f6f3cf6d5bc2bef05c5f3763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= <pierre.maziere@gmx.com>
Date: Mon, 29 Aug 2016 23:11:53 +0200
Subject: [PATCH] [SuperbWallpapersBridge] code simplification
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pierre Mazière <pierre.maziere@gmx.com>
---
 bridges/SuperbWallpapersBridge.php | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/bridges/SuperbWallpapersBridge.php b/bridges/SuperbWallpapersBridge.php
index a87bc2f..a42d2b9 100644
--- a/bridges/SuperbWallpapersBridge.php
+++ b/bridges/SuperbWallpapersBridge.php
@@ -1,45 +1,46 @@
 <?php
 class SuperbWallpapersBridge extends BridgeAbstract {
 
-    private $category;
-    private $resolution;
-
 	public $maintainer = "nel50n";
 	public $name = "Superb Wallpapers Bridge";
 	public $uri = "http://www.superbwallpapers.com/";
 	public $description = "Returns the latests wallpapers from SuperbWallpapers";
 
     public $parameters = array( array(
-        'c'=>array('name'=>'category'),
+      'c'=>array(
+        'name'=>'category',
+        'required'=>true
+      ),
         'm'=>array(
             'name'=>'Max number of wallpapers',
             'type'=>'number'
         ),
         'r'=>array(
             'name'=>'resolution',
-            'exampleValue'=>'1920x1200, 1680x1050,…'
+            'exampleValue'=>'1920x1200, 1680x1050,…',
+            'defaultValue'=>'1920x1200'
         )
     ));
 
     public function collectData(){
-        $html = '';
-        $baseUri = 'http://www.superbwallpapers.com';
-
-        $this->category   = $this->getInput('c') ?: '';           // All default
-        $this->resolution = $this->getInput('r') ?: '1920x1200';  // Wide wallpaper default
+        $category   = $this->getInput('c');
+        $resolution = $this->getInput('r');  // Wide wallpaper default
 
         $num = 0;
         $max = $this->getInput('m') ?: 36;
         $lastpage = 1;
 
         // Get last page number
-        $link = $baseUri.'/'.$this->category.'/9999.html';
-        $html = $this->getSimpleHTMLDOM($link);
+        $link = $this->uri.'/'.$category.'/9999.html';
+        $html = $this->getSimpleHTMLDOM($link)
+          or $this->returnServerError('Could not load '.$link);
+
         $lastpage = min($html->find('.paging .cpage', 0)->innertext(), ceil($max/36));
 
         for ($page = 1; $page <= $lastpage; $page++) {
-            $link = $baseUri.'/'.$this->category.'/'.$page.'.html';
-            $html = $this->getSimpleHTMLDOM($link) or $this->returnServerError('No results for this query.');
+            $link = $this->uri.'/'.$category.'/'.$page.'.html';
+            $html = $this->getSimpleHTMLDOM($link)
+              or $this->returnServerError('No results for this query.');
 
             foreach($html->find('.wpl .i a') as $element) {
                 $thumbnail = $element->find('img', 0);
@@ -59,7 +60,7 @@ class SuperbWallpapersBridge extends BridgeAbstract {
     }
 
     public function getName(){
-        return 'HDWallpapers - '.$this->category.' ['.$this->resolution.']';
+        return $this->name .'- '.$this->getInput('c').' ['.$this->getInput('r').']';
     }
 
     public function getCacheDuration(){