Some cleanup, CLI/bash completion/Doc improvements

diff --git a/data/bash/completion.sh b/data/bash/completion.sh
index d1d6b64b4214dc83510a7cff24c0bfdb3097694a..0a8ff29ac608bcf32da7e07f0026e032d98b1c6f 100644 (file)
--- a/data/bash/completion.sh
+++ b/data/bash/completion.sh
@@ -33,7 +33,8 @@ _sima() {
           -S --host \
           -P --port \
           -h --help --version \
           -S --host \
           -P --port \
           -h --help --version \

-          --var_dir \
+          --var-dir --var_dir \
+          --generate-config \

           -d --daemon"
 
     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
           -d --daemon"
 
     if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then


@@ -54,11 +55,11 @@ _sima() {
         -c|--config)
             _filedir
             if [ -z $XDG_DATA_HOME ]; then
         -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
             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
             fi

-            COMPREPLY+=( $(compgen -W "${confnames}") )
+            COMPREPLY+=( $(compgen -W "${confnames}" -- ${cur} ) )

             return 0
             ;;
         --host|-S)
             return 0
             ;;
         --host|-S)

diff --git a/doc/examples/all_settings.cfg b/doc/examples/all_settings.cfg
index 65cc61f8853b6c75725d0ef1b1cbe0b22936fa56..e8470be73dc790cbd14b161ee8f0bc0432190dff 100644 (file)
--- a/doc/examples/all_settings.cfg
+++ b/doc/examples/all_settings.cfg
@@ -112,10 +112,9 @@ musicbrainzid = True
 [crop]
 ## CONSUME
 # type: integer
 [crop]
 ## CONSUME
 # type: integer

-# default: unset, not cropping playlist
+# default: 10

 # description: How many played tracks to keep in the playlist.
 #  Allow to maintain a fixed length playlist.
 # description: How many played tracks to keep in the playlist.
 #  Allow to maintain a fixed length playlist.

-#  Leave commented to keep all tracks

 #consume = 10
 
 [random]
 #consume = 10
 
 [random]

diff --git a/sima/launch.py b/sima/launch.py
index 9fb0b2d51f17d802d0fe26d0982bdc6c0ecab9d0..4cc60e3be17993ad13536be4f5b92275816c9bc2 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -79,14 +79,13 @@ def load_plugins(sima, source):
 def start(sopt, restart=False):
     """starts application
     """
 def start(sopt, restart=False):
     """starts application
     """

-    # set logger
-    verbosity = sopt.options.get('verbosity', 'warning')

     # loads configuration
     config = ConfMan(sopt.options).config
     # loads configuration
     config = ConfMan(sopt.options).config

+    # set logger
+    logger = logging.getLogger('sima')

     logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)
     logfile = config.get('log', 'logfile', fallback=None)
     verbosity = config.get('log', 'verbosity')
     set_logger(verbosity, logfile)

-    logger = logging.getLogger('sima')

     logger.debug('Command line say: {0}'.format(sopt.options))
     # Create Database
     db_file = config.get('sima', 'db_file')
     logger.debug('Command line say: {0}'.format(sopt.options))
     # Create Database
     db_file = config.get('sima', 'db_file')

diff --git a/sima/lib/logger.py b/sima/lib/logger.py
index 20794069111b6914bcaa3c1cd7a3db8740415bd5..61d2d2504ddb668cf4f1475b004b15ed917861fa 100644 (file)
--- a/sima/lib/logger.py
+++ b/sima/lib/logger.py
@@ -54,7 +54,6 @@ def set_logger(level='info', logfile=None):
     logger:
         level: in debug, info, warning,…
         logfile: file to log to
     logger:
         level: in debug, info, warning,…
         logfile: file to log to

-

     """
     name = 'sima'
     if environ.get('TRACE', False):
     """
     name = 'sima'
     if environ.get('TRACE', False):

diff --git a/sima/utils/startopt.py b/sima/utils/startopt.py
index 2081c19266951f3b215d6353cd0229467c75c47a..e39330431711290d09e4e0095a85146aca8d53b8 100644 (file)
--- a/sima/utils/startopt.py
+++ b/sima/utils/startopt.py
@@ -89,7 +89,7 @@ OPTS = [
          configuration. You can put other options with this one to get them in\
          the generated configuration.'},
     {
          configuration. You can put other options with this one to get them in\
          the generated configuration.'},
     {

-        'sw':['--var_dir'],
+        'sw':['--var-dir', '--var_dir'],

         'dest': 'var_dir',
         'action': Wdir,
         'help': 'Directory to store var content (ie. database, cache)'},
         'dest': 'var_dir',
         'action': Wdir,
         'help': 'Directory to store var content (ie. database, cache)'},


@@ -106,14 +106,14 @@ OPTS = [
         #'help': 'Queue mode in [track, top, album]',
         'help': SUPPRESS, },
     {
         #'help': 'Queue mode in [track, top, album]',
         'help': SUPPRESS, },
     {

-        'sw':['--purge_history'],
+        'sw':['--purge-history'],

         'action': 'store_true',
         'dest': 'do_purge_history',
         'help': SUPPRESS},
 ]
 
 
         'action': 'store_true',
         'dest': 'do_purge_history',
         'help': SUPPRESS},
 ]
 
 

-class StartOpt(object):
+class StartOpt:

     """Command line management.
     """
 
     """Command line management.
     """