Add datetimetz module for timezone information in date display
Allow multiple comma seperated timezones Handle click to cycle through configured timezones Example: ``` bumblebee-status -m datetimetz -p \ datetimetz.timezone=\ "Australia/Sydney,Pacific/Auckland,America/Los_Angeles" ``` Added dependencies to travis config
This commit is contained in:
parent
cc6fa5a3f3
commit
68cb2e1c79
6 changed files with 89 additions and 1 deletions
|
@ -16,6 +16,8 @@ install:
|
||||||
- pip install -U coverage==4.3
|
- pip install -U coverage==4.3
|
||||||
- pip install codeclimate-test-reporter
|
- pip install codeclimate-test-reporter
|
||||||
- pip install taskw
|
- pip install taskw
|
||||||
|
- pip install pytz
|
||||||
|
- pip install tzlocal
|
||||||
script:
|
script:
|
||||||
- nosetests -v --with-coverage --cover-erase tests/
|
- nosetests -v --with-coverage --cover-erase tests/
|
||||||
- CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter
|
- CODECLIMATE_REPO_TOKEN=40cb00907f7a10e04868e856570bb997ab9c42fd3b63d980f2b2269433195fdf codeclimate-test-reporter
|
||||||
|
|
4
PKGBUILD
4
PKGBUILD
|
@ -20,7 +20,9 @@ optdepends=('xorg-xbacklight: to display a displays brightness'
|
||||||
'pacman: display current status of pacman'
|
'pacman: display current status of pacman'
|
||||||
'iputils: display a ping'
|
'iputils: display a ping'
|
||||||
'i3ipc-python: display titlebar'
|
'i3ipc-python: display titlebar'
|
||||||
'fakeroot: dependency of the pacman module')
|
'fakeroot: dependency of the pacman module'
|
||||||
|
'pytz: timezone conversion for datetimetz module'
|
||||||
|
'tzlocal: retrieve system timezone for datetimetz module')
|
||||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
|
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
|
||||||
sha512sums=('3a66fc469dd3b081337c9e213a1b2262f25f30977ee6ef65b9fa5a8b6aa341637832d1a5dbb74e30d68e2824e0d19d7a911eb3390dc6062707a552f429b483e8')
|
sha512sums=('3a66fc469dd3b081337c9e213a1b2262f25f30977ee6ef65b9fa5a8b6aa341637832d1a5dbb74e30d68e2824e0d19d7a911eb3390dc6062707a552f429b483e8')
|
||||||
|
|
||||||
|
|
|
@ -186,6 +186,8 @@ Modules and commandline utilities are only required for modules, the core itself
|
||||||
* i3ipc (for the module 'title')
|
* i3ipc (for the module 'title')
|
||||||
* pacman-contrib (for module 'arch-update')
|
* pacman-contrib (for module 'arch-update')
|
||||||
* docker (for the module 'docker_ps')
|
* docker (for the module 'docker_ps')
|
||||||
|
* pytz (for the module 'datetimetz')
|
||||||
|
* localtz (for the module 'datetimetz')
|
||||||
|
|
||||||
# Required commandline utilities
|
# Required commandline utilities
|
||||||
|
|
||||||
|
|
79
bumblebee/modules/datetimetz.py
Normal file
79
bumblebee/modules/datetimetz.py
Normal file
|
@ -0,0 +1,79 @@
|
||||||
|
# pylint: disable=C0111,R0903
|
||||||
|
|
||||||
|
"""Displays the current date and time with timezone options.
|
||||||
|
|
||||||
|
Parameters:
|
||||||
|
* datetimetz.format : strftime()-compatible formatting string
|
||||||
|
* datetimetz.timezone : IANA timezone name
|
||||||
|
* datetz.format : alias for datetimetz.format
|
||||||
|
* timetz.format : alias for datetimetz.format
|
||||||
|
* timetz.timezone : alias for datetimetz.timezone
|
||||||
|
* datetimetz.locale : locale to use rather than the system default
|
||||||
|
* datetz.locale : alias for datetimetz.locale
|
||||||
|
* timetz.locale : alias for datetimetz.locale
|
||||||
|
* timetz.timezone : alias for datetimetz.timezone
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import absolute_import
|
||||||
|
import datetime
|
||||||
|
import locale
|
||||||
|
import pytz
|
||||||
|
import tzlocal
|
||||||
|
import bumblebee.input
|
||||||
|
import bumblebee.output
|
||||||
|
import bumblebee.engine
|
||||||
|
|
||||||
|
ALIASES = ["datetz", "timetz"]
|
||||||
|
|
||||||
|
def default_format(module):
|
||||||
|
default = "%x %X %Z"
|
||||||
|
if module == "datetz":
|
||||||
|
default = "%x %Z"
|
||||||
|
if module == "timetz":
|
||||||
|
default = "%X %Z"
|
||||||
|
return default
|
||||||
|
|
||||||
|
class Module(bumblebee.engine.Module):
|
||||||
|
def __init__(self, engine, config):
|
||||||
|
super(Module, self).__init__(engine, config,
|
||||||
|
bumblebee.output.Widget(full_text=self.get_time))
|
||||||
|
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, cmd=self.next_tz)
|
||||||
|
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, cmd=self.prev_tz)
|
||||||
|
self._fmt = self.parameter("format", default_format(self.name))
|
||||||
|
self._timezones = self.parameter("timezone", tzlocal.get_localzone().zone).split(",")
|
||||||
|
self._current_tz = 0
|
||||||
|
|
||||||
|
l = locale.getdefaultlocale()
|
||||||
|
if not l or l == (None, None):
|
||||||
|
l = ('en_US', 'UTF-8')
|
||||||
|
lcl = self.parameter("locale", ".".join(l))
|
||||||
|
try:
|
||||||
|
locale.setlocale(locale.LC_TIME, lcl.split("."))
|
||||||
|
except Exception:
|
||||||
|
locale.setlocale(locale.LC_TIME, ('en_US', 'UTF-8'))
|
||||||
|
|
||||||
|
def get_time(self, widget):
|
||||||
|
try:
|
||||||
|
tz = pytz.timezone(self._timezones[self._current_tz].strip())
|
||||||
|
retval = datetime.datetime.now(tz=tzlocal.get_localzone()).astimezone(tz).strftime(self._fmt)
|
||||||
|
except pytz.exceptions.UnknownTimeZoneError:
|
||||||
|
retval = "[Unknown timezone: {}]".format(self._timezones[self._current_tz].strip())
|
||||||
|
|
||||||
|
enc = locale.getpreferredencoding()
|
||||||
|
if hasattr(retval, "decode"):
|
||||||
|
return retval.decode(enc)
|
||||||
|
return retval
|
||||||
|
|
||||||
|
def next_tz(self, event):
|
||||||
|
next_timezone = self._current_tz + 1
|
||||||
|
if next_timezone >= len(self._timezones):
|
||||||
|
next_timezone = 0 # wraparound
|
||||||
|
self._current_tz = next_timezone
|
||||||
|
|
||||||
|
def prev_tz(self, event):
|
||||||
|
previous_timezone = self._current_tz - 1
|
||||||
|
if previous_timezone < 0:
|
||||||
|
previous_timezone = 0 # wraparound
|
||||||
|
self._current_tz = previous_timezone
|
||||||
|
|
||||||
|
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
BIN
screenshots/datetimetz.gif
Normal file
BIN
screenshots/datetimetz.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 109 KiB |
|
@ -6,6 +6,9 @@
|
||||||
"date": { "prefix": "" },
|
"date": { "prefix": "" },
|
||||||
"time": { "prefix": "" },
|
"time": { "prefix": "" },
|
||||||
"datetime": { "prefix": "" },
|
"datetime": { "prefix": "" },
|
||||||
|
"datetz": { "prefix": "" },
|
||||||
|
"timetz": { "prefix": "" },
|
||||||
|
"datetimetz": { "prefix": "" },
|
||||||
"memory": { "prefix": "" },
|
"memory": { "prefix": "" },
|
||||||
"cpu": { "prefix": "" },
|
"cpu": { "prefix": "" },
|
||||||
"disk": { "prefix": "" },
|
"disk": { "prefix": "" },
|
||||||
|
|
Loading…
Reference in a new issue