radboy 0.0.824__py3-none-any.whl → 0.0.826__py3-none-any.whl

radboy/Comm/RxTx.py

@@ -22,6 +22,7 @@ import json,sys,math,re,calendar
 import smtplib
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
+from dataclasses import dataclass
 
 def today():
     dt=datetime.now()
@@ -77,497 +78,7 @@ class MailBox(BASE,Template):
 		for k in kwargs.keys():
 			if k in [s.name for s in self.__table__.columns]:
 				setattr(self,k,kwargs.get(k))
-
-
+@dataclass
 class RxTx:
-	htext=f"""{Fore.light_red}To send a GMAIL, your MUST have a GMAIL and a GMAIL App-Password\n{Fore.cyan}Please Note Commands can be guessed from the first match of a partial so a doWhat == 'new c' will EQUAL doWhat == 'new contact'\nGMAIL app passwords @ {Fore.light_magenta}https://myaccount.google.com/apppasswords{Style.reset}\n"""
-	def print_help(self):
-		print(self.htext)
-
-	def resend(self):
-		print(f"{Fore.light_yellow}Re-Send Message General [From Email Address MUST be {Fore.orange_red_1}GMAIL{Fore.light_yellow}]{Style.reset}")
-		nmb={}
-		nmb['Addressed_To_email']=''
-		nmb['Addressed_From_email']=''
-
-		while nmb['Addressed_To_email'] == '':
-			print(f"{Fore.light_yellow}Please Select your addressee(s)/{Fore.green}To{Fore.light_yellow} ['b' key key throws everything out and goes back a menu]{Style.reset}")
-			Addressed_To_email=self.searchContact(returnable=True)
-			if Addressed_To_email == None:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			if len(Addressed_To_email) < 1:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			with Session(ENGINE) as session:
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}which contact {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="list")
-				if which in [None,'d']:
-					return
-				for i in which:
-					try:
-						val=int(i)
-						if nmb['Addressed_To_email'].split(",") == ['',]:
-							nmb['Addressed_To_email']=','.join(list((Addressed_To_email[val].Email_Address,)))
-
-						else:
-							nmb['Addressed_To_email']=list(nmb['Addressed_To_email'].split(","))
-							nmb['Addressed_To_email'].append(Addressed_To_email[val].Email_Address)
-							nmb['Addressed_To_email']=','.join(list((Addressed_To_email[val].Email_Address,)))
-					except Exception as e:
-						print(repr(e),e,f"couldn't use {i},try next...")
-						print(Addressed_To_email)
-						print(i,type(i),)
-		ap=''
-		while nmb['Addressed_From_email'] == '':
-			print(f"{Fore.light_yellow}Please Select your addresser/{Fore.green}From{Fore.light_yellow}  ['b' key throws everything out and goes back a menu]{Style.reset}")
-			Addressed_From_email=self.searchContact(returnable=True)
-			if Addressed_From_email == None:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			if len(Addressed_From_email) < 1:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			with Session(ENGINE) as session:
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}which contact {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="integer")
-				if which in [None,'d']:
-					return
-				
-				try:
-					val=int(i)
-					ap=Addressed_From_email[val].app_password
-					if nmb['Addressed_From_email'].split(",") == ['',]:
-						nmb['Addressed_From_email']=','.join(list((Addressed_From_email[val].Email_Address,)))
-					else:
-						nmb['Addressed_From_email']=list(nmb['Addressed_From_email'].split(","))
-						nmb['Addressed_From_email'].append(Addressed_From_email[val].Email_Address)
-						nmb['Addressed_From_email']=','.join(nmb['Addressed_From_email'])
-				except Exception as e:
-					print(repr(e),e,f"couldn't use {i},try next...")
-					print(Addressed_From_email)
-					print(i,type(i),)
-		print(f"{Fore.orange_red_1}Let's look for that email to resend.")
-		whiches=self.showSent(returnable=True)
-		if whiches == None:
-			print(f"{Fore.light_red}User canceled!{Style.reset}")
-			return
-		elif len(whiches) < 1:
-			print(f"{Fore.light_red}No Results!{Style.reset}")
-			return
-		which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}which MailBox {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="integer")
-		if which in [None,'d']:
-			return
-		
-		try:
-			val=int(which)
-
-			print(nmb)
-			NewMailBox=whiches[val]
-			session.add(NewMailBox)
-			session.commit()
-			session.refresh(NewMailBox)
-			print(NewMailBox)
-			#time to make the email
-			msg=MIMEMultipart()
-			msg['Subject']=NewMailBox.Title
-			msg['From']=NewMailBox.Addressed_From_email
-			msg['To']=NewMailBox.Addressed_To_email
-			body=MIMEText(NewMailBox.MsgText)
-			msg.attach(body)
-			msg.preamble=NewMailBox.MsgText
-
-			s=smtplib.SMTP_SSL('smtp.gmail.com',465)
-			app_password=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Gmail App Password",helpText="type your app password from gmail",data="string")
-			if app_password in [None,]:
-				print(f"{Fore.light_red}No Password; No Msg Sent!")
-				return
-			elif app_password.lower() == 'd':
-				app_password=ap
-			print(app_password)
-			s.login(NewMailBox.Addressed_From_email,app_password)
-			s.sendmail(NewMailBox.Addressed_From_email,NewMailBox.Addressed_To_email,msg.as_string())
-			s.quit()
-		except Exception as e:
-			print(e)
-
-	def newEmail(self):
-		print(f"{Fore.light_yellow}New Message General [From Email Address MUST be {Fore.orange_red_1}GMAIL{Fore.light_yellow}]{Style.reset}")
-		data={
-		'Title':{
-			'type':'str',
-			'default':'',
-			},
-		'MsgText':{
-			'type':'str+',
-			'default':'',
-			},
-		'DUE_DTOE':{
-			'type':'datetime',
-			'default':datetime.now(),
-			},
-
-		}
-		nmb=FormBuilder(data=data)
-		nmb['DTOE']=datetime.now()
-		nmb['Addressed_To_email']=''
-		nmb['Addressed_From_email']=''
-
-		while nmb['Addressed_To_email'] == '':
-			print(f"{Fore.light_yellow}Please Select your addressee(s)/{Fore.green}To{Fore.light_yellow} ['b' key key throws everything out and goes back a menu]{Style.reset}")
-			Addressed_To_email=self.searchContact(returnable=True)
-			if Addressed_To_email == None:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			if len(Addressed_To_email) < 1:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			with Session(ENGINE) as session:
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}which contact {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="list")
-				if which in [None,'d']:
-					return
-				for i in which:
-					try:
-						val=int(i)
-						if nmb['Addressed_To_email'].split(",") == ['',]:
-							nmb['Addressed_To_email']=','.join(list((Addressed_To_email[val].Email_Address,)))
-
-						else:
-							nmb['Addressed_To_email']=list(nmb['Addressed_To_email'].split(","))
-							nmb['Addressed_To_email'].append(Addressed_To_email[val].Email_Address)
-							nmb['Addressed_To_email']=','.join(list((Addressed_To_email[val].Email_Address,)))
-					except Exception as e:
-						print(repr(e),e,f"couldn't use {i},try next...")
-						print(Addressed_To_email)
-						print(i,type(i),)
-		ap=''
-		while nmb['Addressed_From_email'] == '':
-			print(f"{Fore.light_yellow}Please Select your addresser/{Fore.green}From{Fore.light_yellow}  ['b' key throws everything out and goes back a menu]{Style.reset}")
-			Addressed_From_email=self.searchContact(returnable=True)
-			if Addressed_From_email == None:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			if len(Addressed_From_email) < 1:
-				print(f"{Fore.light_red}No Contacts to use!{Style.reset}")
-				return
-			with Session(ENGINE) as session:
-				which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}which contact {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="integer")
-				if which in [None,'d']:
-					return
-				
-				try:
-					val=int(i)
-					ap=Addressed_From_email[val].app_password
-					if nmb['Addressed_From_email'].split(",") == ['',]:
-						nmb['Addressed_From_email']=','.join(list((Addressed_From_email[val].Email_Address,)))
-					else:
-						nmb['Addressed_From_email']=list(nmb['Addressed_From_email'].split(","))
-						nmb['Addressed_From_email'].append(Addressed_From_email[val].Email_Address)
-						nmb['Addressed_From_email']=','.join(nmb['Addressed_From_email'])
-				except Exception as e:
-					print(repr(e),e,f"couldn't use {i},try next...")
-					print(Addressed_From_email)
-					print(i,type(i),)
-
-			print(nmb)
-			NewMailBox=MailBox(**nmb)
-			session.add(NewMailBox)
-			session.commit()
-			session.refresh(NewMailBox)
-			print(NewMailBox)
-			#time to make the email
-			msg=MIMEMultipart()
-			msg['Subject']=NewMailBox.Title
-			msg['From']=NewMailBox.Addressed_From_email
-			msg['To']=NewMailBox.Addressed_To_email
-			body=MIMEText(NewMailBox.MsgText)
-			msg.attach(body)
-			msg.preamble=NewMailBox.MsgText
-
-			s=smtplib.SMTP_SSL('smtp.gmail.com',465)
-			app_password=Prompt.__init2__(self,func=FormBuilderMkText,ptext="Gmail App Password",helpText="type your app password from gmail",data="string")
-			if app_password in [None,]:
-				print(f"{Fore.light_red}No Password; No Msg Sent!")
-				return
-			elif app_password.lower() == 'd':
-				app_password=ap
-			print(app_password)
-			s.login(NewMailBox.Addressed_From_email,app_password)
-			s.sendmail(NewMailBox.Addressed_From_email,NewMailBox.Addressed_To_email,msg.as_string())
-			s.quit()
-
-
-	
-	def newContact(self):
-		data={
-		'FName':{
-			'type':'str',
-			'default':'',
-			},
-		'MName':{
-			'type':'str',
-			'default':'',
-		},
-		'LName':{
-			'type':'str',
-			'default':'',
-		},
-		'Suffix':{
-			'type':'str',
-			'default':'',
-		},
-		'Email_Address':{
-			'type':'str',
-			'default':'',
-		},
-		'app_password':{
-			'type':'str',
-			'default':'',
-		},
-		'Phone_Number':{
-			'type':'str',
-			'default':'',
-		},
-		}
-		newContactDict=FormBuilder(data)
-		newContactDict['DTOE']=datetime.now()
-		with Session(ENGINE) as session:
-			nc=MailBoxContacts(**newContactDict)
-			session.add(nc)
-			session.commit()
-			session.flush()
-			session.refresh(nc)
-			print(nc)
-
-	def searchContact(self,returnable=False):
-		try:
-			while True:
-				results=[]
-				dateSearch=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Date Search?",helpText="If this is a date search type the date, or 'y' for a date prompt",data='datetime')
-				if dateSearch in [None,]:
-					return
-				elif dateSearch in ['d',]:
-					search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search?",helpText="Search text in anything else",data="string")
-					print(search)
-					if search in [None,]:
-						return
-					elif search in ['d',]:
-						continue
-					elif search in ['*',' ']:
-						with Session(ENGINE) as session:
-							results=session.query(MailBoxContacts)
-							results=results.order_by(MailBoxContacts.LName.asc()).all()
-					else:
-						with Session(ENGINE) as session:
-							results=session.query(MailBoxContacts)
-							results=results.filter(or_(
-								MailBoxContacts.FName.icontains(search.lower()),
-								MailBoxContacts.MName.icontains(search.lower()),
-								MailBoxContacts.LName.icontains(search.lower()),
-								MailBoxContacts.Suffix.icontains(search.lower()),
-								MailBoxContacts.Email_Address.icontains(search.lower()),
-								MailBoxContacts.Phone_Number.icontains(search.lower())
-								)
-							).order_by(MailBoxContacts.LName.asc()).all()
-					ct=len(results)
-					for num,i in enumerate(results):
-						msg=f'''{Fore.light_yellow}{num}/{Fore.light_green}{num+1}/{Fore.light_red}{ct}{Style.reset} -> {i}'''
-						print(msg)
-					if returnable:
-						return results
-					#ask for search details as user wants anything but date search
-				else:
-					with Session(ENGINE) as session:
-						tmp=[]
-						DATE=date(dateSearch.year,dateSearch.month,dateSearch.day)
-						results=session.query(MailBoxContacts).all()
-						for num,i in enumerate(results):
-							DTC=date(i.DTOE.year,i.DTOE.month,i.DTOE.day)
-							if DTC == DATE:
-								tmp.append(i)
-						for num,i in enumerate(tmp):
-							msg=f'''{Fore.light_yellow}{num}/{Fore.light_green}{num+1}/{Fore.light_red}{len(tmp)}{Style.reset} -> {i}'''
-							print(msg)
-						if returnable:
-							return tmp
-
-		except Exception as e:
-			print(e)
-
-	def rmContact(self):
-		try:
-			toRm=self.searchContact(returnable=True)
-			if toRm in [[],None,'d']:
-				return
-			else:
-				with Session(ENGINE) as session:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}Remove {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="list")
-					for i in which:
-						try:
-							val=int(i)
-							item=session.query(MailBoxContacts).filter(MailBoxContacts.mbcid==toRm[val].mbcid).first()
-							session.delete(item)
-							print(item,"Deleted!")
-							session.commit()
-							session.flush()
-						except Exception as e:
-							print(e,"moving on to next index...")
-		except Exception as e:
-			print(e)
-
-	def editContact(self):
-		try:
-			excludes=['mbcid',]
-			toEdit=self.searchContact(returnable=True)
-			if toEdit in [[],None,'d']:
-				return
-			else:
-				with Session(ENGINE) as session:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}Edit {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="list")
-					for i in which:
-						try:
-							val=int(i)
-							item=session.query(MailBoxContacts).filter(MailBoxContacts.mbcid==toEdit[val].mbcid).first()
-							print(item,"To Edit!")
-							data={}
-							for cols in item.__table__.columns:
-								#print(cols.name)
-								name=str(cols.name)
-								if name in excludes:
-									continue
-								data[name]={}
-								data[name]['type']=str(cols.type).lower()
-								data[name]['default']=getattr(item,name)
-							upd8=FormBuilder(data=data)
-							session.query(MailBoxContacts).filter(MailBoxContacts.mbcid==toEdit[val].mbcid).update(upd8)
-							session.commit()
-							session.flush()
-							session.refresh(item)
-
-							print(item,"Updated!")
-						except Exception as e:
-							print(e,"moving on to next index...")
-		except Exception as e:
-			print(e)
-
-	def showSent(self,returnable=True):
-		try:
-			while True:
-				results=[]
-				dateSearch=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Date Search?",helpText="If this is a date search type the date, or 'y' for a date prompt",data='datetime')
-				if dateSearch in [None,]:
-					return
-				elif dateSearch in ['d',]:
-					search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search?",helpText="Search text in anything else",data="string")
-					print(search)
-					if search in [None,]:
-						return
-					elif search in ['d',]:
-						continue
-					elif search in ['*',' ']:
-						with Session(ENGINE) as session:
-							results=session.query(MailBox)
-							results=results.all()
-					else:
-						with Session(ENGINE) as session:
-							results=session.query(MailBox)
-							results=results.filter(or_(
-								MailBox.Title.icontains(search.lower()),
-								MailBox.MsgText.icontains(search.lower()),
-								MailBox.Addressed_From_email.icontains(search.lower()),
-								MailBox.Addressed_To_email.icontains(search.lower()),
-								)
-							).all()
-					ct=len(results)
-					for num,i in enumerate(results):
-						msg=f'''{Fore.light_yellow}{num}/{Fore.light_green}{num+1}/{Fore.light_red}{ct}{Style.reset} -> {i}'''
-						print(msg)
-					if returnable:
-						return results
-					#ask for search details as user wants anything but date search
-				else:
-					with Session(ENGINE) as session:
-						tmp=[]
-						DATE=date(dateSearch.year,dateSearch.month,dateSearch.day)
-						results=session.query(MailBoxContacts).all()
-						for num,i in enumerate(results):
-							DTC=date(i.DTOE.year,i.DTOE.month,i.DTOE.day)
-							if DTC == DATE:
-								tmp.append(i)
-							DTC=date(i.DUE_DTOE.year,i.DUE_DTOE.month,i.DUE_DTOE.day)
-							if DTC == DATE:
-								tmp.append(i) 
-						for num,i in enumerate(tmp):
-							msg=f'''{Fore.light_yellow}{num}/{Fore.light_green}{num+1}/{Fore.light_red}{len(tmp)}{Style.reset} -> {i}'''
-							print(msg)
-						if returnable:
-							return tmp
-		except Exception as e:
-			print(e)
-
-
-	def rmMailBox(self):
-		try:
-			toRm=self.showSent(returnable=True)
-			if toRm in [[],None,'d']:
-				return
-			else:
-				with Session(ENGINE) as session:
-					which=Prompt.__init2__(None,func=FormBuilderMkText,ptext=f"{Fore.light_red}Remove {Fore.light_yellow}Number(s){Style.reset}",helpText="use a dash between numbers to specify a range,commas can be between numbers or ranges",data="list")
-					for i in which:
-						try:
-							val=int(i)
-							item=session.query(MailBox).filter(MailBox.mbid==toRm[val].mbid).first()
-							session.delete(item)
-							print(item,"Deleted!")
-							session.commit()
-							session.flush()
-						except Exception as e:
-							print(e,"moving on to next index...")
-		except Exception as e:
-			print(e)
-
-	def addCmd(self,cmdName='',cmd=None,desc=''):
-		self.cmds[cmdName]={}
-		self.cmds[cmdName]['desc']=desc
-		self.cmds[cmdName]['cmd']=cmd
-		self.htext+=f"{Fore.light_yellow}{cmdName} - {Fore.light_steel_blue}{desc}{Style.reset}\n"
-
-	def __init__(self):
-		try:
-			self.cmds={}
-			self.addCmd(cmdName='help',cmd=self.print_help,desc='show help text')
-			self.addCmd(cmdName='new contact',cmd=self.newContact,desc="make a new contact for the MailBox to use")
-			self.addCmd(cmdName='search contact',cmd=self.searchContact,desc="look for a contact")
-			self.addCmd(cmdName='rm contact',cmd=self.rmContact,desc="remove a contact(s)")
-			self.addCmd(cmdName='rm mailbox',cmd=self.rmMailBox,desc="remove a MailBox Msg")
-			self.addCmd(cmdName="edit contact",cmd=self.editContact,desc="edit a contact(s)")
-			self.addCmd(cmdName="new mb",cmd=self.newEmail,desc="create and send a new email msg")
-			self.addCmd(cmdName="show sent",cmd=self.showSent,desc="show sent emails")
-			self.addCmd(cmdName="resend",cmd=self.resend,desc="resend a sent email")
-			self.print_help()
-			while True:
-				keys=[i.lower() for i in self.cmds.keys()]
-				real=[self.cmds[i]['cmd'] for i in self.cmds.keys()]
-				fieldname='Menu'
-				mode='RxTx'
-				h=f'{Prompt.header.format(Fore=Fore,mode=mode,fieldname=fieldname,Style=Style)}'
-				doWhat=Prompt.__init2__(self,func=FormBuilderMkText,ptext=f'{h} Do What? ',helpText=self.htext,data="string")
-				if doWhat in [None,]:
-					return
-				elif doWhat in ['d',]:
-					self.print_help()
-				elif doWhat.lower() in keys:
-					index=keys.index(doWhat.lower())
-					real[index]()
-				else:
-					for num,i in enumerate(keys):
-						if doWhat.lower() in i:
-							real[num]()
-							break
-
-
-		except Exception as e:
-			print(e,repr(e))
-
-MailBox.metadata.create_all(ENGINE)
-MailBoxContacts.metadata.create_all(ENGINE)
-#RxTx()
+	def __init__(self,*args,**kwargs):
+		print("This Class Has been depreacated and a new option will be designed. no more gmail. bleh!")

radboy/Unified/bareCA.py

@@ -106,6 +106,9 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
 						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,
 						})
 				else:
 					result=session.query(db.Entry).filter(db.Entry.InList==True,db.Entry.Code!="UNASSIGNED_TO_NEW_ITEM").update({
@@ -132,6 +135,9 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
 						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,
 						})
 			else:
 				if not protect_unassigned:
@@ -159,6 +165,9 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
 						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,
 						})
 				else:
 					result=session.query(db.Entry).filter(db.Entry.Code!="UNASSIGNED_TO_NEW_ITEM").update(
@@ -185,6 +194,9 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
 						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,
 						})
 			session.commit()
 			session.flush()
@@ -214,7 +226,10 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_CHP_DSPLY':0,
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
-						'CHKSTND_SPLY':0,})
+						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,})
 			session.commit()
 			session.flush()
 			r=query.all()
@@ -243,7 +258,10 @@ def bare_ca(self,inList=False,protect_unassigned=True):
 						'FLRL_CHP_DSPLY':0,
 						'FLRL_WTR_DSPLY':0,
 						'WD_DSPLY':0,
-						'CHKSTND_SPLY':0,}
+						'CHKSTND_SPLY':0,
+						'Expiry':None,
+						'BestBy':None,
+						'AquisitionDate':None,}
 				)
 			session.commit()
 			session.flush()

radboy/Unified/clearalll.py

@@ -101,6 +101,9 @@ def clear_all(self):
 				'FLRL_WTR_DSPLY':0,
 				'WD_DSPLY':0,
 				'CHKSTND_SPLY':0,
+				'Expiry':None,
+				'BestBy':None,
+				'AquisitionDate':None,
 				})
 			session.commit()
 			session.flush()

radboy/__init__.py

@@ -1 +1 @@
-VERSION='0.0.824'
+VERSION='0.0.826'

{radboy-0.0.824.dist-info → radboy-0.0.826.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.824
+Version: 0.0.826
 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.824.dist-info → radboy-0.0.826.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=h30zoTqt-XLt_afDPlxMxBiKKwmKi3N-yAuldNCqXUo,41476
 radboy/Run.py,sha256=JUoCTHnzQBv7n8PB2_i93ANdAC_iW__RkAge8esCnk4,76
-radboy/__init__.py,sha256=UJ2PEMLdw8H5Kmc17pRFRxwByHQT6K1IFSBRaLtM9pg,17
+radboy/__init__.py,sha256=DjNr8e4Fyq5lbuEXafNdOPgDj72-Ge43gi4bJFph8Sk,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
@@ -44,10 +44,10 @@ radboy/Collector2/__pycache__/Collector2.cpython-313.pyc,sha256=wWFRdtuWIztsbD6T
 radboy/Collector2/__pycache__/__init__.cpython-311.pyc,sha256=WGQfceEjnOEV6HALhJ6z4AHnps_VdghD_8-iErvmfkU,235
 radboy/Collector2/__pycache__/__init__.cpython-312.pyc,sha256=7Ka8Bvea_JHCQtL_T365f4_-8IruXJvar0pc4eAEc4U,273
 radboy/Collector2/__pycache__/__init__.cpython-313.pyc,sha256=IiHFLqDUbXyf_-1vybVUZRWCqm6rs0hyZUDAwOBQeas,152
-radboy/Comm/RxTx.py,sha256=l9Kr7lA5nejxhjBNgxssghwlgaVRzp0wJs8XpscLxTI,20705
+radboy/Comm/RxTx.py,sha256=rLu7qjs0GWFzzjknw0SbiGTbEKu1f4czqinZkSb3Exg,2203
 radboy/Comm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/Comm/__pycache__/RxTx.cpython-312.pyc,sha256=S_1Kf5_EwO1X4blYwIMPlrBs_hD8kLWJIX284vjVRKg,34691
-radboy/Comm/__pycache__/RxTx.cpython-313.pyc,sha256=3N9SXi-jBtf6liyYI0D1m1dpBoLCUUtuy7uDM6L958Q,34985
+radboy/Comm/__pycache__/RxTx.cpython-313.pyc,sha256=bzLVlD6yy0_CxVbxGWXwYNH5qL1L3_1hP64d4OajKYI,3968
 radboy/Comm/__pycache__/__init__.cpython-312.pyc,sha256=jxT5gYVdAKG2X7WED7LoHwmiHsC8BxOtz0YxIdtsBtw,267
 radboy/Comm/__pycache__/__init__.cpython-313.pyc,sha256=-hKMf6R71_1VkbAEpQ4HJOJF0RUxDSpuUHS0kXShyIw,146
 radboy/Comm2Common/Comm2Common.py,sha256=3MOe_RHcD1mhiLJIBBa_j1YbyKZr8pyOyqB-7hMoHoM,1141
@@ -381,8 +381,8 @@ radboy/TouchStampC/__pycache__/__init__.cpython-313.pyc,sha256=kA-p_LdocXJQHfYfD
 radboy/Unified/Unified.py,sha256=SvwPHQFJr6F65_xkbmXtMaCq6ewRnT3MrzUhJp7-_II,66474
 radboy/Unified/Unified2.py,sha256=TnJQ5Ir28cLG449o8mDe8Ya1Zx4WaRhuoHfEIrCbJME,42257
 radboy/Unified/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-radboy/Unified/bareCA.py,sha256=CCqpwi2mhH-pzR4PzWxYrUIQcCxCIi05EtWMhdjfNLo,7169
-radboy/Unified/clearalll.py,sha256=KeBpy_OrpjQL3sJZgOjsVACruwGoZTQMUJKqW26xu3M,3977
+radboy/Unified/bareCA.py,sha256=_WN3mQcuOuaZpd1Fm2aasisb9lCJWY2zbYqvCA0MNbI,7595
+radboy/Unified/clearalll.py,sha256=KjXE7rWb4h6wwSmHxm32NMF9vW5-Om43vNqWOnZ9xsc,4042
 radboy/Unified/__pycache__/Unified.cpython-311.pyc,sha256=ZtvZDV9cVMV_r_Cuj6LR4m27CGUnZy0l9zUTILSnMRg,65018
 radboy/Unified/__pycache__/Unified.cpython-312.pyc,sha256=BT3bLl4LQUs7m3H44WVjg6BsHfU9xnWNwpytZSA2smI,78625
 radboy/Unified/__pycache__/Unified.cpython-313.pyc,sha256=-WdUWwuMFbeW9DHfH8zKDJDDPnUQNBcgHOzzd3buFYA,82621
@@ -390,9 +390,9 @@ radboy/Unified/__pycache__/__init__.cpython-311.pyc,sha256=2OjdGThHMNZ2yMrbdlwiK
 radboy/Unified/__pycache__/__init__.cpython-312.pyc,sha256=5aXXASuWsXCly7t_gqJ6cVbdAeTo4Wom8989FszH4Xw,270
 radboy/Unified/__pycache__/__init__.cpython-313.pyc,sha256=h03zVuB4hfY_ko4nkuSS-SIkjHOGTlFM9bDpMdQPwg4,149
 radboy/Unified/__pycache__/bareCA.cpython-312.pyc,sha256=1zLSCPMarDCdguIxDCjlvTf2SQXi9Y17oznnEbNbQlg,2839
-radboy/Unified/__pycache__/bareCA.cpython-313.pyc,sha256=pvPQ676Vmwf0LAJ8IRDWwju0KSPBorRKRAV29061BJ4,8265
+radboy/Unified/__pycache__/bareCA.cpython-313.pyc,sha256=UEBuma_NesGx3tCMVa8_Njm-BM6KYpZJAeflF24ZGXs,8402
 radboy/Unified/__pycache__/clearalll.cpython-312.pyc,sha256=GDkncqa0aJ_55M5ElOfcl-LLiKS6ZXgY779ENHLYS-E,5042
-radboy/Unified/__pycache__/clearalll.cpython-313.pyc,sha256=Krk2Woz-U_j6CcActz1jyoiOztemPjgLvhbhar6wPIo,7129
+radboy/Unified/__pycache__/clearalll.cpython-313.pyc,sha256=cIw4t3l14gPTYuz_BX7jr-A22dg9I5-mv93k1gqf5Uw,7177
 radboy/UpdatesAndImports/UpdatesAndImports.py,sha256=KXmiLaB72hMs2Iqkek9fMmme7xgNSXgpcVkKBYVXD00,1687
 radboy/UpdatesAndImports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 radboy/UpdatesAndImports/__pycache__/UpdatesAndImports.cpython-311.pyc,sha256=n5mnxgmq0egDH-Evf6h0cRF6mmP9N0pAOsS2NkyKA1o,3351
@@ -413,7 +413,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=qZ4LQ8XS-uhMaNugXsgC9A6uDAYLCWnknnGvAA4jO9g,165
+radboy/__pycache__/__init__.cpython-313.pyc,sha256=TY20MmQ6Q4Ustwl7IQS5MI7DuuQEVTjn2YgSLfp3RDw,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
@@ -441,7 +441,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.824.dist-info/METADATA,sha256=p4HWIjl1Sz6mFsWY_ognrV8jI07CE9TmxPS74eGZRHA,1920
-radboy-0.0.824.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-radboy-0.0.824.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
-radboy-0.0.824.dist-info/RECORD,,
+radboy-0.0.826.dist-info/METADATA,sha256=h5ISi7Ye5Q_81DO9yT_JbPPb_zs2md5F3ClAYyzGyuI,1920
+radboy-0.0.826.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+radboy-0.0.826.dist-info/top_level.txt,sha256=mlM0RWMUxGo1YHnlLmYrHOgGdK4XNRpr7nMFD5lR56c,7
+radboy-0.0.826.dist-info/RECORD,,