webtools-cli 1.2.9__tar.gz → 1.3.0__tar.gz

{webtools_cli-1.2.9 → webtools_cli-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.9
+Version: 1.3.0
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT

{webtools_cli-1.2.9 → webtools_cli-1.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "webtools-cli"
-version = "1.2.9"
+version = "1.3.0"
 description = "Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI"
 readme = "README.md"
 license = "MIT"

{webtools_cli-1.2.9 → webtools_cli-1.3.0}/webtools/core.py

@@ -1054,6 +1054,7 @@ def cloud_download(filepath):
 
 @app.route('/api/adb/status', methods=['GET'])
 def adb_status():
+    global _active_device
     ok, devices_out = _adb_run([ADB_CMD, 'devices'])
     connected, offline = [], []
     if ok:
@@ -1066,10 +1067,11 @@ def adb_status():
                     offline.append({'id': parts[0], 'status': parts[1]})
     
     if connected:
+        _active_device = connected[0]
         return jsonify({
             'status': 'connected',
             'device_id': connected[0],
-            'device_model': _adb_get_device_info(),
+            'device_model': _adb_get_device_info(connected[0]),
             'other_devices': len(connected) - 1
         })
     elif offline:
@@ -3675,6 +3677,7 @@ def _get_adb_cmd():
     return 'adb'
 
 ADB_CMD = _get_adb_cmd()
+_active_device = None  # Track the active device ID for multi-device support
 
 KNOWN_BLOATWARE = {
     # Facebook
@@ -3753,8 +3756,13 @@ CRITICAL_PACKAGES = {
     'com.android.vending', 'com.android.providers.settings',
 }
 
-def _adb_run(cmd, timeout=15):
-    """Run an adb command and return (success, stdout)"""
+def _adb_run(cmd, timeout=15, device=None):
+    """Run an adb command and return (success, stdout). If device is specified, adds -s <device> flag."""
+    # Auto-inject -s <device_id> for device-specific commands
+    if device and len(cmd) > 1 and cmd[0] == ADB_CMD and cmd[1] != 'devices':
+        cmd = [cmd[0], '-s', device] + cmd[1:]
+    elif _active_device and len(cmd) > 1 and cmd[0] == ADB_CMD and cmd[1] not in ('devices', 'version', 'pair', 'connect'):
+        cmd = [cmd[0], '-s', _active_device] + cmd[1:]
     try:
         result = subprocess.run(
             cmd, capture_output=True, text=True, timeout=timeout
@@ -3770,9 +3778,9 @@ def _adb_run(cmd, timeout=15):
     except Exception as e:
         return False, str(e)
 
-def _adb_get_device_info():
+def _adb_get_device_info(device=None):
     """Get connected device model name"""
-    ok, out = _adb_run([ADB_CMD, 'shell', 'getprop', 'ro.product.model'])
+    ok, out = _adb_run([ADB_CMD, 'shell', 'getprop', 'ro.product.model'], device=device)
     if ok and out:
         return out
     return "Unknown Device"
@@ -3862,6 +3870,7 @@ def _adb_display_packages(packages, search_filter=None):
 
 def run_adb_mode():
     """ADB Bloatware Remover - Interactive Mode"""
+    global _active_device
     # Step 1: Check if ADB is available
     ok, version_out = _adb_run([ADB_CMD, 'version'])
     if not ok:
@@ -3902,7 +3911,8 @@ def run_adb_mode():
                             offline_devices.append((parts[0], parts[1]))
             
             if connected_devices:
-                device_name = _adb_get_device_info()
+                _active_device = connected_devices[0]
+                device_name = _adb_get_device_info(connected_devices[0])
                 print(f"\n  {Fore.GREEN}✅ Connected: {device_name} ({connected_devices[0]}){Style.RESET_ALL}")
                 if len(connected_devices) > 1:
                     print(f"  {Fore.YELLOW}   + {len(connected_devices)-1} more device(s){Style.RESET_ALL}")

{webtools_cli-1.2.9 → webtools_cli-1.3.0}/webtools_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webtools-cli
-Version: 1.2.9
+Version: 1.3.0
 Summary: Advanced Web Intelligence & Scraping Toolkit with CLI and Web UI
 Author: Abhinav Adarsh
 License-Expression: MIT