Merge pull request #15 from mgerni/templesync

mgerni · web-flow · commit 78986f33de07 · 2025-05-15T02:00:02.000-04:00
add import from temple sync
diff --git a/static/js/task.js b/static/js/task.js
@@ -373,6 +373,24 @@ $(document).ready(function(){
   });
 });
 
+$(document).ready(function(){
+  $(document).on('click', '#importButton', function(){
+    var input = document.getElementById('importInput');
+    var username = input.value;
+    var importConent = document.getElementById('importContent');
+
+    req = $.ajax({
+      url : '/collectionlog_import/',
+      type : 'POST',
+      data : {username : username}
+    });
+
+    req.done(function(data) {
+      $(importConent).html(data)
+    });
+  });
+});
+
 $(document).ready(function(){
 $('.task-image').mouseenter(function(){
   const tip = this.name;
diff --git a/static/styles.css b/static/styles.css
@@ -916,6 +916,16 @@ nav .rank-check::before {
     font-weight: 900;
     color: var(--complete-color);
 }
+
+nav .temple-sync::before {
+    font-family: "Font Awesome 5 Free";
+    content: "\f021";
+    display: inline-block;
+    padding-right: 3px;
+    vertical-align: middle;
+    font-weight: 900;
+    color: var(--complete-color);
+}
 nav svg {
     fill: var(--current-task-color)
 }
@@ -1457,4 +1467,11 @@ input:checked + .slider:before {
 .recaptcha {
     display: flex;
     justify-content: center;
+}
+
+
+.center {
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
diff --git a/task_database.py b/task_database.py
@@ -262,7 +262,6 @@ def __set_task_complete(username: str, tier: str, task_id: int, complete: bool):
     task_coll = mydb['taskLists']
     cleaned_tier = tier.replace("Tasks", "")
     if complete:
-        print(f"tiers.{cleaned_tier}.completedTasks", task_id)
         result = task_coll.update_one(
             {"username": username},
             {
@@ -540,7 +539,6 @@ def get_task_lists(username):
         if completed_bossPet_ids:
             for id in completed_bossPet_ids:
                 if boss_pet_task.id == id['taskId']:
-                    print(boss_pet_task)
                     boss_pet_task.isCompleted = True
 
         bossPets.append(boss_pet_task)
@@ -646,6 +644,51 @@ def manual_revert_tasks(username, tier, task_id):
     return task.name, task.asset_image, task.tip, task.wiki_link
 
 
+def update_imported_tasks(username: str, all_tasks: list, username2: str):
+    coll = mydb['taskLists']
+    include = {'easy', 'medium', 'hard', 'elite'}
+    tasks_to_check = []
+    for tier in include:
+        current_task = get_taskCurrent_tier(username, tier)
+        if current_task is not None:
+            tasks_to_check.append(current_task[3])
+
+    all_task_ids = {task["taskId"] for group in all_tasks for task in group}
+    found = [value for value in tasks_to_check if value in all_task_ids]
+    exists_all = all(value in all_task_ids for value in tasks_to_check)
+    if exists_all:
+        # coll.update_one({'username': username}, {})
+        for task in found:
+            print(task)
+            __set_current_task(username, 'easy', int(task), False)
+
+    coll.update_one({'username': username},
+                    {'$set': {'tiers.easy.completedTasks': [],
+                              'tiers.medium.completedTasks': [],
+                              'tiers.hard.completedTasks': [],
+                              'tiers.elite.completedTasks': [],
+                            #   'tiers.master.completedTasks': [],
+                            #   'tiers.passive.completedTasks': [],
+                            #   'tiers.extra.completedTasks': [],
+                            #   'tiers.bossPets.completedTasks': [],
+                            #   'tiers.skillPets.completedTasks': [],
+                            #   'tiers.otherPets.completedTasks': []
+                            }
+                    })
+    coll.update_one({'username': username},
+                    {'$set': {'tiers.easy.completedTasks': all_tasks[0],
+                              'tiers.medium.completedTasks': all_tasks[1],
+                              'tiers.hard.completedTasks': all_tasks[2],
+                              'tiers.elite.completedTasks': all_tasks[3],
+                            #   'tiers.master.completedTasks': [],
+                            #   'tiers.passive.completedTasks': [],
+                            #   'tiers.extra.completedTasks': [],
+                            #   'tiers.bossPets.completedTasks': [],
+                            #   'tiers.skillPets.completedTasks': [],
+                            #   'tiers.otherPets.completedTasks': []
+                              }})
+    coll.update_one({'username' : username}, {'$set' : {'ign': username2}})
+
 '''
 import_spreadsheet:
 
diff --git a/taskapp.py b/taskapp.py
@@ -9,12 +9,12 @@
 import tasklists
 from task_database import (get_taskCurrent, generate_task, complete_task, get_task_progress,
                            get_task_lists, manual_complete_tasks, manual_revert_tasks,
-                            uncomplete_all_tasks, lms_status_change,
+                           uncomplete_all_tasks, lms_status_change, update_imported_tasks,
                            official_status_change, username_change, official_icon, unofficial_icon, get_taskCurrent_tier, generate_task_for_tier,
                            complete_task_unofficial_tier, get_user, get_leaderboard)
 import send_grid_email
 from rank_check import get_collection_log, check_collection_log
-from templesync import check_logs, read_json_file
+from templesync import check_logs, read_json_file, import_logs
 
 app = Flask(__name__)
 
@@ -446,34 +446,39 @@ def dashboard():
 def collection_log_check():
     form_data = request.form
     rs_username = form_data['username']
-    easy_check = check_logs(rs_username, read_json_file('tasks/easy.json'))
-    medium_check = check_logs(rs_username, read_json_file('tasks/medium.json'))
-    hard_check = check_logs(rs_username, read_json_file('tasks/hard.json'))
-    elite_check = check_logs(rs_username, read_json_file('tasks/elite.json'))
+    easy_check = check_logs(rs_username, read_json_file('tasks/easy.json'), 'check')
+    medium_check = check_logs(rs_username, read_json_file('tasks/medium.json'), 'check')
+    hard_check = check_logs(rs_username, read_json_file('tasks/hard.json'), 'check')
+    elite_check = check_logs(rs_username, read_json_file('tasks/elite.json'),'check')
 
     return render_template('collection_log_check.html',
                            rs_username = rs_username,
                            easy_check = easy_check,
                            medium_check = medium_check,
                            hard_check = hard_check,
                            elite_check= elite_check)
-    log_data = get_collection_log(rs_username)
-    if log_data[0] == 200:
-        easy_check = check_collection_log(tasklists.easy, log_data[1])
-        medium_check = check_collection_log(tasklists.medium, log_data[1])
-        hard_check = check_collection_log(tasklists.hard, log_data[1])
-        elite_check = check_collection_log(tasklists.elite, log_data[1])
-        
-        return render_template('collection_log_check.html',
-        rs_username = rs_username,
-        easy_check= easy_check,
-        medium_check= medium_check,
-        hard_check = hard_check,
-        elite_check = elite_check
-        )
-    else:
-        print(log_data)
-        return render_template('collection_log_check_error.html', rs_username=rs_username, error=log_data[1])
+
+@app.route('/collectionlog_import/', methods = ['POST'])
+@login_required
+def collection_log_import():
+    form_data = request.form
+    rs_username = form_data['username']
+    easy_import = check_logs('Gerni Task', read_json_file('tasks/easy.json'), 'import')
+    medium_import = check_logs('Gerni Task', read_json_file('tasks/medium.json'), 'import')
+    hard_import = check_logs('Gerni Task', read_json_file('tasks/hard.json'), 'import')
+    elite_import = check_logs('Gerni Task', read_json_file('tasks/elite.json'), 'import')
+    all_tasks = [easy_import, medium_import, hard_import, elite_import]
+    update = update_imported_tasks(session['username'], all_tasks, form_data['username'])
+
+    return render_template('collection_log_import.html',
+                            rs_username = rs_username,
+                            easy = len(easy_import),
+                            medium = len(medium_import),
+                            hard = len(hard_import),
+                            elite = len(elite_import))
+    
+
+    return {'message': easy_import}
 
 # AJAX route for generating a task.
 @app.route('/generate/', methods=['POST'])
@@ -838,7 +843,30 @@ def wall_of_pain():
         **context
     )
 
-
+@app.route('/sync-collection-logs/', methods=['GET'])
+@login_required
+def sync_collection_logs():
+    user_info = BasePageInfo()
+    progress = get_task_progress(user_info.username)
+    context = {
+        'easy': progress['easy']['percent_complete'],
+        'medium': progress['medium']['percent_complete'],
+        'hard': progress['hard']['percent_complete'],
+        'elite': progress['elite']['percent_complete'],
+        'master' : progress['master']['percent_complete'],
+        'passive' : progress['passive']['percent_complete'], 
+        'extra' : progress['extra']['percent_complete'],
+        'allPets' : progress['all_pets']['percent_complete'],
+    }
+    return render_template(
+        'temple-sync.html',
+        username=user_info.username,
+        email_verify=user_info.email_bool,
+        email_val=user_info.email_val,
+        rank_icon=user_info.rank_icon,
+        taskapp_email=taskapp_email,
+        **context
+    )
 #route for Rank Check Page
 @app.route('/rank-check/', methods=['GET'])
 @login_required
diff --git a/tasklists.py b/tasklists.py
@@ -3,8 +3,8 @@
 def to_col_log_data(data: dict) -> ColLogData or None: # type: ignore
     if data is None:
         return None
-    return ColLogData(category=data['category'],
-                      log_name=data['logName'],
+    return ColLogData(category=data.get('category'),
+                      log_name=data.get('logName'),
                       exclude=data.get('exclude'),
                       include=data.get('include'),
                       multi=data.get('multi'),
diff --git a/templates/base_updated.html b/templates/base_updated.html
@@ -29,6 +29,7 @@
         <a class="faq" href="/faq/">FAQ/Rules</a>
         <a class="wop" href="/wall-of-pain/">Wall Of Pain</a>
         <a class="rank-check" href="/rank-check/">Rank Check</a>
+        <a class="temple-sync" href="/sync-collection-logs/">Import</a>
         <a class="profile" href="/profile/">{{username}}</a>
         <a class="logout" href="/logout/">Logout</a>
     </div>
diff --git a/templates/collection_log_import.html b/templates/collection_log_import.html
@@ -0,0 +1,25 @@
+<div>
+    <div>
+        <h3 class="center">Import Results For: <p class="incomplete">{{rs_username}}</p></h3>
+    </div>
+
+    <div class="rank-results-row center">
+        <p class="complete">Easy Tasks: <p class="incomplete">{{easy}}</p></p>
+    </div>
+
+    <div class="rank-results-row center">
+        <p class="complete">Medium Tasks: <p class="incomplete">{{medium}}</p></p>
+    </div>
+
+    <div class="rank-results-row center">
+        <p class="complete">Hard Tasks: <p class="incomplete">{{hard}}</p></p>
+    </div>
+
+    <div class="rank-results-row center">
+        <p class="complete">Elite Tasks: <p class="incomplete">{{elite}}</p></p>
+    </div>
+    <h5 class="center">Browse a task list to see what tasks you've completed already!</h3>
+</div>
+
+
+
diff --git a/templates/temple-sync.html b/templates/temple-sync.html
@@ -0,0 +1,51 @@
+{% extends "base_updated.html" %}
+{% block title %}
+- Temple Sync
+{% endblock %}
+{% block head %}
+{% endblock %}
+{% block context %}
+
+<div class="container" style="margin-top: 5%;">
+    <div class="main-content-rank-check">
+        <div class="rect-large-register rsText">
+            <div class="triangle-top-left">
+                <div class="decoration-top-left shadow"></div>
+            </div>
+            <div class="triangle-top-right">
+                <div class="decoration-top-right shadow"></div>   
+            </div>
+            <div class="triangle-bottom-left">
+                <div class="decoration-bottom-left shadow"></div>
+            </div>
+            <div class="triangle-bottom-right">
+                <div class="decoration-bottom-right shadow"></div>
+            </div>
+
+            <div id="importContent">
+                <div class="rank-results-col center">
+                    <h3>Import from TempleOSRS</h3>
+                    <br>
+                    <p class="incomplete">Currently syncing Easy, Medium, Hard, and, Elite Tasks is supported.</p>
+                    <p class="incomplete">Using this feature will mark all tasks in a supported tier as incomplete.</p>
+                    <p class="incomplete">Only tasks imported from TempleOSRS will be completed.</p>
+                    <p class="complete">You must "link" your account to <a href="https://templeosrs.com">templeosrs.com</a></p>
+                    <br>
+
+                     <p class="complete">If you have not linked your account, you can follow the steps below to do so:</p>
+                     <ol>
+                        <a  target="_blank" href="https://templeosrs.com/faq.php#CATEGORY_06">Temple OSRS FAQ</a>
+                     </ol>
+        
+                     <p  class="complete">Once you have ensured your TempleOSRS data is updated/sync'd, enter your Runescape Username and click Import.</p>
+                     <div class="import-input-section">
+                        <input class="rc-input" type="text" name="inputText" id="importInput" placeholder="RSN">
+                        <button id="importButton" class="rsText button-complete button-green">Import</button>
+                     </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
diff --git a/templesync.py b/templesync.py
@@ -18,9 +18,33 @@ def test():
     for item in data['data']['items']:
         print(item['name'])
 
-def check_logs(username: str, site_tasks: list):
+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):
+    def format_completed_tasks(completed_tasks: set):
+        # iterate over the completed tasks and create a list of dictionaries
+        formatted_tasks = []
+        for task_id in completed_tasks:
+            formatted_tasks.append({
+                'taskId': task_id,
+            })
+        return formatted_tasks
+
     player_data = temple_player_data(username)
     missing_tasks = list()
+    completed_tasks = set()
     for task in site_tasks:
         task_data = task.get('colLogData', None)
         if task_data:
@@ -30,7 +54,14 @@ def check_logs(username: str, site_tasks: list):
                     if item['id'] == log_slot['id']:
                         log_count += 1
                     if log_count == task_data['logCount']:
+                        completed_tasks.add(int(task['_id']))
                         break
-            if log_count != task_data['logCount']:
-                missing_tasks.append(task['name'])
-    return missing_tasks
+                if log_count != task_data['logCount']:
+                    missing_tasks.append(task['name'])
+
+
+    if action == 'check':
+        return missing_tasks
+    else:
+        
+        return format_completed_tasks(completed_tasks)
diff --git a/user_dao.py b/user_dao.py
@@ -119,7 +119,6 @@ def convert_database_tier(tier: str) -> UserTaskList:
             completed_tasks = list(filter(lambda x: x.task_id in all_current_tier_ids, completed_tasks))
 
         current = data.get('currentTask', None)
-        print(current)
         if current:
             current = UserCurrentTask(task_id=current['taskId'])
         return UserTaskList(current_task=current,
