Mercurial > libervia-backend
comparison frontends/src/jp/base.py @ 1641:44a14f83e64b
jp (base): fixed verbose option + there is a new line on ProgressErrorHandler only if the progress bar is actually displayed
author | Goffi <goffi@goffi.org> |
---|---|
date | Sun, 22 Nov 2015 17:35:32 +0100 |
parents | 5a641e7b858a |
children | 7ec7ce9cdc4c |
comparison
equal
deleted
inserted
replaced
1640:d470affbe65c | 1641:44a14f83e64b |
---|---|
186 progress_parent = self.parents['progress'] = argparse.ArgumentParser(add_help=False) | 186 progress_parent = self.parents['progress'] = argparse.ArgumentParser(add_help=False) |
187 if progressbar: | 187 if progressbar: |
188 progress_parent.add_argument("-P", "--progress", action="store_true", help=_("Show progress bar")) | 188 progress_parent.add_argument("-P", "--progress", action="store_true", help=_("Show progress bar")) |
189 | 189 |
190 verbose_parent = self.parents['verbose'] = argparse.ArgumentParser(add_help=False) | 190 verbose_parent = self.parents['verbose'] = argparse.ArgumentParser(add_help=False) |
191 verbose_parent.add_argument('--verbose', '-v', action='count', help=_(u"Add a verbosity level (can be used multiple times)")) | 191 verbose_parent.add_argument('--verbose', '-v', action='count', default=0, help=_(u"Add a verbosity level (can be used multiple times)")) |
192 | 192 |
193 def add_parser_options(self): | 193 def add_parser_options(self): |
194 self.parser.add_argument('--version', action='version', version=("%(name)s %(version)s %(copyleft)s" % {'name': PROG_NAME, 'version': self.version, 'copyleft': COPYLEFT})) | 194 self.parser.add_argument('--version', action='version', version=("%(name)s %(version)s %(copyleft)s" % {'name': PROG_NAME, 'version': self.version, 'copyleft': COPYLEFT})) |
195 | 195 |
196 def import_commands(self): | 196 def import_commands(self): |
495 | 495 |
496 def progressErrorHandler(self, uid, message, profile): | 496 def progressErrorHandler(self, uid, message, profile): |
497 if profile != self.profile: | 497 if profile != self.profile: |
498 return | 498 return |
499 if uid == self.progress_id: | 499 if uid == self.progress_id: |
500 self.disp('') # progress is not finished, so we skip a line | 500 if self.args.progress: |
501 self.disp('') # progress is not finished, so we skip a line | |
501 if self.host.quit_on_progress_end: | 502 if self.host.quit_on_progress_end: |
502 self.onProgressError(message) | 503 self.onProgressError(message) |
503 self.host.quitFromSignal(1) | 504 self.host.quitFromSignal(1) |
504 | 505 |
505 def onProgressStarted(self, metadata): | 506 def onProgressStarted(self, metadata): |