radboy 0.0.462__py3-none-any.whl → 0.0.464__py3-none-any.whl

radboy/CookBook/CookBook.py

@@ -13,21 +13,22 @@ class CookBookUi:
 						query=session.query(CookBook)
 					else:
 						query=session.query(CookBook).filter(or_(CookBook.recipe_uid.icontains(stext),CookBook.recipe_name.icontains(stext)))	
-						query=query.group_by(CookBook.recipe_uid,CookBook.recipe_name)
+					
+					query=query.group_by(CookBook.recipe_uid,CookBook.recipe_name)
 					query=orderQuery(query,CookBook.DTOE,inverse=True)
-				results=query.all()
-				ct=len(results)
-				htext=[]
-				for num,i in enumerate(results):
-					htext.append(std_colorize(f"'{i.recipe_name}' [Name] - '{i.recipe_uid}' [UID] - '{i.cbid}' [cbid]",num,ct))
-				htext='\n'.join(htext)
-				print(htext)
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index to use?",helpText=htext,data="integer")
-				if which is None:
-					return None,None
-				elif which in ['d',]:
-					which=0
-				return results[which].recipe_uid,results[which].recipe_name
+					results=query.all()
+					ct=len(results)
+					htext=[]
+					for num,i in enumerate(results):
+						htext.append(std_colorize(f"'{i.recipe_name}' [Name] - '{i.recipe_uid}' [UID] - '{i.cbid}' [cbid]",num,ct))
+					htext='\n'.join(htext)
+					print(htext)
+					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index to use?",helpText=htext,data="integer")
+					if which is None:
+						return None,None
+					elif which in ['d',]:
+						which=0
+					return results[which].recipe_uid,results[which].recipe_name
 			except Exception as e:
 				print(e)
 

radboy/DB/db.py

@@ -708,11 +708,11 @@ class EntryExtras:
     def __neg__(self):
         return -self.Price
 
-def std_colorize(m,n,c):
+def std_colorize(m,n,c,start=f"{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}"):
         if ((n % 2) != 0) and n > 0:
-            msg=f'{Fore.cyan}{n}/{Fore.light_yellow}{n+1}{Fore.light_red} of {c} {Fore.dark_goldenrod}{m}{Style.reset}\n'
+            msg=f'{start}{Fore.cyan}{n}/{Fore.light_yellow}{n+1}{Fore.light_red} of {c} {Fore.dark_goldenrod}{m}{Style.reset}{end}'
         else:
-            msg=f'{Fore.light_cyan}{n}/{Fore.green_yellow}{n+1}{Fore.orange_red_1} of {c} {Fore.light_salmon_1}{m}{Style.reset}\n'
+            msg=f'{start}{Fore.light_cyan}{n}/{Fore.green_yellow}{n+1}{Fore.orange_red_1} of {c} {Fore.light_salmon_1}{m}{Style.reset}{end}'
         return msg
 
 class Template:

radboy/Lookup2/Lookup2.py

@@ -436,7 +436,7 @@ class Lookup:
 						if num == 0:
 							color_progress=Fore.cyan	
 						if not short:
-							msg=f"{color_progress}{num}{Style.reset}/{Fore.light_red}{ct-1}{Style.reset} ->{r}\n"
+							msg=std_colorize(r,num,ct)
 							'''
 							extras=session.query(EntryDataExtras).filter(EntryDataExtras.EntryId==r.EntryId).all()
 							extras_ct=len(extras)
@@ -449,7 +449,8 @@ class Lookup:
 							msg+=mtext
 							'''
 						else:
-							msg=f"{color_progress}{num}{Style.reset}/{Fore.light_red}{ct-1}{Style.reset} ->{r.seeShort()}\n"
+							#msg=f"{color_progress}{num}{Style.reset}/{Fore.light_red}{ct-1}{Style.reset} ->{}\n"
+							msg=std_colorize(r.seeShort(),num,ct)
 							if extras:
 								extras_items=session.query(EntryDataExtras).filter(EntryDataExtras.EntryId==r.EntryId).all()
 								extras_ct=len(extras_items)

radboy/PhoneBook/PhoneBook.py

@@ -13,21 +13,22 @@ class PhoneBookUi:
 						query=session.query(PhoneBook)
 					else:
 						query=session.query(PhoneBook).filter(or_(PhoneBook.phone_uid.icontains(stext),PhoneBook.phone_name.icontains(stext)))	
-						query=query.group_by(PhoneBook.phone_uid,PhoneBook.phone_name)
+					
+					query=query.group_by(PhoneBook.phone_uid,PhoneBook.phone_name)
 					query=orderQuery(query,PhoneBook.DTOE,inverse=True)
-				results=query.all()
-				ct=len(results)
-				htext=[]
-				for num,i in enumerate(results):
-					htext.append(std_colorize(f"{i.phone_name}[Name] - {i.phone_uid}[UID] - {i.pbid}[pbid]",num,ct))
-				htext='\n'.join(htext)
-				print(htext)
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index to use?",helpText=htext,data="integer")
-				if which is None:
-					return None,None
-				elif which in ['d',]:
-					which=0
-				return results[which].phone_uid,results[which].phone_name
+					results=query.all()
+					ct=len(results)
+					htext=[]
+					for num,i in enumerate(results):
+						htext.append(std_colorize(f"{i.phone_name}[Name] - {i.phone_uid}[UID] - {i.pbid}[pbid]",num,ct))
+					htext='\n'.join(htext)
+					print(htext)
+					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index to use?",helpText=htext,data="integer")
+					if which is None:
+						return None,None
+					elif which in ['d',]:
+						which=0
+					return results[which].phone_uid,results[which].phone_name
 			except Exception as e:
 				print(e)
 

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.462'
+VERSION='0.0.464'

{radboy-0.0.462.dist-info → radboy-0.0.464.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.462
+Version: 0.0.464
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.462.dist-info → radboy-0.0.464.dist-info}/RECORD

@@ -5,7 +5,7 @@ radboy/Holidays.txt,sha256=y-JZPihh5iaWKxMIHNXD39yVuVmf1vMs4FdNDcg0f1Y,3114
 radboy/InventoryGlossary.txt,sha256=018-Yqca6DFb10jPdkUY-5qhkRlQN1k3rxoTaERQ-LA,91008
 radboy/RecordMyCodes.py,sha256=Lt2reA6xchq3U7Y08DvkrHboZ25i1ts7X2E9gSIwcVg,41101
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=kpHn1pRc--4nMkiUEYusuSW61dY0HiyolFFBEm4Gs9g,17
+radboy/__init__.py,sha256=Q8-SC5Kfvmy8yIbWflh_07nUgTrp6vBmLv66_jfO3Z0,17
 radboy/api_key,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/case-export-2024-05-14-13-10-00.672971.xlsx,sha256=Wd592d_VLFmfUI9KKKSVjNwjV91euc1T7ATyvwvUhlg,5431
 radboy/case-export-2024-05-14-13-13-22.540614.xlsx,sha256=OnGrhmScHfGp_mVaWW-LNMsqrQgyZDpiU3wV-2s3U5Q,5556
@@ -75,7 +75,7 @@ radboy/ConvertCode/__pycache__/__init__.cpython-311.pyc,sha256=1-K1vfRZxAs9MoOyy
 radboy/ConvertCode/__pycache__/__init__.cpython-312.pyc,sha256=77LSCMdrPg91lbsloPumUo1SpAt5A8l1WPgTxGIvwTs,274
 radboy/ConvertCode/__pycache__/__init__.cpython-313.pyc,sha256=4F9h0V0Z5sQHdZQGEsnfCSLMQK4lUD5CzJwU4Elv-EU,153
 radboy/ConvertCode/__pycache__/codep.cpython-311.pyc,sha256=-qJqPEjGOP1-x6Xw6W4Msfuu2iwVffN_-DerH18Is2o,1086
-radboy/CookBook/CookBook.py,sha256=AQ-Qj4ZYJDXQJ2UH5lvvjsg3gqWFRoEa9Etvva9KkA8,18206
+radboy/CookBook/CookBook.py,sha256=gvbIcClMh78_6qDBYiZ0VkO_lnyirgjVTRNAglXyk6I,18224
 radboy/CookBook/__init__.py,sha256=svTiqqFxHZeqYCRorLx6qLxL3oI1pil4fxomm-kkQ88,927
 radboy/DB/CoinCombo.py,sha256=NJfTmx3XYgS41zkAyyO2W6de1Mj3rWsCWqU4ikHfvJI,13604
 radboy/DB/DatePicker.py,sha256=6eNjmryFWPpzrRYmI418UwSGin3XpJlL52h8cauanbY,18004
@@ -92,7 +92,7 @@ radboy/DB/SMLabelImporter.py,sha256=eUoBDxVUUEKGL2g_PwkASM67ZB7FmXtSnn4bCagskhY,
 radboy/DB/__init__.py,sha256=JiigA9B7GalP7YuRdcwyGDu5PDSBahoi0lLjtScxlN8,49
 radboy/DB/blankDataFile.py,sha256=YX_05Usi71UpDkZN9UTMYwUipbTndTAtEgqzBEga0kE,9285
 radboy/DB/config.py,sha256=bvu43dUl1_yO3Zq3gsLuenGUgJSiS3S9Cs6ppFEvZbg,239
-radboy/DB/db.py,sha256=CK-Lt9W91xwwfgYD90Uk0rPjb0VezF_bEJO9Hdq7a4o,242906
+radboy/DB/db.py,sha256=hGmj_ayWZQ7xfIuHJwmsYpf0v5umdscVX4fy1dMCveY,243261
 radboy/DB/glossary_db.py,sha256=1_qxeEpjjEtpWB_eDjsgJisimLv7OBm75MuqM-Lt6zg,28218
 radboy/DB/masterLookup.py,sha256=DBaM2uscG3_X5dek49wjdnOzhrjWhKgvOEz_umdz0mY,4566
 radboy/DB/msg.txt,sha256=YxWed6A6tuP1djJ5QPS2Rz3ING4TKKf8kUiCCPtzHXE,7937
@@ -127,7 +127,7 @@ radboy/DB/__pycache__/config.cpython-312.pyc,sha256=Qo7E6MHrF6yqvKgepNFyCoekZXiv
 radboy/DB/__pycache__/config.cpython-313.pyc,sha256=_8wCIg_3jhyJjxnExD2Sm6aY-uZTw036p7Ki5znL7dc,376
 radboy/DB/__pycache__/db.cpython-311.pyc,sha256=rNgigyBd0D-cg1JxKAS8t0B_k0IEJivgVlRaZE10Xis,210105
 radboy/DB/__pycache__/db.cpython-312.pyc,sha256=ANDJPC0RoavbmSKFxG15vC7B4rEGyVt7xRJt7XGY3OA,334609
-radboy/DB/__pycache__/db.cpython-313.pyc,sha256=PPJ49n7D8abZMbyoSnnptfuawUxwXEXNVEo8SGlRBsc,386031
+radboy/DB/__pycache__/db.cpython-313.pyc,sha256=fTlBrpZlmslzengjl1pzr7oX2DDBiavsLeoKOTD8pmk,387245
 radboy/DB/__pycache__/glossary_db.cpython-312.pyc,sha256=8UL-29cKqtKovx0BANm6kzKKteef1BW_2qF3wumzst4,36023
 radboy/DB/__pycache__/glossary_db.cpython-313.pyc,sha256=Ke9bkvllGv5CK0JdT9DRvQ3MOdrXxoYv7TVLNkqLux0,36582
 radboy/DB/__pycache__/masterLookup.cpython-312.pyc,sha256=bQiOkmMwwHgcO18tYSWGQ-YUff4GQlKVhBMp1GoWAqY,6324
@@ -254,10 +254,10 @@ radboy/Lookup/__pycache__/Lookup.cpython-313.pyc,sha256=XLNpbTGk4ryJSRvzf2SDzoxI
 radboy/Lookup/__pycache__/__init__.cpython-311.pyc,sha256=Jm4q7Xibyc4UjYYBeYK6uBoMNTBCYoivU7FCtdX5G08,231
 radboy/Lookup/__pycache__/__init__.cpython-312.pyc,sha256=-3XFxnbTtwL4YFln0aSCyRFd2DD-Gr2-UoBV-eOOqqs,269
 radboy/Lookup/__pycache__/__init__.cpython-313.pyc,sha256=p5qY0NPTD_pjFDK1cIJ6qwHaJb91xspPXboIvk-dIgE,148
-radboy/Lookup2/Lookup2.py,sha256=2oV2eliT9FWh6k7UIFMCyLb7FntY39A9U9PVYXjsTXg,22912
+radboy/Lookup2/Lookup2.py,sha256=Sl2MsiFId83he4bCiwM3FgXpWqXyFEsleWCbhquLhtg,22887
 radboy/Lookup2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/Lookup2/__pycache__/Lookup2.cpython-312.pyc,sha256=Mka0F5UbDbhfF0ogsnklb8eVJz1v7H8hcm5N0yEjUjI,35474
-radboy/Lookup2/__pycache__/Lookup2.cpython-313.pyc,sha256=5FLmnl55zHSUjVAQELIeLK1Bcw0ox7ovVC3ffKQIjnY,42080
+radboy/Lookup2/__pycache__/Lookup2.cpython-313.pyc,sha256=LmqbvP4sladF32erK97o9iI5YKnlPhdecLZpiIvYZrE,41781
 radboy/Lookup2/__pycache__/__init__.cpython-312.pyc,sha256=0mqw_7WZPG7luwCFsqX5YMx3-2pN9URwnp8cuel5rGM,270
 radboy/Lookup2/__pycache__/__init__.cpython-313.pyc,sha256=iuBE5G-ThcR2mSYUgGwZI8WCpQwwJXy6hHnYI-h97_Y,149
 radboy/ModuleTemplate/Tasks.py,sha256=RF4sWnLH4FyzMU8AHOov7WP24-udd96-l9c9SvbIP_0,1088
@@ -282,7 +282,7 @@ radboy/POS/__pycache__/POS.cpython-313.pyc,sha256=-es1vNYvFK6MXznK6FTNTcsdGZzpC6
 radboy/POS/__pycache__/__init__.cpython-311.pyc,sha256=EjkCiNyf59_mmFLzbgGLqpStpeo9gi2dx8IZlhg_Qyg,228
 radboy/POS/__pycache__/__init__.cpython-312.pyc,sha256=mpESqOMEmBPUkkkP2Sci7XPA3MSko8Qw-eMFB2854EE,266
 radboy/POS/__pycache__/__init__.cpython-313.pyc,sha256=DR0_hbFS6FQFh6GWnXDs5bXThEqOZoNBwuzGOW_X9co,145
-radboy/PhoneBook/PhoneBook.py,sha256=qdGu9y2HP7tmVbjEXLAJ3oMdOFY0PY_3me-jXfeHzD8,14735
+radboy/PhoneBook/PhoneBook.py,sha256=eGL32n26PRKrnviA3Aa0u1KmFn_aNmsQrh1dkcwwNpc,14753
 radboy/PhoneBook/__init__.py,sha256=ehY4XgI8wlGvgUugs1HHrMLSaGQi2ox9bGGDIJCq9_E,928
 radboy/PunchCard/CalcTimePad.py,sha256=wpjHbGtqkhWgPABoR_wSwroP3-0o_TH2EKASKUPqsZg,4315
 radboy/PunchCard/PunchCard.py,sha256=Y4hzx5lLFw-1yDyxJukt-Xb3_ADsF6wEmpW_egXGCDc,38123
@@ -396,7 +396,7 @@ radboy/__pycache__/Run.cpython-311.pyc,sha256=G_UEfMtkLRjR6ZpGA_BJzGenuaCcP469Y9
 radboy/__pycache__/Run.cpython-312.pyc,sha256=v4xolc3mHyla991XhpYBUbBHYT0bnJ1gE-lkFoQ4GFA,241
 radboy/__pycache__/__init__.cpython-311.pyc,sha256=R-DVbUioMOW-Fnaq7FpT5F1a5p0q3b_RW-HpLRArCAY,242
 radboy/__pycache__/__init__.cpython-312.pyc,sha256=FsFzLXOlTK8_7ixoPZzakkR8Wibt-DvXLFh-oG2QlPw,164
-radboy/__pycache__/__init__.cpython-313.pyc,sha256=RcvIsnWCXVIm3F3-0tNeLWW-GXrVfY6cLWhSqL5g_CA,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=y0FDN1GTUmoPmM-ox2ZMBis-4f8NtINRIjstwF9uLvo,165
 radboy/__pycache__/__init__.cpython-39.pyc,sha256=D48T6x6FUeKPfubo0sdS_ZUut3FmBvPMP7qT6rYBZzU,275
 radboy/__pycache__/possibleCode.cpython-311.pyc,sha256=zFiHyzqD8gUnIWu4vtyMYIBposiRQqaRXfcT_fOl4rU,20882
 radboy/__pycache__/possibleCode.cpython-312.pyc,sha256=tk_CO-AcsO3YZj5j6vEsw3g37UmEzWc5YgeWEoJEUg4,27922
@@ -421,7 +421,7 @@ radboy/tkGui/Images/__pycache__/__init__.cpython-311.pyc,sha256=tXBYpqbOlZ24B1BI
 radboy/tkGui/__pycache__/BeginnersLuck.cpython-311.pyc,sha256=xLQOnV1wuqHGaub16mPX0dDMGU9ryCeLtNz5e517_GE,3004
 radboy/tkGui/__pycache__/Review.cpython-311.pyc,sha256=wKq24iM6Xe2OampgZ7-8U6Nvmgs2y-qWOrGwtWhc75k,4047
 radboy/tkGui/__pycache__/__init__.cpython-311.pyc,sha256=BX7DBn5qbvKTvlrKOP5gzTBPBTeTgSMjBW6EMl7N8e0,230
-radboy-0.0.462.dist-info/METADATA,sha256=ROsOvJzeFQboQrP0gyNgl0tfMd8C3dSrrSNV1S0qnwg,1601
-radboy-0.0.462.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.462.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.462.dist-info/RECORD,,
+radboy-0.0.464.dist-info/METADATA,sha256=hdlj76lFOlCVP2pXExwA5AMGwY1vcB_gy_fMvYO7bT8,1601
+radboy-0.0.464.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.464.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.464.dist-info/RECORD,,