From 3a63f70e79e3e08c05d27fc62294b9dff7c5ce13 Mon Sep 17 00:00:00 2001 From: ada Date: Tue, 19 Aug 2025 16:37:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BF=D1=80=D0=BE=D1=89=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B8=20=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=BF=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D1=82=D0=BE=D0=BA=20=D0=B8=20=D1=83?= =?UTF-8?q?=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE?= =?UTF-8?q?=20=D1=87=D0=B8=D1=81=D0=BB=D0=BE=D0=B2=D1=8B=D0=BC=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _pages/notes.md | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/_pages/notes.md b/_pages/notes.md index 0a26bfc..9b49368 100644 --- a/_pages/notes.md +++ b/_pages/notes.md @@ -15,39 +15,26 @@ permalink: /notes/ {%- for g in by_folder -%} {%- assign folder = g.name -%} - {%- comment -%} Проверяем, является ли "папка" на самом деле файлом {%- endcomment -%} - {%- if folder == g.items.first.path | split: '/' | last | split: '.' | first -%} - {%- assign folder = "Без проекта" -%} - {%- endif -%} + {%- if folder contains '.md' -%}{% assign folder = "Без проекта" %}{% endif %} ### {{ folder }} ({{ g.items | size }}) {%- comment -%} - Создаем массив пар "префикс|заметка" для сортировки + Подготовим массив с добавленным полем ord (число из префикса). {%- endcomment -%} -{%- assign sorted_pairs = "" | split: "" -%} +{%- assign items_with_ord = "" | split: "" -%} {%- for n in g.items -%} {%- assign base = n.path | split: '/' | last | split: '.' | first -%} {# 01-hs -> "01-hs" #} {%- assign num_str = base | split: '-' | first -%} {# "01" #} {%- assign ord = num_str | plus: 0 -%} {# 0 если нет числа #} {%- if ord == 0 and num_str != "0" -%}{% assign ord = 9999 %}{% endif %} {# без префикса — в конец #} - - {%- comment -%} Форматируем порядковый номер с ведущими нулями для правильной сортировки {%- endcomment -%} - {%- assign ord_padded = ord -%} - {%- if ord < 10 -%}{% assign ord_padded = ord | prepend: "000" %}{% endif -%} - {%- if ord < 100 and ord >= 10 -%}{% assign ord_padded = ord | prepend: "00" %}{% endif -%} - {%- if ord < 1000 and ord >= 100 -%}{% assign ord_padded = ord | prepend: "0" %}{% endif -%} - - {%- assign pair = ord_padded | append: "|" | append: forloop.index0 -%} - {%- assign sorted_pairs = sorted_pairs | push: pair -%} + {%- assign n2 = n | merge: {"ord": ord} -%} + {%- assign items_with_ord = items_with_ord | push: n2 -%} {%- endfor -%}