Add a `draft` field to Post

TODO: handle drafts differently on the frontend

oslo-lib/src/post.rs

@@ -4,6 +4,10 @@ use std::io::{Error, ErrorKind};
 
 use crate::{fs, util};
 
+fn f() -> bool {
+    false
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Post {
     pub title: String,
@@ -11,6 +15,10 @@ pub struct Post {
     pub body: String,
     pub html: String,
     pub date: String,
+    #[serde(serialize_with = "util::int_from_bool")]
+    #[serde(deserialize_with = "util::bool_from_int")]
+    #[serde(default = "f")]
+    pub draft: bool,
 }
 
 impl Post {
@@ -25,9 +33,9 @@ impl Post {
     pub fn from_str(blob: &str) -> Result<Post, Error> {
         let post: Post = match serde_json::from_str(blob) {
             Ok(p) => Ok(p),
-            Err(_) => Err(Error::new(
+            Err(e) => Err(Error::new(
                 ErrorKind::Other,
-                format!("Error deserializing post"),
+                format!("Error deserializing post: {}", e.to_string()),
             )),
         }?;
         Ok(post)

oslo-lib/src/util.rs

@@ -1,4 +1,9 @@
 use pulldown_cmark::{html, Options, Parser};
+use serde::Serializer;
+use serde::{
+    de::{Deserialize, Deserializer},
+    Serialize,
+};
 
 pub fn generate_html(s: &str) -> String {
     let options = Options::all();
@@ -7,3 +12,23 @@ pub fn generate_html(s: &str) -> String {
     html::push_html(&mut html_output, parser);
     html_output
 }
+
+pub fn bool_from_int<'de, D>(deserializer: D) -> Result<bool, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    match u8::deserialize(deserializer)? {
+        1 => Ok(true),
+        _ => Ok(false),
+    }
+}
+
+pub fn int_from_bool<S>(value: &bool, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    match value {
+        true => 1.serialize(s),
+        false => 0.serialize(s),
+    }
+}

templates/components.html

@@ -26,11 +26,6 @@
 
 {% macro form(post=false, action) %}
   <form class="form" method="POST" action="{{ action }}" id="post-form">
-    <input
-      type="hidden"
-      name="id"
-      value="{% if post %}{{ post.slug }}{% endif %}"
-    />
     <input
       type="hidden"
       name="date"
@@ -71,9 +66,15 @@
         required
       >{% if post %}{{ post.body }}{% endif %}</textarea>
     </div>
+    <div class="form__field">
+       <label for="draft">
+        Save as Draft?
+        <input type="checkbox" name="draft" value="1" {% if post.draft %}checked{% endif %}>
+       </label>
+    </div>
     <div class="form__field">
       <a class="btn" href="#" data-preview>Preview</a>
-      <input class="btn btn--green" type="submit" value="Post" />
+      <input class="btn btn--green" type="submit" value="Post">
     </div>
   </form>
 {% endmacro %}

templates/edit.html

@@ -2,7 +2,7 @@
 {% block content %}
 
   <div class="posts">
-    {{ components::form(post=post, action="/posts/{{ post.slug }}") }}
+    {{ components::form(post=post, action="/posts/" ~ post.slug) }}
   </div>
 
 {% endblock %}