From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 10AFE9305B for ; Thu, 15 Sep 2022 15:10:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F29C2199BA for ; Thu, 15 Sep 2022 15:09:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 15 Sep 2022 15:09:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8745E442DF for ; Thu, 15 Sep 2022 15:09:29 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 15 Sep 2022 15:09:13 +0200 Message-Id: <20220915130918.727902-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220915130918.727902-1-f.gruenbichler@proxmox.com> References: <20220915130918.727902-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.158 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-apt 1/3] release: add Commands file reference type X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Sep 2022 13:10:01 -0000 used by command-not-found to lookup which package ships which command. Signed-off-by: Fabian Grünbichler --- Notes: this is technically a breaking change, but the only user of this already has a fallback match arm. I wonder whether we should mark this as non-exhaustive? src/deb822/release_file.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/deb822/release_file.rs b/src/deb822/release_file.rs index 6668450..2b7245b 100644 --- a/src/deb822/release_file.rs +++ b/src/deb822/release_file.rs @@ -51,6 +51,8 @@ pub type Component = String; /// `Packages` and `Sources` will contain further reference to binary or source package files. /// These are handled in `PackagesFile` and `SourcesFile` respectively. pub enum FileReferenceType { + /// A `Commands` index listing command to package mappings + Commands(Architecture, Option), /// A `Contents` index listing contents of binary packages Contents(Architecture, Option), /// A `Contents` index listing contents of binary udeb packages @@ -123,6 +125,20 @@ impl FileReferenceType { Ok(FileReferenceType::Unknown) } } + "cnf" => { + if let Some(rest) = rest.strip_prefix("Commands-") { + if let Some((arch, ext)) = rest.rsplit_once('.') { + Ok(FileReferenceType::Commands( + arch.to_owned(), + FileReferenceType::match_compression(ext).ok().flatten(), + )) + } else { + Ok(FileReferenceType::Commands(rest.to_owned(), None)) + } + } else { + Ok(FileReferenceType::Unknown) + } + }, "dep11" => { if let Some((_path, ext)) = rest.rsplit_once('.') { Ok(FileReferenceType::Dep11( @@ -198,7 +214,8 @@ impl FileReferenceType { pub fn compression(&self) -> Option { match *self { - FileReferenceType::Contents(_, comp) + FileReferenceType::Commands(_, comp) + | FileReferenceType::Contents(_, comp) | FileReferenceType::ContentsUdeb(_, comp) | FileReferenceType::Packages(_, comp) | FileReferenceType::Sources(comp) -- 2.30.2