radboy 0.0.532__tar.gz → 0.0.534__tar.gz

{radboy-0.0.532 → radboy-0.0.534}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.532
+Version: 0.0.534
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.534/STDOUT.TXT

@@ -0,0 +1,6 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"i"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.533"
+#USER INPUT# -> :"0.0.534"

{radboy-0.0.532 → radboy-0.0.534}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.532"
+version = "0.0.534"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.532 → radboy-0.0.534}/radboy/DB/Prompt.py

@@ -49,7 +49,7 @@ except Exception as e:
                 ru_maxrss=0
             return use()
 
-def std_colorize(m,n,c,start=f"[Prompt]{Back.grey_27}{Fore.pale_turquoise_1} Start {'*'*(os.get_terminal_size().columns-(len(Fore.pale_turquoise_1)+(len(Fore.grey_27)*2)+len(Style.reset)))}{Style.reset}\n",end=f"\n{Back.grey_50}{Fore.dark_red_1}{'-'*(os.get_terminal_size().columns-(len(Fore.dark_red_1)+(len(Fore.grey_50)*2)+len(Style.reset)))} Stop {Style.reset}"):
+def std_colorize(m,n,c,start=f"[Prompt]{Back.black}{Fore.pale_turquoise_1} Start {'*'*(os.get_terminal_size().columns-(len(Fore.pale_turquoise_1)+(len(Fore.grey_27)*2)+len(Style.reset)))}{Style.reset}\n",end=f"\n{Back.black}{Fore.dark_red_1}{'-'*(os.get_terminal_size().columns-(len(Fore.dark_red_1)+(len(Fore.grey_50)*2)+len(Style.reset)))} Stop {Style.reset}"):
         if ((n % 2) != 0) and n > 0:
             msg=f'{start}{Fore.cyan}{n}/{Fore.light_yellow}{n+1}{Fore.light_red} of {c} {Fore.dark_goldenrod}{m}{Style.reset}{end}'
         else:
@@ -69,7 +69,8 @@ def timedout(ptext,htext='',timeout_returnable="timeout"):
 {Fore.light_steel_blue}fba,fastboot-auto,autoboot,timeout -{Fore.light_green} set timeout to 0 and return {timeout_returnable}{Style.reset}
 {Fore.light_steel_blue}lb,longboot - {Fore.light_green}set timeout to {db.BooleanAnswers.long_boot_time} and continue{Style.reset}
 {Fore.light_steel_blue}sto,set to,set timeout - {Fore.light_green}set timeout to custom value and continue{Style.reset}
-                '''.split("\n")
+                '''+htext
+                z=z.split("\n")
                 ct=len(z)
                 for num,i in enumerate(z):
                     h.append(std_colorize(i,num,ct))

{radboy-0.0.532 → radboy-0.0.534}/radboy/DB/db.py

@@ -33,6 +33,20 @@ from uuid import uuid1
 import sys
 from inputimeout import inputimeout, TimeoutOccurred
 
+def strip_colors(colored_text):
+    text=colored_text
+    colors=[getattr(Fore,i) for i in Fore._COLORS]
+    colors2=[getattr(Fore,i) for i in Back._COLORS]
+    styles3=[getattr(Style,i) for i in Style._STYLES]
+    #text=''.join([i for i in text if i in string.printable])
+    escape_codes=[]
+    escape_codes.extend(colors)
+    escape_codes.extend(colors2)
+    escape_codes.extend(styles3)
+    for i in escape_codes:
+        text=text.replace(i,'')
+    return text
+
 class BOOLEAN_ANSWERS:
     def __init__(self):
         self.yes=generate_cmds(startcmd=['y','Y','YES','1','t','true','TRUE','True'],endCmd=['',' '])
@@ -172,7 +186,12 @@ str(uuid1()):{
             try: 
                 t=BooleanAnswers.timeout
                 past=datetime.now()
-                user_input = timedout(f"Boot CMDS(timeout=autoboot from)",htext=BooleanAnswers.help)
+                s=strip_colors(BooleanAnswers.help+cmdhtext)
+                htxt=[]
+                ct=len(s)
+                htxt=[f"[BTLDR] {i}" for i in s.split("\n")]
+                htxt='\n'.join(htxt) 
+                user_input = timedout(f"Boot CMDS(timeout=autoboot from)",htext=htxt)
                 #user_input = inputimeout(prompt=f"{BooleanAnswers.timeout_msg}Boot CMDS({t} Seconds Passed=autoboot from {past.strftime("%I:%M:%S %p(12H)/%H:%M:%S(24H)")}):", timeout=t)
                 print(f"You entered: {user_input}")
                 if user_input in ['fb','fastboot','fba','fastboot-auto','timeout']:
@@ -197,7 +216,7 @@ str(uuid1()):{
                 if doWhat.lower() in [str(i) for i in cmds[cmd]['cmds']]:
                     if callable(cmds[cmd]['exec']):
                         ready=cmds[cmd]['exec']()
-                        print(ready)
+                        #print(ready)
                         if ready is True:
                             return
                         break
@@ -366,19 +385,7 @@ LOCATION_FIELDS=[
         'ListQty'
         ]
 
-def strip_colors(colored_text):
-    text=colored_text
-    colors=[getattr(Fore,i) for i in Fore._COLORS]
-    colors2=[getattr(Fore,i) for i in Back._COLORS]
-    styles3=[getattr(Style,i) for i in Style._STYLES]
-    #text=''.join([i for i in text if i in string.printable])
-    escape_codes=[]
-    escape_codes.extend(colors)
-    escape_codes.extend(colors2)
-    escape_codes.extend(styles3)
-    for i in escape_codes:
-        text=text.replace(i,'')
-    return text
+
 
 def dayString(today,plain=False):
     ds=f'''{today.strftime(f"{Fore.light_yellow}%m/{Fore.light_red}%d/{Fore.light_sea_green}%Y {Fore.light_red}(%A, {Fore.grey_50}Week {(today.day - 1) // 7 + 1} of {Fore.light_yellow}%B{Fore.grey_50}, week %W of {Fore.light_sea_green}year %Y){Fore.light_cyan} @ {Fore.orange_red_1}%H/{Fore.light_cyan}24.Hr|({Fore.dark_goldenrod}%I/{Fore.light_cyan}12.Hr){Fore.light_green}:%M.Min{Fore.magenta}:%S.Sec ({Fore.dark_goldenrod}%p/{Fore.light_cyan}12.Hr)")}'''

{radboy-0.0.532 → radboy-0.0.534}/radboy/HealthLog/HealthLog.py

@@ -155,6 +155,8 @@ class HealthLogUi:
 				print(fields,"empty!")
 				return
 			data=FormBuilder(data=fields)
+			if data is None:
+				return
 			if 'LongActingInsulinName' in useColumns or 'ShortActingInsulinName' in useColumns:
 				def searchNames(code):
 					with Session(ENGINE) as session:

radboy-0.0.534/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.534'

{radboy-0.0.532 → radboy-0.0.534}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.532
+Version: 0.0.534
 Summary: A Retail Calculator for Android/Linux
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.532 → radboy-0.0.534}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.532"
+VERSION="0.0.534"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.532/STDOUT.TXT

@@ -1,2 +0,0 @@
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"0.0.532"

radboy-0.0.532/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.532'