From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:42324) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHrq0-0003P3-Dw for guix-patches@gnu.org; Fri, 27 Mar 2020 12:28:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHrpz-00077W-0l for guix-patches@gnu.org; Fri, 27 Mar 2020 12:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHrpy-00076g-Ta for guix-patches@gnu.org; Fri, 27 Mar 2020 12:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jHrpy-0000Wx-QF for guix-patches@gnu.org; Fri, 27 Mar 2020 12:28:02 -0400 Subject: [bug#39258] [PATCH v3 2/3] guix: Search package metadata cache. Resent-Message-ID: From: Arun Isaac Date: Fri, 27 Mar 2020 21:56:53 +0530 Message-Id: <20200327162654.18785-3-arunisaac@systemreboot.net> In-Reply-To: <20200327162654.18785-1-arunisaac@systemreboot.net> References: <20200327162654.18785-1-arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39258@debbugs.gnu.org Cc: Arun Isaac , mail@ambrevar.xyz, ludo@gnu.org, zimon.toutoune@gmail.com * gnu/packages.scm (search-packages): New function. * guix/packages.scm (): New record type. --- gnu/packages.scm | 38 ++++++++++++++++++++++++++++++++++++++ guix/packages.scm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/gnu/packages.scm b/gnu/packages.scm index c0b527acf0..2510b1fe49 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -59,6 +59,7 @@ find-packages-by-name find-package-locations find-best-packages-by-name + search-packages specification->package specification->package+output @@ -474,6 +475,43 @@ package modules." #:opts '(#:to-file? #t))))) cache-file) +(define (search-packages profile regexps) + "Return a list of pairs: objects corresponding to +packages whose name, synopsis, description, or output matches at least one of +REGEXPS sorted by relevance, and its non-zero relevance score." + (define cache-file + (string-append profile %package-metadata-cache-file)) + + (define cache + (catch 'system-error + (lambda () + (map (match-lambda + (#(name version dependencies outputs systems + synopsis description home-page (file line column)) + (make-package-metadata + name version dependencies outputs systems + synopsis description home-page + (location file line column)))) + (load-compiled cache-file))) + (lambda args + (if (= ENOENT (system-error-errno args)) + #f + (apply throw args))))) + + (let ((matches + (filter-map (lambda (package-metadata) + (let ((score (package-relevance package-metadata regexps))) + (and (positive? score) + (cons package-metadata score)))) + cache))) + (sort matches + (lambda (m1 m2) + (match m1 + ((package1 . score1) + (match m2 + ((package2 . score2) + (> score1 score2))))))))) + (define %sigint-prompt ;; The prompt to jump to upon SIGINT. diff --git a/guix/packages.scm b/guix/packages.scm index 70b1478c91..bb06baa1ee 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -115,6 +116,21 @@ transitive-input-references + package-metadata + make-package-metadata + package-metadata? + this-package-metadata + package-metadata-name + package-metadata-version + package-metadata-dependencies + package-metadata-outputs + package-metadata-synopsis + package-metadata-description + package-metadata-license + package-metadata-home-page + package-metadata-supported-systems + package-metadata-location + %supported-systems %hurd-systems %hydra-supported-systems @@ -310,6 +326,22 @@ name of its URI." package) 16))))) +(define-record-type* + package-metadata make-package-metadata + package-metadata? + this-package-metadata + (name package-metadata-name) + (version package-metadata-version) + (dependencies package-metadata-dependencies) + (outputs package-metadata-outputs) + (supported-systems package-metadata-supported-systems) + (synopsis package-metadata-synopsis) + (description package-metadata-description) + ;; TODO: Add license + ;; (license package-metadata-license) + (home-page package-metadata-home-page) + (location package-metadata-location)) + (define (package-upstream-name package) "Return the upstream name of PACKAGE, which could be different from the name it has in Guix." -- 2.25.1