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

commands/analyze.py

@@ -58,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)

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

@@ -59,17 +59,61 @@ def graph(
         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()
-        for i, (typ, val) in enumerate(route):
-            if typ == 'server':
-                t.append(f"server: {val}", style="bold blue")
-            elif typ == 'location':
-                t.append(f" -> location: {val}", style="yellow")
+        # Получаем 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" -> upstream: {val}", style="magenta")
+                t.append(f" -> [", style="white")
+                t.append(f"upstream: {val}", style="magenta")
+                t.append("]", style="white")
             elif typ == 'upstream_server':
-                t.append(f" -> server: {val}", style="grey50")
-        console.print(t) 
+                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/route.py

@@ -31,8 +31,12 @@ def route(
     for conf in configs:
         try:
             tree = parse_nginx_config(conf)
+        except FileNotFoundError:
+            console.print(f"[red]Файл {conf} не найден. Проверьте путь к конфигу.[/red]")
+            continue
         except Exception as e:
-            continue  # пропускаем битые/невалидные
+            console.print(f"[red]Ошибка при разборе {conf}: {e}[/red]")
+            continue
         res = find_route(tree, url)
         if res:
             server = res['server']

commands/syntax.py

@@ -33,6 +33,9 @@ def syntax(
         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)
@@ -41,8 +44,8 @@ def syntax(
             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
         errors = list(ERRORS_RE.finditer(err))

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.5.dist-info → nginx_lens-0.1.6.dist-info}/METADATA

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

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

@@ -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=QmsyeIlGqvhuRqlUFpPrzg90X5yDVJ3BSIGPhkCHYgI,8026
+commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
-commands/diff.py,sha256=VeZsUu1BYrDubDFrmM5xC4DUWZvWUjFRHfddXm3-I3c,1373
-commands/graph.py,sha256=MkPasTYSnpG4i3ge_l36t0YUawE3e71v4RWZF9BlJ8A,3084
+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/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=8tnGsgNy_B97S3O0D_6bvOVfNvAyqeUNotlDOdjltgw,3420
-commands/route.py,sha256=MpSI88lqiqkjwA4q-P7gUXmkDicJXYonTwFVC6fNs44,2012
-commands/syntax.py,sha256=iy5JHtqLWs4OtNYuM1xDESlfJ9tOJ4RdNi1KDTfEO1k,3147
-commands/tree.py,sha256=NEhNU66_e0JCsD4xh4315TM-xwo8NkPwc00lZ4saPzE,1844
+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.5.dist-info/METADATA,sha256=D8emGIWms0maTGCxi5cKe_RMQ9a1veunrpre0tNJUzo,476
-nginx_lens-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.1.5.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.1.5.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.1.5.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,,