portune 0.1.20__tar.gz → 1.0.1__tar.gz

{portune-0.1.20/portune.egg-info → portune-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.20
+Version: 1.0.1
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau

{portune-0.1.20 → portune-1.0.1}/portune/portune.py

@@ -32,6 +32,9 @@ from email.mime.application import MIMEApplication
 from typing import List, Dict, Tuple, Any, Optional, Union
 
 # Constants and global variables
+
+# Use system ping command based on the OS
+# as raw socket ICMP ping requires privileges
 OS = platform.system().lower()
 if OS == "windows":
     PING = "ping -n 1 -w {timeoutms} {ip}"
@@ -40,9 +43,9 @@ elif OS == "darwin":  # macOS
 elif OS == "sunos":  # SunOS
     PING = "ping {ip} {timeout}"
 elif OS == "aix":  # IBM AIX
-    PING = "ping -c 1 -w  {timeout} {ip}"
-elif OS.startswith("hp-ux"):  # HP-UX
-    PING = "ping -n 1 -w {timeout} {ip}"
+    PING = "ping -c 1 -w {timeout} {ip}"
+elif OS.startswith("hp-ux"):  # HP-UX 11.11+
+    PING = "ping -n 1 -m {timeout} {ip}"
 else:
     PING = "ping -c 1 -W {timeout} {ip}"
 
@@ -818,21 +821,13 @@ def ping_hosts(hosts: List[Tuple[str, List[int], str]],
     
     # Use a lock for thread-safe progress updates
     lock = threading.Lock()
-    
-    def _update_progress(_):
-        with lock:
-            progress_bar.update(1)
-    
+        
     with ThreadPoolExecutor(max_workers=parallelism) as executor:
         future_to_host = {
             executor.submit(resolve_and_ping_host, hostname, timeout, noping): hostname
             for hostname, _, _ in hosts
         }
         
-        # Add callback to update progress bar when each future completes
-        for future in future_to_host:
-            future.add_done_callback(_update_progress)
-        
         for future in as_completed(future_to_host):
             orig_hostname = future_to_host[future]
             resolved_hostname, info = future.result()
@@ -841,6 +836,9 @@ def ping_hosts(hosts: List[Tuple[str, List[int], str]],
             if resolved_hostname != orig_hostname:
                 # Keep resolved hostname in the info dict
                 results[orig_hostname]['hostname'] = resolved_hostname
+            with lock:
+                # Update progress bar in a thread-safe manner
+                progress_bar.update(1)
     
     print(file=sys.stderr)  # New line after progress bar
     return results

{portune-0.1.20 → portune-1.0.1}/portune/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.20'
-__version_tuple__ = version_tuple = (0, 1, 20)
+__version__ = version = '1.0.1'
+__version_tuple__ = version_tuple = (1, 0, 1)

{portune-0.1.20 → portune-1.0.1/portune.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.20
+Version: 1.0.1
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau