From: Filippo Valsorda Date: Fri, 7 Dec 2012 23:37:26 +0000 (+0100) Subject: it's curious but bash-completion is with - and not _ X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=4c1d273e88a88f7a7b9e09bb2bbadb161d25b615;p=youtube-dl it's curious but bash-completion is with - and not _ --- diff --git a/Makefile b/Makefile index 119c1eeaa..c97d6ffb0 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,8 @@ README.txt: README.md youtube-dl.1: README.md pandoc -s -f markdown -t man README.md -o youtube-dl.1 -youtube-dl.bash-completion: README.md devscripts/bash_completion.template - python devscripts/bash_completion.py +youtube-dl.bash-completion: youtube_dl/*.py devscripts/bash-completion.template + python devscripts/bash-completion.py youtube-dl.tar.gz: all tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \ diff --git a/devscripts/bash-completion.py b/devscripts/bash-completion.py new file mode 100644 index 000000000..880db7886 --- /dev/null +++ b/devscripts/bash-completion.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python +import os +from os.path import dirname as dirn +import sys + +sys.path.append(dirn(dirn((os.path.abspath(__file__))))) +import youtube_dl + +BASH_COMPLETION_FILE = "youtube-dl.bash-completion" +BASH_COMPLETION_TEMPLATE = "devscripts/bash-completion.template" + +def build_completion(opt_parser): + opts_flag = [] + for group in opt_parser.option_groups: + for option in group.option_list: + #for every long flag + opts_flag.append(option.get_opt_string()) + with open(BASH_COMPLETION_TEMPLATE) as f: + template = f.read() + with open(BASH_COMPLETION_FILE, "w") as f: + #just using the special char + filled_template = template.replace("{{flags}}", " ".join(opts_flag)) + f.write(filled_template) + +parser = youtube_dl.parseOpts()[0] +build_completion(parser) diff --git a/devscripts/bash-completion.template b/devscripts/bash-completion.template new file mode 100644 index 000000000..3b99a9614 --- /dev/null +++ b/devscripts/bash-completion.template @@ -0,0 +1,14 @@ +__youtube-dl() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + opts="{{flags}}" + + if [[ ${cur} == * ]] ; then + COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) + return 0 + fi +} + +complete -F __youtube-dl youtube-dl diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py deleted file mode 100644 index 704034f22..000000000 --- a/devscripts/bash_completion.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python -import os -from os.path import dirname as dirn -import sys - -sys.path.append(dirn(dirn((os.path.abspath(__file__))))) -import youtube_dl - -BASH_COMPLETION_FILE = "youtube-dl.bash_completion" -BASH_COMPLETION_TEMPLATE = "devscripts/bash_completion.template" - -def build_completion(opt_parser): - opts_flag = [] - for group in opt_parser.option_groups: - for option in group.option_list: - #for every long flag - opts_flag.append(option.get_opt_string()) - with open(BASH_COMPLETION_TEMPLATE) as f: - template = f.read() - with open(BASH_COMPLETION_FILE, "w") as f: - #just using the special char - filled_template = template.replace("{{flags}}", " ".join(opts_flag)) - f.write(filled_template) - -parser = youtube_dl.parseOpts()[0] -build_completion(parser) diff --git a/devscripts/bash_completion.template b/devscripts/bash_completion.template deleted file mode 100644 index 3b99a9614..000000000 --- a/devscripts/bash_completion.template +++ /dev/null @@ -1,14 +0,0 @@ -__youtube-dl() -{ - local cur prev opts - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - opts="{{flags}}" - - if [[ ${cur} == * ]] ; then - COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) - return 0 - fi -} - -complete -F __youtube-dl youtube-dl