Refactor glob command and common code to prepare for prefetch

Summary:
# This Diff

Refactor glob command and common code to prepare for prefetch.

# Context

We are doing some Oxidation (Python->Rust) migration of the EdenFS CLI. This is an ongoing BE activity that will complete when all CLI commands have been moved.

Reviewed By: genevievehelsel

Differential Revision: D75331379

fbshipit-source-id: 81973aa8ecbe662289225f6611b0b2ef8ce8392e

Author: jdelliot

eden/fs/cli_rs/edenfs-commands/src/glob_and_prefetch.rs

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+mod common;
+pub mod glob;
+
+pub use glob::*;

eden/fs/cli_rs/edenfs-commands/src/glob_and_prefetch/common.rs

@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+use std::fs::File;
+use std::io::BufRead;
+use std::io::BufReader;
+use std::path::PathBuf;
+
+use anyhow::Result;
+use clap::Parser;
+use hg_util::path::expand_path;
+
+#[derive(Parser, Debug)]
+pub(crate) struct CommonArgs {
+    #[clap(
+        long,
+        alias = "repo",
+        help = "Specify path to mount point (default: root of cwd)",
+        parse(from_str = expand_path)
+    )]
+    pub(crate) mount_point: Option<PathBuf>,
+
+    #[clap(
+        long,
+        help = "Obtain patterns to match from FILE, one per line. If FILE is - , read patterns from standard input."
+    )]
+    pub(crate) pattern_file: Option<PathBuf>,
+
+    // Technically, we use fnmatch, but it uses glob for pattern strings.
+    // source: https://man7.org/linux/man-pages/man3/fnmatch.3.html
+    #[clap(
+        help = "Filename patterns (relative to repo root) to match via glob, see: https://man7.org/linux/man-pages/man7/glob.7.html"
+    )]
+    pub(crate) pattern: Vec<String>,
+
+    #[clap(
+        long,
+        help = "When printing the list of matching files, exclude directories."
+    )]
+    pub(crate) list_only_files: bool,
+
+    #[clap(
+        long,
+        help = "When printing the list of matching files, exclude directories."
+    )]
+    pub(crate) include_dot_files: bool,
+}
+
+impl CommonArgs {
+    pub(crate) fn load_patterns(&self) -> Result<Vec<String>> {
+        let mut pattern = self
+            .pattern
+            .iter()
+            .map(|p| clean_pattern(p.to_string()))
+            .collect::<Vec<String>>();
+        match &self.pattern_file {
+            Some(pattern_file) => {
+                let file = File::open(pattern_file)?;
+                let reader = BufReader::new(file);
+                for line in reader.lines() {
+                    pattern.push(clean_pattern(line?));
+                }
+
+                Ok(pattern)
+            }
+            None => Ok(pattern),
+        }
+    }
+}
+
+#[cfg(target_os = "windows")]
+fn clean_pattern(pattern: String) -> String {
+    pattern.replace("\\", "/")
+}
+
+#[cfg(not(target_os = "windows"))]
+fn clean_pattern(pattern: String) -> String {
+    pattern
+}

eden/fs/cli_rs/edenfs-commands/src/glob.rs renamed to eden/fs/cli_rs/edenfs-commands/src/glob_and_prefetch/glob.rs

@@ -7,83 +7,21 @@
 
 //! edenfsctl glob
 
-use std::fs::File;
-use std::io::BufRead;
-use std::io::BufReader;
 use std::path::Path;
 use std::path::PathBuf;
 
 use anyhow::Context;
 use anyhow::Result;
 use async_trait::async_trait;
 use clap::Parser;
-use edenfs_client::client;
 use edenfs_client::glob_files::Glob;
 use edenfs_client::glob_files::dtype_to_str;
 use edenfs_client::utils::locate_repo_root;
 use edenfs_utils::path_from_bytes;
-use hg_util::path::expand_path;
 
 use crate::ExitCode;
 use crate::get_edenfs_instance;
-
-#[derive(Parser, Debug)]
-pub struct CommonArgs {
-    #[clap(
-        long,
-        alias = "repo",
-        help = "Specify path to mount point (default: root of cwd)",
-        parse(from_str = expand_path)
-    )]
-    mount_point: Option<PathBuf>,
-
-    #[clap(
-        long,
-        help = "Obtain patterns to match from FILE, one per line. If FILE is - , read patterns from standard input."
-    )]
-    pattern_file: Option<PathBuf>,
-
-    // Technically, we use fnmatch, but it uses glob for pattern strings.
-    // source: https://man7.org/linux/man-pages/man3/fnmatch.3.html
-    #[clap(
-        help = "Filename patterns (relative to repo root) to match via glob, see: https://man7.org/linux/man-pages/man7/glob.7.html"
-    )]
-    pattern: Vec<String>,
-
-    #[clap(
-        long,
-        help = "When printing the list of matching files, exclude directories."
-    )]
-    list_only_files: bool,
-
-    #[clap(
-        long,
-        help = "When printing the list of matching files, exclude directories."
-    )]
-    include_dot_files: bool,
-}
-
-impl CommonArgs {
-    fn load_patterns(&self) -> Result<Vec<String>> {
-        let mut pattern = self
-            .pattern
-            .iter()
-            .map(|p| clean_pattern(p.to_string()))
-            .collect::<Vec<String>>();
-        match &self.pattern_file {
-            Some(pattern_file) => {
-                let file = File::open(pattern_file)?;
-                let reader = BufReader::new(file);
-                for line in reader.lines() {
-                    pattern.push(clean_pattern(line?));
-                }
-
-                Ok(pattern)
-            }
-            None => Ok(pattern),
-        }
-    }
-}
+use crate::glob_and_prefetch::common::CommonArgs;
 
 #[derive(Parser, Debug)]
 #[clap(
@@ -196,13 +134,3 @@ impl crate::Subcommand for GlobCmd {
         Ok(0)
     }
 }
-
-#[cfg(target_os = "windows")]
-fn clean_pattern(pattern: String) -> String {
-    pattern.replace("\\", "/")
-}
-
-#[cfg(not(target_os = "windows"))]
-fn clean_pattern(pattern: String) -> String {
-    pattern
-}

eden/fs/cli_rs/edenfs-commands/src/lib.rs

@@ -31,7 +31,7 @@ mod du;
 #[cfg(target_os = "macos")]
 mod file_access_monitor;
 mod gc;
-mod glob;
+mod glob_and_prefetch;
 mod handles;
 mod list;
 mod minitop;
@@ -153,7 +153,7 @@ pub enum TopLevelSubcommand {
     Uptime(crate::uptime::UptimeCmd),
     #[cfg(target_os = "macos")]
     FileAccessMonitor(crate::file_access_monitor::FileAccessMonitorCmd),
-    Glob(crate::glob::GlobCmd),
+    Glob(crate::glob_and_prefetch::GlobCmd),
 }
 
 impl TopLevelSubcommand {