radboy 0.0.461__tar.gz → 0.0.463__tar.gz

{radboy-0.0.461 → radboy-0.0.463}/PKG-INFO

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

radboy-0.0.463/STDOUT.TXT

@@ -0,0 +1,20 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"esus"
+#USER INPUT# -> :"esu"
+#USER INPUT# -> :"sas"
+#USER INPUT# -> :"c4"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"ckbk"
+#USER INPUT# -> :"lsrcp"
+#USER INPUT# -> :""
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"phnbk"
+#USER INPUT# -> :"lsc"
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :""
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.462"
+#USER INPUT# -> :""
+#USER INPUT# -> :"0.0.463"

{radboy-0.0.461 → radboy-0.0.463}/pyproject.toml

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

{radboy-0.0.461 → radboy-0.0.463}/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-0.0.461 → radboy-0.0.463}/radboy/DB/db.py

@@ -710,9 +710,9 @@ class EntryExtras:
 
 def std_colorize(m,n,c):
         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}'
+            msg=f'{Fore.cyan}{n}/{Fore.light_yellow}{n+1}{Fore.light_red} of {c} {Fore.dark_goldenrod}{m}{Style.reset}\n'
         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}'
+            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'
         return msg
 
 class Template:

{radboy-0.0.461 → radboy-0.0.463}/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-0.0.463/radboy/__init__.py

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

{radboy-0.0.461 → radboy-0.0.463}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.461 → radboy-0.0.463}/setup.py

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

radboy-0.0.461/STDOUT.TXT

@@ -1,30 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"ckbk"
-#USER INPUT# -> :"cnwrcp"
-#USER INPUT# -> :""
-#USER INPUT# -> :"5"
-#USER INPUT# -> :"ph"
-#USER INPUT# -> :"use"
-#USER INPUT# -> :"1330"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"f"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lsrcp"
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"phnbk"
-#USER INPUT# -> :""
-#USER INPUT# -> :"cnwc"
-#USER INPUT# -> :""
-#USER INPUT# -> :"8"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.461"

radboy-0.0.461/radboy/__init__.py

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