Prefactor: DRY up dir entry checks and key extraction to helper methods

.. which we'll be reusing shortly.

Author: tnull

lightning-persister/src/fs_store.rs

@@ -2,7 +2,6 @@
 use crate::utils::{check_namespace_key_validity, is_valid_kvstore_str};
 
 use lightning::util::persist::KVStore;
-use lightning::util::string::PrintableString;
 
 use std::collections::HashMap;
 use std::fs;
@@ -316,89 +315,92 @@ impl KVStore for FilesystemStore {
 			let entry = entry?;
 			let p = entry.path();
 
-			if let Some(ext) = p.extension() {
-				#[cfg(target_os = "windows")]
-				{
-					// Clean up any trash files lying around.
-					if ext == "trash" {
-						fs::remove_file(p).ok();
-						continue;
-					}
-				}
-				if ext == "tmp" {
-					continue;
-				}
+			if !dir_entry_is_key(&p)? {
+				continue;
 			}
 
-			let metadata = p.metadata()?;
+			let key = get_key_from_dir_entry(&p, &prefixed_dest)?;
 
-			// We allow the presence of directories in the empty primary namespace and just skip them.
-			if metadata.is_dir() {
-				continue;
-			}
+			keys.push(key);
+		}
 
-			// If we otherwise don't find a file at the given path something went wrong.
-			if !metadata.is_file() {
-				debug_assert!(
-					false,
-					"Failed to list keys of {}/{}: file couldn't be accessed.",
-					PrintableString(primary_namespace),
-					PrintableString(secondary_namespace)
-				);
-				let msg = format!(
-					"Failed to list keys of {}/{}: file couldn't be accessed.",
-					PrintableString(primary_namespace),
-					PrintableString(secondary_namespace)
-				);
-				return Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, msg));
+		self.garbage_collect_locks();
+
+		Ok(keys)
+	}
+}
+
+fn dir_entry_is_key(p: &Path) -> Result<bool, lightning::io::Error> {
+	if let Some(ext) = p.extension() {
+		#[cfg(target_os = "windows")]
+		{
+			// Clean up any trash files lying around.
+			if ext == "trash" {
+				fs::remove_file(p).ok();
+				return Ok(false);
 			}
+		}
+		if ext == "tmp" {
+			return Ok(false);
+		}
+	}
 
-			match p.strip_prefix(&prefixed_dest) {
-				Ok(stripped_path) => {
-					if let Some(relative_path) = stripped_path.to_str() {
-						if is_valid_kvstore_str(relative_path) {
-							keys.push(relative_path.to_string())
-						}
-					} else {
-						debug_assert!(
-							false,
-							"Failed to list keys of {}/{}: file path is not valid UTF-8",
-							PrintableString(primary_namespace),
-							PrintableString(secondary_namespace)
-						);
-						let msg = format!(
-							"Failed to list keys of {}/{}: file path is not valid UTF-8",
-							PrintableString(primary_namespace),
-							PrintableString(secondary_namespace)
-						);
-						return Err(lightning::io::Error::new(
-							lightning::io::ErrorKind::Other,
-							msg,
-						));
-					}
-				},
-				Err(e) => {
+	let metadata = p.metadata()?;
+
+	// We allow the presence of directories in the empty primary namespace and just skip them.
+	if metadata.is_dir() {
+		return Ok(false);
+	}
+
+	// If we otherwise don't find a file at the given path something went wrong.
+	if !metadata.is_file() {
+		debug_assert!(
+			false,
+			"Failed to list keys at path {:?}: file couldn't be accessed.",
+			p.to_str()
+		);
+		let msg =
+			format!("Failed to list keys at path {:?}: file couldn't be accessed.", p.to_str());
+		return Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, msg));
+	}
+
+	Ok(true)
+}
+
+fn get_key_from_dir_entry(p: &Path, base_path: &Path) -> Result<String, lightning::io::Error> {
+	match p.strip_prefix(&base_path) {
+		Ok(stripped_path) => {
+			if let Some(relative_path) = stripped_path.to_str() {
+				if is_valid_kvstore_str(relative_path) {
+					return Ok(relative_path.to_string());
+				} else {
 					debug_assert!(
 						false,
-						"Failed to list keys of {}/{}: {}",
-						PrintableString(primary_namespace),
-						PrintableString(secondary_namespace),
-						e
+						"Failed to list keys of path {:?}: file path is not valid key",
+						p.to_str()
 					);
 					let msg = format!(
-						"Failed to list keys of {}/{}: {}",
-						PrintableString(primary_namespace),
-						PrintableString(secondary_namespace),
-						e
+						"Failed to list keys of path {:?}: file path is not valid key",
+						p.to_str()
 					);
 					return Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, msg));
-				},
+				}
+			} else {
+				debug_assert!(
+					false,
+					"Failed to list keys of path {:?}: file path is not valid UTF-8",
+					p
+				);
+				let msg =
+					format!("Failed to list keys of path {:?}: file path is not valid UTF-8", p);
+				return Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, msg));
 			}
-		}
-
-		self.garbage_collect_locks();
-
-		Ok(keys)
+		},
+		Err(e) => {
+			debug_assert!(false, "Failed to list keys of path {:?}: {}", p, e);
+			let msg = format!("Failed to list keys of path {:?}: {}", p, e);
+			return Err(lightning::io::Error::new(lightning::io::ErrorKind::Other, msg));
+		},
 	}
 }