From 3787b45b49b405fd9e4d6e044eaa6de9474e5baa Mon Sep 17 00:00:00 2001
From: 21pages <sunboeasy@gmail.com>
Date: Thu, 20 Nov 2025 22:15:42 +0800
Subject: [PATCH] fix python scripts read offset (#13574)

Signed-off-by: 21pages <sunboeasy@gmail.com>
---
 res/ab.py                                 | 18 +++++++++---------
 res/{device_group.py => device-groups.py} | 12 ++++++------
 res/devices.py                            |  6 +++---
 res/{user_group.py => user-groups.py}     | 12 ++++++------
 res/users.py                              |  6 +++---
 5 files changed, 27 insertions(+), 27 deletions(-)
 rename res/{device_group.py => device-groups.py} (97%)
 rename res/{user_group.py => user-groups.py} (97%)

diff --git a/res/ab.py b/res/ab.py
index c2ba59d2b..11f52282b 100644
--- a/res/ab.py
+++ b/res/ab.py
@@ -34,9 +34,10 @@ def view_shared_abs(url, token, name=None):
     filtered_params["pageSize"] = pageSize
 
     abs = []
-    current = 1
+    current = 0
 
     while True:
+        current += 1
         filtered_params["current"] = current
         response = requests.get(f"{url}/api/ab/shared/profiles", headers=headers, params=filtered_params)
         if response.status_code != 200:
@@ -52,8 +53,7 @@ def view_shared_abs(url, token, name=None):
         abs.extend(data)
 
         total = response_json.get("total", 0)
-        current += pageSize
-        if len(data) < pageSize or current > total:
+        if len(data) < pageSize or current * pageSize >= total:
             break
 
     return abs
@@ -86,9 +86,10 @@ def view_ab_peers(url, token, ab_guid, peer_id=None, alias=None):
     filtered_params["pageSize"] = pageSize
 
     peers = []
-    current = 1
+    current = 0
 
     while True:
+        current += 1
         filtered_params["current"] = current
         response = requests.get(f"{url}/api/ab/peers", headers=headers, params=filtered_params)
         if response.status_code != 200:
@@ -104,8 +105,7 @@ def view_ab_peers(url, token, ab_guid, peer_id=None, alias=None):
         peers.extend(data)
 
         total = response_json.get("total", 0)
-        current += pageSize
-        if len(data) < pageSize or current > total:
+        if len(data) < pageSize or current * pageSize >= total:
             break
 
     return peers
@@ -403,9 +403,10 @@ def view_ab_rules(url, token, ab_guid):
     }
 
     rules = []
-    current = 1
+    current = 0
 
     while True:
+        current += 1
         params["current"] = current
         response = requests.get(f"{url}/api/ab/rules", headers=headers, params=params)
         if response.status_code != 200:
@@ -421,8 +422,7 @@ def view_ab_rules(url, token, ab_guid):
         rules.extend(data)
 
         total = response_json.get("total", 0)
-        current += pageSize
-        if len(data) < pageSize or current > total:
+        if len(data) < pageSize or current * pageSize >= total:
             break
 
     # Convert numeric permissions to string format
diff --git a/res/device_group.py b/res/device-groups.py
similarity index 97%
rename from res/device_group.py
rename to res/device-groups.py
index ec98de15b..dd861aefc 100755
--- a/res/device_group.py
+++ b/res/device-groups.py
@@ -42,8 +42,9 @@ def list_groups(url, token, name=None, page_size=50):
     params = {"pageSize": page_size}
     if name:
         params["name"] = name
-    data, current = [], 1
+    data, current = [], 0
     while True:
+        current += 1
         params["current"] = current
         r = requests.get(f"{url}/api/device-groups", headers=headers, params=params)
         if r.status_code != 200:
@@ -56,8 +57,7 @@ def list_groups(url, token, name=None, page_size=50):
         rows = res.get("data", [])
         data.extend(rows)
         total = res.get("total", 0)
-        current += page_size
-        if len(rows) < page_size or current > total:
+        if len(rows) < page_size or current * page_size >= total:
             break
     return data
 
@@ -142,8 +142,9 @@ def view_devices(url, token, group_name=None, id=None, device_name=None,
     
     params["pageSize"] = page_size
     
-    data, current = [], 1
+    data, current = [], 0
     while True:
+        current += 1
         params["current"] = current
         r = requests.get(f"{url}/api/devices", headers=headers, params=params)
         if r.status_code != 200:
@@ -152,8 +153,7 @@ def view_devices(url, token, group_name=None, id=None, device_name=None,
         rows = res.get("data", [])
         data.extend(rows)
         total = res.get("total", 0)
-        current += page_size
-        if len(rows) < page_size or current > total:
+        if len(rows) < page_size or current * page_size >= total:
             break
     return data
 
diff --git a/res/devices.py b/res/devices.py
index ba11866e5..832f0509b 100755
--- a/res/devices.py
+++ b/res/devices.py
@@ -34,9 +34,10 @@ def view(
 
     devices = []
 
-    current = 1
+    current = 0
 
     while True:
+        current += 1
         params["current"] = current
         response = requests.get(f"{url}/api/devices", headers=headers, params=params)
         if response.status_code != 200:
@@ -61,8 +62,7 @@ def view(
                 devices.append(device)
 
         total = response_json.get("total", 0)
-        current += pageSize
-        if len(data) < pageSize or current > total:
+        if len(data) < pageSize or current * pageSize >= total:
             break
 
     return devices
diff --git a/res/user_group.py b/res/user-groups.py
similarity index 97%
rename from res/user_group.py
rename to res/user-groups.py
index 909123e4e..5df16c3b6 100755
--- a/res/user_group.py
+++ b/res/user-groups.py
@@ -42,8 +42,9 @@ def list_groups(url, token, name=None, page_size=50):
     params = {"pageSize": page_size}
     if name:
         params["name"] = name
-    data, current = [], 1
+    data, current = [], 0
     while True:
+        current += 1
         params["current"] = current
         r = requests.get(f"{url}/api/user-groups", headers=headers, params=params)
         if r.status_code != 200:
@@ -56,8 +57,7 @@ def list_groups(url, token, name=None, page_size=50):
         rows = res.get("data", [])
         data.extend(rows)
         total = res.get("total", 0)
-        current += page_size
-        if len(rows) < page_size or current > total:
+        if len(rows) < page_size or current * page_size >= total:
             break
     return data
 
@@ -142,8 +142,9 @@ def view_users(url, token, group_name=None, name=None, page_size=50):
     
     params["pageSize"] = page_size
     
-    data, current = [], 1
+    data, current = [], 0
     while True:
+        current += 1
         params["current"] = current
         r = requests.get(f"{url}/api/users", headers=headers, params=params)
         if r.status_code != 200:
@@ -152,8 +153,7 @@ def view_users(url, token, group_name=None, name=None, page_size=50):
         rows = res.get("data", [])
         data.extend(rows)
         total = res.get("total", 0)
-        current += page_size
-        if len(rows) < page_size or current > total:
+        if len(rows) < page_size or current * page_size >= total:
             break
     return data
 
diff --git a/res/users.py b/res/users.py
index 86e562afd..02b114715 100755
--- a/res/users.py
+++ b/res/users.py
@@ -49,9 +49,10 @@ def view(
 
     users = []
 
-    current = 1
+    current = 0
 
     while True:
+        current += 1
         params["current"] = current
         response = requests.get(f"{url}/api/users", headers=headers, params=params)
         if response.status_code != 200:
@@ -67,8 +68,7 @@ def view(
         users.extend(data)
 
         total = response_json.get("total", 0)
-        current += pageSize
-        if len(data) < pageSize or current > total:
+        if len(data) < pageSize or current * pageSize >= total:
             break
 
     return users