diff --git a/blogs/blogs-list.org b/blogs/blogs-list.org index 136840e..91bc86c 100755 --- a/blogs/blogs-list.org +++ b/blogs/blogs-list.org @@ -4,8 +4,8 @@ See the categories: @@html:Categories@@ * Blogs: -- [[file:2026/2026-list.org][2026 List]] @@html:22-02-2026 18:51@@ -- [[file:2025/2025-list.org][2025 List]] @@html:22-02-2026 18:51@@ +- [[file:2026/2026-list.org][2026 List]] @@html:22-02-2026 22:37@@ +- [[file:2025/2025-list.org][2025 List]] @@html:22-02-2026 22:37@@ - [[file:2025/2025-list.sync-conflict-20260222-170216-VT6366A.org][2025 List]] @@html:22-02-2026 17:02@@ - [[file:2025/2025-list.sync-conflict-20260222-170034-NE5VEIB.org][2025 List]] @@html:22-02-2026 17:00@@ - [[file:2025/2025-list.sync-conflict-20260222-165714-NE5VEIB.org][2025 List]] @@html:22-02-2026 16:56@@ diff --git a/build-site.el b/build-site.el index 05b30df..ebf8fb7 100755 --- a/build-site.el +++ b/build-site.el @@ -215,17 +215,52 @@ A file has comments if: (add-to-list 'org-export-filter-body-functions #'z/org-html-insert-comments-into-body) +(defun z/lima-sitemap-format-entry (entry style project) + "Format sitemap ENTRY for lima, ensuring .html links." + (let* ((file (if (listp entry) (car entry) entry)) + (title (org-publish-find-title file project)) + (base (file-name-base file))) + (format "[[file:%s.html][%s]]" + base + (or title base)))) + + +;; (defun z/publish-lima-file (plist filename pub-dir) +;; "Publish Org or Markdown file from lima directory." +;; (let* ((ext (file-name-extension filename)) +;; (base (file-name-base filename)) +;; (output-file (expand-file-name +;; (concat base ".html") +;; pub-dir))) + +;; ;; Ensure output directory exists +;; (make-directory pub-dir t) + +;; (cond +;; ;; ORG FILES +;; ((string= ext "org") +;; (org-publish-org-to 'z-html filename ".html" plist pub-dir)) + +;; ;; MARKDOWN FILES +;; ((string= ext "md") +;; (message "Converting %s → %s" filename output-file) +;; (let ((exit-code +;; (call-process +;; "pandoc" +;; nil +;; "*pandoc-output*" +;; t +;; filename +;; "-o" +;; output-file +;; "--standalone"))) +;; (unless (eq exit-code 0) +;; (error "Pandoc failed with exit code %s" exit-code))))))) (defun z/publish-lima-file (plist filename pub-dir) "Publish Org or Markdown file from lima directory." (let* ((ext (file-name-extension filename)) - (base (file-name-base filename)) - (output-file (expand-file-name - (concat base ".html") - pub-dir))) - - ;; Ensure output directory exists - (make-directory pub-dir t) + (base (file-name-base filename))) (cond ;; ORG FILES @@ -234,21 +269,48 @@ A file has comments if: ;; MARKDOWN FILES ((string= ext "md") - (message "Converting %s → %s" filename output-file) - (let ((exit-code - (call-process - "pandoc" - nil - "*pandoc-output*" - t - filename - "-o" - output-file - "--standalone"))) - (unless (eq exit-code 0) - (error "Pandoc failed with exit code %s" exit-code))))))) + (let* ((temp-org + (expand-file-name + (concat base ".org") + (make-temp-file "lima-build-" t)))) ;; temp directory + ;; Convert Markdown → Org + (call-process + "pandoc" + nil nil nil + filename + "-f" "markdown" + "-t" "org" + "-o" temp-org) + ;; Ensure title exists + (with-temp-buffer + (insert-file-contents temp-org) + (goto-char (point-min)) + (unless (re-search-forward "^#\\+TITLE:" nil t) + (goto-char (point-min)) + (insert "#+TITLE: " base "\n\n")) + (write-region (point-min) (point-max) temp-org)) + + ;; Publish using ORIGINAL base name + (let ((output-file + (expand-file-name + (concat base ".html") + pub-dir))) + (org-publish-org-to + 'z-html + temp-org + ".html" + plist + pub-dir) + + ;; Rename to correct base if needed + (let ((generated + (expand-file-name + (concat (file-name-base temp-org) ".html") + pub-dir))) + (when (file-exists-p generated) + (rename-file generated output-file t))))))))) (setq org-html-htmlize-output-type 'css) @@ -439,8 +501,9 @@ A file has comments if: :sitemap-title "Lima" :sitemap-style list :sitemap-sort-files anti-chronologically + :sitemap-format-entry z/lima-sitemap-format-entry :html-head ,z-shared-head) - + ("org-assets" :base-directory ,(site-path "assets/") :base-extension "css\\|js\\|png\\|jpg\\|gif\\|svg\\|pdf\\|woff\\|woff2\\|ttf" diff --git a/index.org b/index.org index 15bdd51..107aac9 100755 --- a/index.org +++ b/index.org @@ -10,7 +10,7 @@ Feel free to explore: ** Lima -- [[file:lima/limas-play-area.org][lima's page]] +- [[file:lima/lima-list.org][lima's page]] ** Main Pages: diff --git a/lima/.attachments.17098/Khulfa.png b/lima/.attachments.17098/Khulfa.png new file mode 100644 index 0000000..56efd16 Binary files /dev/null and b/lima/.attachments.17098/Khulfa.png differ diff --git a/lima/.attachments.17098/dummy.jpg b/lima/.attachments.17098/dummy.jpg new file mode 100644 index 0000000..5c1effd Binary files /dev/null and b/lima/.attachments.17098/dummy.jpg differ diff --git a/lima/.attachments.17127/git1.jpg b/lima/.attachments.17127/git1.jpg new file mode 100644 index 0000000..c447f5e Binary files /dev/null and b/lima/.attachments.17127/git1.jpg differ diff --git a/lima/dummy.jpg b/lima/dummy.jpg new file mode 100644 index 0000000..5c1effd Binary files /dev/null and b/lima/dummy.jpg differ diff --git a/lima/lima-list.org b/lima/lima-list.org index 2ceb204..ab8d873 100644 --- a/lima/lima-list.org +++ b/lima/lima-list.org @@ -1,3 +1,4 @@ #+TITLE: Lima -- [[file:test.md][test]] \ No newline at end of file +- [[file:linking.html][linking]] +- [[file:test.html][test]] \ No newline at end of file diff --git a/lima/linking.md b/lima/linking.md new file mode 100644 index 0000000..0a89837 --- /dev/null +++ b/lima/linking.md @@ -0,0 +1,33 @@ +# Meeting notes + +* 📅 15 January 2021, via Nextcloud Talk +* 👥 Julius, Vanessa, Jan, … + +## Tasks ✅ + +* [ ] Finish marketing campaign +* [ ] To do 2 +* [ ] … + +## Agenda 📑 + +* What we want to change +* … + +## Recap from last meeting 🔁 + +* … + +## Discussion 💬 + +* Vanessa suggested … +* Julius brought up … +* … + +::: error + +NOOOO + +::: + +![git1.jpg](.attachments.17127/git1.jpg) \ No newline at end of file diff --git a/lima/test.md b/lima/test.md index 04bdf7b..f0d76b8 100644 --- a/lima/test.md +++ b/lima/test.md @@ -7,4 +7,8 @@ this is further testing | ;£7;£ | | | | | | | -remfsdfsd \ No newline at end of file +remfsdfsd + +![dummy.jpg](.attachments.17098/dummy.jpg) + +![Khulfa.png](.attachments.17098/Khulfa.png) \ No newline at end of file diff --git a/org-web-build.log b/org-web-build.log index 17948e1..34c8456 100644 --- a/org-web-build.log +++ b/org-web-build.log @@ -980,8 +980,10 @@ Resetting org-publish-cache Generating sitemap for Lima Publishing file /home/zaine/master-folder/org_files/org_web/lima/lima-list.org using ‘z/publish-lima-file’ +Publishing file /home/zaine/master-folder/org_files/org_web/lima/linking.md using ‘z/publish-lima-file’ + Publishing file /home/zaine/master-folder/org_files/org_web/lima/test.md using ‘z/publish-lima-file’ -Converting /home/zaine/master-folder/org_files/org_web/lima/test.md → /home/zaine/master-folder/org_files/org_web/output/lima/test.html + Resetting org-publish-cache Publishing file /home/zaine/master-folder/org_files/org_web/assets/images/hzone/patpat.png using ‘org-publish-attachment’ Publishing file /home/zaine/master-folder/org_files/org_web/assets/images/reviews/probation-objectives/probation-objectives-2.png using ‘org-publish-attachment’ @@ -1592,6 +1594,10 @@ nil nil +nil + +nil + nil Generating virtual environment python3 -m venv .venv diff --git a/posts/posts-list.org b/posts/posts-list.org index ffdc570..7f90ba9 100755 --- a/posts/posts-list.org +++ b/posts/posts-list.org @@ -4,7 +4,7 @@ See the categories: @@html:Categories@@ * Posts: -- [[file:career/career-list.org][Career List]] @@html:22-02-2026 18:51@@ +- [[file:career/career-list.org][Career List]] @@html:22-02-2026 22:37@@ - [[file:career/database-permissions.org][Database permissions, roles and accounts]] @@html:18-01-2026 23:00@@ @@html: learning @@ @@html: notes @@ - [[file:career/monitoring-and-logging.org][Monitoring and Logging]] @@html:18-01-2026 23:00@@ @@html: learning @@ @@html: notes @@ - [[file:career/pipelines.org][Pipelines and how they work]] @@html:18-01-2026 23:00@@ @@html: learning @@ @@html: notes @@ diff --git a/recently-updated.org b/recently-updated.org index 65efc00..08d9536 100755 --- a/recently-updated.org +++ b/recently-updated.org @@ -2,6 +2,7 @@ #+OPTIONS: toc:nil num:nil * Recently Updated (top 26 files - per lima's request) +- [[file:index.org][Home Page]] @@html:2026-02-22 22:24@@ - [[file:blogs/2025/2025-list.sync-conflict-20260222-170216-VT6366A.org][2025 List]] @@html:2026-02-22 17:02@@ - [[file:blogs/2025/2025-list.sync-conflict-20260222-170034-NE5VEIB.org][2025 List]] @@html:2026-02-22 17:00@@ - [[file:blogs/2025/2025-list.sync-conflict-20260222-165714-NE5VEIB.org][2025 List]] @@html:2026-02-22 16:56@@ @@ -16,7 +17,6 @@ - [[file:posts/career/database-permissions.org][Database permissions, roles and accounts]] @@html:2026-01-18 23:01@@ - [[file:posts/career/pipelines.org][Pipelines and how they work]] @@html:2026-01-18 23:00@@ - [[file:blogs/2026/01-january/11-01-week-review.org][[11-01-2026] - Weekly Review]] @@html:2026-01-17 21:23@@ -- [[file:index.org][Home Page]] @@html:2026-01-17 21:21@@ - [[file:posts/career/airflow.org][Datamarts, Airflow and DAG's]] @@html:2026-01-17 21:17@@ - [[file:blogs/2025/12-december/21-12-week-review.org][[21-12-2025] - Weekly Review]] @@html:2026-01-17 21:09@@ - [[file:blogs/2025/12-december/28-12-week-review.org][[28-12-2025] - Weekly Review]] @@html:2026-01-17 21:08@@ diff --git a/sitemap.org b/sitemap.org index 4f18ae5..c3dc959 100755 --- a/sitemap.org +++ b/sitemap.org @@ -78,13 +78,13 @@ - lima - [[file:lima/lima-list.org][Lima]] - tags - - [[file:tags/introduction.org][Tag: introduction]] - [[file:tags/learning.org][Tag: learning]] + - [[file:tags/introduction.org][Tag: introduction]] - [[file:tags/notes.org][Tag: notes]] - [[file:tags/review.org][Tag: review]] + - [[file:tags/education.org][Tag: education]] - [[file:tags/insights.org][Tag: insights]] - [[file:tags/website.org][Tag: website]] - [[file:tags/emacs.org][Tag: emacs]] - - [[file:tags/education.org][Tag: education]] - [[file:tags/maths.org][Tag: maths]] - [[file:tags/reading.org][Tag: reading]] \ No newline at end of file