radboy 0.0.537__tar.gz → 0.0.539__tar.gz

{radboy-0.0.537 → radboy-0.0.539}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.537
+Version: 0.0.539
 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.539/STDOUT.TXT

@@ -0,0 +1,25 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"price"
+#USER INPUT# -> :"9"
+#USER INPUT# -> :""
+#USER INPUT# -> :"17.4"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :""
+#USER INPUT# -> :"price"
+#USER INPUT# -> :"9"
+#USER INPUT# -> :""
+#USER INPUT# -> :"17.4"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"3"
+#USER INPUT# -> :"price"
+#USER INPUT# -> :"3"
+#USER INPUT# -> :"2.46"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"2"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.539"

{radboy-0.0.537 → radboy-0.0.539}/pyproject.toml

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

{radboy-0.0.537 → radboy-0.0.539}/radboy/DB/db.py

@@ -763,7 +763,7 @@ class EntryExtras:
     def __neg__(self):
         return -self.Price
 
-def std_colorize(m,n,c,start=f"[DB]{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"[DB]{Back.grey_11}{Fore.pale_turquoise_1} Start {'*'*(os.get_terminal_size().columns-(len(Fore.pale_turquoise_1)+(len(Back.grey_11)*2)+len(Style.reset)))}{Style.reset}\n",end=f"\n{Back.grey_11}{Fore.light_red}{'-'*(os.get_terminal_size().columns-(len(Fore.light_red)+(len(Back.grey_11)*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:
@@ -4535,6 +4535,7 @@ class HistoryUi:
     {Fore.light_steel_blue}cmds are order ascending and grouped by cmd to reduce output to screen with too many results{Style.reset}
         {Fore.dark_goldenrod}select,slct,s,use,u{Fore.green_yellow} - select a cmd from history to use{Style.reset}
         {Fore.dark_goldenrod}rm last,rm,r,del{Fore.green_yellow} - delete a cmd from history{Style.reset}
+        {Fore.dark_goldenrod}'rm last ngp','rmngp','rngp','delngp' - {Fore.light_yellow}delete a cmd from history showing everything{Style.reset}
         {Fore.dark_goldenrod}show,sa,show all{Fore.green_yellow} - show all history{Style.reset}
         {Fore.dark_goldenrod}show_ngb,sa_ngb,show allngb{Fore.green_yellow} - show all history without group by cmd{Style.reset}
         {Fore.dark_goldenrod}ca,clear all,clear_all{Fore.green_yellow} - clear all cmds from PromptHistory{Style.reset}
@@ -4554,14 +4555,16 @@ class HistoryUi:
                 self.fixtable()
             elif doWhat in ['select','slct','s','use','u']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Use which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4574,14 +4577,51 @@ class HistoryUi:
                             print(e)
             elif doWhat in ['rm last','rm','r','del']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
+                    which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
+                    if which in [None,]:
+                        continue
+                    elif which in ['d',]:
+                        continue
+                    else:
+                        try:
+                            if which < 0:
+                                index=which*-1
+                                index-=1
+                                rmall=session.query(PH).filter(PH.cmd==results[index].cmd).all()
+                                for num,i in enumerate(rmall):
+                                    session.delete(i)
+                                    if num%1000==0:
+                                        session.commit()
+                                session.commit()
+                            else:
+                                session.delete(results[which])
+                                session.commit()
+                                session.flush()
+                            self.cmd=None
+                        except Exception as e:
+                            print(e)
+            elif doWhat in ['rm last ngp','rmngp','rngp','delngp']:
+                with Session(ENGINE) as session:
+                    results=session.query(PH)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
+                    ct=len(results)
+                    if ct < 1:
+                        print("Nothing in History!")
+                        continue
+                    for num,i in enumerate(results):
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4607,24 +4647,28 @@ class HistoryUi:
                             print(e)
             elif doWhat in ['show','sa','show all']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
+                        print(std_colorize(msg,num,ct))
             elif doWhat in ['show_ngb','sa_ngb','show all ngb']:
                 with Session(ENGINE) as session:
-                    results=session.query(PH).order_by(PH.dtoe.asc()).all()
+                    results=session.query(PH)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}|{i.dtoe+timedelta(seconds=i.ageLimit)}'''
+                        print(std_colorize(msg,num,ct))
             elif doWhat.lower() in ['co','clean old','clean_old']:
                 self.clean_old()
             elif doWhat in ['ca','clear all','clear_all']:
@@ -4640,7 +4684,10 @@ class HistoryUi:
                     search=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} What cmd are you looking for?",helpText="what was in the command text",data="string")
                     if search in [None,'d']:
                         continue
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).filter(PH.cmd.icontains(search)).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.filter(PH.cmd.icontains(search))
+                    results=results.all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
@@ -4649,8 +4696,8 @@ class HistoryUi:
                     mode='PromptHistory'
                     h=f'{Prompt.header.format(Fore=Fore,mode=mode,fieldname=fieldname,Style=Style)}'
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Use which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue
@@ -4669,14 +4716,16 @@ class HistoryUi:
                     search=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} What cmd are you looking for?",helpText="what was in the command text; this will only remove the last used, if there is another inn history it will need to be removed as well, or just use ca",data="string",noHistory=False)
                     if search in [None,'d']:
                         continue
-                    results=session.query(PH).order_by(PH.dtoe.asc()).group_by(PH.cmd).filter(PH.cmd.icontains(search)).all()
+                    results=session.query(PH).group_by(PH.cmd)
+                    results=orderQuery(results,PH.dtoe,inverse=True)
+                    results=results.filter(PH.cmd.icontains(search)).all()
                     ct=len(results)
                     if ct < 1:
                         print("Nothing in History!")
                         continue
                     for num,i in enumerate(results):
-                        msg=f'''{Fore.light_green}{num}{Fore.light_magenta}/{num+1} of {Fore.orange_red_1}{ct}{Style.reset} -> {i.cmd}|{i.dtoe}'''
-                        print(msg)
+                        msg=f'''{i.cmd}|{i.dtoe}'''
+                        print(std_colorize(msg,num,ct))
                     which=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f"{h} Delete which {Fore.light_green}command?{Fore.light_yellow}",helpText=master_help,data="integer")
                     if which in [None,]:
                         continue

{radboy-0.0.537 → radboy-0.0.539}/radboy/TasksMode/Tasks.py

@@ -306,6 +306,39 @@ def pricing(self):
 {Fore.grey_70}default_bottle_size=={Fore.light_yellow}{default_bottle_size},
 {Fore.light_sea_green}default_purchased_qty=={Fore.turquoise_4}{default_purchased_qty}
 {Style.reset}"""
+            def timedecimal_to_ampm():
+                dayHours=Prompt.__init2__(None,func=FormBuilderMkText,ptext="How many hours in a day?: ",helpText="how many hours make a day? default is 24 ",data="dec.dec")
+                if dayHours is None:
+                    return
+                elif dayHours in ['d',]:
+                    dayHours=Decimal('24')
+                halfday=dayHours/2
+
+                result=None
+                time_Dec=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Time Decimal: ",helpText="time of day as a decimal to convert to 12H ",data="dec.dec")
+                if time_Dec is None:
+                    return
+                elif time_Dec in ['d',]:
+                    time_Dec=0.0
+                ampm='am'
+                if time_Dec >= 0 and time_Dec <= dayHours:
+                    if time_Dec <= halfday:
+                        hours=int(time_Dec)
+                    else:
+                        hours=int(time_Dec-halfday)
+                        ampm='pm'
+                    minutes=time_Dec-int(time_Dec)
+                    
+                    try:
+                        minutes=int(minutes*60)
+                    except Exception as e:
+                        print(e)
+                        minutes=0
+                    result=f"{hours}[12H]/{int(time_Dec)}[24]:{minutes} {ampm}"
+                    
+                    return result
+                return result
+
             def tax_rate_decimal():
                 result=None
                 tax_percent=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Tax Rate Percent: ",helpText="percent to convert to decimal (Percent/100=Rate)",data="dec.dec")
@@ -609,6 +642,11 @@ def pricing(self):
                     'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}is multiplied by -1 to make inverse{Style.reset}',
                     'exec':invert_value
                 },
+                f'{uuid1()}':{
+                    'cmds':['time dec to clock','t2c','time to clock'],
+                    'desc':f'{Fore.light_yellow}value{Fore.medium_violet_red}convert decimal time to clock time{Style.reset}',
+                    'exec':timedecimal_to_ampm
+                },
                 }
             for num,i in enumerate(options):
                 options[i]['cmds'].append(str(num))
@@ -630,44 +668,61 @@ def pricing(self):
                     if cmd.lower() in els:
                         result=options[i]['exec']()
                         break
-                print(f"{result:.4f}")
+                print(f"{result}")
                 returnResult=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Return Result?[y/n]",helpText=f"result to return is '{result}'",data="boolean")
                 if returnResult in [True,]:
                     if result is None:
                         return None
                     else:
-                        returnTypes=["float","Decimal","string"]
-                        returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}"]
+                        returnTypes=["float","Decimal","string","string"]
+                        returnActor=[lambda x:round(float(x),4),lambda x:Decimal(x).quantize(Decimal("0.0000")),lambda x: f"{x:.4f}",lambda x:str(x)]
                         ct=len(returnTypes)
                         returnType=None
-                        htext='\n'.join([std_colorize(f"{i} - {returnActor[num](result)} ",num,ct) for num,i in enumerate(returnTypes)])
+                        htext=[]
+                        strOnly=False
+                        for num,i in enumerate(returnTypes):
+                            try:
+                                htext.append(std_colorize(f"{i} - {returnActor[num](result)} ",num,ct))
+                            except Exception as e:
+                                strOnly=True
+                                print(e)
+                        htext='\n'.join(htext)
                         while returnType not in range(0,ct+1):
                             print(htext)
                             returnType=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Return the value as?",helpText=f"{htext}\nwhich index?",data="integer")
                             if returnType is None:
                                 return None
                             elif returnType in ['d',]:
-                                returnType=1
-
-                        if returnTypes[returnType] == 'float':
-                            try:
-                                return returnActor[returnType](result)
-                            except Exception as e:
-                                print(e)
-                                continue
-                        elif returnTypes[returnType] == 'Decimal':
-                            try:
-                                return returnActor[returnType](result)
-                            except Exception as e:
-                                print(e)
-                                continue
-                        elif returnTypes[returnType] == 'string':
-                            try:
-                                return returnActor[returnType](result)
-                            except Exception as e:
-                                print(e)
-                                continue
-                        else:
+                                if not strOnly:   
+                                    returnType=1
+                                else:
+                                    returnType=-1
+                                    break
+                                    #return str(result)
+                        try:
+                            if returnTypes[returnType] == 'float':
+                                try:
+                                    return returnActor[returnType](result)
+                                except Exception as e:
+                                    print(e)
+                                    continue
+                            elif returnTypes[returnType] == 'Decimal':
+                                try:
+                                    return returnActor[returnType](result)
+                                except Exception as e:
+                                    print(e)
+                                    continue
+                            elif returnTypes[returnType] == 'string':
+                                try:
+                                    return returnActor[returnType](result)
+                                except Exception as e:
+                                    print(e)
+                                    continue
+                            else:
+                                return result
+                        except Exception as e:
+                            print(e)
+                            print("returning as a string")
                             return result
                     return result                
         except Exception as e:

radboy-0.0.539/radboy/__init__.py

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

{radboy-0.0.537 → radboy-0.0.539}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.537
+Version: 0.0.539
 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.537 → radboy-0.0.539}/setup.py

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

radboy-0.0.537/STDOUT.TXT

@@ -1,18 +0,0 @@
-#USER INPUT# -> :"hl"
-#USER INPUT# -> :"asai"
-#USER INPUT# -> :""
-#USER INPUT# -> :"5"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"del 1602"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :"alai"
-#USER INPUT# -> :""
-#USER INPUT# -> :"5"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"del"
-#USER INPUT# -> :"1603"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"0.0.537"

radboy-0.0.537/radboy/__init__.py

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