From 9b222736e2ffb2b9bb852826b4cc7ab165225512 Mon Sep 17 00:00:00 2001 From: Stewie Date: Sat, 2 Jul 2022 00:03:08 -0400 Subject: [PATCH] Update bytes_to_text for icon, speed --- ToolsTales.py | 15 ++++++++++++++- __pycache__/ApacheAutomate.cpython-38.pyc | Bin 3043 -> 3046 bytes __pycache__/ToolsTales.cpython-38.pyc | Bin 24121 -> 24396 bytes 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ToolsTales.py b/ToolsTales.py index 1f073a8..9f38791 100644 --- a/ToolsTales.py +++ b/ToolsTales.py @@ -443,6 +443,9 @@ class ToolsTales: with open('test.xml', "wb") as xmlFile: xmlFile.write(txt) + def hex2(self, n): + x = '%x' % (n,) + return ('0' * (len(x) % 2)) + x #Convert a bytes object to text using TAGS and TBL in the json file def bytes_to_text(self, fileRead, offset=-1, end_strings = b"\x00"): @@ -486,7 +489,17 @@ class ToolsTales: if tag_param != None: finalText += tag_param else: - finalText += ("<%s:%08X>" % (tag_name, b2)) + + + #Pad the tag to be even number of characters + hex_value = self.hex2(b2) + if len(hex_value) < 4 and tag_name not in ['icon','speed']: + hex_value = "0"*(4-len(hex_value)) + hex_value + + + + finalText += '<{}:{}>'.format(tag_name, hex_value) + #finalText += ("<%s:%08X>" % (tag_name, b2)) else: finalText += "<%02X:%08X>" % (b, b2) elif chr(b) in self.PRINTABLE_CHARS: diff --git a/__pycache__/ApacheAutomate.cpython-38.pyc b/__pycache__/ApacheAutomate.cpython-38.pyc index b7d71420f41dbc7e6d7d9a8cc3fa042bfa22bbef..8544abc859279e19514467e04aeada59c99cd270 100644 GIT binary patch delta 983 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 C>VsJT delta 2229 zcmX@Jk8$T7M!ry9UM>a(1_sw{yOVykZRF!)WXzi^%eaF-B1J1jyM-}IHbo~zw}oNy z6UJ!C$Q0KUw-&}It(2$~_Y{v7#whI+&lIl~hRG33CM>}Wn$eqQFfppBz5M_G|No*T z3=9m(EFi<7Sd@W*fs=uO!I^=9q4*Wks9{fG&t?F#SW4Iz@TG{BvLc^ zgSJ$?U=8B}riBbOY!VD9ED{X0LN$yF7;D%TGBPrNET|D$$hbgYAw#Wjip&DR6xkHH z7KRd`8sQX%6owS}R%S_t8sQWc7`vItg`t^oA!Drw*c3sqDJ(T2X-vTknhJhJtPBhc zMJgbI5k$B%Fih^$F<|7Gyi3PMq$n38mdC)rP{nDZT5P3iU=cA{P1l0sr8olv!%GQ< z$!WS%8M!9^(Y0q3o@}G%GPz&RkWqBpL(r2{COxpudEP zjf0Vap-5tKmQgaJ%;a-Mwv7Cfd5m)zl_ysjt1${pUTEycs5JS5@eD@($(<(i7@a3; zn0hlhY%VbsWMq_^+-6q5=(_p4nI&Ko%b6G$ia|Mmje&`w2o!#rY()_u3pi8r zN^?_-5=&BVu@vVQmE2+h*;u3svZ;iDfkBh2$Q)!>%47o@KOwl2HJOXR?ns$D!A5~G zWAjEE9cIR^$@lE{Gx;%27T^$LoG^KtLnLF-WC2GBrecWD#L141&W!n!TOBJU%*-oJEh=%$$$2$-vipBV)yb1RJehtnZNBHB%fw^{2?V~$D&7w{K%UTK zE|Qzf>!Tpz4>t>BOc5v{s7-eC5#a`V-5Vt9GdaOWO)nM1FQj3bsCc6Z^XJnde60FKtJvk~kfH7_J>fkwyQe_~0`5?j%J!s z6lTSkGWlyT@Dxanas~2&bWH=(}+sr?I2N*%Zm_64-{D7I9bDtl)tN3 z_4M?rYm4$HPmGjeOrN|aQiAc&$R z?w$N8I-G4LSmk8@7#YT6lXGH}MVUYXpe(G(7^2AtF4;AWCohRn<+cRLn1cw_$yZ_w z7*!^-#%5)MW6c>P>INc$KtwEv07u9q5DT0=r-4|AJPNjVHb`tKhyX_>I2aFsxW_;Q z*b^r}tkWRk4C7?RcrorGP*Dl;P;u0xI3s2)F8|5qaej