update collection log check to also work using new list format

Author: rmobis

taskapp.py

@@ -13,8 +13,7 @@
                            official_status_change, username_change, get_taskCurrent_tier, generate_task_for_tier,
                            complete_task_unofficial_tier, get_user, get_leaderboard)
 import send_grid_email
-from templesync import check_logs, read_json_file
-import time
+from templesync import check_logs
 
 app = Flask(__name__)
 
@@ -439,10 +438,10 @@ def collection_log_check():
     form_data = request.form
     rs_username = form_data['username']
     lms_enabled = get_lms_status(session['username'])
-    easy_check = check_logs(rs_username, read_json_file('task-list/tiers/easy.json').get('tasks'), 'check', lms_enabled=lms_enabled)
-    medium_check = check_logs(rs_username, read_json_file('task-list/tiers/medium.json').get('tasks'), 'check', lms_enabled=lms_enabled)
-    hard_check = check_logs(rs_username, read_json_file('task-list/tiers/hard.json').get('tasks'), 'check', lms_enabled=lms_enabled)
-    elite_check = check_logs(rs_username, read_json_file('task-list/tiers/elite.json').get('tasks'), 'check', lms_enabled=lms_enabled)
+    easy_check = check_logs(rs_username, tasklists.list_for_tier('easy', lms_enabled), 'check')
+    medium_check = check_logs(rs_username, tasklists.list_for_tier('medium', lms_enabled), 'check')
+    hard_check = check_logs(rs_username, tasklists.list_for_tier('hard', lms_enabled), 'check')
+    elite_check = check_logs(rs_username, tasklists.list_for_tier('elite', lms_enabled), 'check')
 
     return render_template('collection_log_check.html',
                            rs_username = rs_username,
@@ -456,10 +455,10 @@ def collection_log_check():
 def collection_log_import():
     form_data = request.form
     rs_username = form_data['username']
-    easy_import = check_logs(rs_username, read_json_file('task-list/tiers/easy.json').get('tasks'), 'import')
-    medium_import = check_logs(rs_username, read_json_file('task-list/tiers/medium.json').get('tasks'), 'import')
-    hard_import = check_logs(rs_username, read_json_file('task-list/tiers/hard.json').get('tasks'), 'import')
-    elite_import = check_logs(rs_username, read_json_file('task-list/tiers/elite.json').get('tasks'), 'import')
+    easy_import = check_logs(rs_username, tasklists.list_for_tier('easy'), 'import')
+    medium_import = check_logs(rs_username, tasklists.list_for_tier('medium'), 'import')
+    hard_import = check_logs(rs_username, tasklists.list_for_tier('hard'), 'import')
+    elite_import = check_logs(rs_username, tasklists.list_for_tier('elite'), 'import')
     all_tasks = [easy_import, medium_import, hard_import, elite_import]
     update = update_imported_tasks(session['username'], all_tasks, form_data['username'])
 

templesync.py

@@ -1,9 +1,6 @@
 import requests
-import json
 import tasklists
-import datetime
-import time
-from task_types import TaskTag
+from task_types import CollectionLogVerificationData, TaskData
 
 
 def temple_player_data(username: str):
@@ -18,37 +15,31 @@ def temple_player_data(username: str):
 
     return cleaned_player_data
 
+# def test():
+#     data = temple_player_data('Gerni Task')
+#     for item in data['data']['items']:
+#         print(item['name'])
 
-def read_json_file(file_path):
-    with open(file_path, 'r') as file:
-        data = json.load(file)
-    return data
+# def get_unix_time(timestamp: str):
+#     datetime_format = "%Y-%m-%d %H:%M:%S"
+#     datetime_object = datetime.datetime.strptime(timestamp, datetime_format)
+#     return time.mktime(datetime_object.timetuple())
 
-def test():
-    data = temple_player_data('Gerni Task')
-    for item in data['data']['items']:
-        print(item['name'])
+# def import_logs(player_name: str, site_tasks: list):
+#     player_data = temple_player_data(player_name)
+#     completed_tasks = list()
+#     for task in site_tasks:
+#         task_data = task.get('colLogData', None)
+#         if task_data:
+#             for item in task_data['include']:
+#                 for log_slot in player_data['data']['items']:
+#                     if item['id'] == log_slot['id']:
+#                         completed_tasks.append(task['_id'])
+#                         break
+#     return completed_tasks
 
-def get_unix_time(timestamp: str):
-    datetime_format = "%Y-%m-%d %H:%M:%S"
-    datetime_object = datetime.datetime.strptime(timestamp, datetime_format)
-    return time.mktime(datetime_object.timetuple())
 
-def import_logs(player_name: str, site_tasks: list):
-    player_data = temple_player_data(player_name)
-    completed_tasks = list()
-    for task in site_tasks:
-        task_data = task.get('colLogData', None)
-        if task_data:
-            for item in task_data['include']:
-                for log_slot in player_data['data']['items']:
-                    if item['id'] == log_slot['id']:
-                        completed_tasks.append(task['_id'])
-                        break
-    return completed_tasks
-
-
-def check_logs(username: str, site_tasks: list, action: str, lms_enabled=True):
+def check_logs(username: str, site_tasks: list["TaskData"], action: str):
     def find_by_id(items, target_id):
         return [item for item in items if int(item['id']) == target_id]
     def format_completed_tasks(completed_tasks: set):
@@ -63,35 +54,24 @@ def format_completed_tasks(completed_tasks: set):
     missing_tasks = list()
     completed_tasks = set()
     for task in site_tasks:
-        # print('******************************************************************************')
-        task_data = task.get('colLogData', None)
-        if TaskTag.LMS in task.get('tags', []) and action == 'check' and not lms_enabled:
+        verification_data = task.verification
+        if not isinstance(verification_data, CollectionLogVerificationData):
+            print("Skipping")
             continue
-        if task_data:
-            log_count = 0
-            for item in task_data['include']:
-                # print(f"Checking item: {item['name']} with ID: {item['id']}")
-                find_item = find_by_id(cleaned_player_data, item['id'])
-                if find_item:
-                    log_count += 1
-                    # print(f"Found item: {find_item[0]['name']} with ID: {find_item[0]['id']}")
-                    # print(f"Log count: {log_count}, Required: {task_data['logCount']}")
-                    if log_count == task_data['logCount']:
-                        completed_tasks.add(task['id'])
-                        # print(f"Completed task: {task['name']} with ID: {task['uuid']}")
 
-                        if action == "import" and find_item[0].get('date', None):
-                            unix_time = get_unix_time(find_item[0]['date'])
-                            # print(find_item[0]['date'], unix_time)
-                        break
-            if log_count != task_data['logCount']:
-                missing_tasks.append(task['name'])
-                # print(f"Missing task: {task['name']} with ID: {task['uuid']}")
+        log_count = 0
+        for itemId in verification_data.item_ids:
+            # print(f"Checking item: {item['name']} with ID: {item['id']}")
+            find_item = find_by_id(cleaned_player_data, itemId)
+            if find_item:
+                log_count += 1
+
+        if log_count >= verification_data.count:
+            completed_tasks.add(task.id)
+        else:
+            missing_tasks.append(task.name)
 
     if action == 'check':
-        # print("Missing tasks:")
-        # for task in missing_tasks:
-        #     print(task)
         return missing_tasks
     else:
         sorted_completed_tasks = sorted(completed_tasks)
@@ -100,4 +80,4 @@ def format_completed_tasks(completed_tasks: set):
 
 
 if __name__ == "__main__":
-    check_logs('Gerni Task', read_json_file('tasks\easy.json'), 'import')
+    check_logs('Gerni Task', tasklists.list_for_tier('easy'), 'import')