bump: version 0.2.0

.cargo/config.toml

@@ -0,0 +1,3 @@
+[alias]
+fc = "fmt --all -- --check"
+cc = "clippy --all-targets -- -D warnings"

Cargo.toml

@@ -6,9 +6,9 @@ authors = ["Kilerd Chan <[email protected]>"]
 license = "MIT"
 edition = "2018"
 
+
 [dependencies]
 structopt = "0.3.3"
-file-lock = "1.1.20"
 tera = "0.11.20"
 serde = "1.0.101"
 serde_derive = "1.0.101"
@@ -32,3 +32,4 @@ regex = "1.3.9"
 itertools = "0.9.0"
 serde_json = "1.0.56"
 env_logger = "0.7.1"
+fs2 = "0.4.3"

homepage/public/index.html

@@ -49,7 +49,7 @@ <h1 class="title">Staple</h1>
     ]
   },
   &quot;develop&quot;: {
-    &quot;live_reload&quot;: &quot;&lt;script&gt;\n\n    function websocket_connect() {\n        let webSocket = new WebSocket(\&quot;ws:&#x2F;&#x2F;localhost:8000&#x2F;notifier\&quot;);\n        webSocket.onopen = function () {\n            webSocket.send(\&quot;Connecting...\&quot;);\n            console.log(\&quot;ws connection...\&quot;);\n        };\n        webSocket.onmessage = function (event) {\n            let data = event.data;\n            console.log(\&quot;ws get event: \&quot;, data);\n            if (data === \&quot;refresh\&quot;) {\n                window.location.reload();\n            }\n        };\n        webSocket.onclose = function (e) {\n            console.log(\&quot;ws disconnected.\&quot;, e);\n            console.log(\&quot;trying to reconnect servere 5 second later\&quot;);\n            setTimeout(websocket_connect, 5000);\n        };\n    }\n\n    if (\&quot;WebSocket\&quot; in window) {\n        websocket_connect();\n\n    } else {\n        console.log(\&quot;your browser does not support websocket\&quot;);\n    }\n&lt;&#x2F;script&gt;&quot;
+    &quot;live_reload&quot;: &quot;&quot;
   },
   &quot;page&quot;: {
     &quot;content&quot;: {
@@ -128,33 +128,5 @@ <h1 class="title">Staple</h1>
 
 </div>
 </body>
-<script>
 
-    function websocket_connect() {
-        let webSocket = new WebSocket("ws://localhost:8000/notifier");
-        webSocket.onopen = function () {
-            webSocket.send("Connecting...");
-            console.log("ws connection...");
-        };
-        webSocket.onmessage = function (event) {
-            let data = event.data;
-            console.log("ws get event: ", data);
-            if (data === "refresh") {
-                window.location.reload();
-            }
-        };
-        webSocket.onclose = function (e) {
-            console.log("ws disconnected.", e);
-            console.log("trying to reconnect servere 5 second later");
-            setTimeout(websocket_connect, 5000);
-        };
-    }
-
-    if ("WebSocket" in window) {
-        websocket_connect();
-
-    } else {
-        console.log("your browser does not support websocket");
-    }
-</script>
 </html>

src/command/build.rs

@@ -1,12 +1,6 @@
 use crate::{app::App, command::StapleCommand, error::StapleError};
-use file_lock::FileLock;
 
 pub(crate) fn build(develop: bool) -> Result<(), StapleError> {
-    StapleCommand::check_config_file_exist()?;
-    let _file_lock = match FileLock::lock("Staple.lock", true, true) {
-        Ok(lock) => lock,
-        Err(err) => panic!("Error getting write lock: {}", err),
-    };
-
+    StapleCommand::lock_file()?;
     App::load(develop)?.render()
 }

src/command/mod.rs

@@ -4,7 +4,10 @@ use structopt::StructOpt;
 
 use crate::error::StapleError;
 
-use crate::constants::STAPLE_CONFIG_FILE;
+use crate::{
+    constants::{STAPLE_CONFIG_FILE, STAPLE_LOCK_FILE},
+    util::lock::LockFile,
+};
 
 pub mod add;
 pub mod build;
@@ -73,6 +76,7 @@ impl StapleCommand {
         }
     }
 
+    #[inline]
     fn config_file_exist() -> bool {
         Path::new(STAPLE_CONFIG_FILE).exists()
     }
@@ -84,4 +88,11 @@ impl StapleCommand {
             Err(StapleError::ConfigNotFound)
         }
     }
+
+    fn lock_file() -> Result<LockFile, StapleError> {
+        let lock_file = LockFile::new(STAPLE_LOCK_FILE)?;
+        info!("Preparing to lock file...");
+        lock_file.lock_file()?;
+        Ok(lock_file)
+    }
 }

src/constants.rs

@@ -9,6 +9,7 @@ pub const HEARTBEAT_INTERVAL: Duration = Duration::from_secs(5);
 pub const CLIENT_TIMEOUT: Duration = Duration::from_secs(10);
 
 pub const STAPLE_CONFIG_FILE: &str = "Staple.toml";
+pub const STAPLE_LOCK_FILE: &str = "Staple.lock";
 
 pub const DESCRIPTION_SEPARATOR: &str = "<!--more-->";
 

src/main.rs

@@ -16,6 +16,7 @@ mod constants;
 mod error;
 mod server;
 mod template;
+mod util;
 
 mod data;
 

src/util/lock.rs

@@ -0,0 +1,37 @@
+use crate::error::StapleError;
+use fs2::FileExt;
+use std::{
+    fs::{File, OpenOptions},
+    ops::Deref,
+    path::Path,
+};
+
+pub struct LockFile(File);
+
+impl Deref for LockFile {
+    type Target = File;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl LockFile {
+    pub fn new(path: impl AsRef<Path>) -> Result<LockFile, StapleError> {
+        let file = OpenOptions::new()
+            .read(false)
+            .write(true)
+            .create(true)
+            .open(path.as_ref())?;
+        Ok(LockFile(file))
+    }
+    pub fn lock_file(&self) -> Result<(), StapleError> {
+        Ok(self.0.lock_exclusive()?)
+    }
+}
+
+impl Drop for LockFile {
+    fn drop(&mut self) {
+        let _result = self.0.unlock();
+    }
+}

src/util/mod.rs

@@ -0,0 +1 @@
+pub mod lock;