diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..44c4b15 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +pycache \ No newline at end of file diff --git a/logos.py b/logos.py index cec53fe..b5f964d 100644 --- a/logos.py +++ b/logos.py @@ -6,6 +6,8 @@ class bcolors: YELLOW = '\033[93m' PINK = '\033[95m' RED = '\033[91m' + BLACK = '\033[30m' + GREY = '\033[37m' ENDC = '\033[0m' BOLD = '\033[1m' UNDERLINE = '\033[4m' @@ -43,4 +45,30 @@ class bcolors: bcolors.PINK +" .XMMMMMMMMMMMMMMMMMMMMMMMMK. ", bcolors.OKBLUE +" kMMMMMMMMMMMMMMMMMMMMMMd ", bcolors.OKBLUE +" KMMMMMMMWXXWMMMMMMMk. ", - bcolors.OKBLUE +" .cooc,. .,coo:. "]] \ No newline at end of file + bcolors.OKBLUE +" .cooc,. .,coo:. "], +[ bcolors.RED + " =**-.= .. ", + bcolors.RED +" +###############++= ", + bcolors.RED +" *###########**##########+ ", + bcolors.RED +" ########- =######* ", + bcolors.RED +" =#####* .######. ", + bcolors.RED +" *####. =#####: ", + bcolors.RED +" *###. :###:* ", + bcolors.RED +" ###- .+####= +### ", + bcolors.RED +" +### .#- . .##* :", + bcolors.RED +".### +* ### ", + bcolors.RED +" ##+ -# - ###: ", + bcolors.RED +".##: ** .##= ", + bcolors.RED +".## +# - -##.. ", + bcolors.RED +".## #+ +## . ", + bcolors.RED +" ##+ .:## ##* ", + bcolors.RED +" ##* :=:##: .###- ", + bcolors.RED +" :##: +*+*#####*. ", + bcolors.RED +" ####- .. ", + bcolors.RED +" ###* ", + bcolors.RED +" .###- ", + bcolors.RED +" ###: ", + bcolors.RED +" +##* ", + bcolors.RED +" *##. ", + bcolors.RED +" *##+ ", + bcolors.RED +" :##*+ ", + bcolors.RED +" :*#- ",]] \ No newline at end of file diff --git a/pyfetch.py b/pyfetch.py index 677db4f..4b60788 100644 --- a/pyfetch.py +++ b/pyfetch.py @@ -195,7 +195,7 @@ def memory_info(): with open("/proc/meminfo", "r") as f: lines = f.readlines() total_memory = int(lines[0].split()[1]) // 1024 - free_memory = int(lines[1].split()[1]) // 1024 + free_memory = int(lines[2].split()[1]) // 1024 used_memory = total_memory - free_memory return f"{used_memory} MB / {total_memory} MB" @@ -331,6 +331,9 @@ def display_array(): if memory != "": data.append(f'{bcolors.YELLOW}Memory{bcolors.ENDC}: {memory}') + + #Print terminal color blocks: + data.append(bcolors.BLACK + "███" + bcolors.RED + "███" + bcolors.OKGREEN + "███" + bcolors.YELLOW + "███" + bcolors.OKBLUE + "███" + bcolors.PINK + "███" + bcolors.OKCYAN + "███" + bcolors.GREY + "███") return data