Add search providers as an editable yaml file + allow searching tiles

Author: KodeStar

app/Search.php

@@ -6,6 +6,7 @@
 use App\Setting;
 use Form;
 use Cache;
+use Yaml;
 
 abstract class Search
 {
@@ -19,7 +20,7 @@ public static function providers()
     {
         $providers = self::standardProviders();
         $providers = $providers + self::appProviders();
-        return $providers;
+        return collect($providers);
     }
 
     /**
@@ -41,38 +42,16 @@ public static function providerDetails($provider)
      */
     public static function standardProviders()
     {
-        return [
-            'google' => [
-                'url' => 'https://www.google.com/search',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'ddg' => [
-                'url' => 'https://duckduckgo.com/',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'bing' => [
-                'url' => 'https://www.bing.com/search',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'qwant' => [
-                'url' => 'https://www.qwant.com/',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'startpage' => [
-                'url' => 'https://www.startpage.com/do/dsearch',
-                'var' => 'query',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-        ];
+        // $providers = json_decode(file_get_contents(storage_path('app/searchproviders.json')));
+        // print_r($providers);
+        $providers = Yaml::parseFile(storage_path('app/searchproviders.yaml'));
+        $all = [];
+        foreach($providers as $key => $provider) {
+            $all[$key] = $provider;
+            $all[$key]['type'] = 'standard';
+        }
+
+        return $all;
     }
 
     /**
@@ -90,10 +69,11 @@ public static function appProviders()
             if(($provider = Item::isSearchProvider($app->class)) !== false) {
                 $name = Item::nameFromClass($app->class);
                 $providers[$app->id] = [
+                    'id' => $app->id,
                     'type' => $provider->type,
                     'class' => $app->class,
                     'url' => $app->url,
-                    'title' => $app->title,
+                    'name' => $app->title,
                     'colour' => $app->colour,
                     'icon' => $app->icon,
                     'description' => $app->description
@@ -133,12 +113,8 @@ public static function form()
                 $output .= '<div id="search-container" class="input-container">';
                 $output .= '<select name="provider">';
                 foreach(self::providers() as $key => $searchprovider) {
-                    $selected = ($key === $user_search_provider) ? ' selected="selected"' : '';
-                    if (is_numeric($key)) {
-                      $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['title'].'</option>';
-                    } else {
-                      $output .= '<option value="'.$key.'"'.$selected.'>'.__('app.options.'.$key).'</option>';
-                    }
+                    $selected = ((string)$key === (string)$user_search_provider) ? ' selected="selected"' : '';
+                    $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
                 }
                 $output .= '</select>';
                 $output .= Form::text('q', null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __('app.settings.search').'...']);

app/Setting.php

@@ -74,6 +74,9 @@ public function getListValueAttribute()
             case 'select':
                 if(!empty($this->value) && $this->value !== 'none') {
                     $options =  (array)json_decode($this->options);
+                    if($this->key === 'search_provider') {
+                        $options = Search::providers()->pluck('name', 'id')->toArray();
+                    }    
                     $value = __($options[$this->value]);
                 } else {
                     $value = __('app.options.none');
@@ -122,6 +125,9 @@ public function getEditValueAttribute()
                 break;
             case 'select':
                 $options = json_decode($this->options);
+                if($this->key === 'search_provider') {
+                    $options = Search::providers()->pluck('name', 'id');
+                }
                 foreach($options as $key => $opt) {
                     $options->$key = __($opt);
                 }

composer.json

@@ -12,7 +12,8 @@
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.4",
-        "laravelcollective/html": "^6.0"
+        "laravelcollective/html": "^6.0",
+        "symfony/yaml": "^5.4"
     },
     "require-dev": {
         "filp/whoops": "~2.0",

composer.lock

@@ -228,6 +228,7 @@
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
+        'Yaml' => Symfony\Component\Yaml\Yaml::class,
 
         'SupportedApps' => App\SupportedApps::class,
         'EnhancedApps' => App\EnhancedApps::class,