tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/api2/admin/datastore.rs - files: return data from index.json

Browse Source
This commit is contained in:
Dietmar Maurer
2019-08-05 13:22:19 +02:00
parent 17ff2cb0e5
commit 8c70e3eb18
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api2/admin/datastore.rs
View File

@ -12,7 +12,7 @@ use chrono::{DateTime, Datelike, TimeZone, Local};
use std::path::PathBuf;
use std::sync::Arc;
use proxmox::tools::{try_block, fs::file_set_contents};
use proxmox::tools::{try_block, fs::file_get_contents, fs::file_set_contents};
use crate::config::datastore;
@ -22,6 +22,25 @@ use crate::server::WorkerTask;
use hyper::{header, Body, Response, StatusCode};
use hyper::http::request::Parts;
fn read_backup_index(store: &DataStore, backup_dir: &BackupDir) -> Result<Value, Error> {
let mut path = store.base_path();
path.push(backup_dir.relative_path());
path.push("index.json.blob");
let raw_data = file_get_contents(&path)?;
let data = DataBlob::from_raw(raw_data)?.decode(None)?;
let mut result: Value = serde_json::from_reader(&mut &data[..])?;
let result = result["files"].take();
if result == Value::Null {
bail!("missing 'files' property in backup index {:?}", path);
}
Ok(result)
}
fn group_backups(backup_list: Vec<BackupInfo>) -> HashMap<String, Vec<BackupInfo>> {
let mut group_hash = HashMap::new();
@ -105,10 +124,9 @@ fn list_snapshot_files (
let datastore = DataStore::lookup_datastore(store)?;
let path = datastore.base_path();
let files = BackupInfo::list_files(&path, &snapshot)?;
let files = read_backup_index(&datastore, &snapshot)?;
Ok(json!(files))
Ok(files)
}
fn delete_snapshots (