djhx-blogger 0.1.6__py3-none-any.whl → 0.1.9__py3-none-any.whl

djhx_blogger/gen.py

@@ -1,10 +1,12 @@
+import os
 import shutil
 import time
-from collections import deque, OrderedDict
+from collections import deque, OrderedDict, defaultdict
 from importlib import resources
 from pathlib import Path
 
 import markdown
+from PIL import Image
 from bs4 import BeautifulSoup
 from jinja2 import Template
 
@@ -19,6 +21,10 @@ def load_template(name: str) -> str:
     file_path = resources.files("djhx_blogger.static.template").joinpath(name)
     return file_path.read_text(encoding="utf-8")
 
+def load_image(img_name: str) -> Path:
+    file_path = resources.files("djhx_blogger.static.images").joinpath(img_name)
+    return Path(str(file_path))
+
 
 class Node:
     cache_map = {}
@@ -254,7 +260,12 @@ def gen_blog_dir(root: Node):
                 with open(node.destination_path, mode='w', encoding='utf-8') as f:
                     f.write(gen_article_index(node.source_path, node.source_path.parent.name))
             else:
-                shutil.copy(node.source_path, node.destination_path)
+                # shutil.copy(node.source_path, node.destination_path)
+                # 图片压缩
+                start_time = int(time.time() * 1000)
+                compress_image(node.source_path, node.destination_path)
+                end_time = int(time.time() * 1000)
+                logger.info(f'压缩图片耗时: {(end_time-start_time)} ms | {node.source_path} -> {node.destination_path}')
 
     end = int(time.time() * 1000)
     logger.info(f'生成目标目录耗时: {end - start} ms')
@@ -352,6 +363,118 @@ def parse_metadata(metadata):
     return meta_dict
 
 
+
+def compress_image(input_path, output_path, quality=70, max_size=(960, 540)):
+    """
+    压缩图片到指定质量和最大尺寸。
+    - input_path: 源图片路径
+    - output_path: 输出路径，默认覆盖源文件
+    - quality: 压缩质量(0~100)
+    - max_size: 限制最大宽高（超过则等比缩小）
+    """
+    if not input_path or not output_path:
+        logger.warning(f'图片压缩 input/output path 不能为空')
+        return
+
+    with Image.open(input_path).convert("RGB") as img:
+        img.thumbnail(max_size)
+        img.save(output_path, optimize=True, quality=quality)
+
+
+def analyze_directory_size(directory_path):
+    """
+    分析目录下不同类型文件的数量和占用空间
+
+    参数:
+        directory_path: 要分析的目录路径
+
+    返回:
+        dict: 包含文件类型统计信息的字典
+    """
+    # 存储统计结果的字典
+    file_stats = defaultdict(lambda: {'count': 0, 'size_bytes': 0})
+
+    # 遍历目录及其所有子目录
+    for root, dirs, files in os.walk(directory_path):
+        for file in files:
+            file_path = os.path.join(root, file)
+
+            try:
+                # 获取文件大小
+                file_size = os.path.getsize(file_path)
+
+                # 获取文件扩展名（转换为小写，去掉点）
+                file_ext = Path(file).suffix.lower()
+                if not file_ext:
+                    file_ext = '无扩展名'
+                else:
+                    file_ext = file_ext[1:]  # 去掉前面的点
+
+                # 更新统计信息
+                file_stats[file_ext]['count'] += 1
+                file_stats[file_ext]['size_bytes'] += file_size
+
+            except (OSError, IOError):
+                # 跳过无法访问的文件
+                continue
+
+    return file_stats
+
+
+def format_size(size_bytes):
+    """
+    将字节数转换为易读的格式
+
+    参数:
+        size_bytes: 字节数
+
+    返回:
+        str: 格式化后的大小字符串
+    """
+    if size_bytes == 0:
+        return "0B"
+
+    size_names = ["B", "KB", "MB", "GB", "TB"]
+    i = 0
+    while size_bytes >= 1024 and i < len(size_names) - 1:
+        size_bytes /= 1024.0
+        i += 1
+
+    # 根据大小选择合适的精度
+    if i == 0:  # B
+        return f"{int(size_bytes)}{size_names[i]}"
+    elif i <= 2:  # KB, MB
+        return f"{size_bytes:.1f}{size_names[i]}"
+    else:  # GB, TB
+        return f"{size_bytes:.2f}{size_names[i]}"
+
+
+def print_directory_stats(directory_path):
+    """
+    打印目录统计信息
+
+    参数:
+        directory_path: 要分析的目录路径
+    """
+    stats = analyze_directory_size(directory_path)
+
+    if not stats:
+        print("目录为空或无法访问")
+        return
+
+    # 按文件大小排序
+    sorted_stats = sorted(stats.items(), key=lambda x: x[1]['size_bytes'], reverse=True)
+
+    # 打印表头
+    print(f"{'类型':<10} | {'数量':<6} | {'大小':<10}")
+    print("-" * 30)
+
+    # 打印每种文件类型的统计信息
+    for file_type, data in sorted_stats:
+        count = data['count']
+        size_str = format_size(data['size_bytes'])
+        print(f"{file_type:<10} | {count:<6} | {size_str:<10}")
+
 def generate_blog(blog_dir: str, blog_target: str):
     start = time.time()
 
@@ -362,13 +485,17 @@ def generate_blog(blog_dir: str, blog_target: str):
     cp_resource(blog_target)
 
     end = time.time()
-    logger.info(f'生成静态博客 {blog_dir}, 任务完成, 总耗时: {int((end-start)*1000)} ms')
+    logger.info(f'生成静态博客 {blog_dir} -> {root_node.destination_path}, 任务完成, 总耗时: {int((end-start)*1000)} ms')
+    print_directory_stats(root_node.destination_path)
+
     return root_node
 
 
 def init_new_blog(blog_dir: str):
     blog_dir_path = Path(blog_dir) / "simple-blog" / "demo-article"
+    blog_images_dir_path = blog_dir_path / "images"
     blog_dir_path.mkdir(parents=True, exist_ok=True)
+    blog_images_dir_path.mkdir(parents=True, exist_ok=True)
     with open(blog_dir_path / 'index.md', 'w', encoding='utf-8') as file:
         file.write(f"""---
 title: "Demo Post"
@@ -380,9 +507,17 @@ summary: "simple demo article"
 
 ## title 1
 
+mountain images:
+
+![mountain](./images/mountain.jpg)
+
 ### title 2
 
 This is a simple demo...
 """
         )
         file.write('')
+
+    mountain_img = load_image('mountain.jpg')
+    logger.info(mountain_img)
+    shutil.copy2(mountain_img, blog_images_dir_path / 'mountain.jpg')

djhx_blogger-0.1.9.dist-info/METADATA

@@ -0,0 +1,42 @@
+Metadata-Version: 2.4
+Name: djhx-blogger
+Version: 0.1.9
+Summary: A simple static site generator, support only markdown file.
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: beautifulsoup4>=4.14.2
+Requires-Dist: fabric>=3.2.2
+Requires-Dist: jinja2>=3.1.6
+Requires-Dist: markdown>=3.9
+Requires-Dist: pillow>=11.3.0
+Requires-Dist: typer>=0.20.0
+Dynamic: license-file
+
+# djhx-blogger
+
+一个个人使用的博客生成器。
+
+## 命令
+
+查看帮助
+```shell
+blg --help
+```
+
+生成一个示例博客目录
+
+```shell
+blg -n "C:\Users\ABC\Desktop\"
+```
+
+生成静态页面
+
+```shell
+blg -o "C:\Users\ABC\Desktop\simple-blog\"
+```
+
+## TODO
+
+1. 图片压缩
+2. 博客网站 title 和 nav-bar 的模板化

{djhx_blogger-0.1.6.dist-info → djhx_blogger-0.1.9.dist-info}/RECORD

@@ -2,19 +2,20 @@ djhx_blogger/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 djhx_blogger/__main__.py,sha256=MwMXMO3kuvG-luTG4lnLwjEnqnm20lI-amV9sETColo,61
 djhx_blogger/cli.py,sha256=IT_hPolwqGsPbOLWwbQymfsHZtUyatgskXYue70UoFE,2013
 djhx_blogger/deploy.py,sha256=tHJrOHaW8vQqN-YfpRLpjZOaUDXrWk_NVXnvPM014Hc,2056
-djhx_blogger/gen.py,sha256=7XM_PQ2FXotFU4SRIQy7RAm-Pqc-iYHg8bu-AMMcVp0,13008
+djhx_blogger/gen.py,sha256=nfDws6xSHAnMP2SBGq6VkT-hWkD3wIclINJ-mx8FcJw,17291
 djhx_blogger/log_config.py,sha256=aEvShHNahBO52w5I6WU4U2yTMAO7qIezcH2K1vSnbVo,871
 djhx_blogger/static/css/archive.css,sha256=Jkfl7HlQ-zsRDT4nFaR0WR7m3-AwCXsWVlLWBLdWVNM,855
 djhx_blogger/static/css/article.css,sha256=lCuMUOia2E7_E_OG7c2Gc7JMr-RdoyASQQ2mB6J2qKo,3239
 djhx_blogger/static/css/basic.css,sha256=gSKoyM_3GwoNGg3wScrVNl9ccnZwkw_ffnxODu_wbko,1152
 djhx_blogger/static/css/category.css,sha256=DBjUWZiaZO8uzpl2iY3acEVYzigW2HM3dHRfh2zNjok,2351
 djhx_blogger/static/images/favicon.ico,sha256=N0NH9yMTUzEZhGomQKeYohKP1MmL5CfmtsZi3jdlbvU,45497
+djhx_blogger/static/images/mountain.jpg,sha256=lY64nDTxXm86MEKMhSZ0FaZSmKQ72tlIb-8cRl6AeC8,766801
 djhx_blogger/static/template/archive.html,sha256=aTeyirij9reMl1WmDTmZVHF0yip3c8RoAam4tj6RIo8,1340
 djhx_blogger/static/template/article.html,sha256=GgU1mZrfAd-T3Y4Z0bqOljdkGI89p-OsuCAU4IHrTwE,1246
 djhx_blogger/static/template/category.html,sha256=KRjTJw-8G3bs_LrhfeEm7xYtBON5v0pLKTPwf_PD_Uo,1607
-djhx_blogger-0.1.6.dist-info/licenses/LICENSE,sha256=Whbb1w0-YAwWeAth-B6_jXSPWx9Fum73B0R-Z_lzUjA,1085
-djhx_blogger-0.1.6.dist-info/METADATA,sha256=h4R6Mmw8PdDWE5CZMhKkrNPpzuKn7uncp012Y0yh8WY,358
-djhx_blogger-0.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-djhx_blogger-0.1.6.dist-info/entry_points.txt,sha256=3rA_ZPnqdFHrqaZ0ATmrrScDNSN-Jcs7efeyC4q2Do0,45
-djhx_blogger-0.1.6.dist-info/top_level.txt,sha256=FZNu1SEldZAx_j_NmZoOxLha4G8-0KndmlFiPjPfJIk,13
-djhx_blogger-0.1.6.dist-info/RECORD,,
+djhx_blogger-0.1.9.dist-info/licenses/LICENSE,sha256=Whbb1w0-YAwWeAth-B6_jXSPWx9Fum73B0R-Z_lzUjA,1085
+djhx_blogger-0.1.9.dist-info/METADATA,sha256=Jufi_kHTmoD5Yq1iJmKC3ihHLn3sBdFHix40DXoSapU,791
+djhx_blogger-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+djhx_blogger-0.1.9.dist-info/entry_points.txt,sha256=3rA_ZPnqdFHrqaZ0ATmrrScDNSN-Jcs7efeyC4q2Do0,45
+djhx_blogger-0.1.9.dist-info/top_level.txt,sha256=FZNu1SEldZAx_j_NmZoOxLha4G8-0KndmlFiPjPfJIk,13
+djhx_blogger-0.1.9.dist-info/RECORD,,

djhx_blogger-0.1.6.dist-info/METADATA

@@ -1,12 +0,0 @@
-Metadata-Version: 2.4
-Name: djhx-blogger
-Version: 0.1.6
-Summary: A simple static site generator, support only markdown file.
-Requires-Python: >=3.9
-License-File: LICENSE
-Requires-Dist: beautifulsoup4>=4.14.2
-Requires-Dist: fabric>=3.2.2
-Requires-Dist: jinja2>=3.1.6
-Requires-Dist: markdown>=3.9
-Requires-Dist: typer>=0.20.0
-Dynamic: license-file