add index

vn-ki · Dec 19, 2020 · a76bf50 · a76bf50
1 parent 7d0b621
commit a76bf50
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 18 deletions.
diff --git a/src/letterboxd.rs b/src/letterboxd.rs
@@ -10,6 +10,9 @@ use thiserror::Error;
 pub enum LetterboxdError {
     #[error("missing attr {0}")]
     HtmlMissingAttr(String),
+
+    #[error("user not found {0}")]
+    UserNotFound(String),
 }
 
 pub struct LetterboxdClient {
@@ -135,10 +138,10 @@ impl LetterboxdClient {
     }
 
     #[tracing::instrument(skip(self))]
-    async fn get_letterboxd_film_by_page(&self, username: &str, page: usize) -> Result<String> {
+    async fn get_letterboxd_film_by_page(&self, username: &str, page: usize) -> Result<reqwest::Response> {
         let url = format!("https://letterboxd.com/{}/films/page/{}", username, page);
         debug!("fetching url={}", url);
-        let text = self.client.get(&url).send().await?.text().await?;
+        let text = self.client.get(&url).send().await?;
         Ok(text)
     }
 
@@ -149,7 +152,11 @@ impl LetterboxdClient {
         // let no_of_pages = self.get_pages(&document)?;
         // TODO: this is weird async problem
         let no_of_pages = {
-            let text = self.get_letterboxd_film_by_page(username, 1).await?;
+            let resp = self.get_letterboxd_film_by_page(username, 1).await?;
+            if resp.status() == reqwest::StatusCode::NOT_FOUND {
+                return Err(LetterboxdError::UserNotFound(username.into()).into());
+            }
+            let text = resp.text().await?;
             let document = Html::parse_document(&text);
             self.get_pages(&document)
         }?;
@@ -165,6 +172,8 @@ impl LetterboxdClient {
             // get the next
             let text = self
                 .get_letterboxd_film_by_page(username, curr_page)
+                .await?
+                .text()
                 .await?;
             let document = Html::parse_document(&text);
             for movie in document.select(&selector) {

diff --git a/src/main.rs b/src/main.rs
@@ -9,12 +9,15 @@ use crate::cache::*;
 use crate::letterboxd::*;
 use anyhow::Result;
 use askama::Template;
+use std::cmp::Ordering;
 use std::collections::HashSet;
-use warp::Filter;
-use tracing::{info, debug};
+use tracing::{debug, info};
 use tracing_subscriber;
-use std::cmp::Ordering;
+use warp::Filter;
 
+#[derive(Template)]
+#[template(path = "index.html")]
+struct IndexTemplate {}
 
 #[derive(Template)]
 #[template(path = "diff.html")]
@@ -51,13 +54,11 @@ async fn get_diff(user1: &str, user2: &str) -> Result<String> {
         .into_iter()
         .filter(|x| !watched_by_2.contains(&x.id))
         .collect();
-    diff.sort_by(|a, b| {
-        match (a.rating, b.rating) {
-            (Some(r1), Some(r2)) => r2.partial_cmp(&r1).unwrap(),
-            (None, Some(_)) => Ordering::Greater,
-            (Some(_), None) => Ordering::Less,
-            (None, None) => Ordering::Equal,
-        }
+    diff.sort_by(|a, b| match (a.rating, b.rating) {
+        (Some(r1), Some(r2)) => r2.partial_cmp(&r1).unwrap(),
+        (None, Some(_)) => Ordering::Greater,
+        (Some(_), None) => Ordering::Less,
+        (None, None) => Ordering::Equal,
     });
     Ok(DiffTemplate {
         user1: &user1,
@@ -78,12 +79,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 Ok(s) => Ok(warp::reply::html(s)),
                 Err(_) => return Err(warp::reject::not_found()),
             }
-            // Ok(warp::reply::html(
-            //     // get_diff(&user1, &user2).await.unwrap_or_else(|err| err.to_string()),
-            // ))
         });
+    let index = warp::path::end().map(|| -> warp::reply::Html<String> {
+        return warp::reply::html(IndexTemplate {}.render().unwrap().into());
+    });
+
+    let routes = hello.or(index);
 
-    warp::serve(hello).run(([127, 0, 0, 1], 3030)).await;
+    warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
 
     Ok(())
 }
diff --git a/templates/diff.html b/templates/diff.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Hello Bulma!</title>
+    <title>{{ user1 }} vs {{ user2 }}</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
   </head>
   <style>

diff --git a/templates/index.html b/templates/index.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>LB Diff</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.1/css/bulma.min.css">
+  </head>
+  <body>
+  <section class="section">
+    <div class="container">
+      <div class="columns is-mobile">
+        {# <div class="column"></div> #}
+        <div class="column is-full-mobile is-four-fifths-tablet is-three-quarters-desktop is-two-thirds-widescreen is-two-thirds-fullhd" style="margin: auto">
+          <h1 class="title is-4">
+            Movies that <input id="user1" class="input is-1" placeholder="LB username"></input> has watched, but <input id="user2" class="input is-1" placeholder="LB username"></input> hasn't!
+          </h1>
+          <p class="subtitle">
+          <a class="button is-link" onclick="redirect()">Compare</a>
+          </p>
+        </div>
+        {# <div class="column"></div> #}
+      </div>
+    </div>
+  </section>
+  </body>
+  <script>
+    function redirect() {
+          let user1 = document.getElementById('user1').value;
+          let user2 = document.getElementById('user2').value;
+          window.location = "/" + user1 + "/vs/" + user2;
+        }
+  </script>
+</html>