Avoid displaying single retrieved character when --verbose > 2

This commit is contained in:
Bernardo Damele 2010-11-07 22:42:56 +00:00
parent b6da946883
commit ea1b0d31be

View File

@ -99,7 +99,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
debugMsg = "starting %d thread%s" % (numThreads, ("s" if numThreads > 1 else "")) debugMsg = "starting %d thread%s" % (numThreads, ("s" if numThreads > 1 else ""))
logger.debug(debugMsg) logger.debug(debugMsg)
if conf.verbose >= 1 and not showEta: if conf.verbose in (1, 2) and not showEta:
if isinstance(length, int) and conf.threads > 1: if isinstance(length, int) and conf.threads > 1:
dataToStdout("[%s] [INFO] retrieved: %s" % (time.strftime("%X"), "_" * min(length, conf.progressWidth))) dataToStdout("[%s] [INFO] retrieved: %s" % (time.strftime("%X"), "_" * min(length, conf.progressWidth)))
dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X")) dataToStdout("\r[%s] [INFO] retrieved: " % time.strftime("%X"))
@ -413,7 +413,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if isinstance(finalValue, basestring) and len(finalValue) > 0: if isinstance(finalValue, basestring) and len(finalValue) > 0:
dataToSessionFile(replaceNewlineTabs(finalValue)) dataToSessionFile(replaceNewlineTabs(finalValue))
if conf.verbose >= 1 and not showEta and infoMsg: if conf.verbose in (1, 2) and not showEta and infoMsg:
dataToStdout(infoMsg) dataToStdout(infoMsg)
kb.locks.seqLock = None kb.locks.seqLock = None
@ -452,7 +452,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if showEta: if showEta:
etaProgressUpdate(time.time() - charStart, len(commonValue)) etaProgressUpdate(time.time() - charStart, len(commonValue))
elif conf.verbose >= 1: elif conf.verbose in (1, 2):
dataToStdout(commonValue[index-1:]) dataToStdout(commonValue[index-1:])
finalValue = commonValue finalValue = commonValue
@ -500,10 +500,10 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if showEta: if showEta:
etaProgressUpdate(time.time() - charStart, index) etaProgressUpdate(time.time() - charStart, index)
elif conf.verbose >= 1: elif conf.verbose in (1, 2):
dataToStdout(val) dataToStdout(val)
if conf.verbose >= 1 or showEta: if conf.verbose in (1, 2) or showEta:
dataToStdout("\n") dataToStdout("\n")
if ( conf.verbose in ( 1, 2 ) and showEta ) or conf.verbose >= 3: if ( conf.verbose in ( 1, 2 ) and showEta ) or conf.verbose >= 3: