From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 1/5] tape/inventory: make 'load_media_db' a method
Date: Thu, 19 May 2022 12:08:16 +0200 [thread overview]
Message-ID: <20220519100820.1829147-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220519100820.1829147-1-d.csapak@proxmox.com>
and use self.inventory_path. This is only used internally (not pub) so there
is no need to have it as a static function.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/tape/inventory.rs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/tape/inventory.rs b/src/tape/inventory.rs
index c3bd4606..c270ffcf 100644
--- a/src/tape/inventory.rs
+++ b/src/tape/inventory.rs
@@ -112,7 +112,7 @@ impl Inventory {
/// Reload the database
pub fn reload(&mut self) -> Result<(), Error> {
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
self.update_helpers();
Ok(())
}
@@ -140,8 +140,8 @@ impl Inventory {
open_backup_lockfile(&self.lockfile_path, None, true)
}
- fn load_media_db(path: &Path) -> Result<BTreeMap<Uuid, MediaStateEntry>, Error> {
- let data = file_get_json(path, Some(json!([])))?;
+ fn load_media_db(&self) -> Result<BTreeMap<Uuid, MediaStateEntry>, Error> {
+ let data = file_get_json(&self.inventory_path, Some(json!([])))?;
let media_list: Vec<MediaStateEntry> = serde_json::from_value(data)?;
let mut map = BTreeMap::new();
@@ -177,7 +177,7 @@ impl Inventory {
/// Stores a single MediaID persistently
pub fn store(&mut self, mut media_id: MediaId, clear_media_status: bool) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
let uuid = media_id.label.uuid.clone();
@@ -217,7 +217,7 @@ impl Inventory {
/// Remove a single media persistently
pub fn remove_media(&mut self, uuid: &Uuid) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
self.map.remove(uuid);
self.update_helpers();
self.replace_file()?;
@@ -659,7 +659,7 @@ impl Inventory {
// Lock database, reload database, set status, store database
fn set_media_status(&mut self, uuid: &Uuid, status: Option<MediaStatus>) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
if let Some(entry) = self.map.get_mut(uuid) {
entry.status = status;
self.update_helpers();
@@ -697,7 +697,7 @@ impl Inventory {
location: Option<MediaLocation>,
) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
if let Some(entry) = self.map.get_mut(uuid) {
entry.location = location;
self.update_helpers();
@@ -721,7 +721,7 @@ impl Inventory {
/// Update online status
pub fn update_online_status(&mut self, online_map: &OnlineStatusMap) -> Result<(), Error> {
let _lock = self.lock()?;
- self.map = Self::load_media_db(&self.inventory_path)?;
+ self.map = self.load_media_db()?;
for (uuid, entry) in self.map.iter_mut() {
if let Some(changer_name) = online_map.lookup_changer(uuid) {
--
2.30.2
next prev parent reply other threads:[~2022-05-19 10:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 10:08 [pbs-devel] [PATCH proxmox-backup 0/5] allow restoring catalogs during inventory Dominik Csapak
2022-05-19 10:08 ` Dominik Csapak [this message]
2022-10-05 17:32 ` [pbs-devel] applied: [PATCH proxmox-backup 1/5] tape/inventory: make 'load_media_db' a method Thomas Lamprecht
2022-05-19 10:08 ` [pbs-devel] [PATCH proxmox-backup 2/5] tape: replace '&Path' with 'AsRef<Path>' in function parameters Dominik Csapak
2022-05-19 10:08 ` [pbs-devel] [PATCH proxmox-backup 3/5] api/tape/inventory: optionally try to restore catalogs Dominik Csapak
2022-05-19 10:08 ` [pbs-devel] [PATCH proxmox-backup 4/5] proxmox-tape: add 'catalog' option to 'proxmox-tape inventory' Dominik Csapak
2022-05-19 10:08 ` [pbs-devel] [PATCH proxmox-backup 5/5] ui: tape/ChangerStatus: adding parameter selection to inventory 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=20220519100820.1829147-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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