Skip to content

Commit 717c41a

Browse files
committed
替换filebutton优化启动速度;bug修复:输出滚动,file entry补全;G_VALUE_HOLDS_INT警告
1 parent f0c1b36 commit 717c41a

File tree

6 files changed

+153
-136
lines changed

6 files changed

+153
-136
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,21 @@ sqlmap ui, using PyGObject(gtk+3)
2121
- ~~UI重新排版~~
2222
- ~~分离并完善tooltip等提示信息~~
2323
- ~~细节优化(margin, padding啥的)~~
24-
- 打从加了filechooserbutton起, 启动就慢了一倍:
25-
根据line_profiler输出: gtk.FileChooserButton()有性能问题!
24+
- ~~打从加了filechooserbutton起, 启动就慢了一倍:
25+
根据line_profiler输出: gtk.FileChooserButton()有性能问题!~~
2626
- ~~重构~~
2727
- ~~添加session功能(v0.2.2)~~
2828
- ~~重构成MVC模式(结构重构改动很大, v0.3)~~
2929
- ~~将管道流集成到UI里(无法实现, 改用pty实现成功)~~
30-
- ~~添加API区(实现sqlmapapi client)~~
30+
- ~~添加API区(实现sqlmapapi client)~~
31+
- ~~修复: 修改filechooserbutton(常有什么network path超时警告, 启动加快),
32+
输出滚动不准确, file entry补全, G_VALUE_HOLDS_INT警告~~
3133
- 继续重构, 优化
3234

3335
#### ABOUT
34-
1. V0.3.2
36+
1. update at 2019-05-01 02:36:25
37+
V0.3.2
3538
2019年 04月 29日 星期一 21:20:07 CST
36-
V0.3.1
37-
2019年 04月 25日 星期四 17:36:44 CST
3839
作者: needle wang ( [email protected] )
3940
2. 使用PyGObject(Gtk+3: python3-gi)重写sqm.py
4041
3. 感谢[sqm](https://github.com/kxcode/gui-for-sqlmap)带来的灵感, 其作者: [KINGX](https://github.com/kxcode) (sqm UI 使用的是python2 + tkinter)

handlers.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,11 @@ def _task_view_append(self, output):
349349

350350
_task_view_textbuffer.insert(_end, '%s\n' % output)
351351

352-
self.m._page4_task_view.scroll_mark_onscreen(_mark)
353352
# 获取焦点
354353
# self.w.set_focus(self.m._page4_task_view)
355354
self.m._page4_task_view.grab_focus()
355+
# https://stackoverflow.com/questions/48934458/gtk-sourceview-scroll-to-mark-not-working
356+
GLib.idle_add(self.m._page4_task_view.scroll_mark_onscreen, _mark)
356357

357358
def run_cmdline(self, button):
358359
'''
@@ -403,9 +404,6 @@ def run_cmdline_old(self, button):
403404
# print(_cmdline_str)
404405
Popen(_cmdline_str, shell = True)
405406

406-
def set_file_entry_text(self, button, entry):
407-
entry.set_text(button.get_filename())
408-
409407
def clear_log_view_buffer(self, button):
410408
_log_view_textbuffer = self.w._log_view.get_buffer()
411409
_log_view_textbuffer.set_text(''.join(
@@ -471,8 +469,8 @@ def _log_view_insert(self, file_path):
471469
time.strftime('\n%Y-%m-%d %R:%S: ----------我是分割线----------\n',
472470
time.localtime()))
473471

474-
self.w._log_view.scroll_mark_onscreen(_mark)
475472
self.w._log_view.grab_focus()
473+
GLib.idle_add(self.w._log_view.scroll_mark_onscreen, _mark)
476474

477475
def read_log_file(self, button):
478476
_base_dir = self._get_url_dir()

profiler.sh

100644100755
File mode changed.

session.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def _load_from_tmp_entry(self):
6868
_tmp_entry = getattr(self.m, _i)
6969

7070
if isinstance(_tmp_entry, g.Entry) and self._cfg['Entry'][_i]:
71+
# print(type(self._cfg['Entry'][_i]))
7172
_tmp_entry.set_text(self._cfg['Entry'][_i])
7273

7374
def _load_from_tmp_ckbtn(self):

0 commit comments

Comments
 (0)