From 1ae9b10caaba17822e60e9018b65043b084845ef Mon Sep 17 00:00:00 2001 From: Noah Swerhun Date: Fri, 10 Mar 2023 21:47:01 -0600 Subject: [PATCH] added global padding feature --- .gitignore | 1 + __pycache__/config_parsing.cpython-310.pyc | Bin 3647 -> 0 bytes config_parsing.py | 3 ++- example_config.yml | 3 +++ main.py | 8 ++++++-- 5 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 __pycache__/config_parsing.cpython-310.pyc diff --git a/.gitignore b/.gitignore index 4cc414d..d5d0b68 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ testing_config.yml +__pycache__ diff --git a/__pycache__/config_parsing.cpython-310.pyc b/__pycache__/config_parsing.cpython-310.pyc deleted file mode 100644 index 6b925ea25dc86cda4d1ff4d0645353abfeaa8aa5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3647 zcma)9&u<(_74EA3IWs*I+i~JJPBxR+i8FB~b{5!#D4Qi=u|NVx;Eh%cBvyN>XFT#u z_oTX=ti9bRi&uzC1W26F3T+M?a^Jmi;s%I+pg~-?kQ-=$gIC({z3Lgqj)TOs>eZ|7 zy?Xt+>b+MrVYyt?@SAe~(fr+nru~fudw(2*uc1ZX1QD8GU9HC&j1kYfyr(zxp3yLR zX2a}R4XbB2?4HwbAlHTQq1Gq}Q&{MW!WIttk|-=|wc;~a(`qa$L|)5Z>4u)DS($z_ z5SeqkA9upQ>t^Qn{I>sIW-T|@{GOMU^8OoAhBD)~Ws{MO!Ouj08tv<7(MOQPa5ZLv zZxhu)xiA!Og6hDmL2sisFm?ug0lgVpq9{rqYTFzVSCmENF^7dikTEeLM)!@!fLg#0 zqaW&wiz7;hEFTpUIp1-`G2z69m_$3S-ZHiOmJ^t5h?C;A*cPWmRh-@?FWo&hNA~dK zHF1`%vVB@Sfr@WsX&g#&&oX2QjU)02fZ4>XD`-pe!j@f1%-eKD;WwDcJ z;-aXFOON%Rxhane3Dz;y-^HdIc(!$>1a;Vb?T0--mYZ9r?)_k){?)q|-pjim z&h77KGHW%ARtxz`o%xHx{oEd@F^Rr5~6Zk9fTBo@l_))YkJ}6cwl$R+!91wgV zTQ`=qr+i70@TvBcWh{_m;1$_Aci;a~I+N^2-Z+3{^*rRJE&Z1CqqYBI zY0YI#jtce&i*^Yhfd2wc9z1l%$bp2M0IPrtnmzgO$ z?X~#8+jSUF8+#0lUH{K*v<4PmXba%(>p;dDR46*?E8Tv_ZrSHs-%r! z&BTUxx;`aCqdW-CC@-D{2^ysVs0KXpUqrj4Ey>1T6{+M?v2p$Ir zJ^Ww1VsL|1fban}2Hs*tl73+s72w7f{6GA2{+$2QdOk8&WG9|;-NhV(Igj{rc^$9W zx4raoS{YT>7qNeox05(}CbblGJ>>~|Tf6(qR8Mq66UI81Cz+OTVJ0lmC$$MpSQFY6 zE#<)nklT>YD!HSuhrkNJE-S34upY1yu$u~V57@a2c^UHWDtYCA{5y~zg4|Q`kyy($ zw%NdsHz6N|{JxTp9hhH-{4nGnDEasS`ANu+K>iCQKYGA^Sxi9sYplVsm*?IuCj4Xe zgpy%$NfxlIk`Dh&lO=RpX0_g~&hD^T>C#ZI)>kFfG2(=*3{+axS$Sx{2jEADH>&lG zs-*NIE4Kh2AMlIdrv@rvRh}5YcdD~BF0WvOjEQBZUo(_1jU#!8ZlDU`7O)bk%Rq#3 z-}TxN3YZ$d9JgZ>x5Ki$qExTJbo6BqmtqT%S7b-gh7a)vo5jW%f8;QE3lsOnA$>jN zn2N(yB%i=JiN?`%Gy}~PJhjlS zym||{$`d^?5;L(At8F7k7nbCk2sw2bVV7s$vQk&7UN&TXXB)i+XEA3|Xcg{izm5DeTQojWiv zPjk-`d7a2v5d0bF2+{SQAzL-XLkGPyvUI_NIbum(b=Ztk#aTl`wOWq?m>OcjS( zCA0EdNTZ-G1U*~?8anO@`GTlrsFE34m4?v|QA}qedk^ zx`(Ryx9r{n^OMn~OP;@y`*H^_h<*xUptiht98Oi{#bZ(3dF1fC`Vf8`ZCq*WrF5Rs zOgdSIlqwO;=KpqF2k)R$G;gjtgUPnRs!C^!%WuJ%rJCC?HoaaqzZ+Qj$**n?FYXoj qHG?Xdx=g48S5-S@VozP&y{F+$n}78UoW5E_2ZpQR#oT$ro%%0g6d<$! diff --git a/config_parsing.py b/config_parsing.py index aff2d78..9d128dc 100644 --- a/config_parsing.py +++ b/config_parsing.py @@ -16,7 +16,8 @@ def get_validated_config(filename): Optional("offset"): int, Optional("line_color"): Regex(r'^#[0-9a-fA-F]{3}$|^#[0-9a-fA-F]{6}$|^#[0-9a-fA-F]{8}$'), Optional("padding", default=" "): str, - Optional("seperator", default="|"): str + Optional("seperator", default="|"): str, + Optional("global_padding", default=""): str }, "modules": [ { diff --git a/example_config.yml b/example_config.yml index 6334e9c..e171608 100644 --- a/example_config.yml +++ b/example_config.yml @@ -38,6 +38,9 @@ bar: # Seperator between modules. Module formatting options are not applied to # the seperator. seperator: "|" + # Padding on either end of the bar itself. This will be placed before and + # after all text on the bar. + global_padding: "" # Here is where you can define a list your individual modules. You can define # as many modules as you want. Some fields are required; these will be diff --git a/main.py b/main.py index 83468f8..efb3b7b 100644 --- a/main.py +++ b/main.py @@ -9,7 +9,7 @@ def print_bar(): for alignment in running_modules_dict: match alignment: case "left": - print("%{l}", end="") + print("%{l}" + global_padding, end="") case "center": print("%{c}", end="") case "right": @@ -26,7 +26,9 @@ def print_bar(): if len(group[i]) > 0: print(seperator, end="") break; - + if alignment == "right": + print(global_padding, end="") + print(flush=True) def create_module_string(pre, prefix, command, post): @@ -51,10 +53,12 @@ def new_module_thread(alignment, pre, name, prefix, command, post, refresh): def main(): global padding global seperator + global global_padding config = get_validated_config("./testing_config.yml") padding = config["bar"]["config"]["padding"] seperator = config["bar"]["config"]["seperator"] + global_padding = config["bar"]["config"]["global_padding"] modules = config["bar"]["modules"]