Merge pull request #691 from Picovoice/v3.0-rust

v3.0 rust

.github/workflows/rust-codestyle.yml

@@ -42,11 +42,11 @@ jobs:
         override: true
 
     - name: Local Porcupine dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/porcupine/binding/rust
 
     - name: Local Rhino dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/rhino/binding/rust
 
     - name: Run clippy
@@ -71,6 +71,18 @@ jobs:
         toolchain: stable
         override: true
 
+    - name: Local Porcupine dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/porcupine/binding/rust
+
+    - name: Local Rhino dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/rhino/binding/rust
+
+    - name: Local dependency
+      run: cargo build
+      working-directory: sdk/rust
+
     - name: Run clippy
       run: cargo clippy -- -D warnings
       working-directory: demo/rust/filedemo
@@ -93,6 +105,22 @@ jobs:
         toolchain: stable
         override: true
 
+    - name: Local Porcupine dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/porcupine/binding/rust
+
+    - name: Local Rhino dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/rhino/binding/rust
+
+    - name: Local dependency
+      run: cargo build
+      working-directory: sdk/rust
+
+    - name: Local dependency
+      run: cargo build
+      working-directory: sdk/rust
+
     - name: Run clippy
       run: cargo clippy -- -D warnings
       working-directory: demo/rust/micdemo

.github/workflows/rust-demos.yml

@@ -53,6 +53,18 @@ jobs:
         toolchain: stable
         override: true
 
+    - name: Local Porcupine dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/porcupine/binding/rust
+
+    - name: Local Rhino dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/rhino/binding/rust
+
+    - name: Local dependency
+      run: cargo build
+      working-directory: sdk/rust
+
     - name: Rust build micdemo
       run: cargo build --verbose
       working-directory: demo/rust/micdemo
@@ -98,6 +110,18 @@ jobs:
         toolchain: nightly
         override: true
 
+    - name: Local Porcupine dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/porcupine/binding/rust
+
+    - name: Local Rhino dependency
+      run: bash copy.sh && cargo build
+      working-directory: resources/rhino/binding/rust
+
+    - name: Local dependency
+      run: cargo build
+      working-directory: sdk/rust
+
     - name: Rust build micdemo
       run: cargo build --verbose
       working-directory: demo/rust/micdemo

.github/workflows/rust.yml

@@ -56,11 +56,11 @@ jobs:
         override: true
 
     - name: Local Porcupine dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/porcupine/binding/rust
 
     - name: Local Rhino dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/rhino/binding/rust
 
     - name: Rust build
@@ -84,15 +84,15 @@ jobs:
     - name: Install stable toolchain
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly
+        toolchain: stable
         override: true
 
     - name: Local Porcupine dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/porcupine/binding/rust
 
     - name: Local Rhino dependency
-      run: ./copy.sh
+      run: bash copy.sh && cargo build
       working-directory: resources/rhino/binding/rust
 
     - name: Rust build

demo/rust/filedemo/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2018"
 clap = "3.2.3"
 hound = "3.4.0"
 itertools = "0.10.3"
-picovoice = "=2.2.1"
+picovoice =  { path = "../../../sdk/rust" }

demo/rust/micdemo/Cargo.toml

@@ -9,5 +9,5 @@ clap = "3.2.3"
 ctrlc = "3.1.9"
 hound = "3.4.0"
 itertools = "0.10.3"
-picovoice = "=2.2.1"
+picovoice = { path = "../../../sdk/rust" }
 pv_recorder = "=1.2.1"

sdk/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "picovoice"
-version = "2.2.1"
+version = "3.0.0"
 edition = "2018"
 description = "Rust SDK for Picovoice's voice recognition platform"
 license = "Apache-2.0"
@@ -25,8 +25,8 @@ path = "src/lib.rs"
 crate_type = ["lib"]
 
 [dependencies]
-pv_porcupine = "=2.2.1"
-pv_rhino = "=2.2.1" 
+pv_porcupine = { path = "../../resources/porcupine/binding/rust" }
+pv_rhino = { path = "../../resources/rhino/binding/rust" }
 
 [dev-dependencies]
 itertools = "0.10.1"

sdk/rust/src/lib.rs

@@ -240,7 +240,7 @@ where
         let frame_length = porcupine.frame_length();
 
         let version = format!(
-            "2.1.1 (Porcupine v{}) (Rhino v{})",
+            "3.0.0 (Porcupine v{}) (Rhino v{})",
             porcupine.version(),
             rhino.version()
         );
@@ -287,6 +287,13 @@ where
         Ok(())
     }
 
+    pub fn reset(&mut self) -> Result<(), PicovoiceError>  {
+        self.wake_word_detected = false;
+        self.rhino.reset().map_err(PicovoiceError::from_rhino)?;
+
+        Ok(())
+    }
+
     pub fn frame_length(&self) -> u32 {
         self.frame_length
     }