From bd5e18bc9f36fd915dac5c5ab31f9d1695e5155f Mon Sep 17 00:00:00 2001
From: Olivier <olivier@librepush.net>
Date: Fri, 8 Jul 2022 15:17:51 +0100
Subject: [PATCH] Extract load_labelling_rules

---
 datman/src/commands/backup.rs                | 12 +++++++-----
 datman/src/remote/backup_source_requester.rs |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/datman/src/commands/backup.rs b/datman/src/commands/backup.rs
index ecd8855..1d5fbe7 100644
--- a/datman/src/commands/backup.rs
+++ b/datman/src/commands/backup.rs
@@ -17,7 +17,9 @@ along with Yama.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::descriptor::{Descriptor, DestPileDescriptor, SourceDescriptor, VirtualSourceKind};
 use crate::get_hostname;
-use crate::labelling::{label_node, load_labelling_rules, str_to_label, Label, State};
+use crate::labelling::{
+    label_node, load_labelling_rules, str_to_label, Label, LabellingRules, State,
+};
 use crate::tree::{scan, FileTree, FileTree1};
 use anyhow::{anyhow, bail};
 use arc_interner::ArcIntern;
@@ -76,8 +78,8 @@ pub fn open_stdout_backup_process(
 pub fn label_filter_and_convert(
     tree: FileTree1<()>,
     descriptor: &Descriptor,
-    desc_path: &Path,
     source_name: &str,
+    rules: &LabellingRules,
     dest: &DestPileDescriptor,
 ) -> anyhow::Result<Option<TreeNode>> {
     info!("Labelling.");
@@ -87,8 +89,7 @@ pub fn label_filter_and_convert(
         .iter()
         .map(|l| Label(ArcIntern::new(l.clone())))
         .collect();
-    let rules = load_labelling_rules(desc_path, source_name)?;
-    label_node("".to_owned(), None, &mut tree, &labels, &rules)?;
+    label_node("".to_owned(), None, &mut tree, &labels, rules)?;
 
     let included_labels: HashSet<Label> = dest.included_labels.iter().map(str_to_label).collect();
 
@@ -158,8 +159,9 @@ pub fn backup_source_to_destination<PT: ProgressTracker>(
             let absolute_dest_path = desc_path.join(&dest.path);
             let pile_descriptor = load_pile_descriptor(&absolute_dest_path)?;
             let pile = open_pile(&absolute_dest_path, &pile_descriptor)?;
+            let rules = load_labelling_rules(desc_path, source_name)?;
             let root = if let Some(root) =
-                label_filter_and_convert(tree, descriptor, desc_path, source_name, dest)?
+                label_filter_and_convert(tree, descriptor, source_name, &rules, dest)?
             {
                 root
             } else {
diff --git a/datman/src/remote/backup_source_requester.rs b/datman/src/remote/backup_source_requester.rs
index 51ff529..a83f88c 100644
--- a/datman/src/remote/backup_source_requester.rs
+++ b/datman/src/remote/backup_source_requester.rs
@@ -1,5 +1,6 @@
 use crate::commands::backup::{get_pointer_name_at, label_filter_and_convert};
 use crate::descriptor::{Descriptor, DestPileDescriptor, SourceDescriptor};
+use crate::labelling::load_labelling_rules;
 use crate::tree::FileTree;
 use anyhow::{anyhow, bail};
 use chrono::Utc;
@@ -209,8 +210,9 @@ pub fn backup_remote_source_to_destination<PT: ProgressTracker + Send + 'static>
             )?
             .ok_or_else(|| anyhow!("Remote scan failed (does the directory exist?)"))?;
 
+            let rules = load_labelling_rules(desc_path, source_name)?;
             let mut root =
-                label_filter_and_convert(scan_result, descriptor, desc_path, source_name, dest)?
+                label_filter_and_convert(scan_result, descriptor, source_name, &rules, dest)?
                     .ok_or_else(|| anyhow!("Empty filter..."))?;
 
             let absolute_dest_path = desc_path.join(&dest.path);