More refactoring (#5965)

data/txt/sha256sums.txt

@@ -189,7 +189,7 @@ c4bfb493a03caf84dd362aec7c248097841de804b7413d0e1ecb8a90c8550bc0  lib/core/readl
 d1bd70c1a55858495c727fbec91e30af267459c8f64d50fabf9e4ee2c007e920  lib/core/replication.py
 1d0f80b0193ac5204527bfab4bde1a7aee0f693fd008e86b4b29f606d1ef94f3  lib/core/revision.py
 d2eb8e4b05ac93551272b3d4abfaf5b9f2d3ac92499a7704c16ed0b4f200db38  lib/core/session.py
-3f6f1fb193835144edc8672dc3b21044509c6d380174ae15491cdb6b142f773b  lib/core/settings.py
+a5953548484b3f8fc1a1afd30f8a1ba46ceee4238f3d59509f0f0af369abb543  lib/core/settings.py
 1c5eab9494eb969bc9ce118a2ea6954690c6851cbe54c18373c723b99734bf09  lib/core/shell.py
 4eea6dcf023e41e3c64b210cb5c2efc7ca893b727f5e49d9c924f076bb224053  lib/core/subprocessng.py
 cdd352e1331c6b535e780f6edea79465cb55af53aa2114dcea0e8bf382e56d1a  lib/core/target.py
@@ -200,7 +200,7 @@ a9b3dca1c17f56bed8e07973c7f8603932012931947633781f7523c05cb2bed2  lib/core/testi
 cba481f8c79f4a75bd147b9eb5a1e6e61d70422fceadd12494b1dbaa4f1d27f4  lib/core/wordlist.py
 4608f21a4333c162ab3c266c903fda4793cc5834de30d06affe9b7566dd09811  lib/__init__.py
 7d1d3e07a1f088428d155c0e1b28e67ecbf5f62775bdeeeb11b4388369dce0f7  lib/parse/banner.py
-5d0de42823d3db6484bcdd3888052c7b32b3be92cf334047dd8825f4064dd76c  lib/parse/cmdline.py
+a3428f5586c907a323c700c5f3523580248f6f769dfbbf23e0dd3faa15d231e3  lib/parse/cmdline.py
 f1ad73b6368730b8b8bc2e28b3305445d2b954041717619bede421ccc4381625  lib/parse/configfile.py
 a96b7093f30b3bf774f5cc7a622867472d64a2ae8b374b43786d155cf6203093  lib/parse/handler.py
 cfd4857ce17e0a2da312c18dcff28aefaa411f419b4e383b202601c42de40eec  lib/parse/headers.py
@@ -247,7 +247,7 @@ af67d25e8c16b429a5b471d3c629dc1da262262320bf7cd68465d151c02def16  lib/utils/brut
 828940a8eefda29c9eb271c21f29e2c4d1d428ccf0dcc6380e7ee6740300ec55  lib/utils/crawler.py
 56b93ba38f127929346f54aa75af0db5f46f9502b16acfe0d674a209de6cad2d  lib/utils/deps.py
 3aca7632d53ab2569ddef876a1b90f244640a53e19b304c77745f8ddb15e6437  lib/utils/getch.py
-34912f5d88bcf99914f1a1946a4c8fdc1c0e06451e62c755c01b7d1b59d78a75  lib/utils/gui.py
+a49b6f13bee9d0f30d78c2cd321a61dbd619d9e14949747f8b15a984c7fb8105  lib/utils/gui.py
 4979120bbbc030eaef97147ee9d7d564d9683989059b59be317153cdaa23d85b  lib/utils/har.py
 af047a6efc1719a3d166fac0b7ff98ab3d29af7b676ff977e98c31c80e9e883e  lib/utils/hashdb.py
 8c9caffbd821ad9547c27095c8e55c398ea743b2e44d04b3572e2670389ccf5b  lib/utils/hash.py
@@ -261,7 +261,7 @@ c0e6e33d2aa115e7ab2459e099cbaeb282065ea158943efc2ff69ba771f03210  lib/utils/sear
 8258d0f54ad94e6101934971af4e55d5540f217c40ddcc594e2fba837b856d35  lib/utils/sgmllib.py
 61dfd44fb0a5a308ba225092cb2768491ea2393999683545b7a9c4f190001ab8  lib/utils/sqlalchemy.py
 6f5f4b921f8cfe625e4656ee4560bc7d699d1aebf6225e9a8f5cf969d0fa7896  lib/utils/timeout.py
-bb5b586044804d40630880dedb3aa7eadc9b81bd44f2511de6a642178a4984be  lib/utils/tui.py
+5ad017569d4cfbd0ec4971537e9bb81ad8ee008029422104932afceaed0fec57  lib/utils/tui.py
 9cb6bd014598515a95945f03861e7484d6c0f9f4b508219eb5cc0c372ed5c173  lib/utils/versioncheck.py
 bd4975ff9cbc0745d341e6c884e6a11b07b0a414105cc899e950686d2c1f88ba  lib/utils/xrange.py
 33049ba7ddaea4a8a83346b3be29d5afce52bbe0b9d8640072d45cadc0e6d4bb  LICENSE

lib/core/settings.py

@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.9.12.58"
+VERSION = "1.9.12.59"
 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/parse/cmdline.py

@@ -775,6 +775,9 @@ def cmdLineParser(argv=None):
         miscellaneous.add_argument("--disable-hashing", dest="disableHashing", action="store_true",
             help="Disable hash analysis on table dumps")
 
+        miscellaneous.add_argument("--gui", dest="gui", action="store_true",
+            help="Experimental Tkinter GUI")
+
         miscellaneous.add_argument("--list-tampers", dest="listTampers", action="store_true",
             help="Display list of available tamper scripts")
 
@@ -799,6 +802,9 @@ def cmdLineParser(argv=None):
         miscellaneous.add_argument("--tmp-dir", dest="tmpDir",
             help="Local directory for storing temporary files")
 
+        miscellaneous.add_argument("--tui", dest="tui", action="store_true",
+            help="Experimental ncurses TUI")
+
         miscellaneous.add_argument("--unstable", dest="unstable", action="store_true",
             help="Adjust options for unstable connections")
 
@@ -857,12 +863,6 @@ def cmdLineParser(argv=None):
         parser.add_argument("--non-interactive", dest="nonInteractive", action="store_true",
             help=SUPPRESS)
 
-        parser.add_argument("--gui", dest="gui", action="store_true",
-            help=SUPPRESS)
-
-        parser.add_argument("--tui", dest="tui", action="store_true",
-            help=SUPPRESS)
-
         parser.add_argument("--smoke-test", dest="smokeTest", action="store_true",
             help=SUPPRESS)
 

lib/utils/gui.py

@@ -67,7 +67,7 @@ def runGui(parser):
         errMsg = "unable to create GUI window ('%s')" % getSafeExString(ex)
         raise SqlmapSystemException(errMsg)
 
-    window.title("sqlmap - Tk GUI")
+    window.title("sqlmap - Tkinter GUI")
 
     # Set theme and colors
     bg_color = "#f5f5f5"

lib/utils/tui.py

@@ -91,7 +91,7 @@ class NcursesUI:
     def _draw_header(self):
         """Draw the header bar"""
         height, width = self.stdscr.getmaxyx()
-        header = " sqlmap - Ncurses TUI "
+        header = " sqlmap - ncurses TUI "
         self.stdscr.attron(curses.color_pair(1) | curses.A_BOLD)
         self.stdscr.addstr(0, 0, header.center(width))
         self.stdscr.attroff(curses.color_pair(1) | curses.A_BOLD)