INTEGRITY: Improve 'Compare Fileset' feature

ShivangNagta · ShivangNagta · commit 16bd1ca5e749 · 2025-08-24T13:33:39.000+05:30
The filtering for searching filesets for comparing is now done using the fileset search page, with additional button 'Compare' for redirecting to the merge page.
diff --git a/src/app/fileset.py b/src/app/fileset.py
@@ -154,7 +154,7 @@ def fileset():
             """
             if old_id is not None:
                 html += f"""<h3><u>Redirected from Fileset: {old_id}</u></h3>"""
-            html += f"<button type='button' onclick=\"location.href='/fileset/{id}/merge'\">Manual Merge</button>"
+            html += f"<button type='button' onclick=\"location.href='/fileset/{id}/merge'\">Compare Filesets</button>"
             html += f"""
                     <form action="/fileset/{id}/mark_full" method="post" style="display:inline;">
                         <button type='submit'>Mark as full</button>
@@ -836,111 +836,8 @@ def update_fileset(id):
 
 @app.route("/fileset/<int:id>/merge", methods=["GET", "POST"])
 def merge_fileset(id):
-    if request.method == "POST":
-        search_query = request.form["search"]
-
-        connection = db_connect()
-
-        try:
-            with connection.cursor() as cursor:
-                query = f"""
-                SELECT 
-                    fs.*, 
-                    g.name AS game_name, 
-                    g.engine AS game_engine, 
-                    g.platform AS game_platform,
-                    g.language AS game_language,
-                    g.extra AS extra
-                FROM 
-                    fileset fs
-                LEFT JOIN 
-                    game g ON fs.game = g.id
-                WHERE g.name LIKE '%{search_query}%' OR g.platform LIKE '%{search_query}%' OR g.language LIKE '%{search_query}%'
-                """
-                cursor.execute(query)
-                results = cursor.fetchall()
-
-                html = f"""
-                <!DOCTYPE html>
-                <html>
-                <head>
-                    <link rel="stylesheet" type="text/css" href="{{{{ url_for('static', filename='style.css') }}}}">
-                    <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
-                    <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
-                </head>
-                <body>
-                <nav>
-                    <div class="logo">
-                        <a href="{{{{ url_for('home') }}}}">
-                            <img src="{{{{ url_for('static', filename='integrity_service_logo_256.png') }}}}" alt="Logo">
-                        </a>
-                    </div>
-                    <div class="nav-buttons">
-                        <a href="{{{{ url_for('user_games_list') }}}}">User Games List</a>
-                        <a href="{{{{ url_for('ready_for_review') }}}}">Ready for review</a>
-                        <a href="{{{{ url_for('fileset_search') }}}}">Fileset Search</a>
-                        <a href="{{{{ url_for('logs') }}}}">Logs</a>
-                        <a href="{{{{ url_for('config') }}}}">Config</a>
-                    </div>
-                </nav>
-                <h2 style="margin-top: 80px;">Search Results for '{search_query}'</h2>
-                <form method="POST">
-                    <input type="text" name="search" placeholder="Search fileset">
-                    <input type="submit" value="Search">
-                </form>
-                <table>
-                <tr><th>ID</th><th>Game Name</th><th>Platform</th><th>Language</th><th>Extra</th><th>Action</th></tr>
-                """
-                for result in results:
-                    html += f"""
-                    <tr>
-                        <td>{result["id"]}</td>
-                        <td>{result["game_name"]}</td>
-                        <td>{result["game_platform"]}</td>
-                        <td>{result["game_language"]}</td>
-                        <td>{result["extra"]}</td>
-                        <td><a href="/fileset/{id}/merge/confirm?target_id={result["id"]}">Select</a></td>
-                    </tr>
-                    """
-                html += "</table>\n"
-                html += "</body>\n</html>"
-
-                return render_template_string(html)
-
-        finally:
-            connection.close()
-
-    return """
-    <!DOCTYPE html>
-    <html>
-    <head>
-        <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
-        <link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
-        <link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
-    </head>
-    <body>
-    <nav>
-        <div class="logo">
-            <a href="{{ url_for('home') }}">
-                <img src="{{ url_for('static', filename='integrity_service_logo_256.png') }}" alt="Logo">
-            </a>
-        </div>
-        <div class="nav-buttons">
-            <a href="{{ url_for('user_games_list') }}">User Games List</a>
-            <a href="{{ url_for('ready_for_review') }}">Ready for review</a>
-            <a href="{{ url_for('fileset_search') }}">Fileset Search</a>
-            <a href="{{ url_for('logs') }}">Logs</a>
-            <a href="{{ url_for('config') }}">Config</a>
-        </div>
-    </nav>
-    <h2 style="margin-top: 80px;">Search Fileset to Merge</h2>
-    <form method="POST">
-        <input type="text" name="search" placeholder="Search fileset">
-        <input type="submit" value="Search">
-    </form>
-    </body>
-    </html>
-    """
+    url = f"/fileset_search?source_id={id}"
+    return redirect(url)
 
 
 @app.route("/fileset/<int:id>/possible_merge", methods=["GET", "POST"])
@@ -1296,7 +1193,7 @@ def highlight_differences(source, target):
                 # For matched_files, files is a tuple of filename from source file and target file
                 # For unmatched_files, files is the filename of the files that was not common.
                 for files in file_category:
-                    if is_common_file:
+                    if is_common_file and len(matched_files) != 0:
                         (target_filename, source_filename) = files
 
                         # Also remove common files from source and target filenames set
@@ -1325,7 +1222,11 @@ def highlight_differences(source, target):
 
                     keys = sorted(set(source_dict.keys()) | set(target_dict.keys()))
 
-                    tr_class = "matched" if is_common_file else "unmatched"
+                    tr_class = (
+                        "matched"
+                        if (is_common_file and len(matched_files) != 0)
+                        else "unmatched"
+                    )
                     html += f"""<tr class="{tr_class}">
                         <td colspan='3'>
                                 <strong>{source_filename}</strong> {" - mac_file" if is_mac_file else ""}
@@ -1369,9 +1270,14 @@ def highlight_differences(source, target):
                                 and source_filename.lower() in detection_files_set
                             ):
                                 is_detection = "1"
-                                fname = source_to_target_matched_map[
+                                fname = (
                                     source_filename.lower()
-                                ]
+                                    if source_filename.lower()
+                                    not in source_to_target_matched_map
+                                    else source_to_target_matched_map[
+                                        source_filename.lower()
+                                    ]
+                                )
                                 detection_type = target_files_map[fname].get(
                                     "detection_type", ""
                                 )
diff --git a/src/app/pagination.py b/src/app/pagination.py
@@ -64,7 +64,7 @@ def create_page(
         where_clauses = []
 
         for key, value in request.args.items():
-            if key in ("page", "sort") or value == "":
+            if key in ("page", "sort", "source_id") or value == "":
                 continue
             tables.add(filters[key])
             col = f"{filters[key]}.{'id' if key == 'fileset' else key}"
@@ -181,7 +181,6 @@ def create_page(
             width = get_width(name, default)
             html += f"<col style='width: {width}%;'>"
         html += "</colgroup>"
-
     if filters:
         html += """<tr class='filter'><td class='filter'><input type='submit' value='Submit'></td>"""
         for key in filters.keys():
@@ -245,6 +244,14 @@ def create_page(
                     </a>
                 </th>"""
 
+    compare_fileset_source_id = request.args.get("source_id", "")
+    if compare_fileset_source_id != "":
+        html += """<th>
+                        <div style="display:flex; align-items:center; width:100%;">
+                            <span style="flex:1; text-align:center;">Action</span>
+                        </div>
+                </th>"""
+
     if results:
         counter = offset + 1
         for row in results:
@@ -284,6 +291,8 @@ def create_page(
                         )
 
                 html += f"<td>{'' if value is None else value}</td>\n"
+            if compare_fileset_source_id != "":
+                html += f"""<td><a href="/fileset/{compare_fileset_source_id}/merge/confirm?target_id={fileset_id}">Compare</a></td>"""
             html += "</tr>\n"
             counter += 1
 
