Skip to content

Commit

Permalink
Merge pull request #6 from gmggroup/5-omf-zip-files-wont-open
Browse files Browse the repository at this point in the history
omf zip files wont open in 7-zip or Windows
  • Loading branch information
Tim-Evans-Seequent authored Jun 25, 2024
2 parents 72c0190 + fdb50e3 commit c74d53e
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ schemars = { version = "0.8", features = ["chrono"] }
serde = { version = "1", features = ["derive"] }
serde_json = { version = "1", features = ["float_roundtrip"] }
thiserror = "1"
zip = { version = "2", default-features = false }
zip = { version = "~2.0", default-features = false }
1 change: 0 additions & 1 deletion src/file/zip_container.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ pub(crate) struct Archive {

impl Archive {
pub fn new(file: File) -> Result<Self, Error> {
// TODO: get the version from the zip comment.
let mut zip_archive = ZipArchive::new(file)?;
let mut members = HashMap::new();
let mut index_found = false;
Expand Down
2 changes: 1 addition & 1 deletion src/geometry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl Geometry {
Self::LineSet(_) => "LineSet",
Self::Surface(_) => "Surface",
Self::GridSurface(_) => "GridSurface",
Self::Composite(_) => "PoinCompositetSet",
Self::Composite(_) => "Composite",
Self::BlockModel(b) if b.has_subblocks() => "BlockModel(sub-blocked)",
Self::BlockModel(_) => "BlockModel",
}
Expand Down
Binary file modified tests/one_of_everything.omf
Binary file not shown.

0 comments on commit c74d53e

Please sign in to comment.