qrpa 1.1.10__tar.gz → 1.1.12__tar.gz

{qrpa-1.1.10 → qrpa-1.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.1.10
+Version: 1.1.12
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>

{qrpa-1.1.10 → qrpa-1.1.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "qrpa"
-version = "1.1.10"
+version = "1.1.12"
 description = "qsir's rpa library"
 authors = [{ name = "QSir", email = "1171725650@qq.com" }]
 readme = "README.md"

{qrpa-1.1.10 → qrpa-1.1.12}/qrpa/fun_base.py

@@ -332,3 +332,8 @@ def insert_empty_column_after_column_name(data, target_col_name, new_header="单
         new_data.append(row)
 
     return new_data
+
+# 去除一维列表指定项目和重复项目
+def clean_list(lst, items_to_remove):
+    # 使用集合去重，然后去除指定项
+    return [x for x in list(dict.fromkeys(lst)) if x not in items_to_remove]

{qrpa-1.1.10 → qrpa-1.1.12}/qrpa/shein_lib.py

@@ -3102,7 +3102,7 @@ class SheinLib:
         page_size = 200  # 列表最多返回200条数据 大了没有用
 
         cache_file = f'{self.config.auto_dir}/shein/cache/check_order_{first_day}_{last_day}.json'
-        list_item = read_dict_from_file_ex(cache_file, self.store_username)
+        list_item_cache = read_dict_from_file_ex(cache_file, self.store_username)
 
         url = f"https://sso.geiwohuo.com/gsfs/finance/reportOrder/dualMode/checkOrderList/item/union"
         payload = {
@@ -3119,9 +3119,9 @@ class SheinLib:
         total = response_text['info']['meta']['count']
         totalPage = math.ceil(total / page_size)
 
-        if int(total) == len(list_item):
+        if int(total) == len(list_item_cache):
             log('总数与缓存数量相同 跳过剩余页抓取', total)
-            return list_item
+            return list_item_cache
 
         for page in range(2, totalPage + 1):
             log(f'获取收支明细列表 第{page}/{totalPage}页')

{qrpa-1.1.10 → qrpa-1.1.12}/qrpa/shein_ziniao.py

@@ -224,6 +224,9 @@ class ZiniaoBrowser:
         if str(r.get("statusCode")) == "0":
             print(r)
             # return r.get("browserList", [])
+            if platform_name == "1688":
+               return [site for site in r.get("browserList", []) if '1688' in site.get('tags')]
+
             return [site for site in r.get("browserList", []) if site.get("platform_name") == platform_name]
         elif str(r.get("statusCode")) == "-10003":
             print(f"login Err {json.dumps(r, ensure_ascii=False)}")
@@ -487,6 +490,7 @@ class ZiniaoRunner:
         if not browser_list:
             print("browser list is empty")
             raise RuntimeError("店铺列表为空")
+        print(browser_list)
 
         # 多线程并发执行任务
         max_threads = 1 if (hostname().lower() == 'krrpa' or hostname().lower() == 'jyrpa') else 3

{qrpa-1.1.10 → qrpa-1.1.12}/qrpa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qrpa
-Version: 1.1.10
+Version: 1.1.12
 Summary: qsir's rpa library
 Author: QSir
 Author-email: QSir <1171725650@qq.com>