Skip to content

Commit 20a4030

Browse files
mathoudebinemathoudebine
authored
Merge pull request #72 from Rollbacke/feature/add_ram-free_disk-used-percent_class-date_class-net_bash-green-dark-theme
Proposal of features such as Net classes, Date and a new theme.
2 parents 068c803 + e0bbf35 commit 20a4030

File tree

11 files changed

+1175
-18
lines changed

11 files changed

+1175
-18
lines changed

‎config.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ config:
1212
# THEME: Cyberpunk
1313
THEME: 3.5inchTheme2
1414

15+
# Network metrics
16+
# Put the interface name or let it blank if the card does not exist
17+
# ETH: ""
18+
ETH: "eth0" # Ethernet Card
19+
WLO: "wlo1" # Wi-Fi Card
20+
1521
display:
1622
# Display resolution in portrait orientation
1723
# Do not use this setting to rotate display! Display orientation is managed by themes

‎library/config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from library.log import logger
88

9+
PNIC_BEFORE = ""
910

1011
def load_yaml(configfile):
1112
with open(configfile, "r") as stream:

‎library/scheduler.py‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,20 @@ def DiskStats():
123123
stats.Disk.stats()
124124

125125

126+
@async_job("Net_Stats")
127+
@schedule(timedelta(seconds=THEME_DATA['STATS']['NET'].get("INTERVAL", None)).total_seconds())
128+
def NetStats():
129+
# logger.debug("Refresh net stats")
130+
stats.Net.stats()
131+
132+
133+
@async_job("Date_Stats")
134+
@schedule(timedelta(seconds=THEME_DATA['STATS']['DATE'].get("INTERVAL", None)).total_seconds())
135+
def DateStats():
136+
# logger.debug("Refresh date stats")
137+
stats.Date.stats()
138+
139+
126140
@async_job("Queue_Handler")
127141
@schedule(timedelta(milliseconds=1).total_seconds())
128142
def QueueHandler():

‎library/stats.py‎

Lines changed: 234 additions & 9 deletions
Large diffs are not rendered by default.

‎main.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@ def sighandler(signum, frame):
8181
logger.warning("Your GPU is not supported yet")
8282
scheduler.MemoryStats()
8383
scheduler.DiskStats()
84+
scheduler.NetStats()
85+
scheduler.DateStats()
8486
scheduler.QueueHandler()

‎res/themes/3.5inchTheme2/theme.yaml‎

Lines changed: 132 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ STATS:
7272
TEXT:
7373
SHOW: True
7474
X: 250
75-
Y: 13
75+
Y: 18
7676
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
7777
FONT_SIZE: 23
7878
FONT_COLOR: 255, 255, 255
@@ -81,7 +81,7 @@ STATS:
8181
GRAPH:
8282
SHOW: True
8383
X: 155
84-
Y: 50
84+
Y: 55
8585
WIDTH: 150
8686
HEIGHT: 15
8787
MIN_VALUE: 0
@@ -98,7 +98,7 @@ STATS:
9898
TEXT:
9999
SHOW: True
100100
X: 154
101-
Y: 70
101+
Y: 74
102102
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
103103
FONT_SIZE: 30
104104
FONT_COLOR: 255, 255, 255
@@ -141,7 +141,7 @@ STATS:
141141
TEXT:
142142
SHOW: True
143143
X: 154
144-
Y: 13
144+
Y: 18
145145
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
146146
FONT_SIZE: 23
147147
FONT_COLOR: 255, 255, 255
@@ -237,7 +237,7 @@ STATS:
237237
BAR_OUTLINE: False
238238
BACKGROUND_COLOR: 0, 0, 0
239239
# BACKGROUND_IMAGE: background.png
240-
VALUE_TEXT:
240+
USED:
241241
SHOW: TRUE
242242
X: 204
243243
Y: 290
@@ -246,6 +246,15 @@ STATS:
246246
FONT_COLOR: 255, 255, 255
247247
BACKGROUND_COLOR: 132, 154, 165
248248
# BACKGROUND_IMAGE: background.png
249+
FREE:
250+
SHOW: FALSE
251+
X: 182
252+
Y: 129
253+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
254+
FONT_SIZE: 23
255+
FONT_COLOR: 255, 255, 255
256+
BACKGROUND_COLOR: 132, 154, 165
257+
# BACKGROUND_IMAGE: background.png
249258
PERCENT_TEXT:
250259
SHOW: TRUE
251260
X: 250
@@ -279,6 +288,15 @@ STATS:
279288
FONT_COLOR: 255, 255, 255
280289
BACKGROUND_COLOR: 132, 154, 165
281290
# BACKGROUND_IMAGE: background.png
291+
PERCENT_TEXT:
292+
SHOW: False
293+
X: 46
294+
Y: 402
295+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
296+
FONT_SIZE: 23
297+
FONT_COLOR: 255, 255, 255
298+
BACKGROUND_COLOR: 132, 154, 165
299+
# BACKGROUND_IMAGE: background.png
282300
TOTAL:
283301
TEXT:
284302
SHOW: TRUE
@@ -299,3 +317,112 @@ STATS:
299317
FONT_COLOR: 255, 255, 255
300318
BACKGROUND_COLOR: 132, 154, 165
301319
# BACKGROUND_IMAGE: background.png
320+
NET:
321+
INTERVAL: 1
322+
WLO:
323+
UPLOAD:
324+
TEXT:
325+
SHOW: FALSE
326+
X: 4
327+
Y: 311
328+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
329+
FONT_SIZE: 23
330+
FONT_COLOR: 255, 255, 255
331+
BACKGROUND_COLOR: 132, 154, 165
332+
# BACKGROUND_IMAGE: background.png
333+
UPLOADED:
334+
TEXT:
335+
SHOW: FALSE
336+
X: 90
337+
Y: 311
338+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
339+
FONT_SIZE: 23
340+
FONT_COLOR: 255, 255, 255
341+
BACKGROUND_COLOR: 132, 154, 165
342+
# BACKGROUND_IMAGE: background.png
343+
DOWNLOAD:
344+
TEXT:
345+
SHOW: FALSE
346+
X: 4
347+
Y: 261
348+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
349+
FONT_SIZE: 23
350+
FONT_COLOR: 255, 255, 255
351+
BACKGROUND_COLOR: 132, 154, 165
352+
# BACKGROUND_IMAGE: background.png
353+
DOWNLOADED:
354+
TEXT:
355+
SHOW: FALSE
356+
X: 90
357+
Y: 261
358+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
359+
FONT_SIZE: 23
360+
FONT_COLOR: 255, 255, 255
361+
BACKGROUND_COLOR: 132, 154, 165
362+
# BACKGROUND_IMAGE: background.png
363+
ETH:
364+
UPLOAD:
365+
TEXT:
366+
SHOW: FALSE
367+
X: 254
368+
Y: 311
369+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
370+
FONT_SIZE: 23
371+
FONT_COLOR: 255, 255, 255
372+
BACKGROUND_COLOR: 132, 154, 165
373+
# BACKGROUND_IMAGE: background.png
374+
UPLOADED:
375+
TEXT:
376+
SHOW: FALSE
377+
X: 192
378+
Y: 311
379+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
380+
FONT_SIZE: 23
381+
FONT_COLOR: 255, 255, 255
382+
BACKGROUND_COLOR: 132, 154, 165
383+
# BACKGROUND_IMAGE: background.png
384+
DOWNLOAD:
385+
TEXT:
386+
SHOW: FALSE
387+
X: 254
388+
Y: 261
389+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
390+
FONT_SIZE: 23
391+
FONT_COLOR: 255, 255, 255
392+
BACKGROUND_COLOR: 132, 154, 165
393+
# BACKGROUND_IMAGE: background.png
394+
DOWNLOADED:
395+
TEXT:
396+
SHOW: FALSE
397+
X: 192
398+
Y: 261
399+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
400+
FONT_SIZE: 23
401+
FONT_COLOR: 255, 255, 255
402+
BACKGROUND_COLOR: 132, 154, 165
403+
# BACKGROUND_IMAGE: background.png
404+
DATE:
405+
# In seconds. Longer intervals cause this to refresh more slowly.
406+
# Setting to lower values will display near real time data,
407+
# but may cause significant CPU usage or the display not to update properly
408+
INTERVAL: 1
409+
DAY:
410+
TEXT:
411+
SHOW: True
412+
X: 155
413+
Y: 4
414+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
415+
FONT_SIZE: 10
416+
FONT_COLOR: 255, 255, 255
417+
BACKGROUND_COLOR: 132, 154, 165
418+
# BACKGROUND_IMAGE: background.png
419+
HOUR:
420+
TEXT:
421+
SHOW: True
422+
X: 250
423+
Y: 4
424+
FONT: jetbrains-mono/JetBrainsMono-Bold.ttf
425+
FONT_SIZE: 10
426+
FONT_COLOR: 255, 255, 255
427+
BACKGROUND_COLOR: 132, 154, 165
428+
# BACKGROUND_IMAGE: background.png

‎res/themes/Cyberpunk/theme.yaml‎

Lines changed: 129 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,18 @@ STATS:
255255
BAR_OUTLINE: True
256256
# BACKGROUND_COLOR: 0, 255, 0
257257
BACKGROUND_IMAGE: background.png
258-
VALUE_TEXT:
258+
USED:
259259
SHOW: True
260-
X: 80
260+
X: 28
261+
Y: 256
262+
FONT: generale-mono/GeneraleMonoA.ttf
263+
FONT_SIZE: 16
264+
FONT_COLOR: 2, 216, 243
265+
# BACKGROUND_COLOR: 0, 0, 0
266+
BACKGROUND_IMAGE: background.png
267+
FREE:
268+
SHOW: True
269+
X: 110
261270
Y: 256
262271
FONT: generale-mono/GeneraleMonoA.ttf
263272
FONT_SIZE: 16
@@ -297,6 +306,15 @@ STATS:
297306
FONT_COLOR: 2, 216, 243
298307
# BACKGROUND_COLOR: 0, 0, 0
299308
BACKGROUND_IMAGE: background.png
309+
PERCENT_TEXT:
310+
SHOW: True
311+
X: 170
312+
Y: 430
313+
FONT: generale-mono/GeneraleMonoA.ttf
314+
FONT_SIZE: 30
315+
FONT_COLOR: 2, 216, 243
316+
# BACKGROUND_COLOR: 0, 0, 0
317+
BACKGROUND_IMAGE: background.png
300318
TOTAL:
301319
TEXT:
302320
SHOW: False
@@ -317,3 +335,112 @@ STATS:
317335
FONT_COLOR: 2, 216, 243
318336
# BACKGROUND_COLOR: 0, 0, 0
319337
BACKGROUND_IMAGE: background.png
338+
NET:
339+
INTERVAL: 1
340+
WLO:
341+
UPLOAD:
342+
TEXT:
343+
SHOW: FALSE
344+
X: 4
345+
Y: 311
346+
FONT: generale-mono/GeneraleMonoA.ttf
347+
FONT_SIZE: 26
348+
FONT_COLOR: 2, 216, 243
349+
# BACKGROUND_COLOR: 0, 0, 0
350+
BACKGROUND_IMAGE: background.png
351+
UPLOADED:
352+
TEXT:
353+
SHOW: FALSE
354+
X: 90
355+
Y: 311
356+
FONT: generale-mono/GeneraleMonoA.ttf
357+
FONT_SIZE: 26
358+
FONT_COLOR: 2, 216, 243
359+
# BACKGROUND_COLOR: 0, 0, 0
360+
BACKGROUND_IMAGE: background.png
361+
DOWNLOAD:
362+
TEXT:
363+
SHOW: FALSE
364+
X: 4
365+
Y: 261
366+
FONT: generale-mono/GeneraleMonoA.ttf
367+
FONT_SIZE: 26
368+
FONT_COLOR: 2, 216, 243
369+
# BACKGROUND_COLOR: 0, 0, 0
370+
BACKGROUND_IMAGE: background.png
371+
DOWNLOADED:
372+
TEXT:
373+
SHOW: FALSE
374+
X: 90
375+
Y: 261
376+
FONT: generale-mono/GeneraleMonoA.ttf
377+
FONT_SIZE: 26
378+
FONT_COLOR: 2, 216, 243
379+
# BACKGROUND_COLOR: 0, 0, 0
380+
BACKGROUND_IMAGE: background.png
381+
ETH:
382+
UPLOAD:
383+
TEXT:
384+
SHOW: FALSE
385+
X: 254
386+
Y: 311
387+
FONT: generale-mono/GeneraleMonoA.ttf
388+
FONT_SIZE: 26
389+
FONT_COLOR: 2, 216, 243
390+
# BACKGROUND_COLOR: 0, 0, 0
391+
BACKGROUND_IMAGE: background.png
392+
UPLOADED:
393+
TEXT:
394+
SHOW: FALSE
395+
X: 192
396+
Y: 311
397+
FONT: generale-mono/GeneraleMonoA.ttf
398+
FONT_SIZE: 26
399+
FONT_COLOR: 2, 216, 243
400+
# BACKGROUND_COLOR: 0, 0, 0
401+
BACKGROUND_IMAGE: background.png
402+
DOWNLOAD:
403+
TEXT:
404+
SHOW: FALSE
405+
X: 254
406+
Y: 261
407+
FONT: generale-mono/GeneraleMonoA.ttf
408+
FONT_SIZE: 26
409+
FONT_COLOR: 2, 216, 243
410+
# BACKGROUND_COLOR: 0, 0, 0
411+
BACKGROUND_IMAGE: background.png
412+
DOWNLOADED:
413+
TEXT:
414+
SHOW: FALSE
415+
X: 192
416+
Y: 261
417+
FONT: generale-mono/GeneraleMonoA.ttf
418+
FONT_SIZE: 26
419+
FONT_COLOR: 2, 216, 243
420+
# BACKGROUND_COLOR: 0, 0, 0
421+
BACKGROUND_IMAGE: background.png
422+
DATE:
423+
# In seconds. Longer intervals cause this to refresh more slowly.
424+
# Setting to lower values will display near real time data,
425+
# but may cause significant CPU usage or the display not to update properly
426+
INTERVAL: 1
427+
DAY:
428+
TEXT:
429+
SHOW: True
430+
X: 10
431+
Y: 455
432+
FONT: generale-mono/GeneraleMonoA.ttf
433+
FONT_SIZE: 18
434+
FONT_COLOR: 255, 239, 8
435+
# BACKGROUND_COLOR: 0, 0, 0
436+
BACKGROUND_IMAGE: background.png
437+
HOUR:
438+
TEXT:
439+
SHOW: True
440+
X: 195
441+
Y: 32
442+
FONT: generale-mono/GeneraleMonoA.ttf
443+
FONT_SIZE: 18
444+
FONT_COLOR: 255, 239, 8
445+
# BACKGROUND_COLOR: 0, 0, 0
446+
BACKGROUND_IMAGE: background.png

0 commit comments

Comments
 (0)