export: add export command and clean up exportall

Signed-off-by: Paul Osborne <[email protected]>

Author: posborne

src/commands/gpio_export.rs

@@ -0,0 +1,27 @@
+// Copyright (C) 2016, The Gpio Util Project Developers.
+
+use options::GpioExportOptions;
+use config::GpioConfig;
+use std::process::exit;
+use export;
+
+pub fn main(config: &GpioConfig, opts: &GpioExportOptions) {
+    let pin = match config.get_pin(&opts.pin[..]) {
+        Some(pin) => pin,
+        None => {
+            println!("Unable to find config entry for pin '{}'", opts.pin);
+            exit(1)
+        }
+    };
+
+    let symlink_root = match opts.symlink_root {
+        Some(ref slr) => &slr[..],
+        None => config.get_symlink_root(),
+    };
+
+    if let Err(e) = export::export(pin, Some(symlink_root)) {
+        println!("Error occurred while exporting pin: {:?}", pin);
+        println!("{}", e);
+        exit(1);
+    }
+}

src/commands/gpio_exportall.rs

@@ -6,17 +6,16 @@ use std::process::exit;
 use export;
 
 pub fn main(config: &GpioConfig, opts: &GpioExportAllOptions) {
+    let symlink_root = match opts.symlink_root {
+        Some(ref slr) => &slr[..],
+        None => config.get_symlink_root(),
+    };
+
     for pin in config.get_pins() {
-        let symlink_root = opts.symlink_root
-                               .clone()
-                               .unwrap_or(String::from(config.get_symlink_root()));
-        match export::export(pin, Some(&symlink_root[..])) {
-            Ok(_) => {}
-            Err(e) => {
-                println!("Error occurred while exporting pin: {:?}", pin);
-                println!("{}", e);
-                exit(1);
-            }
+        if let Err(e) = export::export(pin, Some(symlink_root)) {
+            println!("Error occurred while exporting pin: {:?}", pin);
+            println!("{}", e);
+            exit(1);
         }
     }
 }

src/commands/mod.rs

@@ -1,4 +1,5 @@
 // Copyright (C) 2016, Paul Osborne <[email protected]>
 
 pub mod gpio_read;
+pub mod gpio_export;
 pub mod gpio_exportall;

src/config.rs

@@ -213,7 +213,16 @@ impl GpioConfig {
 
     /// Get the pin with the provided name if present in this configuration
     pub fn get_pin(&self, name: &str) -> Option<&PinConfig> {
-        self.pins.iter().find(|p| p.names.contains(name))
+        // first, try to find pin by name
+        if let Some(pin) = self.pins.iter().find(|p| p.names.contains(name)) {
+            return Some(pin)
+        }
+
+        // Try to parse the name as a 64-bit integer and match against that
+        match name.parse::<u64>() {
+            Ok(pin_num) => self.pins.iter().find(|p| p.num == pin_num),
+            Err(_) => None,
+        }
     }
 
     /// Get a reference to all the pins in this config
@@ -364,6 +373,19 @@ names = ["wildcard"]
         assert_eq!(config.get_pin("missing"), None);
     }
 
+    #[test]
+    fn test_get_pin_by_number() {
+        let config = GpioConfig::from_str(BASIC_CFG).unwrap();
+        let status_led = config.get_pin("37").unwrap();
+        assert_eq!(status_led.num, 37);
+    }
+
+    #[test]
+    fn test_get_pin_by_number_not_found() {
+        let config = GpioConfig::from_str(BASIC_CFG).unwrap();
+        assert_eq!(config.get_pin("64"), None);
+    }
+
     #[test]
     fn test_parser_compact() {
         let config = GpioConfig::from_str(COMPACT_CFG).unwrap();

src/main.rs

@@ -129,7 +129,18 @@ fn main() {
         }
         ("poll", Some(_)) => {}
         ("write", Some(_)) => {}
-        ("export", Some(_)) => {}
+        ("export", Some(m)) => {
+            let export_options = GpioExportOptions {
+                gpio_opts: gpio_options,
+                pin: String::from(m.value_of("pin").unwrap()),
+                symlink_root: match m.value_of("symlink-root") {
+                    Some(slr) => Some(String::from(slr)),
+                    None => None,
+                },
+            };
+
+            gpio_export::main(&cfg, &export_options);
+        }
         ("export-all", Some(m)) => {
             let exportall_options = GpioExportAllOptions {
                 gpio_opts: gpio_options,