mkdocs-document-dates 3.7.3__tar.gz → 3.7.4__tar.gz

{mkdocs_document_dates-3.7.3/mkdocs_document_dates.egg-info → mkdocs_document_dates-3.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs-document-dates
-Version: 3.7.3
+Version: 3.7.4
 Summary: A new generation MkDocs plugin for displaying exact creation date, last updated date, authors, email of documents
 Author-email: Aaron Wang <aaronwqt@gmail.com>
 License-Expression: MIT
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mkdocs<=1.6.1,>=1.6
+Requires-Dist: properdocs>=1.6.5
 Dynamic: license-file
 
 # mkdocs-document-dates

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/mkdocs_document_dates/plugin.py

@@ -205,9 +205,14 @@ class DocumentDatesPlugin(BasePlugin):
         exclude_list = recently_updated_config.get('exclude', [])
         limit = recently_updated_config.get('limit', 10)
 
+        # 获取站点 URL 路径前缀
+        site_url = config.get("site_url", "")
+        base_path = urlparse(site_url).path.rstrip("/")
+        prefix = f"{base_path}/" if base_path else "/"
+
         # 获取最近更新的文档数据
         recent_exclude_patterns = compile_exclude_patterns(exclude_list)
-        recently_updated_docs = get_recently_updated_files(self.last_updated_dates, files, recent_exclude_patterns, limit, self.recent_enable)
+        recently_updated_docs = get_recently_updated_files(self.last_updated_dates, files, recent_exclude_patterns, limit, self.recent_enable, prefix)
 
         # 将数据注入到 config['extra'] 中供全局访问
         if not config.get('extra', {}).get("recently_updated_docs", {}):

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/mkdocs_document_dates/static/templates/recently_updated_group.html

@@ -260,11 +260,19 @@
         --summary-lines-grid: {{ summary_lines.grid }};
         --summary-lines-detail: {{ summary_lines.detail }};
      ">
-    {%- for mtime, rel_path, title, url, cover, summary, readtime, tags in recent_docs %}
+    {%- for doc in recent_docs %}
+    {%- set title = doc.title | default('') %}
+    {%- set url = doc.url | default('') %}
+    {%- set updated_dt = doc.updated_dt | default('') %}
+    {%- set updated = doc.updated | default(updated_dt[:10]) %}
+    {%- set cover = doc.cover | default('') %}
+    {%- set summary = doc.summary | default('') %}
+    {%- set readtime = doc.readtime | default(0) %}
+    {%- set tags = doc.tags | default([]) %}
     <div class="article-card">
         <a class="card-header" href="{{ url }}" target="_blank">
             <div class="card-title">{{ title }}</div>
-            <time class="dd-timeago card-date" datetime="{{ mtime }}">{{ mtime[:10] }}</time>
+            <time class="dd-timeago card-date" datetime="{{ updated_dt }}">{{ updated }}</time>
         </a>
         <div class="card-body">
             {%- if cover %}

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/mkdocs_document_dates/utils.py

@@ -8,6 +8,7 @@ import fnmatch
 import re
 import math
 from pathlib import Path
+from operator import itemgetter
 from datetime import datetime
 from collections import defaultdict
 from mkdocs.structure.files import Files
@@ -143,7 +144,7 @@ def load_git_last_updated_dates(docs_dir_path: Path):
     return doc_mtime_map
 
 # 建议在 on_page_markdown 之后的全局事件中调用，因为需要读取 page.meta 中的信息
-def get_recently_updated_files(existing_dates: dict, files: Files, exclude_list: list, limit: int = 10, recent_enable: bool = False):
+def get_recently_updated_files(existing_dates: dict, files: Files, exclude_list: list, limit: int = 10, recent_enable: bool = False, prefix: str = ""):
     recently_updated_results = []
     if recent_enable:
         files_meta = []
@@ -163,8 +164,8 @@ def get_recently_updated_files(existing_dates: dict, files: Files, exclude_list:
 
             # 获取文档其它信息
             title = file.page.title if file.page and file.page.title else file.name
-            url = file.page.url if file.page and file.page.url else file.url
-            tags = file.page.meta.get("tags") or []
+            url = prefix + (file.page.url if file.page and file.page.url else file.url)
+            tags = (file.page.meta.get("tags") or []) if file.page else []
 
             cover = ''
             summary = ''
@@ -172,25 +173,43 @@ def get_recently_updated_files(existing_dates: dict, files: Files, exclude_list:
             # authors = []
             if file.page:
                 cover = file.page.meta.get('cover', '')
+                if cover and not cover.startswith(('http', 'ftp')):
+                    cover = prefix + cover.lstrip('/')
                 # authors = file.page.meta.document_dates.authors
                 if file.page.file:
                     summary, readtime = analyze_markdown(file.page.file.content_string)
 
-            meta_readtime = int(file.page.meta.get('readtime') or 0)
+            meta_readtime = int((file.page.meta.get('readtime') or 0) if file.page else 0)
             readtime = meta_readtime if meta_readtime > 0 else readtime
 
             # 存储信息（更新时间、路径、标题、URL、封面、摘要、阅读时间、标签）
-            files_meta.append((mtime, rel_path, title, url, cover, summary, readtime, tags))
+            files_meta.append({
+                "updated_ts": mtime,
+                "rel_path": rel_path,
+                "title": title,
+                "url": url,
+                "cover": cover,
+                "summary": summary,
+                "readtime": readtime,
+                "tags": tags,
+            })
             # existing_map[rel_path] = mtime
 
         # 构建最近更新列表
         if files_meta:
+            fmt_full = "%Y-%m-%d %H:%M:%S"
+            fmt_date = "%Y-%m-%d"
             # heapq 取 top limit
-            top_results = heapq.nlargest(limit, files_meta, key=lambda x: x[0])
-            recently_updated_results = [
-                (datetime.fromtimestamp(mtime).strftime("%Y-%m-%d %H:%M:%S"), *rest)
-                for mtime, *rest in top_results
-            ]
+            top_results = heapq.nlargest(limit, files_meta, key=itemgetter("updated_ts"))
+
+            for doc in top_results:
+                dt = datetime.fromtimestamp(doc["updated_ts"])
+
+                recently_updated_results.append({
+                    **doc,
+                    "updated_dt": dt.strftime(fmt_full),
+                    "updated": dt.strftime(fmt_date),
+                })
 
     return recently_updated_results
 
@@ -503,4 +522,4 @@ def analyze_markdown(md: str) -> list:
     summary = MD_SYNTAX_RE.sub("", "  ".join(summary_lines)).strip()
     minutes = max(1, math.ceil(seconds / 60))
 
-    return summary, minutes
+    return summary, minutes

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4/mkdocs_document_dates.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs-document-dates
-Version: 3.7.3
+Version: 3.7.4
 Summary: A new generation MkDocs plugin for displaying exact creation date, last updated date, authors, email of documents
 Author-email: Aaron Wang <aaronwqt@gmail.com>
 License-Expression: MIT
@@ -13,6 +13,7 @@ Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: mkdocs<=1.6.1,>=1.6
+Requires-Dist: properdocs>=1.6.5
 Dynamic: license-file
 
 # mkdocs-document-dates

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/mkdocs_document_dates.egg-info/requires.txt

@@ -1 +1,2 @@
 mkdocs<=1.6.1,>=1.6
+properdocs>=1.6.5

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/pyproject.toml

@@ -4,15 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mkdocs-document-dates"
-version = "3.7.3"
+version = "3.7.4"
 description = "A new generation MkDocs plugin for displaying exact creation date, last updated date, authors, email of documents"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.7"
 license = "MIT"
 authors = [{ name = "Aaron Wang", email = "aaronwqt@gmail.com" }]
 dependencies = [
-  "mkdocs>=1.6,<=1.6.1"
-  # "properdocs>=1.6.5"
+  "mkdocs>=1.6,<=1.6.1",
+  "properdocs>=1.6.5"
 ]
 classifiers = [
   "Programming Language :: Python :: 3",

{mkdocs_document_dates-3.7.3 → mkdocs_document_dates-3.7.4}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 def legacy_setup():
     setup(
         name="mkdocs-document-dates",
-        version="3.7.3",
+        version="3.7.4",
         author="Aaron Wang",
         author_email="aaronwqt@gmail.com",
         license="MIT",