IsaacKerson commited on
Commit
178e0a0
1 Parent(s): 7b3e91c

add db_path function

Browse files
Files changed (3) hide show
  1. pages/join.py +3 -0
  2. pages/quiz.py +1 -3
  3. pages/utils.py +5 -0
pages/join.py CHANGED
@@ -7,6 +7,9 @@ import datetime
7
  from pages.utils import *
8
 
9
  def app():
 
 
 
10
  st.markdown("## Join")
11
 
12
  with st.form("join_form"):
 
7
  from pages.utils import *
8
 
9
  def app():
10
+
11
+ DATABASE = db_path('quiz_maker.db')
12
+
13
  st.markdown("## Join")
14
 
15
  with st.form("join_form"):
pages/quiz.py CHANGED
@@ -13,9 +13,7 @@ def app():
13
  if "form_upload" in st.session_state.keys():
14
  del st.session_state.form_upload
15
 
16
- DATABASE_NAME = 'quiz_maker.db'
17
- BASE_DIR = os.path.dirname(os.path.abspath(__file__))
18
- DATABASE = os.path.join(BASE_DIR, DATABASE_NAME)
19
 
20
  def form_callback(questions):
21
 
 
13
  if "form_upload" in st.session_state.keys():
14
  del st.session_state.form_upload
15
 
16
+ DATABASE = db_path('quiz_maker.db')
 
 
17
 
18
  def form_callback(questions):
19
 
pages/utils.py CHANGED
@@ -30,6 +30,11 @@ def make_subquery(terms, column = 'tags', operator = 'AND'):
30
  def make_query(subquery, limit = 10):
31
  return f"""SELECT * FROM vocab WHERE {subquery} ORDER BY RANDOM() LIMIT {str(limit)}"""
32
 
 
 
 
 
 
33
  def db_connect(database):
34
  conn = sqlite3.connect(database)
35
  c = conn.cursor()
 
30
  def make_query(subquery, limit = 10):
31
  return f"""SELECT * FROM vocab WHERE {subquery} ORDER BY RANDOM() LIMIT {str(limit)}"""
32
 
33
+ def db_path(database):
34
+ DATABASE_NAME = 'quiz_maker.db'
35
+ dir = os.path.dirname(os.path.abspath(__file__))
36
+ return os.path.join(dir, database)
37
+
38
  def db_connect(database):
39
  conn = sqlite3.connect(database)
40
  c = conn.cursor()