From 512a9a3bb5953bc62cc263899d3a888dd87a2090 Mon Sep 17 00:00:00 2001 From: Thanos Apollo Date: Sat, 14 Oct 2023 13:57:48 +0300 Subject: yeetube-buffer:(insert-content) Rewrite using keywords --- yeetube-buffer.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'yeetube-buffer.el') diff --git a/yeetube-buffer.el b/yeetube-buffer.el index 565d192..0ef7134 100644 --- a/yeetube-buffer.el +++ b/yeetube-buffer.el @@ -183,12 +183,15 @@ Emojis cause formatting issues, this should be off by default." (defun yeetube-buffer-insert-content (content) "Insert formatted CONTENT." (insert - (concat (yeetube-buffer--format-title (yeetube-buffer-fix-title (car content))) - (yeetube-buffer--format-view-count (yeetube-buffer-view-count-add-commas - (yeetube-buffer-fix-view-count (nth 2 content)))) - (yeetube-buffer--format-video-duration (nth 3 content)) - (yeetube-buffer--format-channel (nth 4 content)) - "\n"))) + (concat + (yeetube-buffer--format-title (yeetube-buffer-fix-title + (cl-getf content :title))) + (yeetube-buffer--format-view-count (yeetube-buffer-view-count-add-commas + (yeetube-buffer-fix-view-count + (cl-getf content :view-count)))) + (yeetube-buffer--format-video-duration (cl-getf content :duration)) + (yeetube-buffer--format-channel (cl-getf content :channel)) + "\n"))) ;;;###autoload (defun yeetube-buffer-create (query content buffer-mode) -- cgit v1.2.3 From 787d24e4bc7acfe74923c341813d483544965b4c Mon Sep 17 00:00:00 2001 From: Thanos Apollo Date: Sat, 14 Oct 2023 16:23:20 +0300 Subject: yeetube-buffer: Remove (fix-title) Fix titles before they are pushed in yeetube-content with previous commit. --- yeetube-buffer.el | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'yeetube-buffer.el') diff --git a/yeetube-buffer.el b/yeetube-buffer.el index 0ef7134..119c07f 100644 --- a/yeetube-buffer.el +++ b/yeetube-buffer.el @@ -75,22 +75,6 @@ Emojis cause formatting issues, this should be off by default." (equal (aref char-script-table c) 'emoji)) str)) -;; Usually titles from youtube get messed up, -;; This should fix some of the common issues. -(defun yeetube-buffer-fix-title (title) - "Adjust TITLE." - (let ((replacements '(("&" . "&") - (""" . "\"") - ("'" . "'") - ("u0026" . "&") - ("\\\\" . "")))) - (mapc (lambda (replacement) - (setf title (replace-regexp-in-string (car replacement) (cdr replacement) title))) - replacements) - (if yeetube-buffer-display-emojis - title - (yeetube-buffer-strip-emojis title)))) - (defun yeetube-buffer-fix-view-count (view-count) "Fix VIEW-COUNT display issues." (replace-regexp-in-string "[^0-9]" "" view-count)) @@ -184,8 +168,7 @@ Emojis cause formatting issues, this should be off by default." "Insert formatted CONTENT." (insert (concat - (yeetube-buffer--format-title (yeetube-buffer-fix-title - (cl-getf content :title))) + (yeetube-buffer--format-title (cl-getf content :title)) (yeetube-buffer--format-view-count (yeetube-buffer-view-count-add-commas (yeetube-buffer-fix-view-count (cl-getf content :view-count)))) -- cgit v1.2.3