-
-
Notifications
You must be signed in to change notification settings - Fork 261
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
file_status: allow several paths, new format #1369
Changes from 19 commits
3054842
1909b9e
bced76b
eec5c31
1b4c212
d1e5567
e7fd61e
5933dde
4484da1
d76b49d
ef9825e
08b7481
24a5160
c96a435
8fa66b0
e15eedc
fb4c723
67e26e6
b84fda9
fb82b53
0bfe17a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,50 @@ | ||
# -*- coding: utf-8 -*- | ||
""" | ||
Display if a file or directory exists. | ||
Display if files or directories exists. | ||
Configuration parameters: | ||
cache_timeout: how often to run the check (default 10) | ||
format: format of the output. (default '{icon}') | ||
icon_available: icon to display when available (default '●') | ||
icon_unavailable: icon to display when unavailable (default '■') | ||
path: the path to a file or dir to check if it exists (default None) | ||
Color options: | ||
color_bad: Error or file/directory does not exist | ||
color_good: File or directory exists | ||
cache_timeout: refresh interval for this module (default 10) | ||
format: display format for this module | ||
(default '\?color=paths [\?if=paths ●|■]') | ||
format_path: format for paths (default '{basename}') | ||
format_path_separator: show separator if more than one (default ' ') | ||
path: specify a string or a list of paths to check (default None) | ||
thresholds: specify color thresholds to use | ||
(default [(0, 'bad'), (1, 'good')]) | ||
Format placeholders: | ||
{icon} icon for the current availability | ||
{format_path} format for paths | ||
{paths} number of paths, eg 1, 2, 3 | ||
@author obb, Moritz Lüdecke | ||
format_path placeholders: | ||
{basename} basename of pathname | ||
{pathname} pathname | ||
Color options: | ||
color_bad: files or directories does not exist | ||
color_good: files or directories exists | ||
Color thresholds: | ||
format: | ||
paths: print a color based on the number of paths | ||
Examples: | ||
``` | ||
# add multiple paths with wildcard or with pathnames | ||
file_status { | ||
path = ['/tmp/test*', '~user/test1', '~/Videos/*.mp4'] | ||
} | ||
# colorize basenames | ||
file_status { | ||
path = ['~/.config/i3/modules/*.py'] | ||
format = '{format_path}' | ||
format_path = '\?color=good {basename}' | ||
format_path_separator = ', ' | ||
} | ||
``` | ||
@author obb, Moritz Lüdecke, Cyril Levis (@cyrinux) | ||
SAMPLE OUTPUT | ||
{'color': '#00FF00', 'full_text': u'\u25cf'} | ||
|
@@ -25,20 +53,22 @@ | |
{'color': '#FF0000', 'full_text': u'\u25a0'} | ||
""" | ||
|
||
from os.path import expanduser, exists | ||
from glob import glob | ||
from os.path import basename, expanduser | ||
|
||
ERR_NO_PATH = 'no path given' | ||
STRING_NO_PATH = 'missing path' | ||
|
||
|
||
class Py3status: | ||
""" | ||
""" | ||
# available configuration parameters | ||
cache_timeout = 10 | ||
format = '{icon}' | ||
icon_available = u'●' | ||
icon_unavailable = u'■' | ||
format = u'\?color=paths [\?if=paths \u25cf|\u25a0]' | ||
format_path = u'{basename}' | ||
format_path_separator = u' ' | ||
path = None | ||
thresholds = [(0, 'bad'), (1, 'good')] | ||
|
||
class Meta: | ||
deprecated = { | ||
|
@@ -57,32 +87,69 @@ class Meta: | |
} | ||
|
||
def post_config_hook(self): | ||
if self.path: | ||
self.path = expanduser(self.path) | ||
if not self.path: | ||
raise Exception(STRING_NO_PATH) | ||
|
||
# icon deprecation | ||
on = getattr(self, 'icon_available', u'\u25cf') | ||
off = getattr(self, 'icon_unavailable', u'\u25a0') | ||
new_icon = u'\?color=paths [\?if=paths {}|{}]'.format(on, off) | ||
self.format = self.format.replace('{icon}', new_icon) | ||
|
||
# convert str to list + expand path | ||
if not isinstance(self.path, list): | ||
self.path = [self.path] | ||
self.path = list(map(expanduser, self.path)) | ||
|
||
self.init = {'format_path': []} | ||
if self.py3.format_contains(self.format, 'format_path'): | ||
self.init['format_path'] = self.py3.get_placeholders_list( | ||
self.format_path | ||
) | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep this so we can do There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I had a doubt about this, refresh is for example when I There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not understand this sorry, could you rephrase? "I'd clear this with the fam first." There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have a discussion with tobes and/or ultrabug. They our fam. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh sorry, fam = familly >_> |
||
def file_status(self): | ||
if self.path is None: | ||
return { | ||
'color': self.py3.COLOR_ERROR or self.py3.COLOR_BAD, | ||
'full_text': ERR_NO_PATH, | ||
'cached_until': self.py3.CACHE_FOREVER, | ||
} | ||
|
||
if exists(self.path): | ||
icon = self.icon_available | ||
color = self.py3.COLOR_GOOD | ||
else: | ||
icon = self.icon_unavailable | ||
color = self.py3.COLOR_BAD | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There sure are lot of changes. We might as well see this all the way to finish... by removing colors, make and default This module is useful now because I can use this to print names of custom modules... and globbing. Thank you for working on this. :-) |
||
|
||
response = { | ||
'cached_until': self.py3.time_in(self.cache_timeout), | ||
'full_text': self.py3.safe_format(self.format, {'icon': icon}), | ||
'color': color | ||
# init datas | ||
paths = sorted([files for path in self.path for files in glob(path)]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because of this, we don't need |
||
count_path = len(paths) | ||
format_path = None | ||
|
||
# format paths | ||
if self.init['format_path']: | ||
new_data = [] | ||
format_path_separator = self.py3.safe_format( | ||
self.format_path_separator | ||
) | ||
|
||
for pathname in paths: | ||
path = {} | ||
for key in self.init['format_path']: | ||
if key == 'basename': | ||
value = basename(pathname) | ||
elif key == 'pathname': | ||
value = pathname | ||
else: | ||
continue | ||
path[key] = self.py3.safe_format(value) | ||
new_data.append(self.py3.safe_format(self.format_path, path)) | ||
|
||
format_path = self.py3.composite_join( | ||
format_path_separator, new_data | ||
) | ||
|
||
if self.thresholds: | ||
self.py3.threshold_get_color(count_path, 'paths') | ||
|
||
return { | ||
'cached_until': | ||
self.py3.time_in(self.cache_timeout), | ||
'full_text': self.py3.safe_format( | ||
self.format, { | ||
'paths': count_path, | ||
'format_path': format_path | ||
} | ||
) | ||
} | ||
|
||
return response | ||
|
||
|
||
if __name__ == "__main__": | ||
""" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If I remember it correctly, the family mentioned something about storing icons properly, eg
(default '\?color=paths [\?if=paths \u25cf|\u25a0]')
so I assume we should change it everywhere to be similar toSAMPLE OUTPUT
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the goal? For readability? Compliance?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't remember all the details. I think readability so some things are not rendered as blocks or to avoid cause minor confusion. It may or may not had to do more with control characters. ~~EDIT: Maybe wait for the family.~~~
versus more explicit...