From 6a91bd4da75a47e81ad9d8894624e8d3a06ef4cd Mon Sep 17 00:00:00 2001 From: cage Date: Fri, 27 Aug 2021 12:15:12 +0200 Subject: [PATCH] - defined alias for 'zip-file-p' as 'gempub-file-p'. --- src/gempub.lisp | 8 +++++--- src/package.lisp | 1 + src/program-events.lisp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gempub.lisp b/src/gempub.lisp index e512332..e63d0e5 100644 --- a/src/gempub.lisp +++ b/src/gempub.lisp @@ -71,7 +71,7 @@ (define-constant +metadata-entry-name "metadata.txt" :test #'string=) (defun extract-metadata (zip-file) - (when (zip-info:zip-file-p zip-file :ignore-errors t) + (when (gempub:gempub-file-p zip-file :ignore-errors t) (let ((entries (zip-info:list-entries zip-file))) (when (find +metadata-entry-name entries :test #'String=) (when-let ((metadata-raw (os-utils:unzip-single-file zip-file @@ -97,11 +97,13 @@ (getf metadata :version) (getf metadata :cover)))) +(defalias gempub-file-p #'zip-info:zip-file-p) + (defun sync-library (&key (notify nil)) (when notify (ui:notify (format nil (_ "Syncing gempub library.")))) (let ((all-known (db:all-gempub-metadata)) - (all-gempub-files (remove-if-not (lambda (a) (zip-info:zip-file-p a + (all-gempub-files (remove-if-not (lambda (a) (gempub:gempub-file-p a :ignore-errors t)) (fs:collect-files/dirs (swconf:gempub-library-directory)))) (removed-known '()) @@ -109,7 +111,7 @@ (loop for known in all-known do (let ((local-uri (db:row-local-uri known))) (when (not (and (fs:file-exists-p local-uri) - (zip-info:zip-file-p local-uri :ignore-errors t))) + (gempub:gempub-file-p local-uri :ignore-errors t))) (push local-uri removed-known) (db:gempub-metadata-delete local-uri)))) (loop for gempub-file in (mapcar #'uri:normalize-path all-gempub-files) do diff --git a/src/package.lisp b/src/package.lisp index 08a414f..ddb5d92 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -2449,6 +2449,7 @@ (:shadowing-import-from :text-utils :split-lines) (:shadowing-import-from :misc :random-elt :shuffle) (:export + :gempub-file-p :extract-metadata :sync-library :parse-search-gempub diff --git a/src/program-events.lisp b/src/program-events.lisp index 47a03ad..0d6f25c 100644 --- a/src/program-events.lisp +++ b/src/program-events.lisp @@ -1131,7 +1131,7 @@ (gemini-viewer:push-url-to-history window index-path) (refresh-gemini-message-window links raw-text ir nil) (windows:draw window))) - ((zip-info:zip-file-p local-path :ignore-errors t) + ((gempub:gempub-file-p local-path :ignore-errors t) (let ((temp-directory (fs:temporary-directory))) (os-utils:unzip-file local-path temp-directory) (let* ((library-entry (db:gempub-metadata-find local-path))