From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pbs-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4A44E1FF163 for <inbox@lore.proxmox.com>; Thu, 24 Oct 2024 10:01:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 70D1997DD; Thu, 24 Oct 2024 10:02:13 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Thu, 24 Oct 2024 10:01:45 +0200 Message-Id: <20241024080150.30200-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [verify.rs, diff.rs, helper.rs, main.rs, tools.rs, pull.rs, datastore.rs, manifest.rs, catalog.rs, restore.rs, mod.rs, mount.rs] Subject: [pbs-devel] [PATCH v3 proxmox-backup 0/5] introduce dedcated archive name api type X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com> There is currently no dedicated api type for the archive names, given as input parameters to several api methods. This patches introduce a dedicated type for archive names, in order to collect the code for checks and eventual mappings into one location and reduce possible unintentional misuse by passing incorrect argument values to the functions and methods consuming the archive names. As a positive side effect, the mapping now allows also for the server archive type extensions to be optionally passed as input to several commands, e.g. ``` proxmox-backup-client restore <snapshot> <name>.pxar.didx <target> ``` is now valid, being equal to ``` proxmox-backup-client restore <snapshot> <name.pxar <target> ``` @Gabriel: Did not include your git trailers since there was some rebasing, please double check if the changes are still fine by you. Changes since version 2: - Rebased onto current master - Amended commit messages Changes since version 1 (thanks @Gabriel): - Rebased onto current master - Added unit tests for archive name parsing - Added missing check for invalid archive names ending with '/' - Inlined variable names for format strings - Import implemented traits at top Christian Ebner (5): datastore: move `ArchiveType` to api types api types: introduce `BackupArchiveName` type client/server: use dedicated api type for all archive names client: drop unused parse_archive_type helper api types: add unit tests for backup archive name parsing pbs-api-types/src/datastore.rs | 183 ++++++++++++++++++++++++++- pbs-client/src/backup_reader.rs | 14 +- pbs-client/src/backup_writer.rs | 41 +++--- pbs-client/src/pxar/tools.rs | 3 +- pbs-client/src/tools/mod.rs | 24 ++-- pbs-datastore/src/datastore.rs | 6 +- pbs-datastore/src/manifest.rs | 52 +++----- pbs-datastore/src/snapshot_reader.rs | 4 +- proxmox-backup-client/src/catalog.rs | 31 +++-- proxmox-backup-client/src/helper.rs | 7 +- proxmox-backup-client/src/main.rs | 127 ++++++++++--------- proxmox-backup-client/src/mount.rs | 33 ++--- proxmox-file-restore/src/main.rs | 12 +- src/api2/admin/datastore.rs | 60 ++++----- src/api2/backup/mod.rs | 3 +- src/api2/reader/mod.rs | 7 +- src/api2/tape/restore.rs | 10 +- src/backup/verify.rs | 7 +- src/bin/proxmox_backup_debug/diff.rs | 16 +-- src/server/pull.rs | 18 +-- 20 files changed, 417 insertions(+), 241 deletions(-) -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel