Merge pull request #13 from smudge/gnome-support

[v0.2.0] Basic Linux support! (GNOME/GSettings only)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nightlight"
-version = "0.1.1"
+version = "0.2.0"
 authors = ["smudge <nathan@ngriffith.com>"]
 edition = "2018"
 categories = ["command-line-utilities", "os::macos-apis"]
@@ -10,6 +10,11 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
+time = "0.2.10"
+
+[target.'cfg(target_os = "macos")'.dependencies]
 objc = "0.2"
 objc-foundation = "0.1.1"
-time = "0.2.10"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+gio = "0.8.1"

README.md

@@ -105,7 +105,7 @@ nightlight schedule off
 In addition to a CLI, `nightlight` can be pulled-in as a dependency for other Rust crates:
 
 ```
-nightlight = "0.1.1"
+nightlight = "0.2.0"
 ```
 
 Here's an example `fn` that toggles Night Shift off,

build.rs

@@ -1,4 +1,7 @@
-fn main()
-{
-    println!("cargo:rustc-link-search=framework={}", "/System/Library/PrivateFrameworks");
+fn main() {
+    #[cfg(target_os = "macos")]
+    println!(
+        "cargo:rustc-link-search=framework={}",
+        "/System/Library/PrivateFrameworks"
+    );
 }

src/lib.rs

@@ -1,18 +1,20 @@
-mod ffi;
+#[cfg_attr(target_os = "linux", path = "linux/mod.rs")]
+#[cfg_attr(target_os = "macos", path = "macos/mod.rs")]
+mod os;
 mod schedule;
 mod status;
 
 pub use schedule::{Schedule, Time};
 pub use status::Status;
 
 pub struct NightLight {
-    client: ffi::CBBlueLightClient,
+    client: os::Client,
 }
 
 impl NightLight {
     pub fn new() -> NightLight {
         NightLight {
-            client: ffi::CBBlueLightClient::new(),
+            client: os::Client::new(),
         }
     }
 
@@ -46,8 +48,8 @@ impl NightLight {
     }
 
     pub fn get_schedule(&self) -> Result<Schedule, String> {
-        let status = self.client.status()?;
-        NightLight::schedule(status.mode(), status.from_time(), status.to_time())
+        let (from_time, to_time) = self.client.get_schedule()?;
+        NightLight::schedule(self.client.get_mode()?, from_time, to_time)
     }
 
     pub fn set_temp(&self, temp: i32) -> Result<(), String> {
@@ -63,7 +65,7 @@ impl NightLight {
     }
 
     pub fn status(&self) -> Result<Status, String> {
-        Ok(match self.client.status()?.enabled() {
+        Ok(match self.client.get_enabled()? {
             true => Status::On,
             false => Status::Off,
         })

src/linux/locale.rs

@@ -0,0 +1,19 @@
+use std::sync::Arc;
+
+pub struct Locale {
+    is_24_hr: bool,
+}
+
+impl Locale {
+    pub fn initialize() -> Result<(), String> {
+        Ok(())
+    }
+
+    pub fn current() -> Arc<Locale> {
+        Arc::new(Locale { is_24_hr: true })
+    }
+
+    pub fn is_24_hr(&self) -> bool {
+        true
+    }
+}