Merge pull request #65 from snipsco/release/0.58.1

Release 0.58.1
snipsco · Jul 24, 2018 · 7cf77e0 · 7cf77e0
2 parents 4728835 + 7079489
commit 7cf77e0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.58.0] - 2018-07-17`
+## [0.58.1] - 2018-07-24
+### Fixed
+- Error when loading a `SnipsNluEngine` from zip data
+
+## [0.58.0] - 2018-07-17
 ### Added
 - Interactive parsing CLI
 
@@ -79,6 +83,7 @@ being statically hardcoded, reducing the binary size by 31Mb.
 - Rename python package to `snips_nlu_rust`
 
 
+[0.58.1]: https://github.com/snipsco/snips-nlu-rs/compare/0.58.0...0.58.1
 [0.58.0]: https://github.com/snipsco/snips-nlu-rs/compare/0.57.2...0.58.0
 [0.57.2]: https://github.com/snipsco/snips-nlu-rs/compare/0.57.1...0.57.2
 [0.57.1]: https://github.com/snipsco/snips-nlu-rs/compare/0.57.0...0.57.1

diff --git a/snips-nlu-cli/Cargo.toml b/snips-nlu-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-cli"
-version = "0.58.0"
+version = "0.58.1"
 authors = ["Adrien Ball <[email protected]>"]
 
 [dependencies]

diff --git a/snips-nlu-ffi/Cargo.toml b/snips-nlu-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-ffi"
-version = "0.58.0"
+version = "0.58.1"
 authors = [
     "Kevin Lefevre <[email protected]>",
     "Thibaut Lorrain <[email protected]>"

diff --git a/snips-nlu-ffi/kotlin/build.gradle b/snips-nlu-ffi/kotlin/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 
 apply plugin: 'kotlin'
 
-version = "0.58.0"
+version = "0.58.1"
 group = "ai.snips"
 
 repositories {

diff --git a/snips-nlu-ffi/python/snips-nlu-python-ffi/Cargo.toml b/snips-nlu-ffi/python/snips-nlu-python-ffi/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-python-ffi"
-version = "0.58.0"
+version = "0.58.1"
 authors = ["Adrien Ball <[email protected]>"]
 
 [lib]
@@ -10,4 +10,4 @@ crate-type = ["cdylib"]
 [dependencies]
 libc = "0.2"
 ffi-utils = { git = "https://github.com/snipsco/snips-utils-rs", rev = "b1f4af3" }
-snips-nlu-ffi = { git = "https://github.com/snipsco/snips-nlu-rs", tag = "0.58.0" }
+snips-nlu-ffi = { git = "https://github.com/snipsco/snips-nlu-rs", tag = "0.58.1" }
diff --git a/snips-nlu-ffi/python/snips_nlu_rust/__version__ b/snips-nlu-ffi/python/snips_nlu_rust/__version__
@@ -1 +1 @@
-0.58.0
+0.58.1
diff --git a/snips-nlu-ffi/swift/SnipsNlu/Dependencies/build.sh b/snips-nlu-ffi/swift/SnipsNlu/Dependencies/build.sh
@@ -4,7 +4,7 @@
 
 set -e
 
-VERSION="0.58.0"
+VERSION="0.58.1"
 SYSTEM=$(echo $1 | tr '[:upper:]' '[:lower:]')
 LIBRARY_NAME=libsnips_nlu_ffi
 LIBRARY_NAME_A=${LIBRARY_NAME}.a

diff --git a/snips-nlu-lib/Cargo.toml b/snips-nlu-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snips-nlu-lib"
-version = "0.58.0"
+version = "0.58.1"
 authors = [
     "Thibaut Lorrain <[email protected]>",
     "Kevin Lefevre <[email protected]>"

diff --git a/snips-nlu-lib/src/nlu_engine.rs b/snips-nlu-lib/src/nlu_engine.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::io;
 use std::iter::FromIterator;
-use std::path::Path;
+use std::path::{Component, Path};
 use std::str::FromStr;
 use std::sync::Arc;
 
@@ -95,14 +95,6 @@ impl SnipsNluEngine {
             .tempdir()?;
         let temp_dir_path = temp_dir.path();
 
-        let engine_dir_path = archive
-            .by_index(0)?
-            .sanitized_name();
-
-        let engine_dir_name = engine_dir_path
-            .to_str()
-            .ok_or_else(|| format_err!("Engine directory name is empty"))?;
-
         for file_index in 0..archive.len() {
             let mut file = archive.by_index(file_index)?;
             let outpath = temp_dir_path.join(file.sanitized_name());
@@ -120,6 +112,20 @@ impl SnipsNluEngine {
             }
         }
 
+        let first_archive_file = archive
+            .by_index(0)?
+            .sanitized_name();
+
+        let engine_dir_path = first_archive_file
+            .components()
+            .find(|component| if let Component::Normal(_) = component { true } else { false })
+            .ok_or_else(|| format_err!("Trained engine archive is incorrect"))?
+            .as_os_str();
+
+        let engine_dir_name = engine_dir_path
+            .to_str()
+            .ok_or_else(|| format_err!("Engine directory name is empty"))?;
+
         Ok(SnipsNluEngine::from_path(temp_dir_path.join(engine_dir_name))?)
     }
 }