nxshock/omq
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add export path picker

Browse Source
This commit is contained in:
nxshock 2024-03-05 21:41:51 +05:00
parent 7c6ca4c81b
commit fdb66f92f5
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel.go
View File

@ -25,6 +25,7 @@ type Job struct {
scriptFilePath string scriptFilePath string
exportFileFormat ExportFormat exportFileFormat ExportFormat
encoding Encoding encoding Encoding
exportPath string
config Config config Config
@ -72,7 +73,7 @@ func (j *Job) export(inputRows chan Row) error {
return err return err
} }
fileName := filepath.Base(j.scriptFilePath) fileName := filepath.Join(j.exportPath, filepath.Base(j.scriptFilePath))
fileName = strings.TrimSuffix(fileName, filepath.Ext(fileName)) fileName = strings.TrimSuffix(fileName, filepath.Ext(fileName))
outputRows := make(chan []any) outputRows := make(chan []any)

23
ui_main_form.go
View File

@ -33,6 +33,8 @@ type TMainForm struct {
ExportFormatComboBox *vcl.TComboBox ExportFormatComboBox *vcl.TComboBox
CharsetLabel *vcl.TLabel CharsetLabel *vcl.TLabel
CharsetComboBox *vcl.TComboBox CharsetComboBox *vcl.TComboBox
ExportPathLabel *vcl.TLabel
ExportPathPicker *vcl.TDirectoryEdit
BottomPanel *vcl.TPanel BottomPanel *vcl.TPanel
LaunchButton *vcl.TBitBtn LaunchButton *vcl.TBitBtn
@ -157,6 +159,24 @@ func (f *TMainForm) OnFormCreate(sender vcl.IObject) {
f.CharsetComboBox.SetTop(700) f.CharsetComboBox.SetTop(700)
f.CharsetComboBox.SetStyle(types.CsDropDownList) f.CharsetComboBox.SetStyle(types.CsDropDownList)
f.ExportPathLabel = vcl.NewLabel(f)
f.ExportPathLabel.SetParent(f.GroupBox)
f.ExportPathLabel.SetCaption("Путь сохранения результата")
f.ExportPathLabel.SetAlign(types.AlTop)
f.ExportPathLabel.SetTop(800)
f.ExportPathLabel.BorderSpacing().SetTop(8)
f.ExportPathLabel.BorderSpacing().SetLeft(8)
f.ExportPathLabel.BorderSpacing().SetRight(8)
f.ExportPathPicker = vcl.NewDirectoryEdit(f)
f.ExportPathPicker.SetParent(f.GroupBox)
f.ExportPathPicker.SetAlign(types.AlTop)
f.ExportPathPicker.BorderSpacing().SetTop(2)
f.ExportPathPicker.BorderSpacing().SetLeft(8)
f.ExportPathPicker.BorderSpacing().SetRight(8)
f.ExportPathPicker.SetTop(900)
f.ExportPathPicker.SetFlat(true)
f.BottomPanel = vcl.NewPanel(f) f.BottomPanel = vcl.NewPanel(f)
f.BottomPanel.SetParent(f.TabSheet1) f.BottomPanel.SetParent(f.TabSheet1)
f.BottomPanel.SetAlign(types.AlBottom) f.BottomPanel.SetAlign(types.AlBottom)
@ -258,7 +278,8 @@ func (f *TMainForm) OnLaunchButtonClick(sender vcl.IObject) {
configFilePath: filepath.Join(CONFIG_FILES_DIR, f.ConfigComboBox.Text()) + "." + CONFIG_FILE_EXT, configFilePath: filepath.Join(CONFIG_FILES_DIR, f.ConfigComboBox.Text()) + "." + CONFIG_FILE_EXT,
scriptFilePath: filepath.Join(SQL_FILES_DIR, f.SqlFileComboBox.Text()) + "." + SQL_FILE_EXT, scriptFilePath: filepath.Join(SQL_FILES_DIR, f.SqlFileComboBox.Text()) + "." + SQL_FILE_EXT,
exportFileFormat: ExportFormat(f.ExportFormatComboBox.Text()), exportFileFormat: ExportFormat(f.ExportFormatComboBox.Text()),
encoding: Encoding(f.CharsetComboBox.Text())} encoding: Encoding(f.CharsetComboBox.Text()),
exportPath: f.ExportPathPicker.Directory()}
err := job.init() err := job.init()
if err != nil { if err != nil {