fluzzi32/connpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix completion

Browse Source
This commit is contained in:
fluzzi 2022-04-05 15:09:05 -03:00
parent 1f5fe13805
commit fa250e2ae3
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connpy/__init__.py
View File

@ -126,7 +126,7 @@ from .connapp import connapp
from pkg_resources import get_distribution from pkg_resources import get_distribution
__all__ = ["node", "nodes", "configfile", "connapp"] __all__ = ["node", "nodes", "configfile", "connapp"]
__version__ = "2.0.1" __version__ = "2.0.2"
__author__ = "Federico Luzzi" __author__ = "Federico Luzzi"
__pdoc__ = { __pdoc__ = {
'core': False, 'core': False,

7
connpy/connapp.py
View File

@ -690,9 +690,11 @@ _conn()
{ {
DATADIR=$HOME/.config/conn DATADIR=$HOME/.config/conn
command -v jq >/dev/null 2>&1 && {
mapfile -t connections < <(jq -r ' .["connections"] | paths as $path | select(getpath($path) == "connection") | $path | [map(select(. != "type"))[-1,-2,-3]] | map(select(. !=null)) | join("@")' $DATADIR/config.json) mapfile -t connections < <(jq -r ' .["connections"] | paths as $path | select(getpath($path) == "connection") | $path | [map(select(. != "type"))[-1,-2,-3]] | map(select(. !=null)) | join("@")' $DATADIR/config.json)
mapfile -t folders < <(jq -r ' .["connections"] | paths as $path | select(getpath($path) == "folder" or getpath($path) == "subfolder") | $path | [map(select(. != "type"))[-1,-2]] | map(select(. !=null)) | join("@")' $DATADIR/config.json) mapfile -t folders < <(jq -r ' .["connections"] | paths as $path | select(getpath($path) == "folder" or getpath($path) == "subfolder") | $path | [map(select(. != "type"))[-1,-2]] | map(select(. !=null)) | join("@")' $DATADIR/config.json)
mapfile -t profiles < <(jq -r '.["profiles"] | keys[]' $DATADIR/config.json) mapfile -t profiles < <(jq -r '.["profiles"] | keys[]' $DATADIR/config.json)
}
if [ "${#COMP_WORDS[@]}" = "2" ]; then if [ "${#COMP_WORDS[@]}" = "2" ]; then
strings="--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help" strings="--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help"
strings="$strings ${connections[@]} ${folders[@]/#/@}" strings="$strings ${connections[@]} ${folders[@]/#/@}"
@ -733,7 +735,6 @@ _conn()
} }
complete -o nosort -F _conn conn complete -o nosort -F _conn conn
complete -o nosort -F _conn connpy complete -o nosort -F _conn connpy
''' '''
if type == "zshcompletion": if type == "zshcompletion":
return ''' return '''
@ -750,12 +751,14 @@ _conn()
if [[ $words =~ '.* $' ]]; then if [[ $words =~ '.* $' ]]; then
num=$(($num + 1)) num=$(($num + 1))
fi fi
x=`jq -r ' .["connections"] | paths as $path | select(getpath($path) == "connection") | $path | [map(select(. != "type"))[-1,-2,-3]] | map(select(. !=null)) | join("@")' /home/fluzzi32/.config/conn/config.json` command -v jq >/dev/null 2>&1 && {
x=`jq -r ' .["connections"] | paths as $path | select(getpath($path) == "connection") | $path | [map(select(. != "type"))[-1,-2,-3]] | map(select(. !=null)) | join("@")' $DATADIR/config.json`
connections=( $x ) connections=( $x )
x=`jq -r ' .["connections"] | paths as $path | select(getpath($path) == "folder" or getpath($path) == "subfolder") | $path | [map(select(. != "type"))[-1,-2]] | map(select(. !=null)) | join("@")' $DATADIR/config.json | sed -e 's/^/@/'` x=`jq -r ' .["connections"] | paths as $path | select(getpath($path) == "folder" or getpath($path) == "subfolder") | $path | [map(select(. != "type"))[-1,-2]] | map(select(. !=null)) | join("@")' $DATADIR/config.json | sed -e 's/^/@/'`
folders=( $x ) folders=( $x )
x=`jq -r '.["profiles"] | keys[]' $DATADIR/config.json` x=`jq -r '.["profiles"] | keys[]' $DATADIR/config.json`
profiles=( $x ) profiles=( $x )
}
if [ "${num}" = "2" ]; then if [ "${num}" = "2" ]; then
strings="--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help" strings="--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help"
strings="$strings ${connections[@]} ${folders[@]}" strings="$strings ${connections[@]} ${folders[@]}"

9
docs/connpy/index.html
View File

@ -259,7 +259,7 @@ from .connapp import connapp
from pkg_resources import get_distribution from pkg_resources import get_distribution
__all__ = [&#34;node&#34;, &#34;nodes&#34;, &#34;configfile&#34;, &#34;connapp&#34;] __all__ = [&#34;node&#34;, &#34;nodes&#34;, &#34;configfile&#34;, &#34;connapp&#34;]
__version__ = &#34;2.0.1&#34; __version__ = &#34;2.0.2&#34;
__author__ = &#34;Federico Luzzi&#34; __author__ = &#34;Federico Luzzi&#34;
__pdoc__ = { __pdoc__ = {
&#39;core&#39;: False, &#39;core&#39;: False,
@ -1289,9 +1289,11 @@ _conn()
{ {
DATADIR=$HOME/.config/conn DATADIR=$HOME/.config/conn
command -v jq &gt;/dev/null 2&gt;&amp;1 &amp;&amp; {
mapfile -t connections &lt; &lt;(jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;connection&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2,-3]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json) mapfile -t connections &lt; &lt;(jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;connection&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2,-3]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json)
mapfile -t folders &lt; &lt;(jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;folder&#34; or getpath($path) == &#34;subfolder&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json) mapfile -t folders &lt; &lt;(jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;folder&#34; or getpath($path) == &#34;subfolder&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json)
mapfile -t profiles &lt; &lt;(jq -r &#39;.[&#34;profiles&#34;] | keys[]&#39; $DATADIR/config.json) mapfile -t profiles &lt; &lt;(jq -r &#39;.[&#34;profiles&#34;] | keys[]&#39; $DATADIR/config.json)
}
if [ &#34;${#COMP_WORDS[@]}&#34; = &#34;2&#34; ]; then if [ &#34;${#COMP_WORDS[@]}&#34; = &#34;2&#34; ]; then
strings=&#34;--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help&#34; strings=&#34;--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help&#34;
strings=&#34;$strings ${connections[@]} ${folders[@]/#/@}&#34; strings=&#34;$strings ${connections[@]} ${folders[@]/#/@}&#34;
@ -1332,7 +1334,6 @@ _conn()
} }
complete -o nosort -F _conn conn complete -o nosort -F _conn conn
complete -o nosort -F _conn connpy complete -o nosort -F _conn connpy
&#39;&#39;&#39; &#39;&#39;&#39;
if type == &#34;zshcompletion&#34;: if type == &#34;zshcompletion&#34;:
return &#39;&#39;&#39; return &#39;&#39;&#39;
@ -1349,12 +1350,14 @@ _conn()
if [[ $words =~ &#39;.* $&#39; ]]; then if [[ $words =~ &#39;.* $&#39; ]]; then
num=$(($num + 1)) num=$(($num + 1))
fi fi
x=`jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;connection&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2,-3]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; /home/fluzzi32/.config/conn/config.json` command -v jq &gt;/dev/null 2&gt;&amp;1 &amp;&amp; {
x=`jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;connection&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2,-3]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json`
connections=( $x ) connections=( $x )
x=`jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;folder&#34; or getpath($path) == &#34;subfolder&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json | sed -e &#39;s/^/@/&#39;` x=`jq -r &#39; .[&#34;connections&#34;] | paths as $path | select(getpath($path) == &#34;folder&#34; or getpath($path) == &#34;subfolder&#34;) | $path | [map(select(. != &#34;type&#34;))[-1,-2]] | map(select(. !=null)) | join(&#34;@&#34;)&#39; $DATADIR/config.json | sed -e &#39;s/^/@/&#39;`
folders=( $x ) folders=( $x )
x=`jq -r &#39;.[&#34;profiles&#34;] | keys[]&#39; $DATADIR/config.json` x=`jq -r &#39;.[&#34;profiles&#34;] | keys[]&#39; $DATADIR/config.json`
profiles=( $x ) profiles=( $x )
}
if [ &#34;${num}&#34; = &#34;2&#34; ]; then if [ &#34;${num}&#34; = &#34;2&#34; ]; then
strings=&#34;--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help&#34; strings=&#34;--add --del --rm --edit --mod --show mv move ls list cp copy profile bulk config --help&#34;
strings=&#34;$strings ${connections[@]} ${folders[@]}&#34; strings=&#34;$strings ${connections[@]} ${folders[@]}&#34;