Implemented db as a class.

Author: david allen

capstone_kv_impl.py renamed to db.py

@@ -1,14 +1,14 @@
 import string
-from kivy.app import App
-from kivy.lang import Builder
-from kivy.uix.screenmanager import ScreenManager, Screen
+# from kivy.app import App
+# from kivy.lang import Builder
+# from kivy.uix.screenmanager import ScreenManager, Screen
 
 # ---------------------
 # database handling
 # ---------------------
 import sqlite3
 # source tutorial: https://www.youtube.com/watch?v=byHcYRpMgI4
-def db_init(db_name = 'profile.db', table_name = "users"):
+def init(db_name = 'profile.db', table_name = "users"):
     # connect to database
     # database file is created if it doesn't exist
     conn = sqlite3.connect(db_name)
@@ -36,7 +36,7 @@ def db_init(db_name = 'profile.db', table_name = "users"):
 
     return
 
-def db_un_exists(un, db_name = 'profile.db'):
+def un_exists(un, db_name = 'profile.db'):
     conn = sqlite3.connect(db_name)
     c = conn.cursor()
     c.execute(f"""SELECT un 
@@ -47,13 +47,13 @@ def db_un_exists(un, db_name = 'profile.db'):
 
     result = True if len(un_result) else False
 
-    print(f'db_un_exists("{un}") result = "{result}"')
+    print(f'db.un_exists("{un}") result = "{result}"')
 
     conn.close()
 
     return result
 
-def db_profile_new(
+def profile_new(
     un, 
     pw, 
     fn, 
@@ -65,7 +65,7 @@ def db_profile_new(
     conn = sqlite3.connect(db_name)
     c = conn.cursor()
 
-    if not db_un_exists(un):
+    if not un_exists(un):
         c.execute(f"""INSERT INTO users VALUES (
                 '{un}', 
                 '{pw}', 
@@ -87,7 +87,7 @@ def db_profile_new(
 
     return
 
-def db_profile_print(*args, **kwargs):
+def profile_print(*args, **kwargs):
     uns = []
     print_all = False
     profiles = []
@@ -134,15 +134,15 @@ def db_profile_print(*args, **kwargs):
 
     result = True if len(profiles) else False
 
-    print(f'db_profile_print("*{args}, **{kwargs}") profiles =')
+    print(f'db.profile_print("*{args}, **{kwargs}") profiles =')
     for profile in profiles:
         print(profile)
 
     conn.close()
 
     return result
 
-def db_un_login(un, pw, db_name = 'profile.db'):
+def un_login(un, pw, db_name = 'profile.db'):
     conn = sqlite3.connect(db_name)
     c = conn.cursor()
     c.execute(f"""SELECT rowid, first_name 
@@ -156,13 +156,13 @@ def db_un_login(un, pw, db_name = 'profile.db'):
 
     result = True if len(first_name) else False
 
-    print(f'db_un_login("{un}", "{pw}") result = "{result}"')
+    print(f'db.un_login("{un}", "{pw}") result = "{result}"')
 
     conn.close()
 
     return result
 
-def db_profile_update(un, **kwargs):
+def profile_update(un, **kwargs):
     # handle default kwargs
     if 'db_name' not in kwargs.keys():
         db_name = 'profile.db'
@@ -179,14 +179,14 @@ def db_profile_update(un, **kwargs):
             WHERE un = '{un}'
         """)
 
-    print(f'db_profile_update({un}, {kwargs}) executed.')
+    print(f'db.profile_update({un}, {kwargs}) executed.')
 
     conn.commit()
     conn.close()
 
     return
 
-def db_profile_delete(un, **kwargs):
+def profile_delete(un, **kwargs):
     # handle default kwargs
     if 'db_name' not in kwargs.keys():
         db_name = 'profile.db'
@@ -202,78 +202,46 @@ def db_profile_delete(un, **kwargs):
         WHERE un = '{un}'
     """)
 
-    print(f'db_profile_delete({un}) profile deleted, if it existed in the first place.')
+    print(f'db.profile_delete({un}) profile deleted, if it existed in the first place.')
 
     conn.commit()
     conn.close()
 
     return
 
 # ----------------------
-# Kivy Window management
+# Main application function
 # ----------------------
-class SplashWindow(Screen):
-    pass
-
-class LoginWindow(Screen):
-
-    def login_released(self, usnm_input, passw_input):
-        usnm_input.text = ""
-        passw_input.text = ""
-
-        return
-
-    pass
-
-class ProfileWindow(Screen):
-    pass
-
-class WindowManager(ScreenManager):
-    pass
-
-kv = Builder.load_file("my.kv")
+def main():
+    # Database initialization and tests
+    # init()
+    # un_exists('userNameThatDoesNotExist')
+    # profile_delete('userNameThatDoesNotExist')
+    # profile_delete('davidDelSol')
+    # profile_new(
+    #     'davidDelSol',
+    #     'encrypted?',
+    #     'david',
+    #     'aloka',
+    #     'test@preform.io',
+    #     'salsa,extended intelligence,marathon running in a full suit'
+    # )
+    # profile_new(
+    #     'Python733t',
+    #     'encrypted?',
+    #     'Doroteo ',
+    #     'Bonilla',
+    #     'doabonilla@yahoo.com',
+    #     'work,school,sleep,repeat'
+    # )
+    # un_login('davidDelSol', 'encrypted?')
+    # profile_update('davidDelSol', pw = 'definitelyNotEncripted!')
+    # un_login('davidDelSol', 'definitelyNotEncripted!')
+    # un_exists('davidDelSol')
+    # profile_print(all = True)
+    # profile_print(['Python733t'])
+    # profile_print('Python733t')
 
-# ----------------------
-# Main Kivy app
-# ----------------------
-class MyMainApp(App):
-    def build(self):
-        return kv
     pass
 
-
-# ----------------------
-# Main application function
-# ----------------------
-if __name__ == "__main__":
-    # Database initialization and tests
-    db_init()
-    db_un_exists('userNameThatDoesNotExist')
-    db_profile_delete('userNameThatDoesNotExist')
-    db_profile_delete('davidDelSol')
-    db_profile_new(
-        'davidDelSol',
-        'encrypted?',
-        'david',
-        'aloka',
-        'test@preform.io',
-        'salsa,extended intelligence,marathon running in a full suit'
-    )
-    db_profile_new(
-        'Python733t',
-        'encrypted?',
-        'Doroteo ',
-        'Bonilla',
-        'doabonilla@yahoo.com',
-        'work,school,sleep,repeat'
-    )
-    db_un_login('davidDelSol', 'encrypted?')
-    db_profile_update('davidDelSol', pw = 'definitelyNotEncripted!')
-    db_un_login('davidDelSol', 'definitelyNotEncripted!')
-    db_un_exists('davidDelSol')
-    db_profile_print(all = True)
-    db_profile_print(['Python733t'])
-    db_profile_print('Python733t')
-
-    # Run Kivy app
-    MyMainApp().run()
+main()

db_gui_impl.py

@@ -0,0 +1,78 @@
+import string
+from xml.etree.ElementInclude import include
+from kivy.app import App
+from kivy.lang import Builder
+from kivy.uix.screenmanager import ScreenManager, Screen
+
+import db # Teo: use this line to import the db class
+
+# ----------------------
+# Kivy Window management
+# ----------------------
+class SplashWindow(Screen):
+    
+    pass
+
+class LoginWindow(Screen):
+
+    def login_released(self, usnm_input, passw_input):
+        usnm_input.text = ""
+        passw_input.text = ""
+
+        return
+
+    pass
+
+class ProfileWindow(Screen):
+    pass
+
+class WindowManager(ScreenManager):
+    pass
+
+kv = Builder.load_file("my.kv")
+
+# ----------------------
+# Main Kivy app
+# ----------------------
+class MyMainApp(App):
+    def build(self):
+        return kv
+    pass
+
+
+# ----------------------
+# Main application function
+# ----------------------
+if __name__ == "__main__":
+    # # Teo: use these lines to manipulate database
+    # Database initialization and tests 
+    db.init()
+    db.un_exists('userNameThatDoesNotExist')
+    db.profile_delete('userNameThatDoesNotExist')
+    db.profile_delete('davidDelSol')
+    db.profile_new(
+        'davidDelSol',
+        'encrypted?',
+        'david',
+        'aloka',
+        'test@preform.io',
+        'salsa,extended intelligence,marathon running in a full suit'
+    )
+    db.profile_new(
+        'Python733t',
+        'encrypted?',
+        'Doroteo ',
+        'Bonilla',
+        'doabonilla@yahoo.com',
+        'work,school,sleep,repeat'
+    )
+    db.un_login('davidDelSol', 'encrypted?')
+    db.profile_update('davidDelSol', pw = 'definitelyNotEncripted!')
+    db.un_login('davidDelSol', 'definitelyNotEncripted!')
+    db.un_exists('davidDelSol')
+    db.profile_print(all = True)
+    db.profile_print(['Python733t'])
+    db.profile_print('Python733t')
+
+    # Run Kivy app
+    MyMainApp().run()

my.kv

@@ -46,7 +46,7 @@ WindowManager:
         Button:
             text: "Submit"
             on_release:
-                root.login_released(usnm, passw)
+                # root.login_released(usnm, passw)
                 app.root.current = "profile"
                 root.manager.transition.direction = "left"