adjust code structure

Author: linychuo

.editorconfig

@@ -4,6 +4,7 @@ root = true
 
 [*]
 charset = utf-8
+end_of_line = lf
 insert_final_newline = true
 
 # Docstrings and comments use max_line_length = 79

.gitignore

@@ -1,7 +1,6 @@
-__pycache__
-dist
-build
-.env
-.idea
-.vscode
-*.pyc
+__pycache__
+dist
+build
+.env
+.idea
+*.pyc

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.pythonPath": ".env\\Scripts\\python.exe",
+    "python.formatting.yapfPath": ".env\\\\Scripts\\\\yapf"
+}

DESIGN.md

@@ -1,3 +1,3 @@
-## 界面设计
-1. 读取配置文件，如果用户没有打开过任何的sqlite数据库文件，则“弹窗”要求用户选择sqlite数据库文件，否则打开列表，展示打开过的sqlite数据库文件，让用户选择
-2. 用户选择相应的数据库文件后，进入“主界面”，主界面分[左右]两部分显示，左边展示所有的表，右边默认打开执行sql脚本的输入框
+## 界面设计
+1. 读取配置文件，如果用户没有打开过任何的sqlite数据库文件，则“弹窗”要求用户选择sqlite数据库文件，否则打开列表，展示打开过的sqlite数据库文件，让用户选择
+2. 用户选择相应的数据库文件后，进入“主界面”，主界面分[左右]两部分显示，左边展示所有的表，右边默认打开执行sql脚本的输入框

README.md

@@ -1,25 +1,26 @@
-# SQLite client tool
-
-## Dependencies
-- wxPython
-- pyinstaller
-- yapf
-
-## Development
-1. Clone this repository
-```bash
-git clone https://github.com/linychuo/SQLiteClient.git
-```
-2. You could run **cmd** behind root dir
-```bash
-Usage cmd [command]
-
-where [command] is one of:
-  init                  create new virtual env
-  active                active virtual env
-  deactive              deactive virtual env
-  prepare               install all dependencies
-  build                 package exe file
-  fmt                   formatting all py files
-  clean                 clean
-```
+# SQLite client tool
+
+## Dependencies
+- wxPython
+- pyinstaller
+- yapf
+
+## Development
+1. Please install python3!!! 
+2. Clone this repository
+```bash
+git clone https://github.com/linychuo/SQLiteClient.git
+```
+3. You could run **dev** behind root dir
+```bash
+Usage dev [command]
+
+where [command] is one of:
+  init                  create new virtual env
+  active                active virtual env
+  deactive              deactive virtual env
+  prepare               install all dependencies
+  build                 package exe file
+  fmt                   formatting all py files
+  clean                 clean
+```

app.spec

@@ -1,33 +1,33 @@
-# -*- mode: python -*-
-
-block_cipher = None
-
-
-a = Analysis(['app.py'],
-             pathex=['D:\\workspace\\SQLiteClient'],
-             binaries=[],
-             datas=[],
-             hiddenimports=[],
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='SQLiteClient',
-          debug=False,
-          strip=False,
-          upx=True,
-          console=False )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='SQLiteClient')
+# -*- mode: python -*-
+
+block_cipher = None
+
+
+a = Analysis(['app.py'],
+             pathex=['D:\\workspace\\SQLiteClient\\xman'],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='SQLiteClient',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=False )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='SQLiteClient')

cmd.bat dev.batcmd.bat renamed to dev.bat

@@ -1,73 +1,73 @@
-@echo off
-set ACTION=%~1
-
-if "init" == "%ACTION%" (
-	goto :init
-) else if "active" == "%ACTION%" (
-	goto :activate
-) else if "deactive" == "%ACTION%" (
-	goto :deactivate
-) else if "prepare" == "%ACTION%" (
-	goto :prepare
-) else if "build" == "%ACTION%" (
-	goto :build
-) else if "fmt" == "%ACTION%" (
-	goto :fmt
-) else if "clean" == "%ACTION%" (
-	goto :clean
-) else (
-	goto :usage
-)
-
-:init
-virtualenv .env
-goto :eof
-
-:activate
-if not exist "%~dp0.env\Scripts\activate.bat" call:init
-call %~dp0.env\Scripts\activate.bat
-goto :eof
-
-:deactivate
-if exist "%~dp0.env\Scripts\deactivate.bat" (
-call %~dp0.env\Scripts\deactivate.bat
-)
-goto :eof
-
-:prepare
-if not exist "%~dp0.env\Scripts\pip.exe" call:activate
-call %~dp0.env\Scripts\pip.exe install -r requirements.txt
-goto :eof
-
-:build
-if not exist "%~dp0.env\Scripts\pyinstaller.exe" call:prepare
-call %~dp0.env\Scripts\pyinstaller.exe app.spec
-goto :eof
-
-:fmt
-if not exist "%~dp0.env\Scripts\yapf.exe" call:prepare
-for %%d in (*.py) do (
-	echo formatting... %%d
-	call %~dp0.env\Scripts\yapf.exe -i %%d
-)
-goto :eof
-
-:clean
-if exist "%~dp0\build" rmdir/s/q build
-if exist "%~dp0\dist" rmdir/s/q dist
-goto :eof
-
-:usage
-set space_2=  
-set space_4=	
-echo.
-echo Usage cmd [command]
-echo.
-echo where [command] is one of:
-echo %space_2%init		%space_4%create new virtual env
-echo %space_2%active	%space_4%active virtual env
-echo %space_2%deactive	%space_4%deactive virtual env
-echo %space_2%prepare	%space_4%install all dependencies
-echo %space_2%build		%space_4%package exe file
-echo %space_2%fmt		%space_4%format all py files
-echo %space_2%clean		%space_4%clean
+@echo off
+set ACTION=%~1
+
+if "init" == "%ACTION%" (
+	goto :init
+) else if "active" == "%ACTION%" (
+	goto :activate
+) else if "deactive" == "%ACTION%" (
+	goto :deactivate
+) else if "prepare" == "%ACTION%" (
+	goto :prepare
+) else if "build" == "%ACTION%" (
+	goto :build
+) else if "fmt" == "%ACTION%" (
+	goto :fmt
+) else if "clean" == "%ACTION%" (
+	goto :clean
+) else (
+	goto :usage
+)
+
+:init
+python -m venv .env
+goto :eof
+
+:activate
+if not exist "%~dp0.env\Scripts\activate.bat" call:init
+call %~dp0.env\Scripts\activate.bat
+goto :eof
+
+:deactivate
+if exist "%~dp0.env\Scripts\deactivate.bat" (
+call %~dp0.env\Scripts\deactivate.bat
+)
+goto :eof
+
+:prepare
+if not exist "%~dp0.env\Scripts\pip.exe" call:activate
+call %~dp0.env\Scripts\pip.exe install -r requirements.txt
+goto :eof
+
+:build
+if not exist "%~dp0.env\Scripts\pyinstaller.exe" call:prepare
+call %~dp0.env\Scripts\pyinstaller.exe app.spec
+goto :eof
+
+:fmt
+if not exist "%~dp0.env\Scripts\yapf.exe" call:prepare
+for %%d in (*.py) do (
+	echo formatting... %%d
+	call %~dp0.env\Scripts\yapf.exe -i %%d
+)
+goto :eof
+
+:clean
+if exist "%~dp0\build" rmdir/s/q build
+if exist "%~dp0\dist" rmdir/s/q dist
+goto :eof
+
+:usage
+set space_2=  
+set space_4=	
+echo.
+echo Usage cmd [command]
+echo.
+echo where [command] is one of:
+echo %space_2%init		%space_4%create new virtual env
+echo %space_2%active	%space_4%active virtual env
+echo %space_2%deactive	%space_4%deactive virtual env
+echo %space_2%prepare	%space_4%install all dependencies
+echo %space_2%build		%space_4%package exe file
+echo %space_2%fmt		%space_4%format all py files
+echo %space_2%clean		%space_4%clean

requirements.txt

@@ -1,2 +1,3 @@
 wxPython
 pyinstaller
+yapf

app.py xman/app.pyapp.py renamed to xman/app.py

@@ -1,4 +1,3 @@
-# -*- coding=utf-8 -*-
 """
 Main application
 """

db.py xman/db.pydb.py renamed to xman/db.py

@@ -2,8 +2,8 @@
 
 
 class TableMeta:
-
-    def __init__(self, idx, column_name, column_type, is_null, default_value, is_pk):
+    def __init__(self, idx, column_name, column_type, is_null, default_value,
+                 is_pk):
         self.idx = idx + 1
         self.column_name = column_name
         self.column_type = column_type
@@ -22,15 +22,18 @@ def get_object_type(self):
         result = []
         with sqlite3.connect(self.db_file) as conn:
             c = conn.cursor()
-            for row in c.execute("select type from sqlite_master group by type"):
+            for row in c.execute(
+                    "select type from sqlite_master group by type"):
                 result.append(row[0].capitalize())
         return result
 
     def get_object_list(self, object_type):
         object_list = []
         with sqlite3.connect(self.db_file) as conn:
             c = conn.cursor()
-            for _row in c.execute("select * from sqlite_master where type = ?", (object_type,)):
+            for _row in c.execute("select * from sqlite_master where type = ?",
+                                  (object_type, )):
+                print(_row)
                 object_list.append(_row[1])
         return object_list
 
@@ -40,5 +43,14 @@ def get_meta_of_table(self, table_name):
             cur = conn.cursor()
             for row in cur.execute("PRAGMA table_info(%s)" % table_name):
                 print(row)
-                meta_data.append(TableMeta(row[0], row[1], row[2], row[3], row[4], row[5]))
+                meta_data.append(
+                    TableMeta(row[0], row[1], row[2], row[3], row[4], row[5]))
+        return meta_data
+
+    def get_meta_of_index(self, index_name):
+        meta_data = []
+        with sqlite3.connect(self.db_file) as conn:
+            cur = conn.cursor()
+            for row in cur.execute("PRAGMA index_info(%s)" % index_name):
+                print(row)
         return meta_data