X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=data%2Fbash%2Fcompletion.sh;h=2940cb7b1fca669c2c88096c9e0adbe4e1e29a45;hb=8c72e63ba4d41c4d9722ddff3c000de314ff66dc;hp=be0d4447f1772a87ab7b7e406c420c2a73812957;hpb=e8b115becc6a6c5bb66810eb25fff8bebc80b000;p=mpd-sima.git

diff --git a/data/bash/completion.sh b/data/bash/completion.sh
index be0d444..2940cb7 100644
--- a/data/bash/completion.sh
+++ b/data/bash/completion.sh
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2010, 2011, 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of MPD_sima
 #
@@ -31,9 +31,10 @@ _sima() {
           -l --log \
           -v --log-level \
           -S --host \
-          -P --mpd_port \
+          -P --port \
           -h --help --version \
-          --var_dir \
+          --var-dir \
+          --generate-config \
           -d --daemon"
 
     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
@@ -42,7 +43,7 @@ _sima() {
     fi
 
     case "${prev}" in
-        --var_dir)
+        --var-dir)
             _filedir -d
             ;;
         -v|--log-level)
@@ -54,11 +55,11 @@ _sima() {
         -c|--config)
             _filedir
             if [ -z $XDG_DATA_HOME ]; then
-                local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done)
+                local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $PWD/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done)
             else
-                local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $XDG_DATA_HOME/mpd_sima/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done)
+                local confnames=$(for x in $(ls -1 $HOME/.config/mpd_sima/*.cfg $XDG_DATA_HOME/mpd_sima/*.cfg $PWD/*.cfg 2>/dev/null) ; do echo "${x##*//}"; done)
             fi
-            COMPREPLY+=( $(compgen -W "${confnames}") )
+            COMPREPLY+=( $(compgen -W "${confnames}" -- ${cur} ) )
             return 0
             ;;
         --host|-S)
@@ -71,23 +72,17 @@ _sima() {
 complete -F _sima mpd_sima
 complete -F _sima mpd-sima
 
-_art_names_list() {
-    local IFS=$'\n'
-    compgen -W "${artists}" -- ${cur}
-}
-
 _simadb_cli() {
-    local cur prev opts artists
+    local cur prev opts
     local IFS=$'\n'
     COMPREPLY=()
     _get_comp_words_by_ref cur prev
-    opts="--add_similarity -a --remove_similarity --remove_artist \
-    --purge_hist --view_artist --view_all \
-    --bl_curr_trk --bl_curr_art --bl_curr_al --bl_art --remove_bl --view_bl \
-    --dbfile -d \
-    --host -S --port -P \
-    --reciprocal -r --check_names -c \
-    --version -h --help"
+    opts="--purge_hist \
+        --bl_curr_trk --bl_curr_art --bl_curr_al --bl_art --remove_bl --view_bl \
+        --dbfile -d \
+        --host -S --port -P \
+        --check_names -c \
+        --version -h --help"
     opts=$(echo $opts | sed 's/ /\n/g')
 
     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
@@ -105,15 +100,6 @@ _simadb_cli() {
         --host|-S)
             COMPREPLY=( $(compgen -A hostname ${cur}) )
             ;;
-        -a|--add_similarity|--view_artist|-v|--bl_art)
-            if [ -x /usr/bin/mpc ]; then
-                artists=$(for x in $(/usr/bin/mpc list artist) ; do echo "'${x}'"; done)
-                COMPREPLY=( $(compgen -W "${artists}" -- ${cur}) )
-                return 0
-            fi
-            # It should also complete artist name when the string ends with a comma
-            return 0
-            ;;
         *)
             ;;
     esac