Blacked

2026-02-05 15:31:31 +07:00
parent d7e927e6eb
commit 06cd57e2c4
14 changed files with 102 additions and 87 deletions
--- a/redmine_reporter/cli.py
+++ b/redmine_reporter/cli.py
@@ -22,32 +22,26 @@ def parse_date_range(date_arg: str) -> tuple[str, str]:
 def main(argv: Optional[List[str]] = None) -> int:
    parser = argparse.ArgumentParser(
        prog="redmine-reporter",
-        description="Generate Redmine issue report based on your time entries."
+        description="Generate Redmine issue report based on your time entries.",
    )
    parser.add_argument(
        "--date",
        default=Config.get_default_date_range(),
        # help="Date range in format YYYY-MM-DD--YYYY-MM-DD (default: %(default)s)"
-        help="Date range in format YYYY-MM-DD--YYYY-MM-DD (default from .env or %(default)s)"
+        help="Date range in format YYYY-MM-DD--YYYY-MM-DD (default from .env or %(default)s)",
    )
    parser.add_argument(
-        "--compact",
-        action="store_true",
-        help="Use compact plain-text output instead of table"
+        "--compact", action="store_true", help="Use compact plain-text output instead of table"
    )
    parser.add_argument(
        "--output",
-        help="Path to output .odt file (e.g., report.odt). If omitted, prints to stdout."
+        help="Path to output .odt file (e.g., report.odt). If omitted, prints to stdout.",
    )
    parser.add_argument(
-        "--author",
-        default="",
-        help="Override author name from .env (REDMINE_AUTHOR)"
+        "--author", default="", help="Override author name from .env (REDMINE_AUTHOR)"
    )
    parser.add_argument(
-        "--no-time",
-        action="store_true",
-        help="Do not include spent time into table"
+        "--no-time", action="store_true", help="Do not include spent time into table"
    )
    args = parser.parse_args(argv)

@@ -80,10 +74,8 @@ def main(argv: Optional[List[str]] = None) -> int:
    if args.output:
        output_ext = os.path.splitext(args.output)[1].lower()

-        formatter = get_formatter_by_extension(output_ext,
-            author=Config.get_author(args.author),
-            from_date=from_date,
-            to_date=to_date
+        formatter = get_formatter_by_extension(
+            output_ext, author=Config.get_author(args.author), from_date=from_date, to_date=to_date
        )

        if not formatter:
--- a/redmine_reporter/client.py
+++ b/redmine_reporter/client.py
@@ -5,7 +5,9 @@ from .config import Config
 from .utils import get_version


-def fetch_issues_with_spent_time(from_date: str, to_date: str) -> Optional[List[Tuple[Issue, float]]]:
+def fetch_issues_with_spent_time(
+    from_date: str, to_date: str
+) -> Optional[List[Tuple[Issue, float]]]:
    """
    Fetch unique issues linked to time entries of the current user in given date range,
    along with total spent hours per issue.
@@ -16,21 +18,19 @@ def fetch_issues_with_spent_time(from_date: str, to_date: str) -> Optional[List[
        Config.REDMINE_URL,
        username=Config.REDMINE_USER,
        password=Config.REDMINE_PASSWORD,
-        requests={'verify': '/etc/ssl/certs/ca-certificates.crt'}
+        requests={"verify": "/etc/ssl/certs/ca-certificates.crt"},
    )

-    current_user = redmine.user.get('current')
+    current_user = redmine.user.get("current")
    time_entries = redmine.time_entry.filter(
-        user_id=current_user.id,
-        from_date=from_date,
-        to_date=to_date
+        user_id=current_user.id, from_date=from_date, to_date=to_date
    )

    # Агрегируем часы по issue.id
    spent_time: Dict[int, float] = {}
    issue_ids = set()
    for entry in time_entries:
-        if hasattr(entry, 'issue') and entry.issue and hasattr(entry, 'hours'):
+        if hasattr(entry, "issue") and entry.issue and hasattr(entry, "hours"):
            iid = entry.issue.id
            issue_ids.add(iid)
            spent_time[iid] = spent_time.get(iid, 0.0) + float(entry.hours)
@@ -39,12 +39,8 @@ def fetch_issues_with_spent_time(from_date: str, to_date: str) -> Optional[List[
        return None

    # Загружаем полные объекты задач
-    issue_list_str = ','.join(str(i) for i in issue_ids)
-    issues = redmine.issue.filter(
-        issue_id=issue_list_str,
-        status_id='*',
-        sort='project:asc'
-    )
+    issue_list_str = ",".join(str(i) for i in issue_ids)
+    issues = redmine.issue.filter(issue_id=issue_list_str, status_id="*", sort="project:asc")

    # Сопоставляем задачи с суммарным временем
    result = []
--- a/redmine_reporter/config.py
+++ b/redmine_reporter/config.py
@@ -1,7 +1,6 @@
 import os
 from dotenv import load_dotenv

-
 load_dotenv()


--- a/redmine_reporter/formatters/console.py
+++ b/redmine_reporter/formatters/console.py
@@ -8,15 +8,17 @@ class TableFormatter(Formatter):
    """Форматтер для вывода красивой таблицы в консоль."""

    def format(self, rows: List[ReportRow]) -> str:
-        table_rows = [['Проект', 'Версия', 'Задача', 'Статус', 'Затрачено']]
+        table_rows = [["Проект", "Версия", "Задача", "Статус", "Затрачено"]]
        for r in rows:
-            table_rows.append([
-                r['display_project'],
-                r['display_version'],
-                f"{r['issue_id']}. {r['subject']}",
-                r['status_ru'],
-                r['time_text']
-            ])
+            table_rows.append(
+                [
+                    r["display_project"],
+                    r["display_version"],
+                    f"{r['issue_id']}. {r['subject']}",
+                    r["status_ru"],
+                    r["time_text"],
+                ]
+            )
        return tabulate(table_rows, headers="firstrow", tablefmt="fancy_grid")

    def save(self, rows: List[ReportRow], output_path: str) -> None:
@@ -24,6 +26,7 @@ class TableFormatter(Formatter):
        # Это делается в CLI.
        raise NotImplementedError("TableFormatter не поддерживает сохранение в файл.")

+
 class CompactFormatter(Formatter):
    """Форматтер для компактного вывода в консоль."""

--- a/redmine_reporter/formatters/csv.py
+++ b/redmine_reporter/formatters/csv.py
@@ -16,14 +16,16 @@ class CSVFormatter(Formatter):
        writer = csv.writer(output, dialect="excel")
        writer.writerow(["Project", "Version", "Issue ID", "Subject", "Status", "Spent Time"])
        for r in rows:
-            writer.writerow([
-                r["project"],
-                r["version"],
-                r["issue_id"],
-                r["subject"],
-                r["status_ru"],
-                r["time_text"]
-            ])
+            writer.writerow(
+                [
+                    r["project"],
+                    r["version"],
+                    r["issue_id"],
+                    r["subject"],
+                    r["status_ru"],
+                    r["time_text"],
+                ]
+            )
        return output.getvalue()

    def save(self, rows: List[ReportRow], output_path: str) -> None:
--- a/redmine_reporter/formatters/factory.py
+++ b/redmine_reporter/formatters/factory.py
@@ -6,7 +6,6 @@ from .markdown import MarkdownFormatter
 from .odt import ODTFormatter
 from .html import HTMLFormatter

-
 # Словарь для сопоставления расширений файлов с классами форматтеров
 FORMATTER_MAP: Dict[str, Type[Formatter]] = {
    ".odt": ODTFormatter,
--- a/redmine_reporter/formatters/markdown.py
+++ b/redmine_reporter/formatters/markdown.py
@@ -12,7 +12,7 @@ class MarkdownFormatter(Formatter):
    def format(self, rows: List[ReportRow]) -> str:
        lines = [
            "| Проект | Версия | Задача | Статус | Затрачено |",
-            "|--------|--------|--------|--------|-----------|"
+            "|--------|--------|--------|--------|-----------|",
        ]
        for r in rows:
            task_cell = f"{r['issue_id']}. {r['subject']}"
--- a/redmine_reporter/formatters/odt.py
+++ b/redmine_reporter/formatters/odt.py
@@ -26,7 +26,11 @@ class ODTFormatter(Formatter):
        Форматирует данные в объект OpenDocument.
        """

-        with resources.files("redmine_reporter").joinpath("templates", "template.odt").open("rb") as f:
+        with (
+            resources.files("redmine_reporter")
+            .joinpath("templates", "template.odt")
+            .open("rb") as f
+        ):
            doc = load(f)

        para_style_name = "Standard"
@@ -56,7 +60,13 @@ class ODTFormatter(Formatter):

        # Заголовки
        header_row = TableRow()
-        for text in ["Наименование Проекта", "Номер версии*", "Задача", "Статус Готовность*", "Затрачено за отчетный период"]:
+        for text in [
+            "Наименование Проекта",
+            "Номер версии*",
+            "Задача",
+            "Статус Готовность*",
+            "Затрачено за отчетный период",
+        ]:
            cell = TableCell(stylename=cell_style_name)
            cell.addElement(P(stylename=para_style_name, text=text))
            header_row.addElement(cell)
@@ -77,7 +87,9 @@ class ODTFormatter(Formatter):

        # Данные с двухуровневой группировкой и объединением ячеек
        for project, versions in projects.items():
-            total_project_rows = sum(len(rows_for_version) for rows_for_version in versions.values())
+            total_project_rows = sum(
+                len(rows_for_version) for rows_for_version in versions.values()
+            )
            first_version_in_project = True

            for version, rows_for_version in versions.items():
@@ -137,7 +149,7 @@ class ODTFormatter(Formatter):
            "«Задача» -  Номер по Redmine и формулировка.",
            "«Статус» -  Актуальное состояние задачи на момент отчета. Статусы: закрыто, в работе, ожидание, решена.",
            "«Готовность» – Опциональное поле в процентах.",
-            "«Затрачено за отчетный период»  - в днях или часах."
+            "«Затрачено за отчетный период»  - в днях или часах.",
        ]:
            doc.text.addElement(P(stylename=para_style_name, text=line))

--- a/redmine_reporter/report_builder.py
+++ b/redmine_reporter/report_builder.py
@@ -3,21 +3,20 @@ from redminelib.resources import Issue
 from .types import ReportRow
 from .utils import get_version, hours_to_human

-
 STATUS_TRANSLATION = {
-    'New': 'В работе',
-    'In Progress': 'В работе',
-    'Feedback': 'В работе',
-    'Re-opened': 'В работе',
-    'Code Review': 'Решена',
-    'Wait Release': 'Закрыто',
-    'Pending': 'Ожидание',
-    'Resolved': 'Решена',
-    'Testing': 'Решена',
-    'Confirming': 'Ожидание',
-    'Closed': 'Закрыто',
-    'Rejected': 'Закрыто',
-    'Frozen': 'Ожидание',
+    "New": "В работе",
+    "In Progress": "В работе",
+    "Feedback": "В работе",
+    "Re-opened": "В работе",
+    "Code Review": "Решена",
+    "Wait Release": "Закрыто",
+    "Pending": "Ожидание",
+    "Resolved": "Решена",
+    "Testing": "Решена",
+    "Confirming": "Ожидание",
+    "Closed": "Закрыто",
+    "Rejected": "Закрыто",
+    "Frozen": "Ожидание",
 }


--- a/redmine_reporter/utils.py
+++ b/redmine_reporter/utils.py
@@ -10,8 +10,19 @@ def get_month_name_from_range(from_date: str, to_date: str) -> str:
        return "Январь"

    months = [
-        "", "Январь", "Февраль", "Март", "Апрель", "Май", "Июнь",
-        "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"
+        "",
+        "Январь",
+        "Февраль",
+        "Март",
+        "Апрель",
+        "Май",
+        "Июнь",
+        "Июль",
+        "Август",
+        "Сентябрь",
+        "Октябрь",
+        "Ноябрь",
+        "Декабрь",
    ]

    return months[end.month]
@@ -19,7 +30,7 @@ def get_month_name_from_range(from_date: str, to_date: str) -> str:

 def get_version(issue) -> str:
    """Возвращает версию задачи или '<N/A>', если не задана."""
-    return str(getattr(issue, 'fixed_version', '<N/A>'))
+    return str(getattr(issue, "fixed_version", "<N/A>"))


 def hours_to_human(hours: float) -> str: