helper-cli 0.1.9__py3-none-any.whl → 0.1.11__py3-none-any.whl

helper/commands/docker.py

@@ -141,30 +141,33 @@ def get_verbosity(ctx: click.Context) -> Verbosity:
     verbosity.info(f"Verbosity level set to {verbose}")
     return verbosity
 
-@click.group(context_settings={"ignore_unknown_options": True, "allow_extra_args": True})
+@click.group()
+@click.option('-v', '--verbose', count=True, help='Increase verbosity (can be used multiple times)')
 @click.pass_context
-def docker(ctx):
+def docker(ctx, verbose):
     """Docker management commands."""
-    # Parse verbosity from args
-    verbose = 0
-    remaining_args = []
-    i = 0
-    while i < len(ctx.args):
-        arg = ctx.args[i]
-        if arg in ('-v', '--verbose'):
-            if arg == '--verbose':
-                verbose += 1
-            else:
-                # Count number of 'v's in -v, -vv, -vvv, etc.
-                verbose += arg.count('v')
-            # Remove the processed flag
-            ctx.args.pop(i)
-        else:
-            i += 1
+    ctx.ensure_object(dict)
+    
+    # Get verbosity from parent context if it exists, otherwise use the flag value
+    parent_verbosity = ctx.obj.get('verbosity', 0) if hasattr(ctx, 'obj') else 0
+    verbosity_level = max(verbose, parent_verbosity)
     
     # Initialize verbosity
-    verbosity = Verbosity(verbosity=verbose)
-    ctx.obj = {'verbosity': verbosity, 'args': ctx.args}
+    verbosity = Verbosity(verbosity=verbosity_level)
+    ctx.obj['verbosity'] = verbosity
+    
+    # Set up logging
+    logger = logging.getLogger('docker-helper')
+    if verbosity_level >= 3:
+        logger.setLevel(logging.DEBUG)
+    elif verbosity_level == 2:
+        logger.setLevel(logging.INFO)
+    elif verbosity_level == 1:
+        logger.setLevel(logging.WARNING)
+    else:
+        logger.setLevel(logging.ERROR)
+    
+    logger.debug(f"Docker command group initialized with verbosity level: {verbosity_level}")
 
     verbosity.debug("Initializing Docker command group")
     if not check_docker(verbosity):
@@ -407,28 +410,54 @@ def url(ctx, show_all, http_only):
                 verbosity.debug(f"Found {len(port_mappings)} port mappings for {name}")
 
                 for port in port_mappings:
-                    if port['host_port'] and port['container_port']:
-                        verbosity.debug(f"Checking port mapping: {port}")
-
-                        # Check if it's HTTP/HTTPS port (common ports)
-                        http_ports = ['80', '443', '8080', '8443', '3000', '5000', '8000', '8888']
-                        is_http_port = (
-                            port['container_port'] in http_ports or
-                            any(p in port['container_port'] for p in ['80/', '443/', '8080/', '8443/'])
-                        )
-
-                        if is_http_port:
-                            scheme = 'https' if port['container_port'].startswith('443') else 'http'
-                            url = f"{scheme}://{port['host_ip']}:{port['host_port']}"
-                            port_num = port['container_port'].split('/')[0]
-
-                            container_info['urls'].append({
-                                'url': url,
-                                'port': port_num
-                            })
-                            verbosity.info(f"Added URL for {name}: {url} (port {port_num})")
+                    if not port.get('host_port') or not port.get('container_port'):
+                        verbosity.debug(f"Skipping incomplete port mapping: {port}")
+                        continue
+                        
+                    verbosity.debug(f"Checking port mapping: {port}")
+                    verbosity.debug(f"Container name: {name}, Port: {port['container_port']}")
+                    
+                    # Handle different port string formats (e.g., '8069/tcp', '0.0.0.0:8080->80/tcp')
+                    port_str = port['container_port']
+                    
+                    # Extract port number and protocol
+                    port_num = None
+                    protocol = 'tcp'  # default protocol
+                    
+                    # Handle format like '8069/tcp' or '80/http'
+                    if '/' in port_str:
+                        port_num, protocol = port_str.split('/', 1)
+                    # Handle format like '0.0.0.0:8080->80/tcp'
+                    elif '->' in port_str:
+                        _, port_mapping = port_str.split('->', 1)
+                        if '/' in port_mapping:
+                            port_num, protocol = port_mapping.split('/', 1)
                         else:
-                            verbosity.debug(f"Skipping non-HTTP port: {port['container_port']}")
+                            port_num = port_mapping
+                    else:
+                        port_num = port_str
+                    
+                    # Clean up port number (remove any non-numeric characters)
+                    port_num = ''.join(c for c in port_num if c.isdigit())
+                    
+                    # Map all ports to HTTP URLs
+                    if port_num:  # Process all ports regardless of protocol
+                        scheme = 'http'
+                        
+                        # Handle IPv6 addresses (add brackets if needed)
+                        host = port['host_ip']
+                        if ':' in host and not host.startswith('['):
+                            host = f'[{host}]'
+                            
+                        url = f"{scheme}://{host}:{port['host_port']}"
+                        
+                        container_info['urls'].append({
+                            'url': url,
+                            'port': port_num,
+                            'protocol': protocol
+                        })
+                        verbosity.info(f"Added URL for {name}: {url} (port {port_num}/{protocol})")
+                        verbosity.info(f"Added URL for {name}: {url} (port {port_num})")
 
                 # If http_only is True and no HTTP URLs, skip this container
                 if http_only and not container_info['urls']:

helper/main.py

@@ -1,10 +1,89 @@
 import click
+import logging
+import sys
 from .commands import internal_ip, public_ip, arch, nixos, docker
 
-@click.group()
+class VerbosityCommand(click.Command):
+    def parse_args(self, ctx, args):
+        # Initialize verbosity from context if it exists
+        ctx.ensure_object(dict)
+        verbose = ctx.obj.get('verbosity', 0)
+        
+        # Process args for verbosity flags
+        new_args = []
+        i = 0
+        while i < len(args):
+            arg = args[i]
+            if arg == '--verbose':
+                verbose += 1
+            elif arg.startswith('-v'):
+                verbose += arg.count('v')
+            else:
+                new_args.append(arg)
+            i += 1
+        
+        # Update verbosity in context
+        ctx.obj['verbosity'] = verbose
+        
+        # Set up logging
+        self._setup_logging(verbose)
+        
+        # Continue with normal argument parsing
+        return super().parse_args(ctx, new_args)
+    
+    def _setup_logging(self, verbose):
+        logger = logging.getLogger('docker-helper')
+        if verbose >= 3:
+            logger.setLevel(logging.DEBUG)
+        elif verbose == 2:
+            logger.setLevel(logging.INFO)
+        elif verbose == 1:
+            logger.setLevel(logging.WARNING)
+        else:
+            logger.setLevel(logging.ERROR)
+
+class VerbosityGroup(click.Group):
+    def make_context(self, info_name, args, parent=None, **extra):
+        # Pre-process args to find verbosity flags
+        verbose = 0
+        processed_args = []
+        
+        for arg in args:
+            if arg == '--verbose':
+                verbose += 1
+            elif arg.startswith('-v'):
+                verbose += arg.count('v')
+            else:
+                processed_args.append(arg)
+        
+        # Create context with processed args
+        ctx = super().make_context(info_name, processed_args, parent=parent, **extra)
+        
+        # Set verbosity in context
+        ctx.ensure_object(dict)
+        ctx.obj['verbosity'] = verbose
+        
+        # Set up logging
+        logger = logging.getLogger('docker-helper')
+        if verbose >= 3:
+            logger.setLevel(logging.DEBUG)
+        elif verbose == 2:
+            logger.setLevel(logging.INFO)
+        elif verbose == 1:
+            logger.setLevel(logging.WARNING)
+        else:
+            logger.setLevel(logging.ERROR)
+        
+        return ctx
+
+@click.group(cls=VerbosityGroup)
 def cli():
     """Helper CLI - quick system info"""
-    pass
+    # Set up basic logging
+    logging.basicConfig(
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
+        level=logging.ERROR
+    )
 
 # Register all commands
 cli.add_command(internal_ip.internal_ip)

{helper_cli-0.1.9.dist-info → helper_cli-0.1.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: helper-cli
-Version: 0.1.9
+Version: 0.1.11
 Summary: Simple system info CLI
 Requires-Python: >=3.8
 Requires-Dist: click

helper_cli-0.1.11.dist-info/RECORD

@@ -0,0 +1,13 @@
+helper/main.py,sha256=39UV2OxIOAgak7ALwGRdK2oeCaaMXQqvXgnrWU77kB4,3247
+helper/utils.py,sha256=JynYacwFA9kgkDuWpGPCj3VxYl_yFJL-FRCKlW1g6Mo,337
+helper/commands/__init__.py,sha256=HFk0MU1U4VqGJUkb9SvCoslqpYSah8KePP9tP8Xzzs4,30
+helper/commands/arch.py,sha256=AREsblUki99P_wVpi44maQd7KA8IlUCJ6ilzJAQODDU,141
+helper/commands/docker.py,sha256=ZmEk3B2xor0p3AQJPkVQLz0biFa1MSsoF-dRxOHDvsI,25349
+helper/commands/internal_ip.py,sha256=ZN7c1HRgB5f-wRk9IwfGQeI3YuZqmPW-UflIpGEImt0,786
+helper/commands/nixos.py,sha256=--Uz2lA-xw6-spp1WBjzzfu4-imFtcziyZuUHZk3Pxs,3113
+helper/commands/public_ip.py,sha256=HS99RDYCaKDZ-AxMQhUwazgR-tT6IGlBb5Qn0f5ITPg,150
+helper_cli-0.1.11.dist-info/METADATA,sha256=6AR44RTeCCTlJvglidOgz754evOnjEhUeWb7yUqvocY,131
+helper_cli-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+helper_cli-0.1.11.dist-info/entry_points.txt,sha256=4EoFQ0yRogLTvStcbjlpkTqayWmiRqbMwkcDBcgQbK8,43
+helper_cli-0.1.11.dist-info/top_level.txt,sha256=VM8lkErPJijbKhnfEGA_hE_YDXde4iizgqWKloZIxW8,7
+helper_cli-0.1.11.dist-info/RECORD,,

helper_cli-0.1.9.dist-info/RECORD

@@ -1,13 +0,0 @@
-helper/main.py,sha256=kFQ7ZyeRWPwzWlxb603tHpGvjscWlcmt2rxwt_LN09g,779
-helper/utils.py,sha256=JynYacwFA9kgkDuWpGPCj3VxYl_yFJL-FRCKlW1g6Mo,337
-helper/commands/__init__.py,sha256=HFk0MU1U4VqGJUkb9SvCoslqpYSah8KePP9tP8Xzzs4,30
-helper/commands/arch.py,sha256=AREsblUki99P_wVpi44maQd7KA8IlUCJ6ilzJAQODDU,141
-helper/commands/docker.py,sha256=BtkBK7RUyu8yKhYdyaJxFJ-fm_NcQWwC8fKavnrrze0,23835
-helper/commands/internal_ip.py,sha256=ZN7c1HRgB5f-wRk9IwfGQeI3YuZqmPW-UflIpGEImt0,786
-helper/commands/nixos.py,sha256=--Uz2lA-xw6-spp1WBjzzfu4-imFtcziyZuUHZk3Pxs,3113
-helper/commands/public_ip.py,sha256=HS99RDYCaKDZ-AxMQhUwazgR-tT6IGlBb5Qn0f5ITPg,150
-helper_cli-0.1.9.dist-info/METADATA,sha256=1HfCL5LQ12cE9K4BKgEx5X-ys6A4N1P35QpFRpDikg0,130
-helper_cli-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-helper_cli-0.1.9.dist-info/entry_points.txt,sha256=4EoFQ0yRogLTvStcbjlpkTqayWmiRqbMwkcDBcgQbK8,43
-helper_cli-0.1.9.dist-info/top_level.txt,sha256=VM8lkErPJijbKhnfEGA_hE_YDXde4iizgqWKloZIxW8,7
-helper_cli-0.1.9.dist-info/RECORD,,