URL decode queries.

Style tweaks
cargo update
2023-09-05 09:49:59 -07:00 · 2023-09-02 13:10:44 -07:00 · 2023-09-02 13:10:34 -07:00 · 2023-09-02 13:10:17 -07:00 · 2023-09-02 09:00:36 -07:00
8 changed files with 295 additions and 314 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/dev.sh
+++ b/dev.sh
@ -1,7 +1,7 @@
 cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 tmux new-session -d -s letterbox-dev
 tmux rename-window web
-tmux send-keys "cd web; trunk serve --release --address 0.0.0.0 --port 6758 --proxy-backend http://localhost:9345/ --proxy-rewrite=/api/ -w ../shared -w ../notmuch -w ./" C-m
+tmux send-keys "cd web; trunk serve -w ../shared -w ../notmuch -w ./" C-m
 tmux new-window -n server
 tmux send-keys "cd server; cargo watch -x run -w ../shared -w ../notmuch -w ./" C-m
 tmux attach -d -t letterbox-dev
--- a/notmuch/src/lib.rs
+++ b/notmuch/src/lib.rs
@ -454,6 +454,8 @@ pub enum NotmuchError {
    SerdeJson(#[from] serde_json::Error),
    #[error("failed to parse bytes as str")]
    Utf8Error(#[from] std::str::Utf8Error),
+    #[error("failed to parse bytes as String")]
+    StringUtf8Error(#[from] std::string::FromUtf8Error),
    #[error("failed to parse str as int")]
    ParseIntError(#[from] std::num::ParseIntError),
 }
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@ -16,6 +16,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 log = "0.4.17"
 tokio = "1.26.0"
 glog = "0.1.0"
+urlencoding = "2.1.3"

 [dependencies.rocket_contrib]
 version = "0.4.11"
--- a/server/src/main.rs
+++ b/server/src/main.rs
@ -4,7 +4,7 @@ extern crate rocket;
 use std::{error::Error, io::Cursor, str::FromStr};

 use glog::Flags;
-use notmuch::{Notmuch, NotmuchError, SearchSummary, ThreadSet};
+use notmuch::{Notmuch, NotmuchError, ThreadSet};
 use rocket::{
    http::{ContentType, Header},
    request::Request,
@ -40,13 +40,14 @@ async fn search(
 ) -> Result<Json<shared::SearchResult>, Debug<NotmuchError>> {
    let page = page.unwrap_or(0);
    let results_per_page = results_per_page.unwrap_or(10);
+    let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
    info!(" search '{query}'");
    let res = shared::SearchResult {
-        summary: nm.search(query, page * results_per_page, results_per_page)?,
+        summary: nm.search(&query, page * results_per_page, results_per_page)?,
        query: query.to_string(),
        page,
        results_per_page,
-        total: nm.count(query)?,
+        total: nm.count(&query)?,
    };
    Ok(Json(res))
 }
@ -56,13 +57,15 @@ async fn show_pretty(
    nm: &State<Notmuch>,
    query: &str,
 ) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
-    let res = nm.show(query)?;
+    let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
+    let res = nm.show(&query)?;
    Ok(Json(res))
 }

 #[get("/show/<query>")]
 async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
-    let res = nm.show(query)?;
+    let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
+    let res = nm.show(&query)?;
    Ok(Json(res))
 }

--- a/web/Trunk.toml
+++ b/web/Trunk.toml
@ -0,0 +1,11 @@
+[build]
+release = true
+
+[serve]
+# The address to serve on.
+address = "0.0.0.0"
+port = 6758
+
+[[proxy]]
+backend = "http://localhost:9345/"
+rewrite= "/api/"
--- a/web/index.html
+++ b/web/index.html
@ -4,18 +4,19 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="modulepreload" href="/pkg/package.js" as="script" type="text/javascript">
-    <link rel="preload" href="/pkg/package_bg.wasm" as="fetch" type="application/wasm" crossorigin="anonymous">
    <link rel="stylesheet", href="https://jenil.github.io/bulmaswatch/cyborg/bulmaswatch.min.css">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css" integrity="sha512-SzlrxWUlpfuzQ+pcUCosxcglQRNAq/DZjVsC0lE40xsADsfeQoEypE+enwcOiGjk/bSuGGKHEyjSoQ1zVisanQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 <style>
 .message {
-  padding-left: 0.5em;
+  padding: 0.5em;*/
 }
 .body {
  background: white;
  color: black;
-  padding-bottom: 1em;
+  padding: 0.5em;
+  margin-left: -0.5em;
+  margin-right: -0.5em;
+  margin-top: 0.5em;
 }
 .error {
  background-color: red;
@ -83,10 +84,6 @@ input::placeholder, .input::placeholder{

 <body>
    <section id="app"></section>
-    <script type="module">
-        import init from '/pkg/package.js';
-        init('/pkg/package_bg.wasm');
-    </script>
 </body>

 </html>
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@ -323,7 +323,6 @@ fn view_message(thread: &ThreadNode) -> Node<Msg> {
        div![C!["header"], "From: ", &message.headers.from],
        div![C!["header"], "Date: ", &message.headers.date],
        div![C!["header"], "To: ", &message.headers.to],
-        hr![],
        div![
            C!["body"],
            match &message.body {
@ -360,7 +359,7 @@ fn view_part(part: &Part) -> Node<Msg> {
                    .build();
                let inlined = inliner.inline(html).expect("failed to inline CSS");

-                return div![C!["view-part-text-html"], div!["TEST"], raw![&inlined]];
+                return div![C!["view-part-text-html"], raw![&inlined]];
            } else {
                div![
                    C!["error"],
@ -513,7 +512,6 @@ fn view_mobile_search_results(query: &str, search_results: &shared::SearchResult
                span![C!["tags"], tags_chiclet(&r.tags, true)],
            ],
            span![C!["date"], &r.date_relative],
-            hr![],
        ]
    });
    let first = search_results.page * search_results.results_per_page;
@ -610,17 +608,19 @@ fn view_thread(thread_set: &ThreadSet) -> Node<Msg> {
    let subject = first_subject(&thread_node).unwrap_or("<No subject>".to_string());
    set_title(&subject);
    div![
-        h1![subject],
+        h1![C!["title"], subject],
+        view_message(&thread_node),
        a![
            attrs! {At::Href=>api::original(&thread_node.0.as_ref().expect("message missing").id)},
            "Original"
        ],
-        view_message(&thread_node),
+        /*
        div![
            C!["debug"],
            "Add zippy for debug dump",
            view_debug_thread_set(thread_set)
        ] /* pre![format!("Thread: {:#?}", thread_set).replace("    ", "  ")] */
+        */
    ]
 }
Author	SHA1	Message	Date
Bill Thiede	01e5ea14ab	URL decode queries.	2023-09-05 09:49:59 -07:00
Bill Thiede	042d475c75	Style tweaks	2023-09-02 13:10:44 -07:00
Bill Thiede	dd0af52feb	cargo update	2023-09-02 13:10:34 -07:00
Bill Thiede	130f9bbeba	Use Trunk.toml for trunk config.	2023-09-02 13:10:17 -07:00
Bill Thiede	0a05b32a7a	Remove 'TEST' text when viewing certain email types	2023-09-02 09:00:36 -07:00