From 75b055299a6d87a76e48845c0ce502f618c7ebbd Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 3 Mar 2026 01:05:10 +0000 Subject: [PATCH] feat: file search, type/tag filters, and pagination Add tsvector full-text search, type filter (image/document/text/ spreadsheet/archive), tag filter dropdown, and pagination (50/page). Replace folder button bar with compact dropdown. All filters combine and carry through sort and pagination links. Co-Authored-By: Claude Opus 4.6 --- routers/files.py | 124 ++++++++++++++++++++++++++++++++++--------- templates/files.html | 82 ++++++++++++++++++++++++---- 2 files changed, 173 insertions(+), 33 deletions(-) diff --git a/routers/files.py b/routers/files.py index 98320e6..f8775af 100644 --- a/routers/files.py +++ b/routers/files.py @@ -144,12 +144,27 @@ SORT_OPTIONS = { "date_asc": "created_at ASC", } +# Map type filter values to mime prefixes/patterns +TYPE_FILTERS = { + "image": "image/%", + "document": "application/pdf", + "text": "text/%", + "spreadsheet": "application/vnd.%sheet%", + "archive": "application/%zip%", +} + +PER_PAGE = 50 + @router.get("/") async def list_files( request: Request, folder: Optional[str] = None, sort: Optional[str] = None, + q: Optional[str] = None, + file_type: Optional[str] = None, + tag: Optional[str] = None, + page: int = 1, context_type: Optional[str] = None, context_id: Optional[str] = None, db: AsyncSession = Depends(get_db), @@ -163,38 +178,86 @@ async def list_files( order_by = SORT_OPTIONS.get(sort, "storage_path ASC") + # Normalize folder param from form: " " (space) = root, "" = all, None = all + if folder is not None: + if folder.strip() == "" and folder != "": + # Space-only value means root folder + folder = "" + elif folder.strip() == "": + # Empty string means "all folders" (no filter) + folder = None + + # Build dynamic WHERE clauses + where_clauses = ["f.is_deleted = false"] + params = {} + if context_type and context_id: - # Files attached to a specific entity - result = await db.execute(text(f""" + where_clauses.append("fm.context_type = :ct AND fm.context_id = :cid") + params["ct"] = context_type + params["cid"] = context_id + + if folder is not None: + if folder == "": + where_clauses.append("f.storage_path NOT LIKE '%/%'") + else: + where_clauses.append("f.storage_path LIKE :prefix") + params["prefix"] = folder + "/%" + + if q and q.strip(): + search_terms = q.strip().split() + tsquery = " & ".join(f"{t}:*" for t in search_terms) + where_clauses.append("f.search_vector @@ to_tsquery('english', :tsquery)") + params["tsquery"] = tsquery + + if file_type and file_type in TYPE_FILTERS: + where_clauses.append("f.mime_type LIKE :mime_pattern") + params["mime_pattern"] = TYPE_FILTERS[file_type] + + if tag and tag.strip(): + where_clauses.append(":tag = ANY(f.tags)") + params["tag"] = tag.strip() + + where_sql = " AND ".join(where_clauses) + + # Count total for pagination + if context_type and context_id: + count_sql = f""" + SELECT COUNT(*) FROM files f + JOIN file_mappings fm ON fm.file_id = f.id + WHERE {where_sql} + """ + else: + count_sql = f"SELECT COUNT(*) FROM files f WHERE {where_sql}" + + total = (await db.execute(text(count_sql), params)).scalar() + + # Paginate + if page < 1: + page = 1 + offset = (page - 1) * PER_PAGE + total_pages = max(1, (total + PER_PAGE - 1) // PER_PAGE) + + # Query + if context_type and context_id: + query_sql = f""" SELECT f.*, fm.context_type, fm.context_id FROM files f JOIN file_mappings fm ON fm.file_id = f.id - WHERE f.is_deleted = false AND fm.context_type = :ct AND fm.context_id = :cid + WHERE {where_sql} ORDER BY {order_by} - """), {"ct": context_type, "cid": context_id}) - elif folder is not None: - if folder == "": - # Root folder: files with no directory separator in storage_path - result = await db.execute(text(f""" - SELECT * FROM files - WHERE is_deleted = false AND storage_path NOT LIKE '%/%' - ORDER BY {order_by} - """)) - else: - # Specific folder: storage_path starts with folder/ - result = await db.execute(text(f""" - SELECT * FROM files - WHERE is_deleted = false AND storage_path LIKE :prefix - ORDER BY {order_by} - """), {"prefix": folder + "/%"}) + LIMIT :lim OFFSET :off + """ else: - # All files - result = await db.execute(text(f""" - SELECT * FROM files - WHERE is_deleted = false + query_sql = f""" + SELECT f.* FROM files f + WHERE {where_sql} ORDER BY {order_by} - """)) + LIMIT :lim OFFSET :off + """ + params["lim"] = PER_PAGE + params["off"] = offset + result = await db.execute(text(query_sql), params) items = [dict(r._mapping) for r in result] # Add derived folder field for display @@ -202,10 +265,23 @@ async def list_files( dirname = os.path.dirname(item["storage_path"]) item["folder"] = dirname if dirname else "/" + # Get all unique tags for the tag filter dropdown + tag_result = await db.execute(text( + "SELECT DISTINCT unnest(tags) AS tag FROM files WHERE is_deleted = false AND tags IS NOT NULL ORDER BY tag" + )) + all_tags = [r._mapping["tag"] for r in tag_result] + return templates.TemplateResponse("files.html", { "request": request, "sidebar": sidebar, "items": items, "folders": folders, "current_folder": folder, "current_sort": sort or "path", + "current_q": q or "", + "current_type": file_type or "", + "current_tag": tag or "", + "current_page": page, + "total_pages": total_pages, + "total_files": total, + "all_tags": all_tags, "sync_result": sync_result, "context_type": context_type or "", "context_id": context_id or "", diff --git a/templates/files.html b/templates/files.html index 35e59e4..319c2b5 100644 --- a/templates/files.html +++ b/templates/files.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %}
-

Files{{ items|length }}

+

Files{{ total_files }}

@@ -16,18 +16,51 @@
{% endif %} -
- - + + -
-{% set sort_base = '/files?' ~ ('folder=' ~ current_folder ~ '&' if current_folder is not none else '') %} + + + {% if all_tags %} + + {% endif %} + + {% if current_q or current_type or current_tag or current_folder is not none %} + + + Clear + {% else %} + + {% endif %} + + +{% set qp = [] %} +{% if current_folder is not none %}{% if current_folder == '' %}{{ qp.append('folder= ') or '' }}{% else %}{{ qp.append('folder=' ~ current_folder) or '' }}{% endif %}{% endif %} +{% if current_q %}{{ qp.append('q=' ~ current_q) or '' }}{% endif %} +{% if current_type %}{{ qp.append('file_type=' ~ current_type) or '' }}{% endif %} +{% if current_tag %}{{ qp.append('tag=' ~ current_tag) or '' }}{% endif %} +{% set filter_qs = qp | join('&') %} +{% set sort_base = '/files?' ~ (filter_qs ~ '&' if filter_qs else '') %} {% if items %}
@@ -81,11 +114,42 @@
+ +{% if total_pages > 1 %} +{% set page_base = sort_base ~ 'sort=' ~ current_sort ~ '&' %} +
+ {% if current_page > 1 %} + Prev + {% endif %} + + {% for p in range(1, total_pages + 1) %} + {% if p == current_page %} + {{ p }} + {% elif p <= 3 or p >= total_pages - 2 or (p >= current_page - 1 and p <= current_page + 1) %} + {{ p }} + {% elif p == 4 and current_page > 5 %} + ... + {% elif p == total_pages - 3 and current_page < total_pages - 4 %} + ... + {% endif %} + {% endfor %} + + {% if current_page < total_pages %} + Next + {% endif %} +
+{% endif %} + {% else %}
📁
+ {% if current_q or current_type or current_tag %} +
No files match your filters
+ Clear Filters + {% else %}
No files{{ ' in this folder' if current_folder is not none else ' uploaded yet' }}
Upload First File + {% endif %}
{% endif %} {% endblock %}