nginx-lens 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

analyzer/duplicates.py

@@ -3,15 +3,16 @@ from typing import List, Dict, Any
 
 def find_duplicate_directives(tree) -> List[Dict[str, Any]]:
     """
-    Находит дублирующиеся директивы внутри одного блока.
-    Возвращает список: [{block, directive, count}]
+    Находит дублирующиеся директивы внутри одного блока (без вложенности).
+    Возвращает список: [{block, directive, count, location}]
     """
     analyzer = Analyzer(tree)
     duplicates = []
     for d, parent in analyzer.walk():
         if 'directives' in d:
+            # Считаем только прямые дочерние директивы (без вложенных блоков)
             seen = {}
-            for sub, _ in analyzer.walk(d['directives'], d):
+            for sub in d['directives']:
                 if 'directive' in sub:
                     key = (sub['directive'], str(sub.get('args')))
                     seen[key] = seen.get(key, 0) + 1
@@ -21,6 +22,7 @@ def find_duplicate_directives(tree) -> List[Dict[str, Any]]:
                         'block': d,
                         'directive': directive,
                         'args': args,
-                        'count': count
+                        'count': count,
+                        'location': d.get('arg')
                     })
     return duplicates 

commands/analyze.py

@@ -13,6 +13,34 @@ from analyzer.dead_locations import find_dead_locations
 app = typer.Typer()
 console = Console()
 
+# Карта советов и критичности для issue_type
+ISSUE_META = {
+    'location_conflict': ("Возможное пересечение location. Это не всегда ошибка: порядок и типы location могут быть корректны. Проверьте, что порядок и типы location соответствуют вашим ожиданиям. Если всё ок — игнорируйте предупреждение.", "medium"),
+    'duplicate_directive': ("Оставьте только одну директиву с нужным значением в этом блоке.", "medium"),
+    'empty_block': ("Удалите или заполните пустой блок.", "low"),
+    'proxy_pass_no_scheme': ("Добавьте http:// или https:// в proxy_pass.", "medium"),
+    'autoindex_on': ("Отключите autoindex, если не требуется публикация файлов.", "medium"),
+    'if_block': ("Избегайте if внутри location, используйте map/try_files.", "medium"),
+    'server_tokens_on': ("Отключите server_tokens для безопасности.", "low"),
+    'ssl_missing': ("Укажите путь к SSL-сертификату/ключу.", "high"),
+    'ssl_protocols_weak': ("Отключите устаревшие протоколы TLS.", "high"),
+    'ssl_ciphers_weak': ("Используйте современные шифры.", "high"),
+    'listen_443_no_ssl': ("Добавьте ssl к listen 443.", "high"),
+    'listen_443_no_http2': ("Добавьте http2 к listen 443 для производительности.", "low"),
+    'no_limit_req_conn': ("Добавьте limit_req/limit_conn для защиты от DDoS.", "medium"),
+    'missing_security_header': ("Добавьте security-заголовок.", "medium"),
+    'deprecated': ("Замените устаревшую директиву.", "medium"),
+    'limit_too_small': ("Увеличьте лимит до рекомендуемого значения.", "medium"),
+    'limit_too_large': ("Уменьшите лимит до разумного значения.", "medium"),
+    'unused_variable': ("Удалите неиспользуемую переменную.", "low"),
+    'listen_servername_conflict': ("Измените listen/server_name для устранения конфликта.", "high"),
+    'rewrite_cycle': ("Проверьте rewrite на циклические правила.", "high"),
+    'rewrite_conflict': ("Проверьте порядок и уникальность rewrite.", "medium"),
+    'rewrite_no_flag': ("Добавьте last/break/redirect/permanent к rewrite.", "low"),
+    'dead_location': ("Удалите неиспользуемый location или используйте его.", "low"),
+}
+SEVERITY_COLOR = {"high": "red", "medium": "orange3", "low": "yellow"}
+
 def analyze(config_path: str = typer.Argument(..., help="Путь к nginx.conf")):
     """
     Анализирует конфигурацию Nginx на типовые проблемы и best practices.
@@ -30,7 +58,14 @@ def analyze(config_path: str = typer.Argument(..., help="Путь к nginx.conf"
     Пример:
         nginx-lens analyze /etc/nginx/nginx.conf
     """
-    tree = parse_nginx_config(config_path)
+    try:
+        tree = parse_nginx_config(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
+        return
     conflicts = find_location_conflicts(tree)
     dups = find_duplicate_directives(tree)
     empties = find_empty_blocks(tree)
@@ -43,30 +78,58 @@ def analyze(config_path: str = typer.Argument(..., help="Путь к nginx.conf"
     table = Table(show_header=True, header_style="bold blue")
     table.add_column("issue_type")
     table.add_column("issue_description")
+    table.add_column("solution")
+
+    def add_row(issue_type, desc):
+        solution, severity = ISSUE_META.get(issue_type, ("", "low"))
+        color = SEVERITY_COLOR.get(severity, "yellow")
+        table.add_row(f"[{color}]{issue_type}[/{color}]", desc, f"[{color}]{solution}[/{color}]")
 
     for c in conflicts:
-        table.add_row("location_conflict", f"server: {c['server'].get('arg', '')} location: {c['location1']} ↔ {c['location2']}")
+        add_row("location_conflict", f"server: {c['server'].get('arg', '')} location: {c['location1']} ↔ {c['location2']}")
     for d in dups:
-        table.add_row("duplicate_directive", f"{d['directive']} ({d['args']}) — {d['count']} раз в блоке {d['block'].get('block', d['block'])}")
+        loc = d.get('location')
+        add_row("duplicate_directive", f"{d['directive']} ({d['args']}) — {d['count']} раз в блоке {d['block'].get('block', d['block'])}{' location: '+str(loc) if loc else ''}")
     for e in empties:
-        table.add_row("empty_block", f"{e['block']} {e['arg'] or ''}")
+        add_row("empty_block", f"{e['block']} {e['arg'] or ''}")
     for w in warnings:
-        if w['type'] == 'proxy_pass_no_scheme':
-            table.add_row("proxy_pass_no_scheme", f"proxy_pass без схемы: {w['value']}")
-        elif w['type'] == 'autoindex_on':
-            table.add_row("autoindex_on", f"autoindex on в блоке {w['context'].get('block','')}")
-        elif w['type'] == 'if_block':
-            table.add_row("if_block", f"директива if внутри блока {w['context'].get('block','')}")
-        elif w['type'] == 'server_tokens_on':
-            table.add_row("server_tokens_on", f"server_tokens on в блоке {w['context'].get('block','')}")
+        t = w['type']
+        if t == 'proxy_pass_no_scheme':
+            add_row(t, f"proxy_pass без схемы: {w['value']}")
+        elif t == 'autoindex_on':
+            add_row(t, f"autoindex on в блоке {w['context'].get('block','')}")
+        elif t == 'if_block':
+            add_row(t, f"директива if внутри блока {w['context'].get('block','')}")
+        elif t == 'server_tokens_on':
+            add_row(t, f"server_tokens on в блоке {w['context'].get('block','')}")
+        elif t == 'ssl_missing':
+            add_row(t, f"{w['directive']} не указан")
+        elif t == 'ssl_protocols_weak':
+            add_row(t, f"ssl_protocols содержит устаревшие протоколы: {w['value']}")
+        elif t == 'ssl_ciphers_weak':
+            add_row(t, f"ssl_ciphers содержит слабые шифры: {w['value']}")
+        elif t == 'listen_443_no_ssl':
+            add_row(t, f"listen без ssl: {w['value']}")
+        elif t == 'listen_443_no_http2':
+            add_row(t, f"listen 443 без http2: {w['value']}")
+        elif t == 'no_limit_req_conn':
+            add_row(t, f"server без limit_req/limit_conn")
+        elif t == 'missing_security_header':
+            add_row(t, f"отсутствует security header: {w['value']}")
+        elif t == 'deprecated':
+            add_row(t, f"устаревшая директива: {w['directive']} — {w['value']}")
+        elif t == 'limit_too_small':
+            add_row(t, f"слишком маленькое значение: {w['directive']} = {w['value']}")
+        elif t == 'limit_too_large':
+            add_row(t, f"слишком большое значение: {w['directive']} = {w['value']}")
     for v in unused_vars:
-        table.add_row("unused_variable", v['name'])
+        add_row("unused_variable", v['name'])
     for c in listen_conflicts:
-        table.add_row("listen_servername_conflict", f"server1: {c['server1'].get('arg','')} server2: {c['server2'].get('arg','')} listen: {','.join(c['listen'])} server_name: {','.join(c['server_name'])}")
+        add_row("listen_servername_conflict", f"server1: {c['server1'].get('arg','')} server2: {c['server2'].get('arg','')} listen: {','.join(c['listen'])} server_name: {','.join(c['server_name'])}")
     for r in rewrite_issues:
-        table.add_row(r['type'], r['value'])
+        add_row(r['type'], r['value'])
     for l in dead_locations:
-        table.add_row("dead_location", f"server: {l['server'].get('arg','')} location: {l['location'].get('arg','')}")
+        add_row("dead_location", f"server: {l['server'].get('arg','')} location: {l['location'].get('arg','')}")
 
     if table.row_count == 0:
         console.print("[green]Проблем не найдено[/green]")

commands/cli.py

@@ -7,8 +7,8 @@ from commands.diff import diff
 from commands.route import route
 from commands.include import include_tree
 from commands.graph import graph
-from commands.logs import app as logs_app
-from commands.syntax import app as syntax_app
+from commands.logs import logs
+from commands.syntax import syntax
 
 app = typer.Typer(help="nginx-lens — анализ и диагностика конфигураций Nginx")
 console = Console()
@@ -20,8 +20,8 @@ app.command()(diff)
 app.command()(route)
 app.command()(include_tree)
 app.command()(graph)
-app.add_typer(logs_app, name="logs")
-app.add_typer(syntax_app, name="syntax")
+app.command()(logs)
+app.command()(syntax)
 
 if __name__ == "__main__":
     app() 

commands/diff.py

@@ -3,6 +3,7 @@ from rich.console import Console
 from rich.table import Table
 from analyzer.diff import diff_trees
 from parser.nginx_parser import parse_nginx_config
+import difflib
 
 app = typer.Typer()
 console = Console()
@@ -12,28 +13,39 @@ def diff(
     config2: str = typer.Argument(..., help="Второй nginx.conf")
 ):
     """
-    Сравнивает две конфигурации Nginx и выводит отличия side-by-side.
+    Сравнивает две конфигурации Nginx и выводит отличия построчно side-by-side с подсветкой.
 
     Пример:
         nginx-lens diff /etc/nginx/nginx.conf /etc/nginx/nginx.conf.bak
     """
-    tree1 = parse_nginx_config(config1)
-    tree2 = parse_nginx_config(config2)
-    diffs = diff_trees(tree1, tree2)
-    if not diffs:
-        console.print("[green]Конфигурации идентичны[/green]")
+    try:
+        with open(config1) as f1, open(config2) as f2:
+            lines1 = f1.readlines()
+            lines2 = f2.readlines()
+    except FileNotFoundError as e:
+        console.print(f"[red]Файл {e.filename} не найден. Проверьте путь к конфигу.[/red]")
         return
+    except Exception as e:
+        console.print(f"[red]Ошибка при чтении файлов: {e}[/red]")
+        return
+    maxlen = max(len(lines1), len(lines2))
+    # Выравниваем длины
+    lines1 += [''] * (maxlen - len(lines1))
+    lines2 += [''] * (maxlen - len(lines2))
     table = Table(show_header=True, header_style="bold blue")
-    table.add_column("Config 1", style="red")
-    table.add_column("Config 2", style="green")
-    for d in diffs:
-        path = "/".join(d['path'])
-        if d['type'] == 'added':
-            table.add_row("", f"+ {path}")
-        elif d['type'] == 'removed':
-            table.add_row(f"- {path}", "")
-        elif d['type'] == 'changed':
-            v1 = str(d['value1'])
-            v2 = str(d['value2'])
-            table.add_row(f"! {path}\n{v1}", f"! {path}\n{v2}")
+    table.add_column("№", style="dim", width=4)
+    table.add_column("Config 1", style="white")
+    table.add_column("№", style="dim", width=4)
+    table.add_column("Config 2", style="white")
+    for i in range(maxlen):
+        l1 = lines1[i].rstrip('\n')
+        l2 = lines2[i].rstrip('\n')
+        n1 = str(i+1) if l1 else ''
+        n2 = str(i+1) if l2 else ''
+        if l1 == l2:
+            table.add_row(n1, l1, n2, l2)
+        else:
+            style1 = "red" if l1 else "on red"
+            style2 = "green" if l2 else "on green"
+            table.add_row(f"[bold]{n1}[/bold]" if l1 else n1, f"[{style1}]{l1}[/{style1}]" if l1 or l2 else '', f"[bold]{n2}[/bold]" if l2 else n2, f"[{style2}]{l2}[/{style2}]" if l1 or l2 else '')
     console.print(table) 

commands/graph.py

@@ -2,25 +2,118 @@ import typer
 from rich.console import Console
 from parser.nginx_parser import parse_nginx_config
 from exporter.graph import tree_to_dot, tree_to_mermaid
+from rich.text import Text
 
 app = typer.Typer()
 console = Console()
 
 def graph(
-    config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
-    format: str = typer.Option("dot", help="Формат: dot или mermaid")
+    config_path: str = typer.Argument(..., help="Путь к nginx.conf")
 ):
     """
-    Генерирует схему маршрутизации nginx (dot/mermaid).
+    Показывает все возможные маршруты nginx в виде цепочек server → location → proxy_pass → upstream → server.
 
     Пример:
-        nginx-lens graph /etc/nginx/nginx.conf --format dot
-        nginx-lens graph /etc/nginx/nginx.conf --format mermaid
+        nginx-lens graph /etc/nginx/nginx.conf
     """
     tree = parse_nginx_config(config_path)
-    if format == "dot":
-        console.print(tree_to_dot(tree.directives))
-    elif format == "mermaid":
-        console.print(tree_to_mermaid(tree.directives))
-    else:
-        console.print("[red]Неизвестный формат: выберите dot или mermaid[/red]") 
+    routes = []
+    # Для каждого server/location строим маршрут
+    def walk(d, chain, upstreams):
+        if d.get('block') == 'server':
+            srv = d.get('arg','') or '[no arg]'
+            for sub in d.get('directives', []):
+                walk(sub, chain + [('server', srv)], upstreams)
+        elif d.get('block') == 'location':
+            loc = d.get('arg','')
+            for sub in d.get('directives', []):
+                walk(sub, chain + [('location', loc)], upstreams)
+        elif d.get('directive') == 'proxy_pass':
+            val = d.get('args','')
+            # ищем, есть ли такой upstream
+            up_name = None
+            if val.startswith('http://') or val.startswith('https://'):
+                up = val.split('://',1)[1].split('/',1)[0]
+                if up in upstreams:
+                    up_name = up
+            if up_name:
+                for srv in upstreams[up_name]:
+                    routes.append(chain + [('proxy_pass', val), ('upstream', up_name), ('upstream_server', srv)])
+            else:
+                routes.append(chain + [('proxy_pass', val)])
+        elif d.get('upstream'):
+            # собираем upstream-ы
+            upstreams[d['upstream']] = d.get('servers',[])
+        # рекурсивно по всем директивам
+        for sub in d.get('directives', []):
+            walk(sub, chain, upstreams)
+    # Собираем upstream-ы
+    upstreams = {}
+    for d in tree.directives:
+        if d.get('upstream'):
+            upstreams[d['upstream']] = d.get('servers',[])
+    # Строим маршруты
+    for d in tree.directives:
+        walk(d, [], upstreams)
+    if not routes:
+        console.print("[yellow]Не найдено ни одного маршрута[/yellow]")
+        return
+    # Красивый вывод
+    seen = set()
+    for route in routes:
+        if not route or route[0][0] != 'server':
+            continue
+        key = tuple(route)
+        if key in seen:
+            continue
+        seen.add(key)
+        t = Text()
+        # Получаем label для server
+        server_val = route[0][1]
+        server_block = None
+        # Найти сам блок server по arg
+        for d in tree.directives:
+            if d.get('block') == 'server' and (d.get('arg','') == server_val or (not d.get('arg') and (server_val == '[no arg]' or not server_val))):
+                server_block = d
+                break
+        label = get_server_label(server_block) if server_block else (server_val or 'default')
+        t.append(f"[", style="white")
+        t.append(f"server: {label}", style="bold blue")
+        t.append("]", style="white")
+        for i, (typ, val) in enumerate(route[1:]):
+            if typ == 'location':
+                t.append(f" -> [", style="white")
+                t.append(f"location: {val}", style="yellow")
+                t.append("]", style="white")
+            elif typ == 'proxy_pass':
+                t.append(f" -> proxy_pass: {val}", style="green")
+            elif typ == 'upstream':
+                t.append(f" -> [", style="white")
+                t.append(f"upstream: {val}", style="magenta")
+                t.append("]", style="white")
+            elif typ == 'upstream_server':
+                t.append(f" -> [", style="white")
+                t.append(f"server: {val}", style="grey50")
+                t.append("]", style="white")
+        console.print(t)
+
+def get_server_label(server_block):
+    arg = server_block.get('arg')
+    if arg and arg != '[no arg]':
+        return arg
+    # Ищем server_name
+    names = []
+    listens = []
+    for sub in server_block.get('directives', []):
+        if sub.get('directive') == 'server_name':
+            names += sub.get('args', '').split()
+        if sub.get('directive') == 'listen':
+            listens.append(sub.get('args', ''))
+    if names:
+        return ' '.join(names)
+    if listens:
+        return ','.join(listens)
+    return 'default'
+
+if __name__ == "__main__":
+    app() 

commands/include.py

@@ -18,7 +18,14 @@ def include_tree(
         nginx-lens include-tree /etc/nginx/nginx.conf
         nginx-lens include-tree /etc/nginx/nginx.conf --directive server_name
     """
-    tree = build_include_tree(config_path)
+    try:
+        tree = build_include_tree(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
+        return
     rich_tree = Tree(f"[bold blue]{config_path}[/bold blue]")
     def _add(node, t):
         for k, v in t.items():

commands/logs.py

@@ -9,7 +9,6 @@ console = Console()
 
 log_line_re = re.compile(r'(?P<ip>\S+) \S+ \S+ \[(?P<time>[^\]]+)\] "(?P<method>\S+) (?P<path>\S+) [^\"]+" (?P<status>\d{3})')
 
-@app.command()
 def logs(
     log_path: str = typer.Argument(..., help="Путь к access.log или error.log"),
     top: int = typer.Option(10, help="Сколько топ-значений выводить")

commands/route.py

@@ -3,12 +3,14 @@ from rich.console import Console
 from rich.panel import Panel
 from analyzer.route import find_route
 from parser.nginx_parser import parse_nginx_config
+import glob
+import os
 
 app = typer.Typer()
 console = Console()
 
 def route(
-    config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
+    config_path: str = typer.Argument(None, help="Путь к nginx.conf (если не указан — поиск по всем .conf в /etc/nginx)", show_default=False),
     url: str = typer.Argument(..., help="URL для маршрутизации (например, http://host/path)")
 ):
     """
@@ -16,18 +18,36 @@ def route(
 
     Пример:
         nginx-lens route /etc/nginx/nginx.conf http://example.com/api/v1
+        nginx-lens route http://example.com/api/v1
     """
-    tree = parse_nginx_config(config_path)
-    res = find_route(tree, url)
-    if not res:
-        console.print(Panel(f"Не найден подходящий server для {url}", style="red"))
-        return
-    server = res['server']
-    location = res['location']
-    proxy_pass = res['proxy_pass']
-    text = f"[bold]Server:[/bold] {server.get('arg','') or '[no arg]'}\n"
-    if location:
-        text += f"[bold]Location:[/bold] {location.get('arg','')}\n"
-    if proxy_pass:
-        text += f"[bold]proxy_pass:[/bold] {proxy_pass}\n"
-    console.print(Panel(text, title="Route", style="green")) 
+    configs = []
+    if config_path:
+        configs = [config_path]
+    else:
+        configs = glob.glob("/etc/nginx/**/*.conf", recursive=True)
+        if not configs:
+            console.print(Panel("Не найдено ни одного .conf файла в /etc/nginx", style="red"))
+            return
+    for conf in configs:
+        try:
+            tree = parse_nginx_config(conf)
+        except FileNotFoundError:
+            console.print(f"[red]Файл {conf} не найден. Проверьте путь к конфигу.[/red]")
+            continue
+        except Exception as e:
+            console.print(f"[red]Ошибка при разборе {conf}: {e}[/red]")
+            continue
+        res = find_route(tree, url)
+        if res:
+            server = res['server']
+            location = res['location']
+            proxy_pass = res['proxy_pass']
+            text = f"[bold]Config:[/bold] {conf}\n"
+            text += f"[bold]Server:[/bold] {server.get('arg','') or '[no arg]'}\n"
+            if location:
+                text += f"[bold]Location:[/bold] {location.get('arg','')}\n"
+            if proxy_pass:
+                text += f"[bold]proxy_pass:[/bold] {proxy_pass}\n"
+            console.print(Panel(text, title="Route", style="green"))
+            return
+    console.print(Panel(f"Ни один ваш конфиг в /etc/nginx не обрабатывает этот URL", style="red")) 

commands/syntax.py

@@ -8,11 +8,10 @@ import re
 app = typer.Typer(help="Проверка синтаксиса nginx-конфига через nginx -t с подсветкой ошибок.")
 console = Console()
 
-ERROR_RE = re.compile(r'in (.+?):(\d+)')
+ERRORS_RE = re.compile(r'in (.+?):(\d+)(?:\s*\n)?(.+?)(?=\nin |$)', re.DOTALL)
 
-@app.command()
 def syntax(
-    config_path: str = typer.Argument(..., help="Путь к nginx.conf"),
+    config_path: str = typer.Option(None, "-c", "--config", help="Путь к кастомному nginx.conf"),
     nginx_path: str = typer.Option("nginx", help="Путь к бинарю nginx (по умолчанию 'nginx')")
 ):
     """
@@ -21,26 +20,46 @@ def syntax(
     В случае ошибки показывает место в виде таблицы с контекстом.
 
     Пример:
-        nginx-lens syntax /etc/nginx/nginx.conf
-        nginx-lens syntax /etc/nginx/nginx.conf --nginx-path /usr/local/sbin/nginx
+        nginx-lens syntax -c ./mynginx.conf
+        nginx-lens syntax
     """
+    if not config_path:
+        candidates = [
+            "/etc/nginx/nginx.conf",
+            "/usr/local/etc/nginx/nginx.conf",
+            "./nginx.conf"
+        ]
+        config_path = next((p for p in candidates if os.path.isfile(p)), None)
+        if not config_path:
+            console.print("[red]Не удалось найти nginx.conf. Укажите путь через -c.[/red]")
+            return
+    if not os.path.isfile(config_path):
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
     cmd = [nginx_path, "-t", "-c", os.path.abspath(config_path)]
     try:
         result = subprocess.run(cmd, capture_output=True, text=True, check=False)
         if result.returncode == 0:
             console.print("[green]Синтаксис nginx-конфига корректен[/green]")
+            return
         else:
             console.print("[red]Ошибка синтаксиса![/red]")
-        console.print(result.stdout)
-        console.print(result.stderr)
-        # Парсим ошибку
+            console.print(result.stdout)
+            console.print(result.stderr)
+        # Парсим все ошибки
         err = result.stderr or result.stdout
-        m = ERROR_RE.search(err)
-        if m:
-            file, line = m.group(1), int(m.group(2))
-            msg = err.strip().split('\n')[-1]
+        errors = list(ERRORS_RE.finditer(err))
+        if not errors:
+            console.print("[red]Не удалось определить файл и строку ошибки[/red]")
+            return
+        table = Table(title="Ошибки синтаксиса", show_header=True, header_style="bold red")
+        table.add_column("config_file")
+        table.add_column("issue_message")
+        table.add_column("context")
+        for m in errors:
+            file, line, msg = m.group(1), int(m.group(2)), m.group(3).strip().split('\n')[0]
             # Читаем контекст
-            context = []
+            context_lines = []
             try:
                 with open(file) as f:
                     lines = f.readlines()
@@ -48,16 +67,10 @@ def syntax(
                 end = min(len(lines), line+2)
                 for i in range(start, end):
                     mark = "->" if i+1 == line else "  "
-                    context.append((str(i+1), mark, lines[i].rstrip()))
+                    context_lines.append(f"{mark} {lines[i].rstrip()}")
             except Exception:
-                context = []
-            table = Table(title="Ошибка синтаксиса", show_header=True, header_style="bold red")
-            table.add_column("File")
-            table.add_column("Line")
-            table.add_column("Message")
-            table.add_column("Context")
-            for ln, mark, code in context:
-                table.add_row(file, ln, msg if mark == "->" else "", f"{mark} {code}")
-            console.print(table)
+                context_lines = []
+            table.add_row(file, msg, '\n'.join(context_lines))
+        console.print(table)
     except FileNotFoundError:
         console.print(f"[red]Не найден бинарь nginx: {nginx_path}[/red]") 

commands/tree.py

@@ -34,7 +34,14 @@ def tree(
         nginx-lens tree /etc/nginx/nginx.conf --markdown
         nginx-lens tree /etc/nginx/nginx.conf --html
     """
-    tree_obj = parse_nginx_config(config_path)
+    try:
+        tree_obj = parse_nginx_config(config_path)
+    except FileNotFoundError:
+        console.print(f"[red]Файл {config_path} не найден. Проверьте путь к конфигу.[/red]")
+        return
+    except Exception as e:
+        console.print(f"[red]Ошибка при разборе {config_path}: {e}[/red]")
+        return
     root = RichTree(f"[bold blue]nginx.conf[/bold blue]")
     _build_tree(tree_obj.directives, root)
     if markdown:

{nginx_lens-0.1.4.dist-info → nginx_lens-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.1.4
+Version: 0.1.6
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com

{nginx_lens-0.1.4.dist-info → nginx_lens-0.1.6.dist-info}/RECORD

@@ -3,7 +3,7 @@ analyzer/base.py,sha256=oGKg78BfMVmuzYafc08oq9p31-jEgYolGjLkUcIdkN8,607
 analyzer/conflicts.py,sha256=NSNZc8e2x51K41dflSUvuwlDq-rzBXU5ITi6WfxFbfU,2796
 analyzer/dead_locations.py,sha256=uvMu5qBGTVi0Nn960x3WpRvTljGbQuVFivU4nfe36oY,1435
 analyzer/diff.py,sha256=idvXnoLzBVUYgKi_s3uDu0v2GNMV3B8aDqTROXcdQdo,1749
-analyzer/duplicates.py,sha256=VUjbM19Y_Wwty8GEOu_7nNzOH6mr071p_z1MAkp1kBA,1012
+analyzer/duplicates.py,sha256=jpy_6k-BzWxaXFt2Wb3rlulIXUEzbFe9xYRm7rWR50U,1215
 analyzer/empty_blocks.py,sha256=7Zu4-5I5PS3bjhH0Ppq1CvM7rMTeRIc4fHx5n5vkMIw,517
 analyzer/include.py,sha256=FhKR4VsogLknykjLD2N8jX9OtwxZcWik5oPpvp-_luE,2465
 analyzer/rewrite.py,sha256=-jSLLG1jqmGU-dXWvU6NHCW6muB8Lfro6fXX1tDCHCQ,1834
@@ -11,16 +11,16 @@ analyzer/route.py,sha256=2xxQooQEsfn10tzGCZUoP32T0OnTMnPB6qRgBR6not8,2345
 analyzer/unused.py,sha256=Ixzv0bPsw9IafblVwLiAOgugdg2dGu1MJDtuoqzPZiY,1066
 analyzer/warnings.py,sha256=zC36QMvegA2eQPvZ-P1eysrX_kXHx5A1MUKHKKNvG5c,5784
 commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-commands/analyze.py,sha256=ZpChHk6QXut3S1PvslcX_4IeqdaaXtUXX-ogkB-a6GQ,3618
-commands/cli.py,sha256=0uzz71nMXTGlY1odZkEGwtVOjf7uq7762qRLXQaQURo,780
-commands/diff.py,sha256=VeZsUu1BYrDubDFrmM5xC4DUWZvWUjFRHfddXm3-I3c,1373
-commands/graph.py,sha256=xEDMAOZ9Z5gaOGqLhSIGeRlDvRfSborWwUVjk-XLCsk,930
+commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
+commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
+commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
+commands/graph.py,sha256=fvYDUvj_BXdIAm8eg52v5VxhkZijb2YDkCw7D21ZK-M,4650
 commands/health.py,sha256=d2bBui0qauQtO4Ll9cjniKR1Y5dYJBQzG9CECDnsUQ4,1365
-commands/include.py,sha256=zPqJpbbSU_6S3L4ntFncPmyFWba8smvdCRog_SFuAFI,1907
-commands/logs.py,sha256=NkBJAfKGXvZQDEjHwqdfYikKFMyCrEtjfDeD_MJ9ycg,3435
-commands/route.py,sha256=Rnm-zjIbos0NJjUZ0gRs27dCmUfF1tKWKVzdcFcl9hA,1224
-commands/syntax.py,sha256=TM9uOZ7MsxF78iJlajybWzouJgH2YeAbUXo8i3GxPVo,2624
-commands/tree.py,sha256=NEhNU66_e0JCsD4xh4315TM-xwo8NkPwc00lZ4saPzE,1844
+commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
+commands/logs.py,sha256=8tnGsgNy_B97S3O0D_6bvOVfNvAyqeUNotlDOdjltgw,3420
+commands/route.py,sha256=H_xMk9KoqwesutzT9ewiTsakfdjmu01kka9ZQc14faY,2222
+commands/syntax.py,sha256=gABzFvml92bHqYa6YdRx78bmrtd9v2ORT_Hz-gfQu1U,3336
+commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
 exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
@@ -29,8 +29,8 @@ parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 parser/nginx_parser.py,sha256=JqZ3clNy4Nf-bmbsx_rJUL7EgRoB79b87eEu_isMeqg,3577
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upstream_checker/checker.py,sha256=9-6CMUTN7gXUACP8EwX722QogfujZyV-WWWUeM3a79k,455
-nginx_lens-0.1.4.dist-info/METADATA,sha256=MkC1F3wihoxkMKrTJqH0DMrgrZmtTg4L8VqbY85J0jg,476
-nginx_lens-0.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.1.4.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.1.4.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.1.4.dist-info/RECORD,,
+nginx_lens-0.1.6.dist-info/METADATA,sha256=FhO8QQOa9YfJzMUtNq313YcaNQAhHr2UEMNHXDIJkBU,476
+nginx_lens-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.1.6.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.1.6.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.1.6.dist-info/RECORD,,