crawlo 1.1.9__py3-none-any.whl → 1.2.0__py3-none-any.whl

{crawlo-1.1.9.dist-info → crawlo-1.2.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 crawlo/__init__.py,sha256=1tc6uUDF1yRNU7K_k-Dl6h9FGy7Jp8fdhRsXu9PctFI,1312
-crawlo/__version__.py,sha256=lnHAM_YSOt5TvtAm4ZVs32T0TpsCQ5kOOznnQlur1YE,22
+crawlo/__version__.py,sha256=MpAT5hgNoHnTtG1XRD_GV_A7QrHVU6vJjGSw_8qMGA4,22
 crawlo/cli.py,sha256=pbd9wR6evB4aHWNrTRG4WW2ScCN5p4kz44eAuohSdR0,2029
 crawlo/config.py,sha256=cQTDYn2VCdlIs3Jb8mGwF6IWqj85BMr6HQaGS3XjZ7g,9535
 crawlo/config_validator.py,sha256=Q2j9rGW2lZiaA1ka5cJWaabPr1W0fwYHzY_gv-qpPyY,9903
@@ -25,9 +25,9 @@ crawlo/commands/startproject.py,sha256=aBBR5dNb7R-yEMVMisoKiEA86HUFB_yHa0VgPftDX
 crawlo/commands/stats.py,sha256=6pAgkEi8MBnCer2rWmKpaTYr1jaM6HeMG9owAvEzJyY,6064
 crawlo/commands/utils.py,sha256=nohMvUU2zLvX0XzXk6KeCNxP0EvSWj9DiVLxM_7tD5o,5106
 crawlo/core/__init__.py,sha256=PnFyJdVNHBoPmV1sW0AHQXijeoSTQ8cMYrbNM1JK8kA,41
-crawlo/core/engine.py,sha256=tWiQGAxK3bhwmq6xgg03gz-hyflGi5jPSI1ML2vrBgE,13139
+crawlo/core/engine.py,sha256=c65vwIPrwDzFvec2f1QJ2_hikBjj-CYjTGkYrjnWxto,13724
 crawlo/core/processor.py,sha256=qmCqAeqhwYu-UE86evYesaGt9qpuSIfH-ZIZKcXFCZc,1140
-crawlo/core/scheduler.py,sha256=4RsGl9P0hmXB6crbOwfNr2RLiIUET1h5JFIVKtrqyD0,4953
+crawlo/core/scheduler.py,sha256=ONdbmcjGyUoOhnXsO2pmTGU6no1RxTEM5FDDcthGLGA,5219
 crawlo/downloader/__init__.py,sha256=MlstaKfW-WLXNuZs7tb7cG_wG2sQLw2hdWmUjZEIH7c,8299
 crawlo/downloader/aiohttp_downloader.py,sha256=n2qP3Q13lOnvwB7cb3YxNyNKYVHKqofNNg7j9tV9h-E,8400
 crawlo/downloader/cffi_downloader.py,sha256=IpQUqvls4mEYs_UwPvtN2L4uUIujqn-rf03NuZZkMl0,10710
@@ -75,10 +75,10 @@ crawlo/pipelines/pipeline_manager.py,sha256=vK87pAEmpGR24yl6Cr7ovCKag2oB5mruijfY
 crawlo/pipelines/redis_dedup_pipeline.py,sha256=sgrBSVdxPWgh8HQxvGsazz1MSyBERJF5jd1yoeYo0lE,6166
 crawlo/queue/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 crawlo/queue/pqueue.py,sha256=yzF900ko2RReVNZtfk_VV3PzSXEUALI6SHf97geuu6s,1058
-crawlo/queue/queue_manager.py,sha256=UxIhyLzVM0HNNzwQ6LvOoCJ-zOcE95gl0ZKpzTz1ybA,12930
+crawlo/queue/queue_manager.py,sha256=_oO5Taqj5WTSKtj9UuLrGZcWxMg2liqaa-kceXyF4GI,12874
 crawlo/queue/redis_priority_queue.py,sha256=RbwKsVxzk31B1VRvyve4vHKe2DesL7K37IZAA31kdd0,12783
 crawlo/settings/__init__.py,sha256=xsukVKn_h2Hopm1Nj-bXkhbfyS62QTTvJi7fhZUwR9M,123
-crawlo/settings/default_settings.py,sha256=cwEIVL294hs7iWVOSfnwA4nuRWjHXJk_Bqgbd37Vmcw,8783
+crawlo/settings/default_settings.py,sha256=aTYgtWJUGmFF93SV4qeh3pmMpcTkkPd9bJkK486yTik,8781
 crawlo/settings/setting_manager.py,sha256=0RYAk07qoJ5WTw_mvV4ECWGS2QNpCnGmBZVTHjqOVIg,3707
 crawlo/spider/__init__.py,sha256=Z_rK23l5yt-DuwJPg8bcqodM_FIs4-iHLaKOimGumcE,20452
 crawlo/templates/crawlo.cfg.tmpl,sha256=9BAmwEibS5Tvy6HIcGXPb0BGeuesmibebmTW0iAEkmo,230
@@ -167,7 +167,7 @@ tests/test_proxy_middleware_integration.py,sha256=zcl7fR9Toc-I-stSUTzKZPwcfh3kgr
 tests/test_proxy_providers.py,sha256=XwWZCywTYguSsUxSm6fsbaoH1p9dKjqSIx9-sqKZehA,1693
 tests/test_proxy_stats.py,sha256=Til_yksrRz2yBVw-yJi5-36LhNW3vTwpXTm4BdR9PUM,507
 tests/test_proxy_strategies.py,sha256=ZkziozkvZd3KWOQnpHQ8Upd3WpyoX7gN0qFGluNm348,1809
-tests/test_queue_manager_double_crawlo.py,sha256=LYduecvJ93HAU6Ub-tIrGM2pwOUGoCTkpmzBxjpY5tM,9116
+tests/test_queue_manager_double_crawlo.py,sha256=pdoWUFgjfiPGCsuCypUaxMzicXPQnKpZqVh1o4LuaSM,6822
 tests/test_queue_manager_redis_key.py,sha256=-dnqs2p50zpf09-Z7vo74s8hLQ6cxXd8WCdHM0l17qM,6278
 tests/test_redis_config.py,sha256=TqzFRojc6esGXjGhUCvSLYQDUTAgEJsty9vRVuNraMU,893
 tests/test_redis_connection_pool.py,sha256=ORBU0k-6htQ2VVfyQkqTKVLGQWX04XRxdEGsZKeerQA,9177
@@ -183,8 +183,8 @@ tests/test_template_content.py,sha256=5QAnhKZFDKg-_uFryllLMpCk3a1nCS44hMmYfXm8gW
 tests/test_template_redis_key.py,sha256=U6L5HtnDyGp3s6-O4F_yG2Q2nNIGTqB_Q-ESv2EMeOU,4812
 tests/test_tools.py,sha256=IWiu9JGV-5Ow0ivFtiDw62REht-8Hn7NfyR9rnYSlbU,5113
 tests/tools_example.py,sha256=MfVBYemKvHs6MUbydgrJfhiGnygp5dRoIE-eIXCOR7M,7669
-crawlo-1.1.9.dist-info/METADATA,sha256=i3EFNboqsUyzh_CSajaNfJajxlwq-uiP7iDkjMCTQjg,25548
-crawlo-1.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crawlo-1.1.9.dist-info/entry_points.txt,sha256=5HoVoTSPxI8SCa5B7pQYxLSrkOdiunyO9tqNsLMv52g,43
-crawlo-1.1.9.dist-info/top_level.txt,sha256=keG_67pbZ_wZL2dmDRA9RMaNHTaV_x_oxZ9DKNgwvR0,22
-crawlo-1.1.9.dist-info/RECORD,,
+crawlo-1.2.0.dist-info/METADATA,sha256=NwPsIy1QiXk07HBs2iVrgX1_GM8GvNmUVQr-BX08W1g,20004
+crawlo-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crawlo-1.2.0.dist-info/entry_points.txt,sha256=5HoVoTSPxI8SCa5B7pQYxLSrkOdiunyO9tqNsLMv52g,43
+crawlo-1.2.0.dist-info/top_level.txt,sha256=keG_67pbZ_wZL2dmDRA9RMaNHTaV_x_oxZ9DKNgwvR0,22
+crawlo-1.2.0.dist-info/RECORD,,

tests/test_queue_manager_double_crawlo.py

@@ -49,26 +49,15 @@ async def test_queue_manager_naming():
             print(f"测试 {i}: {test_case['name']}")
             print(f"  输入队列名称: {test_case['queue_name']}")
             
-            # 测试队列管理器中的项目名称提取逻辑
+            # 使用优化后的项目名称提取逻辑
             project_name = "default"
             if ':' in test_case['queue_name']:
                 parts = test_case['queue_name'].split(':')
-                if len(parts) >= 2:
-                    # 处理可能的双重 crawlo 前缀
-                    if parts[0] == "crawlo" and parts[1] == "crawlo":
-                        # 双重 crawlo 前缀，取第三个部分作为项目名称
-                        if len(parts) >= 3:
-                            project_name = parts[2]
-                        else:
-                            project_name = "default"
-                    elif parts[0] == "crawlo":
-                        # 正常的 crawlo 前缀，取第二个部分作为项目名称
-                        project_name = parts[1]
-                    else:
-                        # 没有 crawlo 前缀，使用第一个部分作为项目名称
-                        project_name = parts[0]
-                else:
-                    project_name = test_case['queue_name'] or "default"
+                # 跳过所有"crawlo"前缀，取第一个非"crawlo"部分作为项目名称
+                for part in parts:
+                    if part != "crawlo":
+                        project_name = part
+                        break
             else:
                 project_name = test_case['queue_name'] or "default"
             
@@ -132,26 +121,15 @@ async def test_queue_manager_create_queue():
                 # 创建队列管理器
                 queue_manager = QueueManager(config)
                 
-                # 创建队列实例（模拟队列管理器的_create_queue方法）
+                # 使用优化后的项目名称提取逻辑
                 project_name = "default"
                 if ':' in test_case['queue_name']:
                     parts = test_case['queue_name'].split(':')
-                    if len(parts) >= 2:
-                        # 处理可能的双重 crawlo 前缀
-                        if parts[0] == "crawlo" and parts[1] == "crawlo":
-                            # 双重 crawlo 前缀，取第三个部分作为项目名称
-                            if len(parts) >= 3:
-                                project_name = parts[2]
-                            else:
-                                project_name = "default"
-                        elif parts[0] == "crawlo":
-                            # 正常的 crawlo 前缀，取第二个部分作为项目名称
-                            project_name = parts[1]
-                        else:
-                            # 没有 crawlo 前缀，使用第一个部分作为项目名称
-                            project_name = parts[0]
-                    else:
-                        project_name = test_case['queue_name'] or "default"
+                    # 跳过所有"crawlo"前缀，取第一个非"crawlo"部分作为项目名称
+                    for part in parts:
+                        if part != "crawlo":
+                            project_name = part
+                            break
                 else:
                     project_name = test_case['queue_name'] or "default"
                 
@@ -193,39 +171,4 @@ async def test_queue_manager_create_queue():
     except Exception as e:
         print(f"❌ 队列管理器创建队列测试失败: {e}")
         traceback.print_exc()
-        return False
-
-
-async def main():
-    """主测试函数"""
-    print("🚀 开始队列管理器双重 crawlo 前缀问题测试...")
-    print("=" * 50)
-    
-    try:
-        # 测试队列管理器项目名称提取
-        naming_test_success = await test_queue_manager_naming()
-        print()
-        
-        # 测试队列管理器创建队列
-        create_test_success = await test_queue_manager_create_queue()
-        print()
-        
-        print("=" * 50)
-        if naming_test_success and create_test_success:
-            print("🎉 队列管理器双重 crawlo 前缀问题测试通过！")
-        else:
-            print("❌ 部分测试失败，请检查实现")
-            return 1
-            
-    except Exception as e:
-        print("=" * 50)
-        print(f"❌ 测试过程中发生异常: {e}")
-        traceback.print_exc()
-        return 1
-    
-    return 0
-
-
-if __name__ == "__main__":
-    exit_code = asyncio.run(main())
-    sys.exit(exit_code)
+        return False