Fix GitHub Actions (#4)

.github/workflows/rust.yml

@@ -10,12 +10,18 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
-
-    runs-on: ubuntu-latest
+  tests:
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      max-parallel: 3
+      matrix:
+        platform: [ ubuntu-latest, macos-latest, windows-latest ]
 
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt install libdbus-1-dev -y
+        if: matrix.platform == 'ubuntu-latest'
       - name: Build
         run: cargo build --verbose
       - name: Run tests

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "idasen"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Andrzej Klajnert <[email protected]>"]
 edition = "2018"
 license = "MIT"

src/lib.rs

@@ -6,7 +6,7 @@ extern crate failure_derive;
 pub use btleplug::api::Peripheral as Device;
 use btleplug::api::{BDAddr, Central, Characteristic, ParseBDAddrError, UUID};
 #[cfg(target_os = "linux")]
-use btleplug::bluez::{adapter::ConnectedAdapter as Adapter, manager::Manager};
+use btleplug::bluez::{adapter::Adapter, manager::Manager};
 #[cfg(target_os = "macos")]
 use btleplug::corebluetooth::{adapter::Adapter, manager::Manager};
 #[cfg(target_os = "windows")]
@@ -16,19 +16,6 @@ use std::cmp::{max, min, Ordering};
 use std::thread;
 use std::time::Duration;
 
-#[cfg(any(target_os = "windows", target_os = "macos"))]
-fn get_central(manager: &Manager) -> Adapter {
-    let adapters = manager.adapters().unwrap();
-    adapters.into_iter().next().unwrap()
-}
-
-#[cfg(target_os = "linux")]
-fn get_central(manager: &Manager) -> Adapter {
-    let adapters = manager.adapters().unwrap();
-    let adapter = adapters.into_iter().next().unwrap();
-    adapter.connect().unwrap()
-}
-
 const CONTROL_UUID: UUID = UUID::B128([
     0x8a, 0xf7, 0x15, 0x02, 0x9c, 0x00, 0x49, 0x8a, 0x24, 0x10, 0x8a, 0x33, 0x02, 0x00, 0xfa, 0x99,
 ]);
@@ -90,7 +77,8 @@ pub enum Error {
 
 fn get_desk(mac: Option<BDAddr>) -> Result<impl Device, Error> {
     let manager = Manager::new().unwrap();
-    let central = get_central(&manager);
+    let adapters = manager.adapters().unwrap();
+    let central = adapters.into_iter().next().unwrap();
     if let Err(err) = central.start_scan() {
         return Err(match err {
             btleplug::Error::PermissionDenied => Error::PermissionDenied,
@@ -226,7 +214,7 @@ impl<T: Device> Idasen<T> {
         target_position: u16,
         progress: Option<ProgressBar>,
     ) -> Result<(), Error> {
-        if target_position < MIN_HEIGHT || target_position > MAX_HEIGHT {
+        if !(MIN_HEIGHT..=MAX_HEIGHT).contains(&target_position) {
             return Err(Error::PositionNotInRange);
         }