radboy 0.0.534__tar.gz → 0.0.535__tar.gz

{radboy-0.0.534 → radboy-0.0.535}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.534
+Version: 0.0.535
 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.535/STDOUT.TXT

@@ -0,0 +1,16 @@
+#USER INPUT# -> :"aet"
+#USER INPUT# -> :"ur"
+#USER INPUT# -> :"et"
+#USER INPUT# -> :"ur"
+#USER INPUT# -> :"y"
+#USER INPUT# -> :"4"
+#USER INPUT# -> :"b"
+#USER INPUT# -> :"hl"
+#USER INPUT# -> :"lscmts"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.535"

{radboy-0.0.534 → radboy-0.0.535}/pyproject.toml

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

{radboy-0.0.534 → radboy-0.0.535}/radboy/DB/ExerciseTracker.py

@@ -422,6 +422,11 @@ class ExerciseTracker:
                                     session.flush()
                                     session.refresh(rout[num])
                         if reset_only:
+                            #resume
+                            if logMe:
+                                hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nResetting! {datetime.now().ctime()}")
+                                session.add(hl)
+                                session.commit()
                             continue
                             #return
                         total_dur=timedelta(seconds=0)
@@ -431,19 +436,28 @@ class ExerciseTracker:
                             for num, i in enumerate(rout):
                                 if completed_reps > total_reps:
                                     completed=ct
+                                    if logMe:
+                                        hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 2! {datetime.now().ctime()}")
+                                        session.add(hl)
+                                        session.commit()
                                     break
                                 exercise=session.query(Exercise).filter(Exercise.exid==i.exid).first()
                                 exercise.cdt=datetime.now()
-                                if logMe:
-                                    hl=HealthLog(Comments=f"{exercise.Name}:exid:{i}\nstarted! {datetime.now().ctime()}")
-                                    session.add(hl)
-                                    session.commit()
+                                
                                 if exercise.CurrentRep < exercise.Reps:
                                     setattr(exercise,"CurrentRep",getattr(exercise,"CurrentRep")+1)
+                                    if logMe:
+                                        hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nstarted! {datetime.now().ctime()}")
+                                        session.add(hl)
+                                        session.commit()
                                 else:
                                     setattr(exercise,"CurrentRep",getattr(exercise,"CurrentRep"))
                                     completed+=1
                                     #completed_reps+=1
+                                    if logMe:
+                                        hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nResuming! {datetime.now().ctime()}")
+                                        session.add(hl)
+                                        session.commit()
                                     continue
                                 #os.system("clear")
                                 session.commit()
@@ -473,6 +487,10 @@ class ExerciseTracker:
                                 #print(completed_reps)
                                 completed_reps+=1
                                 if old > completed_reps:
+                                    if logMe:
+                                        hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 1! {datetime.now().ctime()}")
+                                        session.add(hl)
+                                        session.commit()
                                     continue
                                 for num2, i in enumerate(rout):
                                     rout[num2].Note=json.dumps({'completed':completed_reps,'Total Duration':str(total_dur)})
@@ -497,6 +515,10 @@ class ExerciseTracker:
                         session.add(rd)
                         session.commit()
                         session.refresh(rd)
+                        if logMe:
+                            hl=HealthLog(Comments=f"{exercise.Name}:Exercise({i})\t\nCompleted Stage 3! {datetime.now().ctime()}")
+                            session.add(hl)
+                            session.commit()
                         print(rd)
         except Exception as e:
             print(e)

radboy-0.0.535/radboy/__init__.py

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

{radboy-0.0.534 → radboy-0.0.535}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.534
+Version: 0.0.535
 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.534 → radboy-0.0.535}/setup.py

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

radboy-0.0.534/STDOUT.TXT

@@ -1,6 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"i"
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.533"
-#USER INPUT# -> :"0.0.534"

radboy-0.0.534/radboy/__init__.py

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