Add prices, format dates nicely

Author: penelopeysm

rust/Cargo.lock

@@ -5,6 +5,7 @@ edition = "2021"
 authors = ["Penelope Yong <penelopeysm@gmail.com>"]
 description = "Fetch upcoming classical music concerts in London"
 repository = "https://github.com/penelopeysm/london_classical"
+default-run = "london_classical"
 
 [lib]
 path = "src/lib.rs"
@@ -14,6 +15,7 @@ chrono = {version = "0.4.37", features = ["serde"]}
 chrono-tz = "0.9.0"
 futures = "0.3.30"
 html-escape = "0.2.13"
+regex = "1.10.4"
 reqwest = {version = "0.12.3", features = ["json"]}
 scraper = "0.19.0"
 serde = {version = "1.0.197", features = ["derive"]}

rust/Cargo.toml

@@ -0,0 +1,10 @@
+use ts_rs::TS;
+use london_classical::core::Concert;
+
+fn main() {
+    let output_dir = env!("CARGO_MANIFEST_DIR").to_string() + "/../src/lib/bindings";
+    match Concert::export_all_to(&output_dir) {
+        Ok(_) => println!("Exported types to {}", output_dir),
+        Err(e) => eprintln!("Error: {}", e),
+    }
+}

rust/src/bin/export-types.rs

@@ -3,21 +3,18 @@ use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Piece {
     pub composer: String,
     pub title: String,
 }
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Performer {
     pub name: String,
     pub instrument: Option<String>,
 }
 
 #[derive(Debug, Serialize, Deserialize, TS)]
-#[ts(export)]
 pub struct Concert {
     pub datetime: DateTime<Utc>,
     pub url: String,
@@ -29,4 +26,6 @@ pub struct Concert {
     pub programme_pdf_url: Option<String>,
     pub pieces: Vec<Piece>,
     pub venue: String,
+    pub min_price: Option<u32>, // pennies
+    pub max_price: Option<u32>, // pennies
 }

rust/src/core.rs

@@ -2,6 +2,7 @@ use crate::core;
 use chrono::{DateTime, Utc};
 use futures::future::join_all;
 use html_escape::decode_html_entities;
+use regex::Regex;
 use scraper::{Html, Selector};
 use serde::{Deserialize, Serialize};
 
@@ -170,6 +171,23 @@ fn parse_concert_json(
         }
     }
 
+    // Figure out prices
+    let prices_text = json["data"]["page"]["pricesText"].as_str().unwrap();
+    let (min_price, max_price) = match prices_text {
+        _ if prices_text.to_lowercase() == "free" => (Some(0), Some(0)),
+        _ => {
+            let re = Regex::new(r"£(\d+)").unwrap();
+            let all_prices_in_pennies: Vec<u32> = re
+                .captures_iter(prices_text)
+                .map(|cap| cap[1].parse::<u32>().unwrap())
+                .collect::<Vec<u32>>();
+            (
+                all_prices_in_pennies.iter().min().map(|&x| x * 100),
+                all_prices_in_pennies.iter().max().map(|&x| x * 100),
+            )
+        }
+    };
+
     fn clean_up_description(s: &str) -> String {
         // Split paragraphs
         let s = decode_html_entities(s)
@@ -204,6 +222,8 @@ fn parse_concert_json(
         is_wigmore_u35,
         performers,
         pieces,
+        min_price,
+        max_price,
     }
 }
 

rust/src/wigmore.rs

@@ -1,5 +1,6 @@
 <script lang="ts">
     import { type Concert } from "src/lib/bindings/Concert";
+    import { formatDate } from "src/utils";
 
     export let selectedConcert: Concert | null;
 </script>
@@ -14,7 +15,22 @@
                 {/if}
             </h2>
             <p>
-                {selectedConcert.datetime.toLocaleString()} at {selectedConcert.venue}
+                {formatDate(new Date(selectedConcert.datetime))}
+                •
+                {selectedConcert.venue}
+                •
+                {#if selectedConcert.min_price !== null && selectedConcert.max_price !== null}
+                    {#if selectedConcert.min_price === selectedConcert.max_price}
+                        {#if selectedConcert.min_price === 0}
+                            Free entry
+                        {:else}
+                            £{selectedConcert.min_price / 100}
+                        {/if}
+                    {:else}
+                        £{selectedConcert.min_price /
+                            100}–£{selectedConcert.max_price / 100}
+                    {/if}
+                {/if}
             </p>
 
             <p>
@@ -33,7 +49,11 @@
                 <div class="two-col-grid">
                     {#each selectedConcert.performers as performer}
                         <span>{performer.name}</span>
-                        <span>{performer.instrument ? performer.instrument : ""}</span>
+                        <span
+                            >{performer.instrument
+                                ? performer.instrument
+                                : ""}</span
+                        >
                     {/each}
                 </div>
             {/if}

src/lib/Details.svelte

@@ -1,18 +1,14 @@
 <script lang="ts">
     import { type Concert } from "src/lib/bindings/Concert";
     import { type FiltersType } from "src/lib/filters";
+    import { formatDate } from "src/utils";
 
     export let selectedConcert: Concert | null;
     export let filters: FiltersType;
 
     // Initialise list of concerts
     import rawConcerts from "src/assets/concerts.json";
-    const concerts = rawConcerts.map((c) => {
-        return {
-            ...c,
-            datetime: new Date(c.datetime),
-        } as unknown as Concert;
-    });
+    const concerts = rawConcerts as Concert[];
     let concertsToShow: Concert[] = [];
 
     function satisfiesFilters(concert: Concert, filters: FiltersType): boolean {
@@ -53,7 +49,7 @@
             {#if concert.subtitle !== null}
                 <h4>{concert.subtitle}</h4>
             {/if}
-            <p>{concert.datetime.toLocaleString()}</p>
+            <p>{formatDate(new Date(concert.datetime))}</p>
             <p>{concert.venue}</p>
         </button>
     {/each}

src/lib/Overview.svelte

@@ -0,0 +1,6 @@
+export function formatDate(date: Date): string {
+    let day_of_week = date.toLocaleString(undefined, { weekday: 'long' });
+    let date_long = date.toLocaleString(undefined, { day: '2-digit', month: 'long', year: 'numeric' });
+    let time = date.toLocaleString(undefined, { hour: 'numeric', minute: '2-digit', hour12: true });
+    return `${date_long} (${day_of_week}), ${time}`;
+}