-
Notifications
You must be signed in to change notification settings - Fork 65
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: refactor archive type #748
Open
nichmor
wants to merge
5
commits into
conda:main
Choose a base branch
from
nichmor:feat/refactor-archive-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
06542e1
feat: refactor archive type
nichmor 2995cb9
misc: refactor into fs and archive.rs and add tests
nichmor 00d38cb
Merge branch 'main' into feat/refactor-archive-type
nichmor bb0a234
misc: refactor into fs and archive.rs and add tests
nichmor c445c7c
misc: refactor into fs and archive.rs and add tests
nichmor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
//! Functions that enable extracting or streaming a Conda package for objects that implement the | ||
|
||
use std::path::{Path, PathBuf}; | ||
|
||
use rattler_conda_types::package::ArchiveType; | ||
|
||
use crate::read::{folder_from_conda, folder_from_tar_bz2}; | ||
/// Test | ||
pub struct Archive { | ||
/// Test | ||
pub archive_type: ArchiveType, | ||
/// Test | ||
pub location: PathBuf, | ||
} | ||
|
||
impl Archive { | ||
/// Test | ||
pub fn new(archive_type: ArchiveType, location: PathBuf) -> Self { | ||
Archive { | ||
archive_type, | ||
location, | ||
} | ||
} | ||
|
||
/// Test | ||
pub fn extract_a_folder( | ||
&self, | ||
folder_to_extract: &Path, | ||
destination: &Path, | ||
) -> Result<(), std::io::Error> { | ||
match self.archive_type { | ||
ArchiveType::TarBz2 => { | ||
folder_from_tar_bz2(&self.location, folder_to_extract, destination) | ||
} | ||
ArchiveType::Conda => folder_from_conda(&self.location, folder_to_extract, destination), | ||
} | ||
} | ||
} | ||
|
||
impl TryFrom<PathBuf> for Archive { | ||
type Error = std::io::Error; | ||
|
||
fn try_from(path: PathBuf) -> Result<Self, Self::Error> { | ||
let archive_type = ArchiveType::try_from(path.as_path()).ok_or(std::io::Error::new( | ||
std::io::ErrorKind::NotFound, | ||
"package does not point to valid archive", | ||
))?; | ||
Ok(Archive { | ||
archive_type, | ||
location: path, | ||
}) | ||
} | ||
} | ||
nichmor marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we also rename this to match the function it calls?