Merge pull request #3443 from mcornella/better-web-search-plugin

Refactor and improve web-search plugin

plugins/web-search/web-search.plugin.zsh

@@ -1,43 +1,46 @@
 # web_search from terminal
 
 function web_search() {
-  # get the open command
+  emulate -L zsh
-  local open_cmd
+
-  if [[ "$OSTYPE" = darwin* ]]; then
+  # define search engine URLS
-    open_cmd='open'
+  typeset -A urls
-  else
+  urls=(
-    open_cmd='xdg-open'
+    google      "https://www.google.com/search?q="
-  fi
+    bing        "https://www.bing.com/search?q="
+    yahoo       "https://search.yahoo.com/search?p="
+    duckduckgo  "https://www.duckduckgo.com/?q="
+    yandex      "https://yandex.ru/yandsearch?text="
+  )
+
+  # define the open command
+  case "$OSTYPE" in
+    darwin*)  open_cmd="open" ;;
+    cygwin*)  open_cmd="cygstart" ;;
+    linux*)   open_cmd="xdg-open" ;;
+    *)        echo "Platform $OSTYPE not supported"
+              return 1
+              ;;
+  esac
 
   # check whether the search engine is supported
-  if [[ ! $1 =~ '(google|bing|yahoo|duckduckgo)' ]];
+  if [[ -z "$urls[$1]" ]]; then
-  then
     echo "Search engine $1 not supported."
     return 1
   fi
 
-  local url="http://www.$1.com"
+  # search or go to main page depending on number of arguments passed
-
+  if [[ $# -gt 1 ]]; then
-  # no keyword provided, simply open the search engine homepage
+    # build search url:
-  if [[ $# -le 1 ]]; then
+    # join arguments passed with '+', then append to search engine URL
-    $open_cmd "$url"
+    url="${urls[$1]}${(j:+:)@[2,-1]}"
-    return
-  fi
-  if [[ $1 == 'duckduckgo' ]]; then
-  #slightly different search syntax for DDG
-    url="${url}/?q="
   else
-    url="${url}/search?q="
+    # build main page url:
+    # split by '/', then rejoin protocol (1) and domain (2) parts with '//'
+    url="${(j://:)${(s:/:)urls[$1]}[1,2]}"
   fi
-  shift   # shift out $1
 
-  while [[ $# -gt 0 ]]; do
+  nohup $open_cmd "$url" &>/dev/null
-    url="${url}$1+"
-    shift
-  done
-
-  url="${url%?}" # remove the last '+'
-  nohup $open_cmd "$url" >/dev/null 2&>1
 }
 
 
@@ -45,6 +48,8 @@ alias bing='web_search bing'
 alias google='web_search google'
 alias yahoo='web_search yahoo'
 alias ddg='web_search duckduckgo'
+alias yandex='web_search yandex'
+
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
 alias news='web_search duckduckgo \!n'