crawlo 1.2.4__py3-none-any.whl → 1.2.5__py3-none-any.whl

crawlo/__version__.py

@@ -1 +1 @@
-__version__ = "1.2.4"
+__version__ = "1.2.5"

crawlo/cli.py

@@ -10,12 +10,19 @@ from crawlo.commands import get_commands
 def main():
     # 获取框架版本号
     version_file = os.path.join(os.path.dirname(__file__), '__version__.py')
+    VERSION = '1.0.0'  # 默认版本号
     if os.path.exists(version_file):
-        with open(version_file, 'r') as f:
-            exec(f.read())
-        VERSION = locals().get('__version__', '1.0.0')
-    else:
-        VERSION = '1.0.0'
+        try:
+            with open(version_file, 'r') as f:
+                content = f.read()
+                # 使用正则表达式提取版本号
+                import re
+                version_match = re.search(r"__version__\s*=\s*['\"]([^'\"]*)['\"]", content)
+                if version_match:
+                    VERSION = version_match.group(1)
+        except Exception:
+            # 如果读取失败，使用默认版本号
+            pass
 
     # 获取所有可用命令
     commands = get_commands()

crawlo/commands/startproject.py

@@ -108,7 +108,11 @@ def _copytree_with_templates(src, dst, context, template_type='default', modules
 
     for item in src_path.rglob('*'):
         rel_path = item.relative_to(src_path)
-        dst_item = dst_path / rel_path
+        # 对于run.py.tmpl文件，需要特殊处理，将其放到项目根目录
+        if item.name == 'run.py.tmpl':
+            dst_item = dst_path.parent / rel_path  # 放到项目根目录
+        else:
+            dst_item = dst_path / rel_path
 
         # 检查是否应该包含此文件
         path_str = str(rel_path).replace('\\', '/')
@@ -147,6 +151,9 @@ def _copytree_with_templates(src, dst, context, template_type='default', modules
                 if item.name == 'settings.py.tmpl':
                     # 特殊处理设置模板文件，统一生成为 settings.py
                     final_dst = dst_item.parent / 'settings.py'
+                # 特殊处理run.py.tmpl文件
+                elif item.name == 'run.py.tmpl':
+                    final_dst = dst_item.with_suffix('')  # 去掉.tmpl后缀
                 else:
                     final_dst = dst_item.with_suffix('')
                     
@@ -171,8 +178,8 @@ def _should_include_file(rel_path, modules: List[str]) -> bool:
         'settings.py.tmpl',
         'spiders/__init__.py.tmpl',
         'items.py.tmpl',
-        'middlewares.py.tmpl',
-        'run.py.tmpl'
+        'middlewares.py.tmpl'
+        # 移除了'run.py.tmpl'，因为它现在在模板根目录
     ]
     
     path_str = str(rel_path).replace('\\', '/')
@@ -364,16 +371,25 @@ def main(args):
         else:
             console.print("[yellow]⚠ 警告:[/yellow] 找不到模板 'crawlo.cfg.tmpl'。")
 
-        # 3. 复制并渲染项目包内容
+        # 3. 渲染 run.py.tmpl (放在项目根目录)
+        run_template = TEMPLATES_DIR / 'run.py.tmpl'
+        if run_template.exists():
+            run_content = _render_template(run_template, context)
+            (project_dir / 'run.py').write_text(run_content, encoding='utf-8')
+            console.print(f":white_check_mark: 已创建 [green]{project_dir / 'run.py'}[/green]")
+        else:
+            console.print("[yellow]⚠ 警告:[/yellow] 找不到模板 'run.py.tmpl'。")
+
+        # 4. 复制并渲染项目包内容
         package_dir = project_dir / project_name
         _copytree_with_templates(template_dir, package_dir, context, template_type, modules)
         console.print(f":white_check_mark: 已创建项目包: [green]{package_dir}[/green]")
 
-        # 4. 创建 logs 目录
+        # 5. 创建 logs 目录
         (project_dir / 'logs').mkdir(exist_ok=True)
         console.print(":white_check_mark: 已创建 logs 目录")
         
-        # 5. 创建 output 目录（用于数据输出）
+        # 6. 创建 output 目录（用于数据输出）
         (project_dir / 'output').mkdir(exist_ok=True)
         console.print(":white_check_mark: 已创建 output 目录")
 

crawlo/templates/project/settings.py.tmpl

@@ -1,35 +1,9 @@
 # -*- coding: UTF-8 -*-
-"""
-{{project_name}} 项目配置文件
-=============================
-基于 Crawlo 框架的爬虫项目配置。
-
-🎯 快速开始：
-
-# 方式1：使用默认配置（推荐）
-from crawlo.crawler import CrawlerProcess
-process = CrawlerProcess()  # 无需任何配置
-
-# 方式2：使用配置工厂
-from crawlo.config import CrawloConfig
-config = CrawloConfig.standalone()  # 单机模式
-config = CrawloConfig.distributed(redis_host='192.168.1.100')  # 分布式模式
-process = CrawlerProcess(settings=config.to_dict())
-
-# 方式3：使用环境变量
-from crawlo.config import CrawloConfig
-config = CrawloConfig.from_env()  # 从环境变量读取
-"""
 import os
 from crawlo.config import CrawloConfig
 
 # ============================== 项目基本信息 ==============================
 PROJECT_NAME = '{{project_name}}'
-try:
-    from crawlo import __version__
-    VERSION = __version__
-except ImportError:
-    VERSION = '1.0.0'
 
 # ============================== 运行模式选择 ==============================
 

crawlo/templates/project/settings_distributed.py.tmpl

@@ -5,17 +5,11 @@
 基于 Crawlo 框架的分布式爬虫项目配置。
 适合大规模数据采集和多节点部署。
 """
-
 import os
 from crawlo.config import CrawloConfig
 
 # ============================== 项目基本信息 ==============================
 PROJECT_NAME = '{{project_name}}'
-try:
-    from crawlo import __version__
-    VERSION = __version__
-except ImportError:
-    VERSION = '1.0.0'
 
 # ============================== 分布式配置说明 ==============================
 # 

crawlo/templates/project/settings_gentle.py.tmpl

@@ -5,17 +5,11 @@
 基于 Crawlo 框架的温和爬虫项目配置。
 适合对目标网站友好的低负载爬取。
 """
-
 import os
 from crawlo.config import CrawloConfig
 
 # ============================== 项目基本信息 ==============================
 PROJECT_NAME = '{{project_name}}'
-try:
-    from crawlo import __version__
-    VERSION = __version__
-except ImportError:
-    VERSION = '1.0.0'
 
 # ============================== 温和模式配置说明 ==============================
 # 

crawlo/templates/project/settings_high_performance.py.tmpl

@@ -5,17 +5,11 @@
 基于 Crawlo 框架的高性能爬虫项目配置。
 针对大规模、高并发场景优化。
 """
-
 import os
 from crawlo.config import CrawloConfig
 
 # ============================== 项目基本信息 ==============================
 PROJECT_NAME = '{{project_name}}'
-try:
-    from crawlo import __version__
-    VERSION = __version__
-except ImportError:
-    VERSION = '1.0.0'
 
 # ============================== 高性能配置 ==============================
 # 使用配置工厂创建高性能配置

crawlo/templates/project/settings_simple.py.tmpl

@@ -5,17 +5,11 @@
 基于 Crawlo 框架的简化爬虫项目配置。
 适合快速开始和小型项目。
 """
-
 import os
 from crawlo.config import CrawloConfig
 
 # ============================== 项目基本信息 ==============================
 PROJECT_NAME = '{{project_name}}'
-try:
-    from crawlo import __version__
-    VERSION = __version__
-except ImportError:
-    VERSION = '1.0.0'
 
 # ============================== 简化版配置说明 ==============================
 # 

{crawlo-1.2.4.dist-info → crawlo-1.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crawlo
-Version: 1.2.4
+Version: 1.2.5
 Summary: Crawlo 是一款基于异步IO的高性能Python爬虫框架，支持分布式抓取。
 Home-page: https://github.com/crawl-coder/Crawlo.git
 Author: crawl-coder

{crawlo-1.2.4.dist-info → crawlo-1.2.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 crawlo/__init__.py,sha256=1tc6uUDF1yRNU7K_k-Dl6h9FGy7Jp8fdhRsXu9PctFI,1312
-crawlo/__version__.py,sha256=XBKH8E1LmDxv06U39yqMBbXZapOERFgICEDYZs_kRso,22
-crawlo/cli.py,sha256=3noRkIcHUsraO-o0ZI_EylR3-RsoJ0_j_f27hVBzbdc,2536
+crawlo/__version__.py,sha256=jBmZf3HLbiQlWiolOsAA6J5-BbxXD2bqFqEqDH3lfqo,22
+crawlo/cli.py,sha256=8OD2us3YYG55AMTm_3YmHiZ8_Plokkx6p2DVR7w0JGs,2872
 crawlo/config.py,sha256=zbFn2HfcbDcD1QOSgNOB9kjw12UDb7zo4Y7RLcJJirQ,9506
 crawlo/config_validator.py,sha256=eQWrSY4xNnbDgwAmPOENyMb0wb3rdzOL55yBCKmpIak,9883
 crawlo/crawler.py,sha256=KPVgLpDJIZ0k3-U9CtrYgvnLatFG9eYPdjUtqoPBHXU,40305
@@ -21,7 +21,7 @@ crawlo/commands/genspider.py,sha256=NAeXmfb9ElLOuLc4F2xIzuG779KvAAesy3EZa_QxqR8,
 crawlo/commands/help.py,sha256=pHp0m6QBF4NZnZncPBxOLRlJQXJZQsztlyn5euFD9po,5186
 crawlo/commands/list.py,sha256=VR4AWrOiLQgw2t6u8dm9uxsCoCPzX36_6XeTs3tzcQk,5772
 crawlo/commands/run.py,sha256=-5psh1ui0zJmHjmzkSo8Tnl99B1e4Rz90lk0Ak-2SuA,12236
-crawlo/commands/startproject.py,sha256=AmYdsLVl1ETel3DcPyHIQKijXo9WZyF9fHbED2lLPwY,15329
+crawlo/commands/startproject.py,sha256=8tMokyCBN4nEpWjAca3NQorU5t8WR5ffBQZ7eyvUWpA,16260
 crawlo/commands/stats.py,sha256=fCNk7ix6v9PrscC-wKQl6ddA4xaQLogrN_1SNEj66tk,6128
 crawlo/commands/utils.py,sha256=3nP8bMgPH36ELqg1ilzPhHS873ncNvZNxOEDYY4uDm4,5087
 crawlo/core/__init__.py,sha256=PnFyJdVNHBoPmV1sW0AHQXijeoSTQ8cMYrbNM1JK8kA,41
@@ -85,16 +85,16 @@ crawlo/settings/default_settings.py,sha256=FnytMOyx4bpzfLkdbppBTkkKn12bxYuWBShVM
 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
+crawlo/templates/run.py.tmpl,sha256=v_g-LQMYJ6pC8TZgyWj0yB2yTTKrwy9lEJufAYCXyxY,1228
 crawlo/templates/project/__init__.py.tmpl,sha256=f3ETIXw_O6K-lkL6lXM5znMPJW1FZYGFrwDs2BnHcnQ,58
 crawlo/templates/project/items.py.tmpl,sha256=mt1Mm--H2Ouos3r7JPkYh0r33rgYJf1YOMz0OZy8TYs,297
 crawlo/templates/project/middlewares.py.tmpl,sha256=T67p8j0laL4NJJ_3xzPM9yivgZRjTEMiEtEWLPwbkmw,4160
 crawlo/templates/project/pipelines.py.tmpl,sha256=GBHYU0Jx8sKDCdGJp44FMSH7u2slxoFg6a-R9Uwg_-I,2608
-crawlo/templates/project/run.py.tmpl,sha256=v_g-LQMYJ6pC8TZgyWj0yB2yTTKrwy9lEJufAYCXyxY,1228
-crawlo/templates/project/settings.py.tmpl,sha256=RmlHMvRln7YXxjC02QzPma71kYOyU83TPEsHlXGf3xc,13429
-crawlo/templates/project/settings_distributed.py.tmpl,sha256=jwUsq30EjldOKmS5mspHJcR1zm_R5Sqlk8boriTjI7Y,5800
-crawlo/templates/project/settings_gentle.py.tmpl,sha256=wVZtUEgtKmvtaAnG7VFJ4usF0xXvp_VkD4fv2VNur4Y,4868
-crawlo/templates/project/settings_high_performance.py.tmpl,sha256=FmUV3w_W5pIy3G68IoY4r50t5ldMwuJ9e8sZ_17kQTc,5373
-crawlo/templates/project/settings_simple.py.tmpl,sha256=K0ZQ1QQBCVm7nJkPQqzNdu8gZl9gZAPMSoyEyhCX7og,3869
+crawlo/templates/project/settings.py.tmpl,sha256=DFXWWMo88KQyvg-VVEURyEfEd5EEpAdTrehbUaK0FEM,12661
+crawlo/templates/project/settings_distributed.py.tmpl,sha256=wqrQjQuydhnP8O1xs-8g5txu42aV5YVC4QHVhvpc1-c,5691
+crawlo/templates/project/settings_gentle.py.tmpl,sha256=7UTZe8JqA1SUKozlxiGjxgWsakzIhKAtPvU7EfB28wQ,4759
+crawlo/templates/project/settings_high_performance.py.tmpl,sha256=LzswtNUV6Iw0ewWfnM2FXt2aHNJtUOceXSrg8HBy2mY,5264
+crawlo/templates/project/settings_simple.py.tmpl,sha256=ifn0VhDv8ZGcsahdzhHol18ATwUoq-B2lfbFeJk-ISk,3760
 crawlo/templates/project/spiders/__init__.py.tmpl,sha256=j_YKsw6HQMJyqlk3WUouP3bsr-XVxshRoSNakHBc00g,106
 crawlo/templates/spider/spider.py.tmpl,sha256=jMhzyxpIpV_KigB-pmN-5mGMiYtu4mfQIOvpZcCGGJI,5055
 crawlo/tools/__init__.py,sha256=5H6rAhjfNSqRMjjlLDVq-vEJWRFyCO-J6HN2kexnXJU,3671
@@ -199,8 +199,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.2.4.dist-info/METADATA,sha256=7n1JTTKPVs4kOjG2WAleNTxBub7Y6gXb3816BOryQr8,19185
-crawlo-1.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-crawlo-1.2.4.dist-info/entry_points.txt,sha256=5HoVoTSPxI8SCa5B7pQYxLSrkOdiunyO9tqNsLMv52g,43
-crawlo-1.2.4.dist-info/top_level.txt,sha256=keG_67pbZ_wZL2dmDRA9RMaNHTaV_x_oxZ9DKNgwvR0,22
-crawlo-1.2.4.dist-info/RECORD,,
+crawlo-1.2.5.dist-info/METADATA,sha256=NPGU5IbQFGu8iNyapjE3faSy_A84yHeI9gzjuGv1PbE,19185
+crawlo-1.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+crawlo-1.2.5.dist-info/entry_points.txt,sha256=5HoVoTSPxI8SCa5B7pQYxLSrkOdiunyO9tqNsLMv52g,43
+crawlo-1.2.5.dist-info/top_level.txt,sha256=keG_67pbZ_wZL2dmDRA9RMaNHTaV_x_oxZ9DKNgwvR0,22
+crawlo-1.2.5.dist-info/RECORD,,