Adding support for classes which each use their own category. Moving key into a confi...

[coldcallbot-discord.git] / coldcall.py

diff --git a/coldcall.py b/coldcall.py
index 8cae6ca71e3fcc8791683ecce11e9b6497c8a5d4..a18c893f78fb96eb42a449fb6d5f9b5307597b04 100644 (file)
--- a/coldcall.py
+++ b/coldcall.py
@@ -11,24 +11,29 @@ import re
 import discord
 
 class ColdCall():
-    def __init__ (self):
+    def __init__ (self, course = ''):
+        self.course = course
         self.today = str(datetime.date(datetime.now()))
         # how much less likely should it be that a student is called upon?
-        self.weight = 2 
+        self.weight = 2
+        self.__set_filenames()
 
+
+    def __set_filenames(self):
         # filenames
-        self.__fn_studentinfo = "data/student_information.tsv"
-        self.__fn_daily_calllist = f"data/call_list-{self.today}.tsv"
-        self.__fn_daily_attendence = f"data/attendence-{self.today}.tsv"
+        self.__fn_studentinfo = f"data/{self.course}/student_information.tsv"
+        self.__fn_daily_calllist = f"data/{self.course}/call_list-{self.today}.tsv"
+        self.__fn_daily_attendance = f"data/{self.course}/attendance-{self.today}.tsv"
 
     def __load_prev_questions(self):
         previous_questions = defaultdict(int)
 
-        for fn in listdir("./data/"):
+        for fn in listdir(f"./data/{self.course}/"):
             if re.match("call_list-\d{4}-\d{2}-\d{2}.tsv", fn):
-                with open(f"./data/{fn}", 'r') as f:
+                with open(f"./data/{self.course}/{fn}", 'r') as f:
                     for row in DictReader(f, delimiter="\t"):
-                        previous_questions[row["discord_name"]] += 1
+                        if not row["answered"] == "FALSE":
+                            previous_questions[row["discord_name"]] += 1
 
         return previous_questions
     
@@ -38,12 +43,8 @@ class ColdCall():
 
         preferred_names = {}
         with open(self.__fn_studentinfo, 'r') as f:
-            for line in f.readlines():
-                x = line.strip().split("\t")
-                if x[0] == "Timestamp":
-                    continue
-
-                preferred_names[x[4]] = x[2]
+            for row in DictReader(f, delimiter="\t"):
+                preferred_names[row["discord_name"]] = row["name"]
 
         if selected_student in preferred_names:
             return preferred_names[selected_student]
@@ -65,14 +66,14 @@ class ColdCall():
         print(weights)
         return choices(list(weights.keys()), weights=list(weights.values()), k=1)[0]
 
-    def __record_attendence(self, students_present):
+    def __record_attendance(self, students_present):
         # if it's the first one of the day, write it out
-        if not os.path.exists(self.__fn_daily_attendence):
-            with open(self.__fn_daily_attendence, "w") as f:
-                print("\t".join(["timestamp", "attendence_list"]), file=f)
+        if not os.path.exists(self.__fn_daily_attendance):
+            with open(self.__fn_daily_attendance, "w") as f:
+                print("\t".join(["timestamp", "attendance_list"]), file=f)
 
         # open for appending the student
-        with open(self.__fn_daily_attendence, "a") as f:
+        with open(self.__fn_daily_attendance, "a") as f:
             print("\t".join([str(datetime.now()),
                              ",".join(students_present)]),
                   file=f)
@@ -92,7 +93,7 @@ class ColdCall():
         selected_student = self.__select_student_from_list(students_present)
 
         # record the called-upon student in the right place
-        self.__record_attendence(students_present)
+        self.__record_attendance(students_present)
         self.__record_coldcall(selected_student)
 
         preferred_name = self.__get_preferred_name(selected_student)
@@ -102,13 +103,17 @@ class ColdCall():
             coldcall_message = f"@{selected_student}, you're up!"
         return coldcall_message
 
-# cc = ColdCall()
+    def update_course(self, course_name):
+        self.course = course_name
+        self.__set_filenames()
 
-# test_student_list = ["Jordan", "Kristen Larrick", "Madison Heisterman", "Maria.Au20", "Laura (Alia) Levi", "Leona Aklipi", "Linya Feng", "anne", "kirst", "emmaaitelli", "ashleylee", "allie_partridge", "Tiana_Cole", "Hamin", "Ella Qu", "Angel Su", "Shizuka", "Ben Baird", "Kim Do", "Isaacm24", "Sam Bell", "Courtneylg", "TasnimHasan"]
-# cc.coldcall(test_student_list)
+# cc = ColdCall()
+ 
+# test_student_list = ["jordan", "Kristen Larrick", "Madison Heisterman", "Maria.Au20", "Laura (Alia) Levi", "Leona Aklipi", "anne", "emmaaitelli", "ashleylee", "allie_partridge", "Tiana_Cole", "Hamin", "Ella Qu", "Shizuka", "Ben Baird", "Kim Do", "Isaacm24", "Sam Bell", "Courtneylg"]
+# print(cc.coldcall(test_student_list))
 
-# test_student_list = ["Jordan", "Kristen Larrick", "Mako"]
-# cc.coldcall(test_student_list)
+# test_student_list = ["jordan", "Kristen Larrick", "Mako"]
+# print(cc.coldcall(test_student_list))
 
-# test_student_list = ["Jordan", "Kristen Larrick"]
-# cc.coldcall(test_student_list)
+# test_student_list = ["jordan", "Kristen Larrick"]
+# print(cc.coldcall(test_student_list))