sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2024-11-22 17:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Minor fix for a test case 211

Browse Source
This commit is contained in:
Miroslav Stampar 2013-05-09 21:20:17 +02:00
parent 8b64709c17
commit f8cef1fc6f
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/core/progress.py
View File

@ -75,7 +75,7 @@ class ProgressBar(object):
""" """
if len(self._times) <= ((self._max * 3) / 100) or newAmount > self._max: if len(self._times) <= ((self._max * 3) / 100) or newAmount > self._max:
eta = 0 eta = None
else: else:
midTime = sum(self._times) / len(self._times) midTime = sum(self._times) / len(self._times)
midTimeWithLatest = (midTime + deltaTime) / 2 midTimeWithLatest = (midTime + deltaTime) / 2
@ -85,22 +85,17 @@ class ProgressBar(object):
self.update(newAmount) self.update(newAmount)
self.draw(eta) self.draw(eta)
def draw(self, eta=0): def draw(self, eta=None):
""" """
This method draws the progress bar if it has changed This method draws the progress bar if it has changed
""" """
if self._progBar != self._oldProgBar: if self._progBar != self._oldProgBar:
self._oldProgBar = self._progBar self._oldProgBar = self._progBar
dataToStdout("\r%s %d/%d%s" % (self._progBar, self._amount, self._max, (" ETA %s" % self._convertSeconds(int(eta))) if eta is not None else ""))
if eta and self._amount < self._max: if self._amount >= self._max:
dataToStdout("\r%s %d/%d ETA %s" % (self._progBar, self._amount, self._max, self._convertSeconds(int(eta)))) dataToStdout("\r%s\r" % (" " * self._width))
else: kb.prependFlag = False
dataToStdout("\r%s\r" % (" " * (self._width - 1)))
if self._amount < self._max:
dataToStdout("%s %d/%d" % (self._progBar, self._amount, self._max))
else:
kb.prependFlag = False
def __str__(self): def __str__(self):
""" """