radboy 0.0.351__tar.gz → 0.0.352__tar.gz

{radboy-0.0.351 → radboy-0.0.352}/PKG-INFO

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

radboy-0.0.352/STDOUT.TXT

@@ -0,0 +1,28 @@
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"mksl"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"03201519"
+#USER INPUT# -> :""
+#USER INPUT# -> :"qc"
+#USER INPUT# -> :"em"
+#USER INPUT# -> :"ssf2e"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"iron"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"iron"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"0g"
+#USER INPUT# -> :"n"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"lu"
+#USER INPUT# -> :"0"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.352"

{radboy-0.0.351 → radboy-0.0.352}/pyproject.toml

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

{radboy-0.0.351 → radboy-0.0.352}/radboy/DB/db.py

@@ -736,8 +736,11 @@ class EntryDataExtras(BASE,Template):
                         with Session(ENGINE) as session:
                             check=session.query(self.__class__).filter(self.__class__.field_name==kwargs[k],self.__class__.EntryId==kwargs['EntryId']).first()
                             if isinstance(check,self.__class__):
-                                dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
-                                kwargs[k]=f"{kwargs[k]} {dateStr}"
+                                if check.field_value == kwargs['field_value']:
+                                    raise Exception(f"Value is duplicated for {k}={kwargs['field_value']}")
+                                else:
+                                    dateStr=datetime.now().strftime("[Updated on %m/%d/%Y at %H:%M:%S.]")
+                                    kwargs[k]=f"{kwargs[k]} {dateStr}"
                     setattr(self,k,str(kwargs[k]))
                 else:
                     setattr(self,k,kwargs[k])

{radboy-0.0.351 → radboy-0.0.352}/radboy/EntryExtras/Extras.py

@@ -866,128 +866,132 @@ class EntryDataExtrasMenu:
     def sch_f2e(self,barcode=None):
         with Session(ENGINE) as session:
             while True:
-                if self.code is None or not isinstance(self.code,str):
-                    if barcode != None:
-                        search=barcode
+                try:
+                    if self.code is None or not isinstance(self.code,str):
+                        if barcode != None:
+                            search=barcode
+                        else:
+                            search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
+                            if search in [None]:
+                                return
                     else:
-                        search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search? [Barcode,Code,Name]",helpText="searches Barcode,Code,Name",data="string")
-                        if search in [None]:
-                            return
-                else:
-                    search=self.code
+                        search=self.code
 
-                results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
-                ct=len(results)
-                if ct == 0:
-                    print("No Results were Found!")
-                    return
-                msg=[]
-                for num,i in enumerate(results):
-                    msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
-                msg='\n'.join(msg)
-                product=None
-                while True:
-                    print(msg)
-                    index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
-                    if index in [None,]:
+                    results=session.query(Entry).filter(or_(Entry.Barcode==search,Entry.Code==search,Entry.Barcode.icontains(search),Entry.Code.icontains(search),Entry.Name.icontains(search))).all()
+                    ct=len(results)
+                    if ct == 0:
+                        print("No Results were Found!")
                         return
-                    try:
-                        product=results[index]
-                        break
-                    except Exception as e:
-                        print(e)
-                if product in [None,]:
-                    return
-                print("sf2e()")
-                while True:
+                    msg=[]
+                    for num,i in enumerate(results):
+                        msg.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {i.seeShort()}")
+                    msg='\n'.join(msg)
+                    product=None
                     while True:
+                        print(msg)
+                        index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg,data="integer")
+                        if index in [None,]:
+                            return
                         try:
-                            fs=[]
-                            fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            ct_fse=len(fse)
-                            for nunm,i in enumerate(fse):
-                                fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
-                            fs='\n'.join(fs)
-                            field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
-                            if field_search in [None]:
-                                return
-                            elif field_search in ['d',]:
-                                field_search=''
-                            query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
-                            results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
-                            if len(results_ede) < 1:
-                                continue
+                            product=results[index]
                             break
                         except Exception as e:
                             print(e)
-                    field=None
-                    msg_ede=[]
-                    for num,i in enumerate(results_ede):
-                        if num%2==0:
-                            color=Fore.cyan
-                        elif num%3==0:
-                            color=Fore.light_cyan
-                        elif num%4==0:
-                            color=Fore.light_steel_blue
-                        elif num%5==0:
-                            color=Fore.light_green
-                        elif num%6==0:
-                            color=Fore.turquoise_4
-                        elif num%7==0:
-                            color=Fore.deep_sky_blue_3a
-                        elif num%8==0:
-                            color=Fore.spring_green_3a
-                        elif num%9==0:
-                            color=Fore.dark_cyan
-                        else:
-                            color=Fore.light_blue
-                        msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
-                    msg_ede='\n'.join(msg_ede)
+                    if product in [None,]:
+                        return
+                    print("sf2e()")
                     while True:
-                        try:
-                            print(msg_ede)
-                            index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
-                            if index in [None,]:
-                                return
-                            if not isinstance(index,int):
-                                print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
-                                continue
+                        while True:
                             try:
-                                print(index)
-                                if index <= len(results_ede)-1:
-                                    field=results_ede[index]
-                                else:
-                                    print(f"index is not within 0-{len(results_ede)-1}")
+                                fs=[]
+                                fse=session.query(EntryDataExtras).group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                ct_fse=len(fse)
+                                for nunm,i in enumerate(fse):
+                                    fs.append(f"{Fore.light_yellow}{num}/{Fore.light_cyan}{num+1} of {Fore.light_red}{ct_fse} -> {Fore.light_magenta}{i.field_name}{Style.reset}")
+                                fs='\n'.join(fs)
+                                field_search=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Search field?",helpText=f"searches EntryDataExtras field_names:\n{fs}",data="string")
+                                if field_search in [None]:
+                                    return
+                                elif field_search in ['d',]:
+                                    field_search=''
+                                query=session.query(EntryDataExtras).filter(EntryDataExtras.field_name.icontains(field_search))
+                                results_ede=query.group_by(EntryDataExtras.field_name,EntryDataExtras.field_type).all()
+                                if len(results_ede) < 1:
                                     continue
                                 break
                             except Exception as e:
                                 print(e)
-                                break
-                        except Exception as e:
-                            print(e)
-                    if field == None:
-                        return
-                    field_name=field.field_name
-                    field_type=field.field_type
-                    field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
-                    if field_value in [None,]:
-                        return
-                    
-                    print(field_name,field_type,field_value)
-                    extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
-                    session.add(extra)
-                    session.commit()
-                    session.refresh(extra)
-                    print(extra)
-                    anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
-                    if anotherField in [None,]:
-                        return
-                    elif anotherField in ['d',True]:
-                        continue
-                    else:
+                        field=None
+                        msg_ede=[]
+                        for num,i in enumerate(results_ede):
+                            if num%2==0:
+                                color=Fore.cyan
+                            elif num%3==0:
+                                color=Fore.light_cyan
+                            elif num%4==0:
+                                color=Fore.light_steel_blue
+                            elif num%5==0:
+                                color=Fore.light_green
+                            elif num%6==0:
+                                color=Fore.turquoise_4
+                            elif num%7==0:
+                                color=Fore.deep_sky_blue_3a
+                            elif num%8==0:
+                                color=Fore.spring_green_3a
+                            elif num%9==0:
+                                color=Fore.dark_cyan
+                            else:
+                                color=Fore.light_blue
+                            msg_ede.append(f"{Fore.cyan}{num}/{Fore.light_yellow}{num+1} of {Fore.light_red}{ct}{Fore.grey_50} -> {color}{i.field_name}{Style.reset}:{i.field_type} ede_id={i.ede_id} doe={i.doe}")
+                        msg_ede='\n'.join(msg_ede)
+                        while True:
+                            try:
+                                print(msg_ede)
+                                index=Prompt.__init2__(None,func=FormBuilderMkText,ptext="which index do you wish to use?",helpText=msg_ede,data="integer")
+                                if index in [None,]:
+                                    return
+                                if not isinstance(index,int):
+                                    print(f"{Fore.light_red}Index must be an {Fore.light_cyan}integer{Style.reset}")
+                                    continue
+                                try:
+                                    print(index)
+                                    if index <= len(results_ede)-1:
+                                        field=results_ede[index]
+                                    else:
+                                        print(f"index is not within 0-{len(results_ede)-1}")
+                                        continue
+                                    break
+                                except Exception as e:
+                                    print(e)
+                                    break
+                            except Exception as e:
+                                print(e)
+                        if field == None:
+                            return
+                        field_name=field.field_name
+                        field_type=field.field_type
+                        field_value=Prompt.__init2__(self,func=FormBuilderMkText,ptext="What do you wish to store as the value?",helpText=field_type,data=field_type)
+                        if field_value in [None,]:
+                            return
+                        
+                        print(field_name,field_type,field_value)
+                        extra=EntryDataExtras(field_name=field_name,field_type=field_type,field_value=field_value,EntryId=product.EntryId)
+                        session.add(extra)
+                        session.commit()
+                        session.refresh(extra)
+                        print(extra)
+                        anotherField=Prompt.__init2__(None,func=FormBuilderMkText,ptext="Add another field to this product[y/n]?",helpText="yes/no/boolean",data="boolean")
+                        if anotherField in [None,]:
+                            return
+                        elif anotherField in ['d',True]:
+                            continue
+                        else:
+                            break
+                    if barcode != None:
                         break
-                if barcode != None:
-                    break
+                except Exception as e:
+                    print(e)
+                    
 
     def sch_c2e(self,barcode=None):
         with Session(ENGINE) as session:

radboy-0.0.352/radboy/__init__.py

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

{radboy-0.0.351 → radboy-0.0.352}/radboy.egg-info/PKG-INFO

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

{radboy-0.0.351 → radboy-0.0.352}/setup.py

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

radboy-0.0.351/STDOUT.TXT

@@ -1,105 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"w"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"la-af"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laaf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"eaxpf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"eaxpf"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"h"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"ladp"
-#USER INPUT# -> :"lanp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"neu"
-#USER INPUT# -> :"em"
-#USER INPUT# -> :"laxp"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.351"

radboy-0.0.351/radboy/__init__.py

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