Skip to content

Commit

Permalink
Use consistent naming conventions (no extensions in scripts)
Browse files Browse the repository at this point in the history
In order to not break existing user's configs, symbolic
links with the old names are introduced
  • Loading branch information
kb100 committed Jan 21, 2017
1 parent dad13e4 commit 98f026e
Show file tree
Hide file tree
Showing 11 changed files with 1,163 additions and 1,160 deletions.
2 changes: 1 addition & 1 deletion battery/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ To use with i3blocks, copy the blocklet configuration in the given `i3blocks.con

```INI
[battery]
command=$SCRIPT_DIR/battery.py
command=$SCRIPT_DIR/battery
markup=pango
interval=30
```
87 changes: 87 additions & 0 deletions battery/battery
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/usr/bin/env python3
#
# Copyright (C) 2016 James Murphy
# Licensed under the GPL version 2 only
#
# A battery indicator blocklet script for i3blocks

from subprocess import check_output

status = check_output(['acpi'], universal_newlines=True)

if not status:
# stands for no battery found
fulltext = "<span color='red'><span font='FontAwesome'>\uf00d \uf240</span></span>"
percentleft = 100
else:
# if there is more than one battery in one laptop, the percentage left is
# available for each battery separately, although state and remaining
# time for overall block is shown in the status of the first battery
batteries = status.split("\n")
state_batteries=[]
commasplitstatus_batteries=[]
percentleft_batteries=[]
for battery in batteries:
if battery!='':
state_batteries.append(battery.split(": ")[1].split(", ")[0])
commasplitstatus = battery.split(", ")
percentleft_batteries.append(int(commasplitstatus[1].rstrip("%\n")))
commasplitstatus_batteries.append(commasplitstatus)
state = state_batteries[0]
commasplitstatus = commasplitstatus_batteries[0]
percentleft = int(sum(percentleft_batteries)/len(percentleft_batteries))

# stands for charging
FA_LIGHTNING = "<span color='yellow'><span font='FontAwesome'>\uf0e7</span></span>"

# stands for plugged in
FA_PLUG = "<span font='FontAwesome'>\uf1e6</span>"

# stands for using battery
FA_BATTERY = "<span font='FontAwesome'>\uf240</span>"

# stands for unknown status of battery
FA_QUESTION = "<span font='FontAwesome'>\uf128</span>"

timeleft = ""

if state == "Discharging":
time = commasplitstatus[-1].split()[0]
time = ":".join(time.split(":")[0:2])
timeleft = " ({})".format(time)
fulltext = FA_BATTERY + " "
elif state == "Full":
fulltext = FA_PLUG + " "
elif state == "Unknown":
fulltext = FA_QUESTION + " " + FA_BATTERY + " "
else:
fulltext = FA_LIGHTNING + " " + FA_PLUG + " "

def color(percent):
if percent < 10:
# exit code 33 will turn background red
return "#FFFFFF"
if percent < 20:
return "#FF3300"
if percent < 30:
return "#FF6600"
if percent < 40:
return "#FF9900"
if percent < 50:
return "#FFCC00"
if percent < 60:
return "#FFFF00"
if percent < 70:
return "#FFFF33"
if percent < 80:
return "#FFFF66"
return "#FFFFFF"

form = '<span color="{}">{}%</span>'
fulltext += form.format(color(percentleft), percentleft)
fulltext += timeleft

print(fulltext)
print(fulltext)
if percentleft < 10:
exit(33)
87 changes: 0 additions & 87 deletions battery/battery.py

This file was deleted.

1 change: 1 addition & 0 deletions battery/battery.py
2 changes: 1 addition & 1 deletion battery/i3blocks.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[battery]
command=$SCRIPT_DIR/battery.py
command=$SCRIPT_DIR/battery
markup=pango
interval=30
2 changes: 1 addition & 1 deletion monitor_manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Add the following to your i3blocks config:

```
[monitors]
command=$SCRIPT_DIR/monitor_manager.py
command=$SCRIPT_DIR/monitor_manager
interval=once
```

Expand Down
Loading

0 comments on commit 98f026e

Please sign in to comment.