From a4f695d8c2dd4cd70c6f1242e48ef41dc1111dfd Mon Sep 17 00:00:00 2001 From: Marcin Olichwiruk <21108638+olichwiruk@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:57:41 +0100 Subject: [PATCH] fix(oca-rs): get OCAFile based on OCABundle history --- oca/src/facade/fetch.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/oca/src/facade/fetch.rs b/oca/src/facade/fetch.rs index 768479c..3b37cd5 100644 --- a/oca/src/facade/fetch.rs +++ b/oca/src/facade/fetch.rs @@ -4,7 +4,7 @@ use crate::{ data_storage::DataStorage, repositories::{OCABundleCacheRepo, OCABundleFTSRepo}, }; -use oca_ast::ast::ObjectKind; +use oca_ast::ast::{ObjectKind, OCAAst}; use oca_bundle::build::OCABuildStep; use oca_bundle::state::oca::{ capture_base::CaptureBase, DynOverlay, OCABundle, @@ -316,8 +316,12 @@ impl Facade { } pub fn get_oca_bundle_ocafile(&self, said: String) -> Result> { - let oca_bundle = self.get_oca_bundle(said)?; - self.parse_oca_bundle_to_ocafile(&oca_bundle) + let oca_bundle_steps = self.get_oca_bundle_steps(said)?; + let mut oca_ast = OCAAst::new(); + for step in oca_bundle_steps { + oca_ast.commands.push(step.command); + } + Ok(oca_file::ocafile::generate_from_ast(&oca_ast)) } pub fn parse_oca_bundle_to_ocafile(&self, bundle: &OCABundle) -> Result> {