From 202ecc8caf2dfa0325a2193cb4a471ae6bac4358 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 24 Dec 2025 13:49:50 +0100 Subject: [PATCH] update org-chef --- .../org-chef-24kitchen.el | 88 ----------- .../org-chef-bbc-food.el | 112 -------------- .../org-chef-martha-stewart.el | 104 ------------- .../org-chef-nytimes.el | 124 ---------------- elpa/org-chef-20231127.1601/org-chef-pkg.el | 15 -- .../org-chef-reluctant-gourmet.el | 121 --------------- .../org-chef-20231127.1601/org-chef-saveur.el | 138 ------------------ .../org-chef-autoloads.el | 34 +---- .../org-chef-basics-with-babish.el | 0 .../org-chef-bbc-good-food.el | 0 .../org-chef-binging-with-babish.el | 0 .../org-chef-chef-koch.el | 0 .../org-chef-cultures-for-health.el | 0 .../org-chef-edit.el | 2 +- .../org-chef-fine-cooking.el | 0 .../org-chef-genius-kitchen.el | 0 .../org-chef-jamie-oliver.el | 0 .../org-chef-json-ld.el | 0 .../org-chef-kotikokki.el | 0 .../org-chef-marmiton.el | 69 ++++----- elpa/org-chef-20250714.107/org-chef-pkg.el | 11 ++ .../org-chef-recipetin-eats.el | 0 .../org-chef-serious-eats.el | 0 .../org-chef-simply-recipes.el | 0 .../org-chef-taste.el | 0 .../org-chef-utils.el | 0 .../org-chef-wordpress.el | 0 .../org-chef-xiachufang.el | 0 .../org-chef.el | 44 ++---- 29 files changed, 65 insertions(+), 797 deletions(-) delete mode 100644 elpa/org-chef-20231127.1601/org-chef-24kitchen.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-bbc-food.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-martha-stewart.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-nytimes.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-pkg.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-reluctant-gourmet.el delete mode 100644 elpa/org-chef-20231127.1601/org-chef-saveur.el rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-autoloads.el (82%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-basics-with-babish.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-bbc-good-food.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-binging-with-babish.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-chef-koch.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-cultures-for-health.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-edit.el (97%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-fine-cooking.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-genius-kitchen.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-jamie-oliver.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-json-ld.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-kotikokki.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-marmiton.el (58%) create mode 100644 elpa/org-chef-20250714.107/org-chef-pkg.el rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-recipetin-eats.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-serious-eats.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-simply-recipes.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-taste.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-utils.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-wordpress.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef-xiachufang.el (100%) rename elpa/{org-chef-20231127.1601 => org-chef-20250714.107}/org-chef.el (79%) diff --git a/elpa/org-chef-20231127.1601/org-chef-24kitchen.el b/elpa/org-chef-20231127.1601/org-chef-24kitchen.el deleted file mode 100644 index 2ea0eb5c..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-24kitchen.el +++ /dev/null @@ -1,88 +0,0 @@ -;;; org-chef-24kitchen.el --- org-chef 24kitchen fetching. -*- lexical-binding: t; -*- - -;; Copyright (C) 2019 Calvin Beck, Folkert van der Beek - -;; Author: Folkert van der Beek -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2019 - -;; Copyright 2019 Folkert van der Beek - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from 24kitchen.nl. - -;;; Code: - -(require 'org-chef-utils) -(require 'dom) - -(defun org-chef-24kitchen-extract-name (dom) - "Get the name of a recipe from an 24kitchen DOM." - (dom-text (dom-children (dom-by-class dom "^page-title$")))) - -(defun org-chef-24kitchen-extract-ingredients (dom) - "Get the ingredients for a recipe from an 24kitchen DOM." - (org-chef-remove-empty-strings (mapcar #'(lambda (node) (string-trim (replace-regexp-in-string "[[:space:]\n]+" " " (dom-texts node)))) (dom-by-class dom "^recipe-component$")))) - -(defun org-chef-24kitchen-extract-servings (dom) - "Get the number of servings for a recipe from an 24kitchen DOM." - (string-trim (dom-text (dom-by-class dom "^portion-amount$")))) - -(defun org-chef-24kitchen-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an 24kitchen DOM." - (string-trim (dom-text (dom-by-class dom "^cooking-time$")))) - -(defun org-chef-24kitchen-extract-ready-in (dom) - "Get the total amount of time for a recipe from an 24kitchen DOM." - (string-trim (dom-text (dom-by-class dom "^total-time$")))) - -(defun org-chef-24kitchen-extract-directions (dom) - "Get the directions for a recipe from an 24kitchen DOM." - (org-chef-remove-empty-strings (mapcar #'(lambda (node) (string-trim (dom-text node))) (dom-children (cdr (dom-by-class dom "^recipe-body$")))))) - -(defun org-chef-24kitchen-fetch (url) - "Given an 24kitchen.nl URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - `((name . ,(org-chef-24kitchen-extract-name dom)) - (ingredients . ,(org-chef-24kitchen-extract-ingredients dom)) - (servings . ,(org-chef-24kitchen-extract-servings dom)) - (prep-time . "") - (cook-time . ,(org-chef-24kitchen-extract-cook-time dom)) - (ready-in . ,(org-chef-24kitchen-extract-ready-in dom)) - (directions . ,(org-chef-24kitchen-extract-directions dom)) - (source-url . ,url)))) - -(provide 'org-chef-24kitchen) -;;; org-chef-24kitchen.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-bbc-food.el b/elpa/org-chef-20231127.1601/org-chef-bbc-food.el deleted file mode 100644 index f5dd406b..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-bbc-food.el +++ /dev/null @@ -1,112 +0,0 @@ - -;;; org-chef-bbc-food.el --- Functions for fetching recipes from .de. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck - -;; Author: Calvin Beck -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from bbc.co.uk/food/ -(require 'org-chef-utils) -(require 'dom) - -(defun org-chef-bbc-food-extract-name (dom) - "Get the name of a recipe from a DOM." - (dom-text (dom-by-class dom "content-title__text") )) - - -(defun org-chef-bbc-food-extract-ingredients (dom) - "Get the ingredients for a recipe from a DOM." - (mapcar 'dom-texts (dom-by-tag (dom-by-class dom "recipe-ingredient-list") 'li))) - - -(defun org-chef-bbc-food-extract-servings (dom) - "Get the number of servings for a recipe from a DOM." - (dom-text (dom-by-class dom "recipe-metadata__serving"))) - -(defun org-chef-bbc-food-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from a DOM." - (dom-text (dom-by-class dom "recipe-metadata__prep-time"))) - -(defun org-chef-bbc-food-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from a DOM." -(dom-text (dom-by-class dom "recipe-metadata__cook-time"))) - -(defun org-chef-bbc-food-extract-ready-in (dom) - "Get the total amount of time for a recipe from a DOM." - (dom-text (dom-by-class dom "recipe-metadata__prep-time"))) - -(defun org-chef-bbc-food-extract-directions (dom) - "Get the directions for a recipe from a DOM." - (mapcar 'dom-texts (dom-by-tag (dom-by-class dom "recipe-method__list") 'li))) - - -(defun org-chef-bbc-food-from-dom (dom) - "Given a .de DOM, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions" - (let* ((prep-time (org-chef-bbc-food-extract-prep-time dom)) - (cook-time (org-chef-bbc-food-extract-cook-time dom)) - (total-time (org-chef-bbc-food-extract-ready-in dom))) - - `((ingredients . ,(org-chef-bbc-food-extract-ingredients dom)) - (name . ,(org-chef-bbc-food-extract-name dom)) - (servings . ,(org-chef-bbc-food-extract-servings dom)) - (prep-time . ,prep-time) - (cook-time . ,cook-time) - (ready-in . ,total-time) - (directions . ,(org-chef-bbc-food-extract-directions dom))))) - - -(defun org-chef-bbc-food-fetch (url) - "Given a .de URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - (cons `(source-url . ,url) (org-chef-bbc-food-from-dom dom)))) - - -(provide 'org-chef-bbc-food) -;;; org-chef-bbc-food.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-martha-stewart.el b/elpa/org-chef-20231127.1601/org-chef-martha-stewart.el deleted file mode 100644 index 93b05691..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-martha-stewart.el +++ /dev/null @@ -1,104 +0,0 @@ -;;; org-chef-martha-stewart.el --- org-chef marthastewart fetching. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck - -;; Author: Calvin Beck -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from marthastewart.com. - -;;; Code: - - -(require 'org-chef-utils) -(require 'dom) - - -(defun org-chef-martha-stewart-extract-name (dom) - "Get the name of a recipe from an marthastewart DOM." - (string-trim (dom-text (car (dom-by-class dom "^page-title$"))))) - - -(defun org-chef-martha-stewart-extract-ingredients (dom) - "Get the ingredients for a recipe from an marthastewart DOM." - (mapcar #'(lambda (n) (string-trim (dom-text n))) - (dom-by-class dom "^component-text$"))) - - -(defun org-chef-martha-stewart-extract-servings (dom) - "Get the number of servings for a recipe from an marthastewart DOM." - (string-trim (dom-text (car (dom-by-class dom "servings-data$"))))) - - -(defun org-chef-martha-stewart-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an marthastewart DOM." - (string-trim (dom-text (car (dom-by-class dom "prep-time-data$"))))) - - -(defun org-chef-martha-stewart-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an marthastewart DOM." - nil) - - -(defun org-chef-martha-stewart-extract-ready-in (dom) - "Get the total amount of time for a recipe from an marthastewart DOM." - (string-trim (dom-text (car (dom-by-class dom "total-time-data$"))))) - - -(defun org-chef-martha-stewart-extract-directions (dom) - "Get the directions for a recipe from an marthastewart DOM." - (mapcar #'(lambda (n) (string-trim (dom-texts (dom-children n)))) - (dom-by-class dom "^directions-item-text$"))) - - -(defun org-chef-martha-stewart-fetch (url) - "Given an marthastewart.com URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - `((name . ,(org-chef-martha-stewart-extract-name dom)) - (ingredients . ,(org-chef-martha-stewart-extract-ingredients dom)) - (servings . ,(org-chef-martha-stewart-extract-servings dom)) - (prep-time . ,(org-chef-martha-stewart-extract-prep-time dom)) - (cook-time . ,(org-chef-martha-stewart-extract-cook-time dom)) - (ready-in . ,(org-chef-martha-stewart-extract-ready-in dom)) - (directions . ,(org-chef-martha-stewart-extract-directions dom)) - (source-url . ,url)))) - - -(provide 'org-chef-martha-stewart) -;;; org-chef-martha-stewart.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-nytimes.el b/elpa/org-chef-20231127.1601/org-chef-nytimes.el deleted file mode 100644 index 8fea3c85..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-nytimes.el +++ /dev/null @@ -1,124 +0,0 @@ -;;; org-chef-nytimes.el --- Functions for fetching recipes from nytimes.com. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck/Asilata Bapat - -;; Author: Calvin Beck /Asilata Bapat -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck/Asilata Bapat - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from nytimes.com. - -;;; Code: - - -(require 'org-chef-utils) -(require 'dom) - - -(defun org-chef-nytimes-extract-name (dom) - "Get the name of a recipe from an nytimes DOM." - (string-trim (dom-text (car (dom-by-class dom "recipe-title"))))) - - -(defun org-chef-nytimes-ingredient-to-string (dom) - "Extract string representation of a single ingredient from an nytimes DOM." - (string-join (org-chef-remove-empty-strings (mapcar 'string-trim (dom-strings dom))) " ")) - -(defun org-chef-nytimes-extract-ingredients (dom) - "Get the ingredients for a recipe from an nytimes DOM." - (mapcar 'org-chef-nytimes-ingredient-to-string - (dom-by-tag (car (dom-elements dom 'class "^recipe-ingredients$")) 'li))) - -(defun org-chef-nytimes-extract-servings (dom) - "Get the number of servings for a recipe from an nytimes DOM." - (replace-regexp-in-string " servings" "" (dom-text (car (dom-elements dom 'itemprop "recipeYield"))))) - - -(defun org-chef-nytimes-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an nytimes DOM." - "") - - -(defun org-chef-nytimes-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an nytimes DOM." - "") - - -(defun org-chef-nytimes-extract-ready-in (dom) - "Get the total amount of time for a recipe from an nytimes DOM." - (dom-texts (dom-by-class (cadr (dom-by-tag (dom-by-class dom "recipe-time-yield") 'li)) "recipe-yield-value"))) - - -(defun org-chef-nytimes-extract-directions (dom) - "Get the directions for a recipe from an nytimes DOM." - (mapcar 'dom-texts (dom-by-tag (dom-by-class dom "recipe-steps") 'li))) - - -(defun org-chef-nytimes-from-dom (dom) - "Given an nytimes.com DOM, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions" - (let* ((prep-time (org-chef-nytimes-extract-prep-time dom)) - (cook-time (org-chef-nytimes-extract-cook-time dom)) - (total-time (org-chef-nytimes-extract-ready-in dom))) - - `((ingredients . ,(org-chef-nytimes-extract-ingredients dom)) - (name . ,(org-chef-nytimes-extract-name dom)) - (servings . ,(org-chef-nytimes-extract-servings dom)) - (prep-time . ,prep-time) - (cook-time . ,cook-time) - (ready-in . ,total-time) - (directions . ,(org-chef-nytimes-extract-directions dom))))) - - -(defun org-chef-nytimes-fetch (url) - "Given an nytimes.com URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - (cons `(source-url . ,url) (org-chef-nytimes-from-dom dom)))) - - -(provide 'org-chef-nytimes) -;;; org-chef-nytimes.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-pkg.el b/elpa/org-chef-20231127.1601/org-chef-pkg.el deleted file mode 100644 index a62f615c..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-pkg.el +++ /dev/null @@ -1,15 +0,0 @@ -(define-package "org-chef" "20231127.1601" "Cookbook and recipe management with org-mode." - '((org "0") - (emacs "24")) - :commit "1710b54441ed744dcdfb125d08fb88cfaf452f10" :authors - '(("Calvin Beck" . "hobbes@ualberta.ca")) - :maintainers - '(("Calvin Beck" . "hobbes@ualberta.ca")) - :maintainer - '("Calvin Beck" . "hobbes@ualberta.ca") - :keywords - '("convenience" "abbrev" "outlines" "org" "food" "recipes" "cooking") - :url "https://github.com/Chobbes/org-chef") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/org-chef-20231127.1601/org-chef-reluctant-gourmet.el b/elpa/org-chef-20231127.1601/org-chef-reluctant-gourmet.el deleted file mode 100644 index 6ee4174a..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-reluctant-gourmet.el +++ /dev/null @@ -1,121 +0,0 @@ -;;; org-chef-reluctant-gourmet.el --- Functions for fetching recipes from reluctantgourmet.com. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck - -;; Author: Calvin Beck -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from reluctantgourmet.com. - -;;; Code: - - -(require 'org-chef-utils) -(require 'dom) - - -(defun org-chef-reluctant-gourmet-extract-name (dom) - "Get the name of a recipe from an reluctantgourmet DOM." - (dom-text (car (dom-by-id dom "zlrecipe-title")))) - - -(defun org-chef-reluctant-gourmet-extract-ingredients (dom) - "Get the ingredients for a recipe from an reluctantgourmet DOM." - (mapcar #'(lambda (n) (string-trim (dom-text n))) (dom-by-class dom "^ingredient$"))) - - -(defun org-chef-reluctant-gourmet-extract-servings (dom) - "Get the number of servings for a recipe from an reluctantgourmet DOM." - (dom-texts (car (dom-elements dom 'itemprop "^recipeYield$")))) - - -(defun org-chef-reluctant-gourmet-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an reluctantgourmet DOM." - (dom-texts (car (dom-elements dom 'itemprop "^prepTime$")))) - - -(defun org-chef-reluctant-gourmet-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an reluctantgourmet DOM." - (dom-texts (car (dom-elements dom 'itemprop "^cookTime$")))) - - -(defun org-chef-reluctant-gourmet-extract-ready-in (dom) - "Get the total amount of time for a recipe from an reluctantgourmet DOM." - (dom-texts (car (dom-elements dom 'itemprop "^totalTime$")))) - - -(defun org-chef-reluctant-gourmet-extract-directions (dom) - "Get the directions for a recipe from an reluctantgourmet DOM." - (mapcar #'dom-text (seq-filter (lambda (x) (not (stringp x))) - (dom-elements dom 'itemprop "^recipeInstructions$")))) - - -(defun org-chef-reluctant-gourmet-from-dom (dom) - "Given a reluctantgourmet.com DOM, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions" - (let* ((prep-time (org-chef-reluctant-gourmet-extract-prep-time dom)) - (cook-time (org-chef-reluctant-gourmet-extract-cook-time dom)) - (total-time (org-chef-reluctant-gourmet-extract-ready-in dom))) - - `((ingredients . ,(org-chef-reluctant-gourmet-extract-ingredients dom)) - (name . ,(org-chef-reluctant-gourmet-extract-name dom)) - (servings . ,(org-chef-reluctant-gourmet-extract-servings dom)) - (prep-time . ,prep-time) - (cook-time . ,cook-time) - (ready-in . ,total-time) - (directions . ,(org-chef-reluctant-gourmet-extract-directions dom))))) - - -(defun org-chef-reluctant-gourmet-fetch (url) - "Given a reluctantgourmet.com URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - (cons `(source-url . ,url) (org-chef-reluctant-gourmet-from-dom dom)))) - - -(provide 'org-chef-reluctant-gourmet) -;;; org-chef-reluctant-gourmet.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-saveur.el b/elpa/org-chef-20231127.1601/org-chef-saveur.el deleted file mode 100644 index 1d70fc8a..00000000 --- a/elpa/org-chef-20231127.1601/org-chef-saveur.el +++ /dev/null @@ -1,138 +0,0 @@ -;;; org-chef-saveur.el --- Functions for fetching recipes from saveur.com. -*- lexical-binding: t; -*- - -;; Copyright (C) 2018 Calvin Beck/Derek Ellis - -;; Author: Calvin Beck /Derek Ellis -;; URL: https://github.com/Chobbes/org-chef -;; Created: 2018 - -;; Copyright 2018 Calvin Beck/Derek Ellis - -;; Permission is hereby granted, free of charge, to any person -;; obtaining a copy of this software and associated documentation -;; files (the "Software"), to deal in the Software without -;; restriction, including without limitation the rights to use, copy, -;; modify, merge, publish, distribute, sublicense, and/or sell copies -;; of the Software, and to permit persons to whom the Software is -;; furnished to do so, subject to the following conditions: - -;; The above copyright notice and this permission notice shall be -;; included in all copies or substantial portions of the Software. - -;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -;; SOFTWARE. - -;;; Commentary: - -;; Functions for fetching information from saveur.com. - -;;; Code: - - -(require 'org-chef-utils) -(require 'dom) - - (defun org-chef-saveur-chomp (str) - "Chomp leading and tailing whitespace from STR." - (replace-regexp-in-string (rx (or (: bos (* (any " \t\n"))) - (: (* (any " \t\n")) eos))) - "" - str)) - - -(defun org-chef-saveur-extract-name (dom) - "Get the name of a recipe from an saveur DOM." - (string-trim (dom-text (car (dom-by-class dom "page-title"))))) - - -(defun org-chef-saveur-extract-ingredients (dom) - "Get the ingredients for a recipe from an saveur DOM." - (remove "" - (mapcar 'org-chef-saveur-chomp - (split-string - (replace-regexp-in-string " ⁄ " "/" - (string-join (mapcar #'dom-texts (dom-by-class dom "^ingredients$")))) "\n" )))) - - -(defun org-chef-saveur-extract-servings (dom) - "Get the number of servings for a recipe from an saveur DOM." - (replace-regexp-in-string "serves " "" - (dom-text (dom-by-tag (dom-by-class dom "yield") 'span)))) - - -(defun org-chef-saveur-extract-prep-time (dom) - "Get the amount of prep-time for a recipe from an saveur DOM." - (org-chef-saveur-chomp - (dom-text (dom-by-class dom "^prep-time$")))) - - -(defun org-chef-saveur-extract-cook-time (dom) - "Get the amount of cook-time for a recipe from an saveur DOM." - (org-chef-saveur-chomp - (dom-text (dom-by-class dom "^cook-time$")))) - - -(defun org-chef-saveur-extract-ready-in (dom) - "Get the total amount of time for a recipe from an saveur DOM." - (string-trim (dom-texts (dom-by-class (cadr (dom-by-tag (dom-by-class dom "recipe-time-yield") 'li)) "recipe-yield-value")))) - - -(defun org-chef-saveur-extract-directions (dom) - "Get the directions for a recipe from an saveur DOM." - (remove "" - (mapcar 'org-chef-saveur-chomp - (split-string - (replace-regexp-in-string " ⁄ " "/" - (dom-texts - (dom-by-class dom "^instructions "))) "\n \n " )))) - -(defun org-chef-saveur-from-dom (dom) - "Given an saveur.com DOM, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions" - (let* ((prep-time (org-chef-saveur-extract-prep-time dom)) - (cook-time (org-chef-saveur-extract-cook-time dom)) - (total-time (org-chef-saveur-extract-ready-in dom))) - - `((ingredients . ,(org-chef-saveur-extract-ingredients dom)) - (name . ,(org-chef-saveur-extract-name dom)) - (servings . ,(org-chef-saveur-extract-servings dom)) - (prep-time . ,prep-time) - (cook-time . ,cook-time) - (ready-in . ,total-time) - (directions . ,(org-chef-saveur-extract-directions dom))))) - - -(defun org-chef-saveur-fetch (url) - "Given an saveur.com URL, retrieve the recipe information. - -This returns an alist with the following keys: - -- name -- ingredients -- servings -- prep-time -- cook-time -- ready-in -- directions -- source-url" - (let ((dom (org-chef-url-retrieve-dom url))) - (cons `(source-url . ,url) (org-chef-saveur-from-dom dom)))) - - -(provide 'org-chef-saveur) -;;; org-chef-saveur.el ends here diff --git a/elpa/org-chef-20231127.1601/org-chef-autoloads.el b/elpa/org-chef-20250714.107/org-chef-autoloads.el similarity index 82% rename from elpa/org-chef-20231127.1601/org-chef-autoloads.el rename to elpa/org-chef-20250714.107/org-chef-autoloads.el index 44f10c92..1f1b09aa 100644 --- a/elpa/org-chef-20231127.1601/org-chef-autoloads.el +++ b/elpa/org-chef-20250714.107/org-chef-autoloads.el @@ -15,25 +15,19 @@ Prompt for a recipe URL, and then insert the recipe at point. (fn URL)" t) +(autoload 'org-chef-get-recipe-string-from-url "org-chef" "\ +Prompt for a recipe URL, and return the ‘org-mode’ string. + +(fn URL)") (autoload 'org-chef-get-recipe-from-url "org-chef" "\ Prompt for a recipe URL, and return the ‘org-mode’ string.") (register-definition-prefixes "org-chef" '("org-chef-")) - -;;; Generated autoloads from org-chef-24kitchen.el - -(register-definition-prefixes "org-chef-24kitchen" '("org-chef-24kitchen-")) - ;;; Generated autoloads from org-chef-basics-with-babish.el (register-definition-prefixes "org-chef-basics-with-babish" '("org-chef-basics-with-babish-")) - -;;; Generated autoloads from org-chef-bbc-food.el - -(register-definition-prefixes "org-chef-bbc-food" '("org-chef-bbc-food-")) - ;;; Generated autoloads from org-chef-bbc-good-food.el @@ -94,31 +88,11 @@ the quantities inside the ingredients list. (register-definition-prefixes "org-chef-marmiton" '("org-chef-marmiton-")) - -;;; Generated autoloads from org-chef-martha-stewart.el - -(register-definition-prefixes "org-chef-martha-stewart" '("org-chef-martha-stewart-")) - - -;;; Generated autoloads from org-chef-nytimes.el - -(register-definition-prefixes "org-chef-nytimes" '("org-chef-nytimes-")) - ;;; Generated autoloads from org-chef-recipetin-eats.el (register-definition-prefixes "org-chef-recipetin-eats" '("org-chef-recipetin-eats-")) - -;;; Generated autoloads from org-chef-reluctant-gourmet.el - -(register-definition-prefixes "org-chef-reluctant-gourmet" '("org-chef-reluctant-gourmet-")) - - -;;; Generated autoloads from org-chef-saveur.el - -(register-definition-prefixes "org-chef-saveur" '("org-chef-saveur-")) - ;;; Generated autoloads from org-chef-serious-eats.el diff --git a/elpa/org-chef-20231127.1601/org-chef-basics-with-babish.el b/elpa/org-chef-20250714.107/org-chef-basics-with-babish.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-basics-with-babish.el rename to elpa/org-chef-20250714.107/org-chef-basics-with-babish.el diff --git a/elpa/org-chef-20231127.1601/org-chef-bbc-good-food.el b/elpa/org-chef-20250714.107/org-chef-bbc-good-food.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-bbc-good-food.el rename to elpa/org-chef-20250714.107/org-chef-bbc-good-food.el diff --git a/elpa/org-chef-20231127.1601/org-chef-binging-with-babish.el b/elpa/org-chef-20250714.107/org-chef-binging-with-babish.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-binging-with-babish.el rename to elpa/org-chef-20250714.107/org-chef-binging-with-babish.el diff --git a/elpa/org-chef-20231127.1601/org-chef-chef-koch.el b/elpa/org-chef-20250714.107/org-chef-chef-koch.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-chef-koch.el rename to elpa/org-chef-20250714.107/org-chef-chef-koch.el diff --git a/elpa/org-chef-20231127.1601/org-chef-cultures-for-health.el b/elpa/org-chef-20250714.107/org-chef-cultures-for-health.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-cultures-for-health.el rename to elpa/org-chef-20250714.107/org-chef-cultures-for-health.el diff --git a/elpa/org-chef-20231127.1601/org-chef-edit.el b/elpa/org-chef-20250714.107/org-chef-edit.el similarity index 97% rename from elpa/org-chef-20231127.1601/org-chef-edit.el rename to elpa/org-chef-20250714.107/org-chef-edit.el index cc1bd999..eadca04e 100644 --- a/elpa/org-chef-20231127.1601/org-chef-edit.el +++ b/elpa/org-chef-20250714.107/org-chef-edit.el @@ -36,7 +36,7 @@ multiplying them all by MULTIPLIER" (save-excursion (while (re-search-forward - "\\([0-9]+\\)?\\([¼½¾⅐⅑⅒⅓⅔⅕⅖⅗⅘⅙⅚⅛⅜⅝⅞]\\)\\|\\([0-9]+\\)/\\([0-9]+\\)\\|\\([0-9]+\\)" (mark) t) + "\\([0-9]+\\)?\\([¼½¾⅐⅑⅒⅓⅔⅕⅖⅗⅘⅙⅚⅛⅜⅝⅞]\\)\\|\\([0-9]+\\)/\\([0-9]+\\)\\|\\([0-9]+\\(?:\\.[0-9]+\\)?\\)" (mark) t) (cond ;; Unicode vulgar/mixed fractions ((match-string 2) diff --git a/elpa/org-chef-20231127.1601/org-chef-fine-cooking.el b/elpa/org-chef-20250714.107/org-chef-fine-cooking.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-fine-cooking.el rename to elpa/org-chef-20250714.107/org-chef-fine-cooking.el diff --git a/elpa/org-chef-20231127.1601/org-chef-genius-kitchen.el b/elpa/org-chef-20250714.107/org-chef-genius-kitchen.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-genius-kitchen.el rename to elpa/org-chef-20250714.107/org-chef-genius-kitchen.el diff --git a/elpa/org-chef-20231127.1601/org-chef-jamie-oliver.el b/elpa/org-chef-20250714.107/org-chef-jamie-oliver.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-jamie-oliver.el rename to elpa/org-chef-20250714.107/org-chef-jamie-oliver.el diff --git a/elpa/org-chef-20231127.1601/org-chef-json-ld.el b/elpa/org-chef-20250714.107/org-chef-json-ld.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-json-ld.el rename to elpa/org-chef-20250714.107/org-chef-json-ld.el diff --git a/elpa/org-chef-20231127.1601/org-chef-kotikokki.el b/elpa/org-chef-20250714.107/org-chef-kotikokki.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-kotikokki.el rename to elpa/org-chef-20250714.107/org-chef-kotikokki.el diff --git a/elpa/org-chef-20231127.1601/org-chef-marmiton.el b/elpa/org-chef-20250714.107/org-chef-marmiton.el similarity index 58% rename from elpa/org-chef-20231127.1601/org-chef-marmiton.el rename to elpa/org-chef-20250714.107/org-chef-marmiton.el index 2a71bef7..b1dc0273 100644 --- a/elpa/org-chef-20231127.1601/org-chef-marmiton.el +++ b/elpa/org-chef-20250714.107/org-chef-marmiton.el @@ -41,7 +41,7 @@ (defun org-chef-marmiton-sanitize (str) "Sanitize the STR by removing beginning/trailing spaces extracted from a marmiton dom." - (replace-regexp-in-string "^[ \r\n]*\\(.*[^ \r\n]\\)[ \r\n]*$" "\\1" str)) + (replace-regexp-in-string "\n" " " (replace-regexp-in-string "^[ \r\n]*\\(.*[^ \r\n]\\)[ \r\n]*$" "\\1" str))) (defun org-chef-marmiton-extract-dom-text (dom) "Embedded the operation santize of dom-text from a marmiton DOM." @@ -49,43 +49,44 @@ (defun org-chef-marmiton-extract-name (dom) "Get the name of a recipe from a marmiton DOM." - (dom-text (car (dom-elements dom 'class "^main-title $")))) - -(defun org-chef-marmiton-extract-current-ingredient (dom) - "Extract element for the current ingredient from a marmiton DOM." - (concat - (org-chef-marmiton-extract-dom-text (dom-elements dom 'class "^recipe-ingredient-qt$")) - " " - (org-chef-marmiton-extract-dom-text (dom-elements dom 'class "^ingredient$")))) + (dom-text (dom-child-by-tag (dom-elements marmidom 'class "^main-title$") 'h1))) (defun org-chef-marmiton-extract-ingredients (dom) "Get the ingredients for a recipe from a marmiton DOM." - (mapcar 'org-chef-marmiton-extract-current-ingredient (dom-elements dom 'class "^recipe-ingredients__list__item$"))) + (mapcar 'org-chef-marmiton-extract-dom-text (dom-elements dom 'class "^card-ingredient-content$"))) + +(defun org-chef-marmiton-step-container-to-step (dom) + "Take a step DOM and turn it into a string for the directions." + (dom-text (dom-child-by-tag dom 'p))) (defun org-chef-marmiton-extract-directions (dom) "Get the directions for a recipe from a marmiton DOM." + (mapcar #'org-chef-marmiton-step-container-to-step + (dom-elements marmidom 'class "^recipe-step-list__container$"))) - (mapcar (lambda (x) (org-chef-marmiton-extract-dom-text (cddr x))) - (dom-elements dom 'class "^recipe-preparation__list__item$"))) +(defun org-chef-marmiton-extract-time-details (dom) + "Get the time details DOM from a marmiton recipe." + (dom-elements dom 'class "time__details")) -(defun org-chef-marmiton-extract-prep-time (dom) - "Get the preparation time for a recipe from a marmiton DOM." - (org-chef-marmiton-extract-dom-text - (dom-elements (dom-elements dom 'class "recipe-infos__timmings__preparation") - 'class "^recipe-infos__timmings__value$"))) +(defun org-chef-marmiton-prep-time-from-details (dom) + "Extract prep time from the time details DOM" + (dom-text (cadddr (dom-children (cadr (dom-children dom)))))) -(defun org-chef-marmiton-extract-cook-time (dom) - "Extract the cooking time for a recipe from a marmiton DOM." - (org-chef-marmiton-extract-dom-text - (dom-elements (dom-elements dom 'class "recipe-infos__timmings__cooking") - 'class "^recipe-infos__timmings__value$"))) +(defun org-chef-marmiton-cook-time-from-details (dom) + "Extract cook time from the time details DOM" + (dom-text (cadddr (dom-children (cdr (cddddr (dom-children dom))))))) +(defun org-chef-marmiton-extract-ready-in (dom) + "Extract the total time for a recipe from a marmiton DOM." + (org-chef-marmiton-extract-dom-text + (dom-child-by-tag + (dom-elements (dom-elements marmidom 'class "recipe-preparation__time") + 'class "^time__total$") + 'div))) (defun org-chef-marmiton-extract-servings (dom) - (dom-text (car (dom-elements dom 'class "^title-2 recipe-infos__quantity__value$")))) - - - + (dom-text (car (dom-elements dom 'class "^recipe-ingredients__qt-counter__value_container")))) +(dom-elements marmidom 'class "recipe-ingredients__qt-counter__value_container") (defun org-chef-marmiton-from-dom (dom) "Given a marmiton.org DOM, retrieve the recipe information. @@ -98,13 +99,15 @@ This returns an alist with the following keys: - cook-time - ready-in - directions" - `((ingredients . ,(org-chef-marmiton-extract-ingredients dom)) - (name . ,(org-chef-marmiton-extract-name dom)) - (servings . ,(org-chef-marmiton-extract-servings dom)) - (prep-time . ,(org-chef-marmiton-extract-prep-time dom)) - (cook-time . ,(org-chef-marmiton-extract-cook-time dom)) - (ready-in . nil) - (directions . ,(org-chef-marmiton-extract-directions dom)))) + (let + ((time-details (org-chef-marmiton-extract-time-details dom))) + `((ingredients . ,(org-chef-marmiton-extract-ingredients dom)) + (name . ,(org-chef-marmiton-extract-name dom)) + (servings . ,(org-chef-marmiton-extract-servings dom)) + (prep-time . ,(org-chef-marmiton-prep-time-from-details time-details)) + (cook-time . ,(org-chef-marmiton-cook-time-from-details time-details)) + (ready-in . ,(org-chef-marmiton-extract-ready-in dom)) + (directions . ,(org-chef-marmiton-extract-directions dom))))) (defun org-chef-marmiton-fetch (url) diff --git a/elpa/org-chef-20250714.107/org-chef-pkg.el b/elpa/org-chef-20250714.107/org-chef-pkg.el new file mode 100644 index 00000000..a023d369 --- /dev/null +++ b/elpa/org-chef-20250714.107/org-chef-pkg.el @@ -0,0 +1,11 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "org-chef" "20250714.107" + "Cookbook and recipe management with org-mode." + '((org "0") + (emacs "24.3")) + :url "https://github.com/Chobbes/org-chef" + :commit "9f749324f7e8c51a2da8516820268c83e825c6c7" + :revdesc "9f749324f7e8" + :keywords '("convenience" "abbrev" "outlines" "org" "food" "recipes" "cooking") + :authors '(("Calvin Beck" . "hobbes@ualberta.ca")) + :maintainers '(("Calvin Beck" . "hobbes@ualberta.ca"))) diff --git a/elpa/org-chef-20231127.1601/org-chef-recipetin-eats.el b/elpa/org-chef-20250714.107/org-chef-recipetin-eats.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-recipetin-eats.el rename to elpa/org-chef-20250714.107/org-chef-recipetin-eats.el diff --git a/elpa/org-chef-20231127.1601/org-chef-serious-eats.el b/elpa/org-chef-20250714.107/org-chef-serious-eats.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-serious-eats.el rename to elpa/org-chef-20250714.107/org-chef-serious-eats.el diff --git a/elpa/org-chef-20231127.1601/org-chef-simply-recipes.el b/elpa/org-chef-20250714.107/org-chef-simply-recipes.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-simply-recipes.el rename to elpa/org-chef-20250714.107/org-chef-simply-recipes.el diff --git a/elpa/org-chef-20231127.1601/org-chef-taste.el b/elpa/org-chef-20250714.107/org-chef-taste.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-taste.el rename to elpa/org-chef-20250714.107/org-chef-taste.el diff --git a/elpa/org-chef-20231127.1601/org-chef-utils.el b/elpa/org-chef-20250714.107/org-chef-utils.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-utils.el rename to elpa/org-chef-20250714.107/org-chef-utils.el diff --git a/elpa/org-chef-20231127.1601/org-chef-wordpress.el b/elpa/org-chef-20250714.107/org-chef-wordpress.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-wordpress.el rename to elpa/org-chef-20250714.107/org-chef-wordpress.el diff --git a/elpa/org-chef-20231127.1601/org-chef-xiachufang.el b/elpa/org-chef-20250714.107/org-chef-xiachufang.el similarity index 100% rename from elpa/org-chef-20231127.1601/org-chef-xiachufang.el rename to elpa/org-chef-20250714.107/org-chef-xiachufang.el diff --git a/elpa/org-chef-20231127.1601/org-chef.el b/elpa/org-chef-20250714.107/org-chef.el similarity index 79% rename from elpa/org-chef-20231127.1601/org-chef.el rename to elpa/org-chef-20250714.107/org-chef.el index 74089d73..a0d2ac4c 100644 --- a/elpa/org-chef-20231127.1601/org-chef.el +++ b/elpa/org-chef-20250714.107/org-chef.el @@ -1,13 +1,14 @@ -;;; org-chef.el --- Cookbook and recipe management with org-mode. -*- lexical-binding: t; -*- +;;; org-chef.el --- Cookbook and recipe management with org-mode -*- lexical-binding: t; -*- ;; Copyright (C) 2018 Calvin Beck ;; Author: Calvin Beck ;; URL: https://github.com/Chobbes/org-chef ;; Created: 2018 -;; Version: 0.1.3 +;; Package-Version: 20250714.107 +;; Package-Revision: 9f749324f7e8 ;; Keywords: convenience, abbrev, outlines, org, food, recipes, cooking -;; Package-Requires: ((org "0") (emacs "24")) +;; Package-Requires: ((org "0") (emacs "24.3")) ;; Copyright 2018 Calvin Beck @@ -43,23 +44,11 @@ (require 'org-chef-utils) (require 'org-chef-edit) -(require 'org-chef-24kitchen) (require 'org-chef-json-ld) (require 'org-chef-genius-kitchen) -(require 'org-chef-simply-recipes) -(require 'org-chef-martha-stewart) -(require 'org-chef-cultures-for-health) (require 'org-chef-fine-cooking) -(require 'org-chef-marmiton) -(require 'org-chef-serious-eats) -(require 'org-chef-reluctant-gourmet) -(require 'org-chef-chef-koch) -(require 'org-chef-nytimes) -(require 'org-chef-saveur) -(require 'org-chef-xiachufang) (require 'org-chef-wordpress) (require 'org-chef-taste) -(require 'org-chef-bbc-food) (require 'org-chef-bbc-good-food) (require 'org-chef-jamie-oliver) (require 'org-chef-recipetin-eats) @@ -79,8 +68,8 @@ See https://github.com/magit/ghub/issues/81 and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34341 for more information.") -(defcustom org-chef-prefer-json-ld nil - "Prefer JSON-LD extractor over custom extractor. This is for testing the JSON-LD functionality." +(defcustom org-chef-prefer-json-ld t + "Prefer JSON-LD extractor over custom extractor." :type 'boolean) (defun org-chef-to-unordered-list (list) @@ -131,26 +120,16 @@ for more information.") (defun org-chef-fetch-recipe-specific-url (URL) "Look up a recipe based on a specific URL." (cond - ((org-chef-match-url "24kitchen.nl" URL) (org-chef-24kitchen-fetch URL)) ((org-chef-match-url "geniuskitchen.com" URL) (org-chef-genius-kitchen-fetch URL)) - ((org-chef-match-url "simplyrecipes.com" URL) (org-chef-simply-recipes-fetch URL)) - ((org-chef-match-url "marthastewart.com" URL) (org-chef-martha-stewart-fetch URL)) - ((org-chef-match-url "culturesforhealth.com" URL) (org-chef-cultures-for-health-fetch URL)) - ((org-chef-match-url "marmiton.org" URL) (org-chef-marmiton-fetch URL)) - ((org-chef-match-url "seriouseats.com" URL) (org-chef-serious-eats-fetch URL)) - ((org-chef-match-url "reluctantgourmet.com" URL) (org-chef-reluctant-gourmet-fetch URL)) - ((org-chef-match-url "chefkoch.de" URL) (org-chef-chef-koch-fetch URL)) - ((org-chef-match-url "nytimes.com" URL) (org-chef-nytimes-fetch URL)) - ((org-chef-match-url "saveur.com" URL) (org-chef-saveur-fetch URL)) - ((org-chef-match-url "xiachufang.com" URL) (org-chef-xiachufang-fetch URL)) ((org-chef-match-url "finecooking.com" URL) (org-chef-fine-cooking-fetch URL)) ((org-chef-match-url "taste.com.au" URL) (org-chef-taste-fetch URL)) - ((org-chef-match-url "bbc.co.uk/food/" URL) (org-chef-bbc-food-fetch URL)) ((org-chef-match-url "bbcgoodfood.com" URL) (org-chef-bbc-good-food-fetch URL)) ((org-chef-match-url "jamieoliver.com" URL) (org-chef-jamie-oliver-fetch URL)) ((org-chef-match-url "recipetineats.com" URL) (org-chef-recipetin-eats-fetch URL)) ((org-chef-match-url "basicswithbabish.co" URL) (org-chef-basics-with-babish-fetch URL)) + ((org-chef-match-url "andrew-rea-zfrt.squarespace.com" URL) (org-chef-basics-with-babish-fetch URL)) ((org-chef-match-url "bingingwithbabish.com" URL) (org-chef-binging-with-babish-fetch URL)) + ((org-chef-match-url "andrew-rea-c8g3.squarespace.com" URL) (org-chef-binging-with-babish-fetch URL)) ((org-chef-match-url "kotikokki.net" URL) (org-chef-kotikokki-fetch URL)) (t nil))) @@ -170,13 +149,16 @@ for more information.") (interactive "sRecipe URL: ") (org-chef-recipe-insert-org (org-chef-fetch-recipe URL))) +;;;###autoload +(defun org-chef-get-recipe-string-from-url (URL) + "Prompt for a recipe URL, and return the ‘org-mode’ string." + (org-chef-recipe-org-string (org-chef-fetch-recipe URL))) ;;;###autoload (defun org-chef-get-recipe-from-url () "Prompt for a recipe URL, and return the ‘org-mode’ string." (let ((URL (read-string "Recipe URL: "))) - (org-chef-recipe-org-string (org-chef-fetch-recipe URL)))) - + (org-chef-get-recipe-string-from-url URL))) (provide 'org-chef) ;;; org-chef.el ends here -- 2.47.3