diff --git a/.all-contributorsrc b/.all-contributorsrc index 3ce727e9..a51d415c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -714,6 +714,13 @@ "name": "Jason Schweier", "avatar_url": "https://avatars1.githubusercontent.com/u/4923990?v=4", "profile": "http://jmks.ca", + "contributions": [] + }, + { + "login": "massa1240", + "name": "Massa", + "avatar_url": "https://avatars2.githubusercontent.com/u/8268483?v=4", + "profile": "https://github.com/massa1240", "contributions": [ ] } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cd6fa01..e4f7aea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ * [Transmission](https://wtfutil.com/modules/transmission/) module no longer blocks rendering when a Transmission daemon cannot be found, [#661](https://github.com/wtfutil/wtf/issues/661) by [@senorprogrammer](https://github.com/senorprogrammer) * [Trello](https://wtfutil.com/modules/trello/) module now respects project list order, [#664](https://github.com/wtfutil/wtf/issues/664) by [@Seanstoppable](https://github.com/Seanstoppable) * [Todo](https://wtfutil.com/modules/todo/) module now respects checkbox settings, [#616](https://github.com/wtfutil/wtf/issues/616) by [@Seanstoppable](https://github.com/Seanstoppable) +* [Todoist](https://wtfutil.com/modules/todoist/) module now properly handles todo items with due date and times, [#645](https://github.com/wtfutil/wtf/issues/645) by [@massa1240](https://github.com/massa1240) ### 👍 Updated diff --git a/README.md b/README.md index 524738d7..f1da567f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![All Contributors](https://img.shields.io/badge/all_contributors-101-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-102-orange.svg?style=flat-square)](#contributors) [![Build Status](https://travis-ci.com/wtfutil/wtf.svg?branch=master)](https://travis-ci.com/wtfutil/wtf) [![Twitter](https://img.shields.io/badge/follow-on%20twitter-blue.svg)](https://twitter.com/wtfutil) [![Go Report Card](https://goreportcard.com/badge/github.com/wtfutil/wtf)](https://goreportcard.com/report/github.com/wtfutil/wtf) @@ -211,7 +211,7 @@ Dependency management in WTF is handled by [Go modules](https://github.com/golan | [Bob 'Wombat' Hogg
Bob 'Wombat' Hogg](https://github.com/rwhogg)
| [Christopher Hall
Christopher Hall](https://github.com/hxw)
| [Heitor Neiva
Heitor Neiva](https://github.com/hneiva)
| [Herby Gillot
Herby Gillot](https://github.com/herbygillot)
| [James Canning
James Canning](http://brudil.com)
| [jeffz
jeffz](https://twitter.com/jeffz4000)
| [Mikkel Jeppesen Juhl
Mikkel Jeppesen Juhl](https://mikkeljuhl.com)
| | [Erik
Erik](https://github.com/lesteenman)
| [Nate Yourchuck
Nate Yourchuck](https://github.com/nyourchuck)
| [Casey Primozic
Casey Primozic](https://cprimozic.net/)
| [Alvaro [Andor]
Alvaro [Andor]](http://pierdelacabeza.com/maruja)
| [Joel Valentine
Joel Valentine](https://github.com/Midnight-Conqueror)
| [Viktor Braun
Viktor Braun](https://www.viktor-braun.de)
| [ChrisDBrown
ChrisDBrown](https://www.chrisdbrown.co.uk/)
| | [Narendra L
Narendra L](https://narengowda.github.io/)
| [ibaum
ibaum](https://github.com/ibaum)
| [Tim Scheuermann
Tim Scheuermann](https://github.com/noxer)
| [Indradhanush Gupta
Indradhanush Gupta](https://indradhanush.github.io/)
| [Victor Hugo Avelar Ossorio
Victor Hugo Avelar Ossorio](https://victoravelar.com)
| [Steven Whitehead
Steven Whitehead](https://github.com/scw007)
| [Lawrence Craft
Lawrence Craft](https://github.com/lawrencecraft)
| -| [Avi Press
Avi Press](http://avi.press)
| [Sarah Kraßnigg
Sarah Kraßnigg](https://github.com/Tardog)
| [Jason Schweier
Jason Schweier](http://jmks.ca)
| +| [Avi Press
Avi Press](http://avi.press)
| [Sarah Kraßnigg
Sarah Kraßnigg](https://github.com/Tardog)
| [Jason Schweier
Jason Schweier](http://jmks.ca)
| [Massa
Massa](https://github.com/massa1240)
| ## Acknowledgments diff --git a/modules/cmdrunner/settings.go b/modules/cmdrunner/settings.go index 3f6c13db..f1c33f04 100644 --- a/modules/cmdrunner/settings.go +++ b/modules/cmdrunner/settings.go @@ -19,6 +19,10 @@ type Settings struct { cmd string `help:"The terminal command to be run, withouth the arguments. Ie: ping, whoami, curl."` tail bool `help:"Automatically scroll to the end of the command output."` maxLines int `help:"Maximum number of lines kept in the buffer."` + + // The dimensions of the module + width int + height int } // NewSettingsFromYAML loads the cmdrunner portion of the WTF config @@ -33,5 +37,7 @@ func NewSettingsFromYAML(name string, moduleConfig *config.Config, globalConfig maxLines: moduleConfig.UInt("maxLines", 256), } + settings.width, settings.height = utils.CalculateDimensions(moduleConfig, globalConfig) + return &settings } diff --git a/modules/cmdrunner/widget.go b/modules/cmdrunner/widget.go index ddcfd36d..6e8ffecb 100644 --- a/modules/cmdrunner/widget.go +++ b/modules/cmdrunner/widget.go @@ -3,6 +3,7 @@ package cmdrunner import ( "bytes" "fmt" + "os" "os/exec" "strings" "sync" @@ -108,6 +109,7 @@ func (widget *Widget) execute() { // Setup the command to run cmd := exec.Command(widget.settings.cmd, widget.settings.args...) cmd.Stdout = widget + cmd.Env = widget.environment() // Run the command and wait for it to exit in another Go-routine go func() { @@ -134,3 +136,13 @@ func (widget *Widget) drainLines(n int) { widget.buffer.ReadBytes('\n') } } + +func (widget *Widget) environment() []string { + envs := os.Environ() + envs = append( + envs, + fmt.Sprintf("WTF_WIDGET_WIDTH=%d", widget.settings.width), + fmt.Sprintf("WTF_WIDGET_HEIGHT=%d", widget.settings.height), + ) + return envs +} diff --git a/utils/utils.go b/utils/utils.go index d01b79f8..d5bf07a9 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -10,6 +10,8 @@ import ( "regexp" "runtime" "strings" + + "github.com/olebedev/config" ) const ( @@ -144,3 +146,53 @@ func ParseJson(obj interface{}, text io.Reader) error { } return nil } + +// CalculateDimensions reads the module dimensions from the module and global config. The border is already substracted. +func CalculateDimensions(moduleConfig, globalConfig *config.Config) (int, int) { + // Read the source data from the config + left := moduleConfig.UInt("position.left", 0) + top := moduleConfig.UInt("position.top", 0) + width := moduleConfig.UInt("position.width", 0) + height := moduleConfig.UInt("position.height", 0) + + cols := ToInts(globalConfig.UList("wtf.grid.columns")) + rows := ToInts(globalConfig.UList("wtf.grid.rows")) + + // Make sure the values are in bounds + left = clamp(left, 0, len(cols)-1) + top = clamp(top, 0, len(rows)-1) + width = clamp(width, 0, len(cols)-left) + height = clamp(height, 0, len(rows)-top) + + // Start with the border subtracted and add all the spanned rows and cols + w, h := -2, -2 + for _, x := range cols[left : left+width] { + w += x + } + for _, y := range rows[top : top+height] { + h += y + } + + // The usable space may be empty + w = max(w, 0) + h = max(h, 0) + + return w, h +} + +func max(a, b int) int { + if a > b { + return a + } + return b +} + +func clamp(x, a, b int) int { + if a > x { + return a + } + if b < x { + return b + } + return x +}