Merge branch 'master' into master

.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": [
       ]
     }

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
 

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
 | [<img src="https://avatars3.githubusercontent.com/u/2373856?v=4" width="48px;" alt="Bob 'Wombat' Hogg"/><br /><sub><b>Bob 'Wombat' Hogg</b></sub>](https://github.com/rwhogg)<br /> | [<img src="https://avatars0.githubusercontent.com/u/143462?v=4" width="48px;" alt="Christopher Hall"/><br /><sub><b>Christopher Hall</b></sub>](https://github.com/hxw)<br /> | [<img src="https://avatars1.githubusercontent.com/u/3451557?v=4" width="48px;" alt="Heitor Neiva"/><br /><sub><b>Heitor Neiva</b></sub>](https://github.com/hneiva)<br /> | [<img src="https://avatars3.githubusercontent.com/u/618376?v=4" width="48px;" alt="Herby Gillot"/><br /><sub><b>Herby Gillot</b></sub>](https://github.com/herbygillot)<br /> | [<img src="https://avatars3.githubusercontent.com/u/382352?v=4" width="48px;" alt="James Canning"/><br /><sub><b>James Canning</b></sub>](http://brudil.com)<br /> | [<img src="https://avatars1.githubusercontent.com/u/45892?v=4" width="48px;" alt="jeffz"/><br /><sub><b>jeffz</b></sub>](https://twitter.com/jeffz4000)<br /> | [<img src="https://avatars0.githubusercontent.com/u/1764035?v=4" width="48px;" alt="Mikkel Jeppesen Juhl"/><br /><sub><b>Mikkel Jeppesen Juhl</b></sub>](https://mikkeljuhl.com)<br /> |
 | [<img src="https://avatars1.githubusercontent.com/u/963290?v=4" width="48px;" alt="Erik"/><br /><sub><b>Erik</b></sub>](https://github.com/lesteenman)<br /> | [<img src="https://avatars1.githubusercontent.com/u/155574?v=4" width="48px;" alt="Nate Yourchuck"/><br /><sub><b>Nate Yourchuck</b></sub>](https://github.com/nyourchuck)<br /> | [<img src="https://avatars3.githubusercontent.com/u/4335849?v=4" width="48px;" alt="Casey Primozic"/><br /><sub><b>Casey Primozic</b></sub>](https://cprimozic.net/)<br /> | [<img src="https://avatars3.githubusercontent.com/u/2430915?v=4" width="48px;" alt="Alvaro [Andor]"/><br /><sub><b>Alvaro [Andor]</b></sub>](http://pierdelacabeza.com/maruja)<br /> | [<img src="https://avatars1.githubusercontent.com/u/17101621?v=4" width="48px;" alt="Joel Valentine"/><br /><sub><b>Joel Valentine</b></sub>](https://github.com/Midnight-Conqueror)<br /> | [<img src="https://avatars0.githubusercontent.com/u/4738210?v=4" width="48px;" alt="Viktor Braun"/><br /><sub><b>Viktor Braun</b></sub>](https://www.viktor-braun.de)<br /> | [<img src="https://avatars3.githubusercontent.com/u/3877652?v=4" width="48px;" alt="ChrisDBrown"/><br /><sub><b>ChrisDBrown</b></sub>](https://www.chrisdbrown.co.uk/)<br /> |
 | [<img src="https://avatars2.githubusercontent.com/u/582821?v=4" width="48px;" alt="Narendra L"/><br /><sub><b>Narendra L</b></sub>](https://narengowda.github.io/)<br /> | [<img src="https://avatars1.githubusercontent.com/u/24609103?v=4" width="48px;" alt="ibaum"/><br /><sub><b>ibaum</b></sub>](https://github.com/ibaum)<br /> | [<img src="https://avatars3.githubusercontent.com/u/566185?v=4" width="48px;" alt="Tim Scheuermann"/><br /><sub><b>Tim Scheuermann</b></sub>](https://github.com/noxer)<br /> | [<img src="https://avatars0.githubusercontent.com/u/2682729?v=4" width="48px;" alt="Indradhanush Gupta"/><br /><sub><b>Indradhanush Gupta</b></sub>](https://indradhanush.github.io/)<br /> | [<img src="https://avatars3.githubusercontent.com/u/7926849?v=4" width="48px;" alt="Victor Hugo Avelar Ossorio"/><br /><sub><b>Victor Hugo Avelar Ossorio</b></sub>](https://victoravelar.com)<br /> | [<img src="https://avatars3.githubusercontent.com/u/4001640?v=4" width="48px;" alt="Steven Whitehead"/><br /><sub><b>Steven Whitehead</b></sub>](https://github.com/scw007)<br /> | [<img src="https://avatars0.githubusercontent.com/u/660580?v=4" width="48px;" alt="Lawrence Craft"/><br /><sub><b>Lawrence Craft</b></sub>](https://github.com/lawrencecraft)<br /> |
-| [<img src="https://avatars1.githubusercontent.com/u/1388071?v=4" width="48px;" alt="Avi Press"/><br /><sub><b>Avi Press</b></sub>](http://avi.press)<br /> | [<img src="https://avatars0.githubusercontent.com/u/22562624?v=4" width="48px;" alt="Sarah Kraßnigg"/><br /><sub><b>Sarah Kraßnigg</b></sub>](https://github.com/Tardog)<br /> | [<img src="https://avatars1.githubusercontent.com/u/4923990?v=4" width="48px;" alt="Jason Schweier"/><br /><sub><b>Jason Schweier</b></sub>](http://jmks.ca)<br /> |
+| [<img src="https://avatars1.githubusercontent.com/u/1388071?v=4" width="48px;" alt="Avi Press"/><br /><sub><b>Avi Press</b></sub>](http://avi.press)<br /> | [<img src="https://avatars0.githubusercontent.com/u/22562624?v=4" width="48px;" alt="Sarah Kraßnigg"/><br /><sub><b>Sarah Kraßnigg</b></sub>](https://github.com/Tardog)<br /> | [<img src="https://avatars1.githubusercontent.com/u/4923990?v=4" width="48px;" alt="Jason Schweier"/><br /><sub><b>Jason Schweier</b></sub>](http://jmks.ca)<br /> | [<img src="https://avatars2.githubusercontent.com/u/8268483?v=4" width="48px;" alt="Massa"/><br /><sub><b>Massa</b></sub>](https://github.com/massa1240)<br /> |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 ## Acknowledgments

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
 }

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
+}

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
+}