Skip to content

Commit

Permalink
Minor stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
grisu48 committed Dec 16, 2024
1 parent 447980e commit e4268e7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
12 changes: 7 additions & 5 deletions cmd/openqa-revtui/openqa-revtui.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,29 +163,31 @@ func registerRabbitMQ(cf *Config, remote, topic string) (gopenqa.RabbitMQ, error
}

func main() {
var cf Config
var defaultConfig Config
var err error
cfs = make([]Config, 0)

if cf, err = loadDefaultConfig(); err != nil {
if defaultConfig, err = loadDefaultConfig(); err != nil {
fmt.Fprintf(os.Stderr, "Error loading default config file: %s\n", err)
os.Exit(1)
}
if err := parseProgramArgs(&cf); err != nil {
if err := parseProgramArgs(&defaultConfig); err != nil {
fmt.Fprintf(os.Stderr, "%s\n", err)
os.Exit(1)
}

// If no configuration file has been added, use the default configuration
// This is needed for allowing configuration to be set via program parameters
if len(cfs) < 1 {
cfs = append(cfs, cf)
if err := cf.Validate(); err != nil {
if err := defaultConfig.Validate(); err != nil {
fmt.Fprintf(os.Stderr, "%s\n", err)
os.Exit(1)
}
cfs = append(cfs, defaultConfig)
}

cf := &cfs[cfi]

// Run TUI and use the return code
tui = CreateTUI()
// Apply sorting of the first group
Expand Down
20 changes: 12 additions & 8 deletions cmd/openqa-revtui/tui.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,19 +231,23 @@ func (tui *TUI) readInput() {
// Always leave one line overlap for better orientation
tui.Model.offset = min(max, tui.Model.offset+tui.screensize-1)
case 90: // Shift+Tab
cfi--
if cfi < 0 {
cfi = len(cfs) - 1
if len(cfs) > 1 {
cfi--
if cfi < 0 {
cfi = len(cfs) - 1
}
RefreshJobs()
tui.Update()
}
RefreshJobs()
tui.Update()
}
}
// Default keys
if k == 9 { // Tab
cfi = (cfi + 1) % len(cfs)
RefreshJobs()
tui.Update()
if len(cfs) > 1 {
cfi = (cfi + 1) % len(cfs)
RefreshJobs()
tui.Update()
}
}

// Forward keypress to listener
Expand Down

0 comments on commit e4268e7

Please sign in to comment.