Melhorias de UI/UX no app (issue #36)

spsvalidator/src/spsvalidator/build_metadata.py

@@ -5,11 +5,13 @@
 from flask_babel import gettext
 
 from spsvalidator import build_info
+from spsvalidator.version import is_running_from_source
 
 
 def get_footer_build_label() -> str:
     if (
-        build_info.BUILD_MACOS_VERSION != "development"
+        not is_running_from_source()
+        and build_info.BUILD_MACOS_VERSION != "development"
         and build_info.BUILD_PLATFORM == "macOS"
     ):
         return gettext(

spsvalidator/src/spsvalidator/translations/en/LC_MESSAGES/messages.po

@@ -36,6 +36,39 @@ msgstr "Select a .zip file to validate."
 msgid "Apenas arquivos .zip SPS são suportados."
 msgstr "Only SPS .zip files are supported."
 
+#: src/spsvalidator/web/templates/index.html:414
+msgid "Validando..."
+msgstr "Validating..."
+
+#: src/spsvalidator/web/templates/_history_list.html:15
+msgid "Ações"
+msgstr "Actions"
+
+#: src/spsvalidator/web/templates/_history_list.html:37
+#, python-format
+msgid "Baixar CSV de %(name)s"
+msgstr "Download CSV for %(name)s"
+
+#: src/spsvalidator/web/templates/_history_list.html:38
+msgid "Baixar CSV"
+msgstr "Download CSV"
+
+#: src/spsvalidator/web/templates/_history_list.html:44
+msgid "CSV"
+msgstr "CSV"
+
+#: src/spsvalidator/web/templates/_history_list.html:56
+msgid "Pré-visualização HTML"
+msgstr "HTML preview"
+
+#: src/spsvalidator/web/routes.py:83
+msgid "PDF principal"
+msgstr "Main PDF"
+
+#: src/spsvalidator/web/templates/_history_list.html:105
+msgid "Paginação"
+msgstr "Pagination"
+
 #: src/spsvalidator/web/templates/index.html:79
 msgid "Validação de pacotes SPS"
 msgstr "SPS package validation"
@@ -80,11 +113,6 @@ msgstr ""
 msgid "Exceptions"
 msgstr ""
 
-#: src/spsvalidator/web/templates/index.html:109
-#: src/spsvalidator/web/templates/index.html:129
-msgid "Relatório"
-msgstr "Report"
-
 #: src/spsvalidator/web/templates/index.html:136
 msgid "Nenhum pacote validado ainda."
 msgstr "No packages validated yet."

spsvalidator/src/spsvalidator/translations/es/LC_MESSAGES/messages.po

@@ -36,6 +36,39 @@ msgstr "Seleccione un archivo .zip para validar."
 msgid "Apenas arquivos .zip SPS são suportados."
 msgstr "Solo se admiten archivos .zip SPS."
 
+#: src/spsvalidator/web/templates/index.html:414
+msgid "Validando..."
+msgstr "Validando..."
+
+#: src/spsvalidator/web/templates/_history_list.html:15
+msgid "Ações"
+msgstr "Acciones"
+
+#: src/spsvalidator/web/templates/_history_list.html:37
+#, python-format
+msgid "Baixar CSV de %(name)s"
+msgstr "Descargar CSV de %(name)s"
+
+#: src/spsvalidator/web/templates/_history_list.html:38
+msgid "Baixar CSV"
+msgstr "Descargar CSV"
+
+#: src/spsvalidator/web/templates/_history_list.html:44
+msgid "CSV"
+msgstr "CSV"
+
+#: src/spsvalidator/web/templates/_history_list.html:56
+msgid "Pré-visualização HTML"
+msgstr "Vista previa HTML"
+
+#: src/spsvalidator/web/routes.py:83
+msgid "PDF principal"
+msgstr "PDF principal"
+
+#: src/spsvalidator/web/templates/_history_list.html:105
+msgid "Paginação"
+msgstr "Paginación"
+
 #: src/spsvalidator/web/templates/index.html:79
 msgid "Validação de pacotes SPS"
 msgstr "Validación de paquetes SPS"
@@ -80,11 +113,6 @@ msgstr ""
 msgid "Exceptions"
 msgstr ""
 
-#: src/spsvalidator/web/templates/index.html:109
-#: src/spsvalidator/web/templates/index.html:129
-msgid "Relatório"
-msgstr "Informe"
-
 #: src/spsvalidator/web/templates/index.html:136
 msgid "Nenhum pacote validado ainda."
 msgstr "Ningún paquete validado todavía."

spsvalidator/src/spsvalidator/translations/pt/LC_MESSAGES/messages.po

@@ -36,6 +36,39 @@ msgstr ""
 msgid "Apenas arquivos .zip SPS são suportados."
 msgstr ""
 
+#: src/spsvalidator/web/templates/index.html:414
+msgid "Validando..."
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:15
+msgid "Ações"
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:37
+#, python-format
+msgid "Baixar CSV de %(name)s"
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:38
+msgid "Baixar CSV"
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:44
+msgid "CSV"
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:56
+msgid "Pré-visualização HTML"
+msgstr ""
+
+#: src/spsvalidator/web/routes.py:83
+msgid "PDF principal"
+msgstr ""
+
+#: src/spsvalidator/web/templates/_history_list.html:105
+msgid "Paginação"
+msgstr ""
+
 #: src/spsvalidator/web/templates/index.html:79
 msgid "Validação de pacotes SPS"
 msgstr ""
@@ -80,11 +113,6 @@ msgstr ""
 msgid "Exceptions"
 msgstr ""
 
-#: src/spsvalidator/web/templates/index.html:109
-#: src/spsvalidator/web/templates/index.html:129
-msgid "Relatório"
-msgstr ""
-
 #: src/spsvalidator/web/templates/index.html:136
 msgid "Nenhum pacote validado ainda."
 msgstr ""

spsvalidator/src/spsvalidator/version.py

@@ -4,10 +4,24 @@
 from pathlib import Path
 
 
+def _pyproject_path() -> Path:
+    return Path(__file__).resolve().parents[2] / "pyproject.toml"
+
+
+def is_running_from_source() -> bool:
+    """True quando rodando a partir do repositorio (pip install -e .).
+
+    Nesse caso pyproject.toml esta presente ao lado do pacote; num build
+    empacotado (PyInstaller) ele nao existe, e so ai os metadados
+    gravados em build_info.py (gerados pra aquele build especifico) sao
+    confiaveis.
+    """
+    return _pyproject_path().is_file()
+
+
 def _load_version() -> str:
-    pyproject_path = Path(__file__).resolve().parents[2] / "pyproject.toml"
-    if pyproject_path.is_file():
-        with pyproject_path.open("rb") as file_pointer:
+    if is_running_from_source():
+        with _pyproject_path().open("rb") as file_pointer:
             data = tomllib.load(file_pointer)
         return str(data["project"]["version"])
     from spsvalidator import build_info

spsvalidator/src/spsvalidator/web/routes.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from datetime import datetime
 from pathlib import Path
 
 from flask import (
@@ -69,6 +70,24 @@ def _html_previews_by_article(package_sha256: str) -> list[dict]:
     return groups
 
 
+def _short_pdf_label(xml_stem: str, filename: str) -> str:
+    """Rótulo curto pra diferenciar PDFs de um mesmo artigo na listagem.
+
+    Os nomes de arquivo compartilham o prefixo `xml_stem` (ex.:
+    "artigo.pdf", "artigo-suppl1.pdf"), o que faz uma lista inteira de
+    nomes completos parecer repetitiva; aqui extraímos só a parte que
+    diferencia cada arquivo.
+    """
+    stem = filename[:-4] if filename.lower().endswith(".pdf") else filename
+    if stem == xml_stem:
+        return gettext("PDF principal")
+    if stem.startswith(xml_stem):
+        suffix = stem[len(xml_stem):].lstrip("-_")
+        if suffix:
+            return suffix
+    return filename
+
+
 def _pdf_previews_by_article(package_sha256: str) -> list[dict]:
     """PDFs extraídos para um pacote, agrupados por artigo (xml_stem).
 
@@ -82,19 +101,43 @@ def _pdf_previews_by_article(package_sha256: str) -> list[dict]:
     for article_dir in sorted(base_dir.iterdir()):
         if not article_dir.is_dir():
             continue
+        xml_stem = article_dir.name
         pdf_names = sorted(p.name for p in (article_dir / "assets").glob("*.pdf"))
         if pdf_names:
-            groups.append({"xml_stem": article_dir.name, "pdf_names": pdf_names})
+            pdfs = [
+                {"filename": name, "label": _short_pdf_label(xml_stem, name)}
+                for name in pdf_names
+            ]
+            groups.append({"xml_stem": xml_stem, "pdfs": pdfs})
     return groups
 
 
+def _format_validated_at(value: str) -> str:
+    """Trunca os microssegundos de "validated_at" pra exibicao na tabela.
+
+    O valor e gravado com datetime.now(UTC).isoformat(), que inclui
+    microssegundos; isso e ruido pra quem esta lendo a lista de historico.
+    """
+    try:
+        return datetime.fromisoformat(value).isoformat(timespec="seconds")
+    except ValueError:
+        return value
+
+
 def _parse_int(value, default: int) -> int:
     try:
         return int(value)
     except (TypeError, ValueError):
         return default
 
 
+def _page_range(page: int, total_pages: int, window: int = 2) -> list[int]:
+    """Janela de numeros de pagina ao redor da pagina atual, tipo Django."""
+    start = max(1, page - window)
+    end = min(total_pages, page + window)
+    return list(range(start, end + 1))
+
+
 def _paginated_history() -> dict:
     db_path = current_app.config["DB_PATH"]
     name_query = request.args.get("q", "").strip()
@@ -115,6 +158,7 @@ def _paginated_history() -> dict:
         offset=(page - 1) * page_size,
     )
     for item in history_items:
+        item["validated_at"] = _format_validated_at(item["validated_at"])
         item["html_previews"] = _html_previews_by_article(item["package_sha256"])
         item["pdf_previews"] = _pdf_previews_by_article(item["package_sha256"])
 
@@ -126,6 +170,7 @@ def _paginated_history() -> dict:
         "page_size": page_size,
         "total": total,
         "total_pages": total_pages,
+        "page_range": _page_range(page, total_pages),
     }
 
 
@@ -171,7 +216,16 @@ def validate():
     except Exception as exc:
         return _render_index(latest_result=None, error_message=str(exc))
 
-    return redirect(url_for("web.index", history_id=result["history_id"]))
+    return redirect(
+        url_for(
+            "web.index",
+            history_id=result["history_id"],
+            q=request.args.get("q") or None,
+            status=request.args.get("status") or None,
+            page_size=request.args.get("page_size") or None,
+            page=request.args.get("page") or None,
+        )
+    )
 
 
 @web_blueprint.get("/validation/<history_id>/report.csv")