radboy 0.0.460__tar.gz → 0.0.463__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.460
+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.460 → radboy-0.0.463}/pyproject.toml

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

{radboy-0.0.460 → radboy-0.0.463}/radboy/CookBook/CookBook.py

@@ -2,6 +2,36 @@ from . import *
 
 
 class CookBookUi:
+	def list_uids_names(self):
+		while True:
+			try:
+				with Session(ENGINE) as session:
+					stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Name or UID?[b=skip]",helpText="b|back skips",data="string")
+					if stext is None:
+						return None,None
+					if stext in ['d',]:
+						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=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
+			except Exception as e:
+				print(e)
+
 	def total_rcp(self):
 		with Session(ENGINE) as session:
 			rcp=self.ls_rcp_names(asSelector=True,whole=True,names=True)
@@ -65,6 +95,7 @@ class CookBookUi:
 		#edit everything found by searchtext using recipe_uid as the final selection parameter
 	def create_new_rcp(self):
 		with Session(ENGINE) as session:
+			ruid,rname=self.list_uids_names()
 			uid=uuid1()
 			uid=str(uid)
 			excludes=['cbid','DTOE','recipe_uid','Instructions','recipe_name']
@@ -163,8 +194,14 @@ class CookBookUi:
 					return
 			instructions={
 			'Instructions':{'default':'','type':'text'},
-			'recipe_name':{'default':'','type':'string'}}
+			'recipe_name':{'default':'','type':'string'},
+			'recipe_uid':{'default':'','type':'string'}}
+			if rname is not None:
+				instructions['recipe_name']['default']=rname
+			if ruid is not None:
+				instructions['recipe_uid']['default']=ruid
 			fdi=FormBuilder(data=instructions)
+			
 			if fdi is None:
 				print("User Quit Early, so all work has been deleted!")
 				r=session.query(CookBook).filter(CookBook.recipe_uid==uid).delete()

{radboy-0.0.460 → 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.460 → radboy-0.0.463}/radboy/PhoneBook/PhoneBook.py

@@ -2,7 +2,36 @@ from . import *
 
 
 class PhoneBookUi:
-	
+	def list_uids_names(self):
+		while True:
+			try:
+				with Session(ENGINE) as session:
+					stext=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Name or UID?[b=skip]",helpText="b|back skips",data="string")
+					if stext is None:
+						return None,None
+					if stext in ['d',]:
+						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=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
+			except Exception as e:
+				print(e)
+
 	def create_new_rcp(self):
 		with Session(ENGINE) as session:
 			uid=uuid1()
@@ -11,13 +40,19 @@ class PhoneBookUi:
 			session.add(phonebook)
 			session.commit()
 			excludes=['pbid','DTOE']
+			uid,name=self.list_uids_names()
 			instructions={i.name:{'default':getattr(phonebook,i.name),'type':str(i.type).lower()} for i in PhoneBook.__table__.columns if i.name not in excludes}
+			if name is not None:
+				instructions['phone_name']['default']=name
+			if uid is not None:
+				instructions['phone_uid']['default']=uid
 			fdi=FormBuilder(data=instructions)
 			if fdi is None:
 				print("User Quit Early, so all work has been deleted!")
 				r=session.delete(phonebook)
 				session.commit()
 			else:
+				
 				session.query(PhoneBook).filter(PhoneBook.pbid==phonebook.pbid).update(fdi)
 				session.commit()
 

radboy-0.0.463/radboy/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.460
+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.460 → 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.460"
+VERSION="0.0.463"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.460/STDOUT.TXT

@@ -1,7 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"silu"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"0.0.460"

radboy-0.0.460/radboy/__init__.py

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