[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 8ee4770 264/357: [admin int] Add abstraction: archive-
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 8ee4770 264/357: [admin int] Add abstraction: archive--form-from-file-contents |
Date: |
Thu, 10 Dec 2020 18:06:56 -0500 (EST) |
branch: elpa-admin
commit 8ee477062712545321a2810c964e45f9756a8e4a
Author: Thien-Thi Nguyen <ttn@gnu.org>
Commit: Thien-Thi Nguyen <ttn@gnu.org>
[admin int] Add abstraction: archive--form-from-file-contents
* admin/archive-contents.el (archive--form-from-file-contents): New func.
(archive--multi-file-package-def, archive--get-prop)
(archive--read-externals-list, archive--html-make-index): Use it.
---
admin/archive-contents.el | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 67f4414..6f2fc76 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -299,15 +299,21 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(cons (intern pkg) (vector (archive--version-to-list vers)
req (nth 3 exp) 'tar extras))))
+(defun archive--form-from-file-contents (filename)
+ (with-temp-buffer
+ (insert-file-contents filename)
+ ;; This is unnecessary because ‘with-temp-buffer’ generates a new
+ ;; (empty) buffer, and ‘insert-file-contents’ inserts after point.
+ ;; In other words, point is alraedy at bob.
+ ;;- (goto-char (point-min))
+ (read (current-buffer))))
+
(defun archive--multi-file-package-def (dir pkg)
"Return the `define-package' form in the file DIR/PKG-pkg.el."
(let ((pkg-file (expand-file-name (concat pkg "-pkg.el") dir)))
- (with-temp-buffer
- (unless (file-exists-p pkg-file)
- (error "File not found: %s" pkg-file))
- (insert-file-contents pkg-file)
- (goto-char (point-min))
- (read (current-buffer)))))
+ (unless (file-exists-p pkg-file)
+ (error "File not found: %s" pkg-file))
+ (archive--form-from-file-contents pkg-file)))
(defun archive--refresh-pkg-file ()
(let* ((dir (directory-file-name default-directory))
@@ -389,10 +395,8 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(let ((pkgdescfile (expand-file-name (format "%s-pkg.el" name)
srcdir)))
(when (file-readable-p pkgdescfile)
- (with-temp-buffer
- (insert-file-contents pkgdescfile)
- (let ((desc (read (current-buffer))))
- (plist-get (cdr desc) kprop)))))
+ (let ((desc (archive--form-from-file-contents pkgdescfile)))
+ (plist-get (cdr desc) kprop))))
(when (file-readable-p mainsrcfile)
(with-temp-buffer
(insert-file-contents mainsrcfile)
@@ -437,9 +441,8 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(replace-regexp-in-string "&" "&" txt)))
(defun archive--read-externals-list (&optional dir)
- (with-temp-buffer
- (insert-file-contents (expand-file-name "externals-list" dir))
- (read (current-buffer))))
+ (archive--form-from-file-contents
+ (expand-file-name "externals-list" dir)))
(defun archive--insert-repolinks (name srcdir _mainsrcfile url)
(when url
@@ -559,11 +562,8 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(defun batch-html-make-index ()
(let ((packages (make-hash-table :test #'equal))
(archive-contents
- (with-temp-buffer
- (insert-file-contents "archive-contents")
- (goto-char (point-min))
- ;; Skip the first element which is a version number.
- (cdr (read (current-buffer))))))
+ ;; Skip the first element which is a version number.
+ (cdr (archive--form-from-file-contents "archive-contents"))))
(dolist (subdir (directory-files "../../build/packages" nil))
(cond
((member subdir '("." ".." "elpa.rss" "index.html" "archive-contents")))
- [elpa] elpa-admin 7e4545d 200/357: * admin/archive-contents.el (archive--html-header): Use `title' for the H1., (continued)
- [elpa] elpa-admin 7e4545d 200/357: * admin/archive-contents.el (archive--html-header): Use `title' for the H1., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 49382d4 067/357: Some tweaks to README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e38e391 108/357: Use lm-keywords-list instead of split-string for archive contents., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a73fa6a 113/357: update link in README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a0bc800 185/357: Squashed 'packages/pinentry/' content from commit 075deb6, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 98bcea9 268/357: [admin int] Add abstraction: archive--dirname, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin e2b9274 266/357: [admin int] Simplify ‘archive--write-pkg-file’ calling convention., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ae66216 267/357: [admin int] Replace one-armed-‘if’ w/ either ‘when’ or ‘and’., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 32ff16d 247/357: Merge commit 'ff57536e7c8e7dd2b5bfdf803fe78327b572e080', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 94286b7 276/357: * packages/yasnippet: Merge version 0.12.0 from upstream., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8ee4770 264/357: [admin int] Add abstraction: archive--form-from-file-contents,
Stefan Monnier <=
- [elpa] elpa-admin b9ba590 252/357: packages/yasnippet: Merge external (v0.11.0), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 602f32e 277/357: Merge yasnippet 0.12.1 from upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 19a11bc 278/357: Add explicit instructions for new external packages, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 280353e 287/357: Merge commit 'cb905bdc728fb3b5f9fdff8836d71b62bd717eab' from mmm-mode, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 63888f3 292/357: Warn about transfer.fsckObjects, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a5d74b0 291/357: * packages/yasnippet: Merge version 0.13.0 from upstream., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin eb92dfc 293/357: Fix repo links for :core packages, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a71a25a 306/357: Update packages/darkroom from upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f79d3e5 327/357: Merge commit 'b49ba259cc7e490e8acdecd28e66063f5ad1325e', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f9ce2f8 328/357: Merge commit 'b2c449c0d5aad67eeee9857e7fd7710f985084ec', Stefan Monnier, 2020/12/10