masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix index error in temp module. (#766)

Browse Source
This commit is contained in:
Facetoe 2020-02-10 17:43:25 +08:00 committed by GitHub
parent ad4ae456a5
commit 2c7de0b88e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
i3pystatus/temp.py
View File

@ -190,9 +190,7 @@ class Temperature(IntervalModule, ColorRangeModule):
if self.dynamic_color: if self.dynamic_color:
perc = int(self.percentage(int(temp), self.alert_temp)) perc = int(self.percentage(int(temp), self.alert_temp))
if (perc > 99): color = self.get_colour(perc)
perc = 99
color = self.colors[perc]
else: else:
color = self.color if temp < self.alert_temp else self.alert_color color = self.color if temp < self.alert_temp else self.alert_color
return { return {
@ -236,7 +234,7 @@ class Temperature(IntervalModule, ColorRangeModule):
if self.pango_enabled: if self.pango_enabled:
percentage = self.percentage(sensor.current, sensor.critical) percentage = self.percentage(sensor.current, sensor.critical)
if self.dynamic_color: if self.dynamic_color:
color = self.colors[int(percentage)] color = self.get_colour(percentage)
return self.format_pango(color, current_val) return self.format_pango(color, current_val)
return current_val return current_val
@ -246,9 +244,13 @@ class Temperature(IntervalModule, ColorRangeModule):
bar = make_vertical_bar(int(percentage)) bar = make_vertical_bar(int(percentage))
if self.pango_enabled: if self.pango_enabled:
if self.dynamic_color: if self.dynamic_color:
color = self.colors[int(percentage)] color = self.get_colour(percentage)
return self.format_pango(color, bar) return self.format_pango(color, bar)
return bar return bar
def format_pango(self, color, value): def format_pango(self, color, value):
return '<span color="{}">{}</span>'.format(color, value) return '<span color="{}">{}</span>'.format(color, value)
def get_colour(self, percentage):
index = -1 if int(percentage) > len(self.colors) - 1 else int(percentage)
return self.colors[index]