Some more refactoring

Author: stamparm

lib/core/settings.py

@@ -19,7 +19,7 @@
 from lib.core.enums import OS
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.11.34"
+VERSION = "1.1.11.35"
 TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
 TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
 VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/techniques/blind/inference.py

@@ -469,7 +469,7 @@ def blindThread():
                             currentCharIndex = threadData.shared.index[0]
 
                         if kb.threadContinue:
-                            charStart = time.time()
+                            start = time.time()
                             val = getChar(currentCharIndex, asciiTbl, not(charsetType is None and conf.charset))
                             if val is None:
                                 val = INFERENCE_UNKNOWN_CHAR
@@ -482,7 +482,7 @@ def blindThread():
 
                         if kb.threadContinue:
                             if showEta:
-                                progress.progress(time.time() - charStart, threadData.shared.index[0])
+                                progress.progress(calculateDeltaSeconds(start), threadData.shared.index[0])
                             elif conf.verbose >= 1:
                                 startCharIndex = 0
                                 endCharIndex = 0
@@ -550,7 +550,7 @@ def blindThread():
 
             while True:
                 index += 1
-                charStart = time.time()
+                start = time.time()
 
                 # Common prediction feature (a.k.a. "good samaritan")
                 # NOTE: to be used only when multi-threading is not set for
@@ -575,7 +575,7 @@ def blindThread():
                         # Did we have luck?
                         if result:
                             if showEta:
-                                progress.progress(time.time() - charStart, len(commonValue))
+                                progress.progress(calculateDeltaSeconds(start), len(commonValue))
                             elif conf.verbose in (1, 2) or conf.api:
                                 dataToStdout(filterControlChars(commonValue[index - 1:]))
 

txt/checksum.md5

@@ -46,7 +46,7 @@ e1c000db9be27f973569b1a430629037  lib/core/option.py
 760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
-34bc58ea008c92da42e79a18fce3ec9c  lib/core/settings.py
+a8384d71c6ec22df3c2fc67bf660aee8  lib/core/settings.py
 35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 d5a04d672a18f78deb2839c3745ff83c  lib/core/target.py
@@ -87,7 +87,7 @@ ac3f47b2f8d2cd530512405b4a23a9db  lib/takeover/metasploit.py
 21b6eff33f5d28c5e167a948976817cb  lib/takeover/udf.py
 e49d1213f9ae0c0f922c5aef4febe205  lib/takeover/web.py
 d3080bf68b4b85ed2c98af5de74e8b73  lib/takeover/xp_cmdshell.py
-ed995f2c65aab9f222005493b590eb2d  lib/techniques/blind/inference.py
+ca47f20b11f58ce60a0ddfcfca242d3f  lib/techniques/blind/inference.py
 5fb9aaf874daa47ea2b672a22740e56b  lib/techniques/blind/__init__.py
 5fb9aaf874daa47ea2b672a22740e56b  lib/techniques/dns/__init__.py
 95331b2826f28db9ff962670391aa7d6  lib/techniques/dns/test.py