Merge pull request #18 from runabove/selector

Selector

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "beamium"
-version = "1.3.0"
+version = "1.3.1"
 authors = [ "d33d33 <[email protected]>" ]
 
 build = "build.rs"

src/config.rs

@@ -165,18 +165,18 @@ pub fn load_config(config_path: &str) -> Result<Config, ConfigError> {
         },
     };
 
-    // Load from etc
-    if Path::new("/etc/beamium/config.yaml").exists() {
-        try!(load_path("/etc/beamium/config.yaml", &mut config));
-    }
-
-    // Load local
-    if Path::new("config.yaml").exists() {
-        try!(load_path("config.yaml", &mut config));
-    }
+    if config_path.is_empty() {
+        // Load from etc
+        if Path::new("/etc/beamium/config.yaml").exists() {
+            try!(load_path("/etc/beamium/config.yaml", &mut config));
+        }
 
-    // Load from provided path
-    if !config_path.is_empty() {
+        // Load local
+        if Path::new("config.yaml").exists() {
+            try!(load_path("config.yaml", &mut config));
+        }
+    } else {
+        // Load from provided path
         try!(load_path(config_path, &mut config));
     }
 

src/router.rs

@@ -153,7 +153,7 @@ fn route(sinks: &Vec<config::Sink>,
                 for (i, sink) in sinks.iter().enumerate() {
                     if sink.selector.is_some() {
                         let selector = sink.selector.as_ref().unwrap();
-                        if line.split_whitespace()
+                        if !line.split_whitespace()
                             .nth(1)
                             .map_or(false, |class| selector.is_match(class)) {
                             continue;