From 87f185e62bbbb9ee1c73dc39665702f1019b8eb7 Mon Sep 17 00:00:00 2001 From: Tobias Witek Date: Wed, 23 Jan 2019 19:56:16 +0100 Subject: [PATCH] [modules/git] Nicer formatting of stati Add separate widgets for each state, so that each state can have a custom icon *and* a custom coloring. --- bumblebee/modules/git.py | 47 +++++++++++++++------------- screenshots/git.png | Bin 5542 -> 6044 bytes themes/gruvbox-light.json | 7 ++++- themes/gruvbox-powerline-light.json | 5 +++ themes/gruvbox-powerline.json | 5 +++ themes/gruvbox.json | 7 ++++- themes/icons/ascii.json | 6 ++++ themes/icons/awesome-fonts.json | 8 ++--- themes/solarized-dark-awesome.json | 7 ++++- themes/solarized-powerline.json | 7 ++++- themes/solarized.json | 7 ++++- 11 files changed, 75 insertions(+), 31 deletions(-) diff --git a/bumblebee/modules/git.py b/bumblebee/modules/git.py index fb42a8e..468d174 100644 --- a/bumblebee/modules/git.py +++ b/bumblebee/modules/git.py @@ -23,50 +23,53 @@ import bumblebee.util class Module(bumblebee.engine.Module): def __init__(self, engine, config): - super(Module, self).__init__(engine, config, - bumblebee.output.Widget(full_text=self.gitinfo) - ) + widgets = [] + super(Module, self).__init__(engine, config, widgets) self._engine = engine - self._fmt = self.parameter("format", "{branch} {flags}") self._error = False + self.update(self.widgets()) def hidden(self): return self._error - def gitinfo(self, widget): - info = "" - directory = None - data = { - "branch": "n/a", - "directory": "n/a", - "flags": {}, - } + def update(self, widgets): + state = {} + new_widgets = [] try: directory = bumblebee.util.execute("xcwd").strip() directory = self._get_git_root(directory) repo = pygit2.Repository(directory) + new_widgets.append(bumblebee.output.Widget(name='git.main', full_text=repo.head.shorthand)) + for filepath, flags in repo.status().items(): if flags == pygit2.GIT_STATUS_WT_NEW or \ flags == pygit2.GIT_STATUS_INDEX_NEW: - data["flags"]["new"] = True + state['new'] = True if flags == pygit2.GIT_STATUS_WT_DELETED or \ flags == pygit2.GIT_STATUS_INDEX_DELETED: - data["flags"]["deleted"] = True + state['deleted'] = True if flags == pygit2.GIT_STATUS_WT_MODIFIED or \ flags == pygit2.GIT_STATUS_INDEX_MODIFIED: - data["flags"]["modified"] = True - - data["branch"] = repo.head.shorthand - data["directory"] = directory - data["flags"] = " ".join([self._engine._theme.symbol(widget, name, name[0]) for name in data["flags"].keys()]) + state['modified'] = True self._error = False + if 'new' in state: + new_widgets.append(bumblebee.output.Widget(name='git.new')) + if 'modified' in state: + new_widgets.append(bumblebee.output.Widget(name='git.modified')) + if 'deleted' in state: + new_widgets.append(bumblebee.output.Widget(name='git.deleted')) + + while len(widgets) > 0: + del widgets[0] + for widget in new_widgets: + widgets.append(widget) + except Exception as e: self._error = True - logging.error(e) - return "n/a" - return string.Formatter().vformat(self._fmt, (), data) + def state(self, widget): + return widget.name.split('.')[1] def _get_git_root(self, directory): while len(directory) > 1: diff --git a/screenshots/git.png b/screenshots/git.png index 2ec404b66cade0f3fc06f5b9355771deccbce64e..69f786b0cc481affb1984aeda19d8348fab64503 100644 GIT binary patch delta 6041 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 TXAhJB3jhEBNkvXXu0mjf0!g+D delta 5535 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 h)|to@f97002ovPDHLkV1fZC;oblM diff --git a/themes/gruvbox-light.json b/themes/gruvbox-light.json index 11ef684..ebb7983 100644 --- a/themes/gruvbox-light.json +++ b/themes/gruvbox-light.json @@ -49,5 +49,10 @@ "fg": "#1d2021", "bg": "#b8bb26" } - } + }, + "git": { + "modified": { "bg": "#458588" }, + "deleted": { "bg": "#9d0006" }, + "new": { "bg": "#b16286" } + } } diff --git a/themes/gruvbox-powerline-light.json b/themes/gruvbox-powerline-light.json index b4c4311..ba4b441 100644 --- a/themes/gruvbox-powerline-light.json +++ b/themes/gruvbox-powerline-light.json @@ -49,5 +49,10 @@ "fg": "#1d2021", "bg": "#b8bb26" } + }, + "git": { + "modified": { "bg": "#458588" }, + "deleted": { "bg": "#9d0006" }, + "new": { "bg": "#b16286" } } } diff --git a/themes/gruvbox-powerline.json b/themes/gruvbox-powerline.json index f4cee5d..1e0f588 100644 --- a/themes/gruvbox-powerline.json +++ b/themes/gruvbox-powerline.json @@ -49,5 +49,10 @@ "fg": "#1d2021", "bg": "#b8bb26" } + }, + "git": { + "modified": { "bg": "#458588" }, + "deleted": { "bg": "#9d0006" }, + "new": { "bg": "#b16286" } } } diff --git a/themes/gruvbox.json b/themes/gruvbox.json index 3f8df28..8ef2813 100644 --- a/themes/gruvbox.json +++ b/themes/gruvbox.json @@ -49,5 +49,10 @@ "fg": "#1d2021", "bg": "#b8bb26" } - } + }, + "git": { + "modified": { "bg": "#458588" }, + "deleted": { "bg": "#9d0006" }, + "new": { "bg": "#b16286" } + } } diff --git a/themes/icons/ascii.json b/themes/icons/ascii.json index 6cc79bb..42e78af 100644 --- a/themes/icons/ascii.json +++ b/themes/icons/ascii.json @@ -121,5 +121,11 @@ "ONLINE": {"prefix": "pool"}, "FAULTED": {"prefix": "pool (!)"}, "DEGRADED": {"prefix": "pool (!)"} + }, + "git": { + "main": { "prefix": "" }, + "new": { "prefix": "[n]" }, + "modified": { "prefix": "[m]" }, + "deleted": { "prefix": "[d]" } } } diff --git a/themes/icons/awesome-fonts.json b/themes/icons/awesome-fonts.json index 01359da..83b5ac8 100644 --- a/themes/icons/awesome-fonts.json +++ b/themes/icons/awesome-fonts.json @@ -186,9 +186,9 @@ } }, "git": { - "prefix": "", - "new": "", - "modified": "", - "deleted": "" + "main": { "prefix": "" }, + "new": { "prefix": "" }, + "modified": { "prefix": "" }, + "deleted": { "prefix": "" } } } diff --git a/themes/solarized-dark-awesome.json b/themes/solarized-dark-awesome.json index 9c3a6b3..9ec45e2 100644 --- a/themes/solarized-dark-awesome.json +++ b/themes/solarized-dark-awesome.json @@ -40,5 +40,10 @@ "fg": "#002b36", "bg": "#859900" } - } + }, + "git": { + "modified": { "bg": "#2aa198" }, + "deleted": { "bg": "#d33682" }, + "new": { "bg": "#859900" } + } } diff --git a/themes/solarized-powerline.json b/themes/solarized-powerline.json index f940e5c..3e52f7f 100644 --- a/themes/solarized-powerline.json +++ b/themes/solarized-powerline.json @@ -42,5 +42,10 @@ "fg": "#002b36", "bg": "#859900" } - } + }, + "git": { + "modified": { "bg": "#2aa198" }, + "deleted": { "bg": "#d33682" }, + "new": { "bg": "#859900" } + } } diff --git a/themes/solarized.json b/themes/solarized.json index 03cabec..4486634 100644 --- a/themes/solarized.json +++ b/themes/solarized.json @@ -44,5 +44,10 @@ "fg": "#002b36", "bg": "#859900" } - } + }, + "git": { + "modified": { "bg": "#2aa198" }, + "deleted": { "bg": "#d33682" }, + "new": { "bg": "#859900" } + } }