refactored and compiling

Author: benartuso

src/cli/src/cmd_setup.rs

@@ -818,14 +818,14 @@ pub fn diff() -> Command {
         .arg(Arg::new("keys")
             .required(false)
             .long("keys")
-            .short("k")
+            .short('k')
             .help("Comma-separated list of columns to compare on. If not specified, all columns are used for comparison.")
             .use_value_delimiter(true)
             .action(clap::ArgAction::Set))
         .arg(Arg::new("targets")
             .required(false)
             .long("targets")
-            .short("t")
+            .short('t')
             .help("Comma-separated list of columns in which to view changes. If not specified, all columns are viewed")
             .use_value_delimiter(true)
             .action(clap::ArgAction::Set))

src/cli/src/dispatch.rs

@@ -519,12 +519,6 @@ pub async fn diff(
     let current_commit = api::local::commits::head_commit(&repository)?;
     // For revision_1 and revision_2, if none, set to current_commit
     // let revision_1 = revision_1.unwrap_or(current_commit.id.as_str());
-    // let revision_2 = revision_2.unwrap_or(current_commit.id.as_str());
-
-    let commit_1 = api::local::revisions::get(&repository, revision_1)?
-        .ok_or_else(|| OxenError::revision_not_found(revision_1.into()))?;
-    let commit_2 = api::local::revisions::get(&repository, revision_2)?
-        .ok_or_else(|| OxenError::revision_not_found(revision_2.into()))?;
 
     // TODONOW: might be able to clean this logic up - pull out into function so we can early return and be less confusing
     let (cpath_1, cpath_2) = if let Some(file_2) = file_2 {

src/cli/src/parse_and_run.rs

@@ -943,11 +943,18 @@ pub async fn pull(sub_matches: &ArgMatches) {
     }
 }
 
-pub async fn diff(sub_matches: &ArgMatches) {
+pub async fn remote_diff(sub_matches: &ArgMatches) {
+    log::debug!("in remote diff...");
     let is_remote = true;
     p_diff(sub_matches, is_remote).await
 }
 
+pub async fn diff(sub_matches: &ArgMatches) {
+    log::debug!("parse and run diff");
+    let is_remote = false;
+    p_diff(sub_matches, is_remote).await
+}
+
 async fn p_diff(sub_matches: &ArgMatches, is_remote: bool) {
     let resource1 = sub_matches
         .get_one::<String>("RESOURCE1")
@@ -961,7 +968,7 @@ async fn p_diff(sub_matches: &ArgMatches, is_remote: bool) {
     let (file2, revision2) = match resource2 {
         Some(resource) => {
             let (file, revision) = parse_file_and_revision(resource);
-            (Some(PathBuf::from(file)), Some(revision))
+            (Some(PathBuf::from(file)), revision)
         }
         None => (None, None),
     };

src/lib/src/api/local/compare.rs

@@ -44,6 +44,7 @@ pub fn compare_files(
     targets: Vec<String>,
     output: Option<PathBuf>,
 ) -> Result<CompareResult, OxenError> {
+    log::debug!("comparing files");
     // Assert that the files exist in their respective commits.
     let file_1 = get_version_file(repo, &compare_entry_1)?;
     let file_2 = get_version_file(repo, &compare_entry_2)?;

src/lib/src/command/compare.rs

@@ -13,8 +13,9 @@ pub fn compare(
     keys: Vec<String>,
     targets: Vec<String>,
     output: Option<PathBuf>,
-) -> Result<(), OxenError> {
+) -> Result<String, OxenError> {
     // TODONOW - anything we can clean up with this mut initialization?
+    log::debug!("in the compare...");
     let mut compare_entry_1 = CompareEntry {
         commit_entry: None,
         path: cpath_1.path.clone(),
@@ -64,10 +65,11 @@ pub fn compare(
         output,
     )?;
 
+    log::debug!("compare result: {:?}", compare_result);
+
     let text = match compare_result {
         CompareResult::Tabular((_, text)) => text,
         CompareResult::Text(text) => text,
     };
-    println!("{}", text);
-    Ok(())
+    Ok(text)
 }

src/lib/src/model/compare/tabular_compare.rs

@@ -20,8 +20,22 @@ pub struct TabularCompare {
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct TabularCompareBody {
     pub compare_id: String,
-    pub left_resource: String,
-    pub right_resource: String,
-    pub keys: Vec<String>,
-    pub targets: Vec<String>,
+    pub left: TabularCompareResourceBody,
+    pub right: TabularCompareResourceBody,
+    pub keys: Vec<TabularCompareFieldBody>,
+    pub compare: Vec<TabularCompareFieldBody>,
+    pub display: Vec<TabularCompareFieldBody>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct TabularCompareResourceBody {
+    pub path: String,
+    pub version: String,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct TabularCompareFieldBody {
+    pub left: String,
+    pub right: String,
+    pub alias: Option<String>,
 }