From patchwork Fri Mar 27 16:26:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 20908 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CF4DB27BBE4; Fri, 27 Mar 2020 16:28:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 38B1F27BBEA for ; Fri, 27 Mar 2020 16:28:12 +0000 (GMT) Received: from localhost ([::1]:44146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHrq7-0003Rm-PH for patchwork@mira.cbaines.net; Fri, 27 Mar 2020 12:28:11 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39258] [PATCH v3 2/3] guix: Search package metadata cache. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Mar 2020 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39258 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 39258@debbugs.gnu.org Cc: Arun Isaac , mail@ambrevar.xyz, ludo@gnu.org, zimon.toutoune@gmail.com Received: via spool by 39258-submit@debbugs.gnu.org id=B39258.15853264401946 (code B ref 39258); Fri, 27 Mar 2020 16:28:02 +0000 Received: (at 39258) by debbugs.gnu.org; 27 Mar 2020 16:27:20 +0000 Received: from localhost ([127.0.0.1]:33284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHrpH-0000V8-T2 for submit@debbugs.gnu.org; Fri, 27 Mar 2020 12:27:20 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:36900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jHrpD-0000Uk-4S for 39258@debbugs.gnu.org; Fri, 27 Mar 2020 12:27:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=8009glw+epzSdw5fvr0/RvcHVylaG/W/J8vu/6Gx8iQ=; b=TArhqYsNVyfjNE+iMhCyJ6+Ldf cHHBOZQNPRkdwq4GhNmuazzVUSQzgFlioFNcUpS5JicSer6p0hoADGBPVi893FFqKMwtHGlHKbYeu UBoPMkK0jy0ydl4sxFv57ekWh9ObiunWgWPXm8E4HJB6UDrvWSux0WCb0OlzBBXyi/dI=; Received: from [192.168.2.1] (helo=steel.lan) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jHrp5-0044U6-08; Fri, 27 Mar 2020 21:57:07 +0530 From: Arun Isaac Date: Fri, 27 Mar 2020 21:56:53 +0530 Message-Id: <20200327162654.18785-3-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327162654.18785-1-arunisaac@systemreboot.net> References: <20200327162654.18785-1-arunisaac@systemreboot.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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."