public inbox for pdm-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager v2 01/18] lib: pdm-config: views: add locking/saving methods
Date: Fri, 14 Nov 2025 13:11:15 +0100	[thread overview]
Message-ID: <20251114121218.2479318-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20251114121218.2479318-1-d.csapak@proxmox.com>

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 lib/pdm-config/src/views.rs | 22 +++++++++++++++++++---
 server/src/views/mod.rs     |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/pdm-config/src/views.rs b/lib/pdm-config/src/views.rs
index 59c02a66..5f523d07 100644
--- a/lib/pdm-config/src/views.rs
+++ b/lib/pdm-config/src/views.rs
@@ -1,17 +1,33 @@
 use anyhow::Error;
 
+use proxmox_product_config::{open_api_lockfile, replace_config, ApiLockGuard};
 use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
 
-use pdm_api_types::views::ViewConfigEntry;
+use pdm_api_types::{views::ViewConfigEntry, ConfigDigest};
 
 use pdm_buildcfg::configdir;
 
 const VIEW_CFG_FILENAME: &str = configdir!("/views.cfg");
+const VIEW_FILTER_CFG_LOCKFILE: &str = configdir!("/.views.lock");
 
 /// Get the `views.cfg` config file contents.
-pub fn config() -> Result<SectionConfigData<ViewConfigEntry>, Error> {
+pub fn config() -> Result<(SectionConfigData<ViewConfigEntry>, ConfigDigest), Error> {
     let content =
         proxmox_sys::fs::file_read_optional_string(VIEW_CFG_FILENAME)?.unwrap_or_default();
 
-    ViewConfigEntry::parse_section_config(VIEW_CFG_FILENAME, &content)
+    let digest = openssl::sha::sha256(content.as_bytes());
+
+    let data = ViewConfigEntry::parse_section_config(VIEW_CFG_FILENAME, &content)?;
+    Ok((data, digest.into()))
+}
+
+/// Get exclusive lock
+pub fn lock_config() -> Result<ApiLockGuard, Error> {
+    open_api_lockfile(VIEW_FILTER_CFG_LOCKFILE, None, true)
+}
+
+pub fn save_config(config: &SectionConfigData<ViewConfigEntry>) -> Result<(), Error> {
+    let raw = ViewConfigEntry::write_section_config(VIEW_CFG_FILENAME, config)?;
+    replace_config(VIEW_CFG_FILENAME, raw.as_bytes())?;
+    Ok(())
 }
diff --git a/server/src/views/mod.rs b/server/src/views/mod.rs
index 80f8425c..04d39620 100644
--- a/server/src/views/mod.rs
+++ b/server/src/views/mod.rs
@@ -13,7 +13,7 @@ mod tests;
 /// Returns an error if the view configuration file could not be read, or
 /// if the view with the provided ID does not exist.
 pub fn get_view(view_id: &str) -> Result<View, Error> {
-    let config = pdm_config::views::config()?;
+    let (config, _) = pdm_config::views::config()?;
 
     let entry = config
         .get(view_id)
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel


  reply	other threads:[~2025-11-14 12:11 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-14 12:11 [pdm-devel] [PATCH datacenter-manager v2 00/18] enable custom views on the UI Dominik Csapak
2025-11-14 12:11 ` Dominik Csapak [this message]
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 02/18] lib: api-types: add 'layout' property to ViewConfig Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 03/18] server: api: implement CRUD api for views Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 04/18] server: api: resources: add 'view' category to search syntax Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 05/18] ui: remote selector: allow forcing of value Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 06/18] ui: dashboard types: add missing 'default' to de-serialization Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 07/18] ui: dashboard: status row: add optional 'editing state' Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 08/18] ui: dashboard: prepare view for editing custom views Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 09/18] ui: views: implement view loading from api Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 10/18] ui: views: make 'view' name property optional Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 11/18] ui: views: add 'view' parameter to api calls Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 12/18] ui: views: save updated layout to backend Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 13/18] ui: add view list context Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 14/18] ui: configuration: add view CRUD panels Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 15/18] ui: main menu: add optional view_list property Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 16/18] ui: load view list on page init Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 17/18] lib/ui: move views types to pdm-api-types Dominik Csapak
2025-11-14 12:11 ` [pdm-devel] [PATCH datacenter-manager v2 18/18] server: api: views: check layout string for validity Dominik Csapak
2025-11-14 12:22 ` [pdm-devel] [PATCH datacenter-manager v2 00/18] enable custom views on the UI Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251114121218.2479318-2-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pdm-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal