fix(sort): update frontmatter

liblaf · Mar 25, 2023 · 85d961b · 85d961b
1 parent 2643414
commit 85d961b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -43,7 +43,11 @@ install: $(TARGET) | $(BIN)
 pretty:
 	isort --profile black $(CURDIR)
 	black $(CURDIR)
+
+	poetry run utils.py sort yaml $(DATA)/github.yaml
+	poetry run utils.py sort yaml $(DATA)/websites.yaml
 	prettier --write $(CURDIR)/**/*.md
+	prettier --write $(CURDIR)/**/*.yaml
 
 rename: $(TARGET)
 ifneq ($(and $(OS), $(ARCH)), )

diff --git a/docs/awesome-github.md b/docs/awesome-github.md
@@ -1,5 +1,9 @@
 ---
 title: Awesome GitHub
+category:
+  - Awesome
+tag:
+  - GitHub
 ---
 
 ## Awesome

diff --git a/docs/awesome-websites.md b/docs/awesome-websites.md
@@ -1,5 +1,9 @@
 ---
 title: Awesome Websites
+category:
+  - Awesome
+tag:
+  - Website
 ---
 
 ## C/C++

diff --git a/utils/sort/__init__.py b/utils/sort/__init__.py
@@ -26,8 +26,12 @@ def sort_list(data: list) -> list:
     try:
         result = sorted(result)
     except:
-        try:
-            result = sorted(result, key=lambda x: x["url"])
-        except:
-            pass
+        if isinstance(result[0], dict):
+            for key in sorted(result[0].keys()):
+                try:
+                    result = sorted(result, key=lambda x: x[key])
+                except:
+                    pass
+                else:
+                    break
     return result
diff --git a/utils/sort/github/constants.py b/utils/sort/github/constants.py
@@ -1,6 +1,10 @@
 FRONTMATTER: str = r"""
 ---
 title: Awesome GitHub
+category:
+  - Awesome
+tag:
+  - GitHub
 ---
 """
 

diff --git a/utils/sort/github/template.py b/utils/sort/github/template.py
@@ -2,14 +2,15 @@
 
 import github.Repository
 
+from ...utils import escape_markdown
 from .constants import ITEM_TEMPLATE, SECTION_TEMPLATE
 
 
 def format_item(repo: github.Repository.Repository) -> str:
     template = string.Template(ITEM_TEMPLATE)
     result = template.substitute(
         {
-            "description": repo.description,
+            "description": escape_markdown(repo.description),
             "full_name": repo.full_name,
             "name": repo.name,
             "url": repo.url,

diff --git a/utils/sort/url/constants.py b/utils/sort/url/constants.py
@@ -1,6 +1,10 @@
 FRONTMATTER: str = r"""
 ---
 title: Awesome Websites
+category:
+  - Awesome
+tag:
+  - Website
 ---
 """
 

diff --git a/utils/sort/url/template.py b/utils/sort/url/template.py
@@ -3,8 +3,8 @@
 
 import urltitle
 
+from ...utils import escape_markdown
 from .constants import ITEM_TEMPLATE, SECTION_TEMPLATE
-from .utils import escape_markdown
 
 
 def format_item(url: dict) -> str:

diff --git a/utils/sort/url/utils.py → utils/utils.py b/utils/sort/url/utils.py → utils/utils.py