- addded option --demo in init.db to add fake students, otherwise initialize empty.

Miguel Barao
1 parent ca9934fa
Showing 2 changed files with 10 additions and 8 deletions Show diff stats
README.md
initdb.py
@@ -70,9 +70,10 @@ The following commands will show how to run a demonstration test:
 ```.bash
 cd WHERE/YOU/INSTALLED/perguntations
  
-# create database.
-# a database with fake students is created if no CSV file is provided
-./initdb.py OPTIONAL_CSV_FILE
+# create and initialize database either from a CSV file, fake students or empty
+./initdb.py students.csv    # from CSV file
+./initdb.py --demo          # initialize with fake students
+./initdb.py                 # empty
 mv students.db demo/
  
 # edit test configuration and check if everything looks right
@@ -20,7 +20,7 @@ def fix(name):
 #   Parse command line options
 argparser = argparse.ArgumentParser(description='Create new database from a CSV file (SIIUE format)')
 argparser.add_argument('--db', default='students.db', type=str, help='database filename')
-# argparser.add_argument('--demo', default='students.db', type=str, help='add demo students')
+argparser.add_argument('--demo', action='store_true', help='initialize database with a few fake students')
 argparser.add_argument('csvfile', nargs='?', type=str, default='', help='CSV filename')
 args = argparser.parse_args()
  
@@ -50,8 +50,8 @@ try:
             sys.exit(1)
         else:
             session.add_all([Student(id=r['N.º'], name=fix(r['Nome']), password='') for r in csvreader])
-    else:
-        # otherwise add a few fake students
+    elif args.demo:
+        # add a few fake students
         fakes = [
             ['1888', 'Fernando Pessoa'],
             ['1799', 'Almeida Garrett'],
@@ -74,14 +74,15 @@ except Exception:
  
 else:
     n = session.query(Student).count()
-    print('New database created: {0}\n{1} users inserted:'.format(args.db, n))
+    print('New database created: {0}\n{1} user(s) inserted:'.format(args.db, n))
  
     users = session.query(Student).order_by(Student.id).all()
     print('    {0:8} - {1} (administrator)'.format(users[0].id, users[0].name))
     if n > 1:
         print('    {0:8} - {1}'.format(users[1].id, users[1].name))
     if n > 3:
-        print('    .\n    .\n    .')
+        print('    ...        ...')
+        # print('    .\n    .\n    .')
     if n > 2:
         print('    {0:8} - {1}'.format(users[-1].id, users[-1].name))
...	...	@@ -70,9 +70,10 @@ The following commands will show how to run a demonstration test:
70	70	```.bash
71	71	cd WHERE/YOU/INSTALLED/perguntations
72	72
73		-# create database.
74		-# a database with fake students is created if no CSV file is provided
75		-./initdb.py OPTIONAL_CSV_FILE
	73	+# create and initialize database either from a CSV file, fake students or empty
	74	+./initdb.py students.csv # from CSV file
	75	+./initdb.py --demo # initialize with fake students
	76	+./initdb.py # empty
76	77	mv students.db demo/
77	78
78	79	# edit test configuration and check if everything looks right
...	...
...	...	@@ -20,7 +20,7 @@ def fix(name):
20	20	# Parse command line options
21	21	argparser = argparse.ArgumentParser(description='Create new database from a CSV file (SIIUE format)')
22	22	argparser.add_argument('--db', default='students.db', type=str, help='database filename')
23		-# argparser.add_argument('--demo', default='students.db', type=str, help='add demo students')
	23	+argparser.add_argument('--demo', action='store_true', help='initialize database with a few fake students')
24	24	argparser.add_argument('csvfile', nargs='?', type=str, default='', help='CSV filename')
25	25	args = argparser.parse_args()
26	26
...	...	@@ -50,8 +50,8 @@ try:
50	50	sys.exit(1)
51	51	else:
52	52	session.add_all([Student(id=r['N.º'], name=fix(r['Nome']), password='') for r in csvreader])
53		- else:
54		- # otherwise add a few fake students
	53	+ elif args.demo:
	54	+ # add a few fake students
55	55	fakes = [
56	56	['1888', 'Fernando Pessoa'],
57	57	['1799', 'Almeida Garrett'],
...	...	@@ -74,14 +74,15 @@ except Exception:
74	74
75	75	else:
76	76	n = session.query(Student).count()
77		- print('New database created: {0}\n{1} users inserted:'.format(args.db, n))
	77	+ print('New database created: {0}\n{1} user(s) inserted:'.format(args.db, n))
78	78
79	79	users = session.query(Student).order_by(Student.id).all()
80	80	print(' {0:8} - {1} (administrator)'.format(users[0].id, users[0].name))
81	81	if n > 1:
82	82	print(' {0:8} - {1}'.format(users[1].id, users[1].name))
83	83	if n > 3:
84		- print(' .\n .\n .')
	84	+ print(' ... ...')
	85	+ # print(' .\n .\n .')
85	86	if n > 2:
86	87	print(' {0:8} - {1}'.format(users[-1].id, users[-1].name))
87	88
...	...