basic weather-based "uptime"
This commit is contained in:
parent
3584ecce96
commit
f427c0fbae
7 changed files with 267 additions and 10 deletions
167
Cargo.lock
generated
167
Cargo.lock
generated
|
|
@ -17,6 +17,21 @@ version = "2.0.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
||||
|
||||
[[package]]
|
||||
name = "android-tzdata"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||
|
||||
[[package]]
|
||||
name = "android_system_properties"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.95"
|
||||
|
|
@ -116,9 +131,11 @@ version = "0.1.0"
|
|||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
"chrono",
|
||||
"maud",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_path_to_error",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
|
|
@ -128,18 +145,53 @@ version = "2.8.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.17.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "chrono"
|
||||
version = "0.4.39"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"wasm-bindgen",
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "fnv"
|
||||
version = "1.0.7"
|
||||
|
|
@ -275,12 +327,45 @@ dependencies = [
|
|||
"tower-service",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone"
|
||||
version = "0.1.61"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"core-foundation-sys",
|
||||
"iana-time-zone-haiku",
|
||||
"js-sys",
|
||||
"wasm-bindgen",
|
||||
"windows-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone-haiku"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.169"
|
||||
|
|
@ -365,6 +450,15 @@ dependencies = [
|
|||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.36.7"
|
||||
|
|
@ -538,6 +632,12 @@ dependencies = [
|
|||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.2"
|
||||
|
|
@ -675,6 +775,73 @@ version = "0.11.0+wasi-snapshot-preview1"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
"rustversion",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.52.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@ edition = "2021"
|
|||
[dependencies]
|
||||
anyhow = "1.0.95"
|
||||
axum = { version = "0.8.1", features = ["macros"] }
|
||||
chrono = "0.4.39"
|
||||
maud = { version = "0.27.0", features = ["axum"] }
|
||||
serde = { version = "1.0.217", features = ["derive"] }
|
||||
serde_json = "1.0.138"
|
||||
serde_path_to_error = "0.1.16"
|
||||
tokio = { version = "1.43.0", features = ["full"] }
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// Converts raw data from ff14-fish-tracker to JSON files that we can use with Serde.
|
||||
// Converts raw data from ff14-fish-tracker to JSON files that we can use with serde.
|
||||
// The only thing that manually needs to be done is to export the variables from said files.
|
||||
// Run using `node convert-to-json.js`.
|
||||
|
||||
|
|
@ -11,6 +11,13 @@ const result = {
|
|||
fish_entries: FISH_INFO,
|
||||
};
|
||||
|
||||
// For some reason, there are sometimes double-nested `bestCatchPath` attributes?
|
||||
Object.values(result.db_data.FISH).forEach((fish) => {
|
||||
if (fish.bestCatchPath[0] instanceof Array) {
|
||||
result.db_data.FISH[fish._id].bestCatchPath = fish.bestCatchPath[0];
|
||||
}
|
||||
});
|
||||
|
||||
const json = JSON.stringify(result);
|
||||
|
||||
await fs.writeFile("data.json", json, { encoding: "utf8" });
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
22
src/clock.rs
Normal file
22
src/clock.rs
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
// Mostly nicked from https://github.com/icykoneko/ff14-fish-tracker-app/blob/master/js/app/time.js. Thanks!
|
||||
|
||||
use chrono::{DateTime, Utc};
|
||||
|
||||
const EARTH_TO_EORZEA: f64 = 3600. / 175.;
|
||||
const EORZEA_TO_EARTH: f64 = 1. / EARTH_TO_EORZEA;
|
||||
|
||||
pub fn to_eorzea_time(earth_time: DateTime<Utc>) -> DateTime<Utc> {
|
||||
let et_ts = earth_time.timestamp();
|
||||
let new_ts = et_ts.abs() as f64 * EARTH_TO_EORZEA;
|
||||
DateTime::from_timestamp(new_ts.floor() as i64, 0).unwrap()
|
||||
}
|
||||
|
||||
pub fn get_current_eorzea_date() -> DateTime<Utc> {
|
||||
to_eorzea_time(Utc::now())
|
||||
}
|
||||
|
||||
pub fn to_earth_time(ez_time: DateTime<Utc>) -> DateTime<Utc> {
|
||||
let ez_ts = ez_time.timestamp();
|
||||
let new_ts = (ez_ts.abs() as f64 * EORZEA_TO_EARTH).ceil();
|
||||
DateTime::from_timestamp(new_ts as i64, 0).unwrap()
|
||||
}
|
||||
54
src/data.rs
54
src/data.rs
|
|
@ -1,7 +1,10 @@
|
|||
use std::collections::HashMap;
|
||||
|
||||
use chrono::Timelike;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::clock;
|
||||
|
||||
const DATA: &'static str = include_str!("../data.json");
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
|
|
@ -24,6 +27,14 @@ pub struct FishEntry {
|
|||
pub start_hour: Option<f32>,
|
||||
pub end_hour: Option<f32>,
|
||||
pub location: Option<u32>,
|
||||
pub best_catch_path: Vec<u32>,
|
||||
pub predators: Vec<Vec<u32>>,
|
||||
pub intuition_length: Option<u32>,
|
||||
pub patch: f32,
|
||||
pub folklore: Option<u32>,
|
||||
pub fish_eyes: bool,
|
||||
pub big_fish: bool,
|
||||
pub weather_set: Vec<u32>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
|
|
@ -39,9 +50,44 @@ pub struct FishMeta {
|
|||
pub name_en: String,
|
||||
}
|
||||
|
||||
impl Data {
|
||||
pub fn new() -> Self {
|
||||
let json = serde_json::from_str(DATA).unwrap();
|
||||
json
|
||||
pub struct CombinedFish<'a> {
|
||||
pub entry: &'a FishEntry,
|
||||
pub meta: &'a FishMeta,
|
||||
}
|
||||
|
||||
impl<'a> CombinedFish<'a> {
|
||||
pub fn is_in_time_range(&self) -> bool {
|
||||
if self.entry.start_hour.is_none() || self.entry.end_hour.is_none() {
|
||||
return false;
|
||||
}
|
||||
let et = clock::get_current_eorzea_date();
|
||||
let start_hour = self.entry.start_hour.unwrap();
|
||||
let end_hour = self.entry.end_hour.unwrap();
|
||||
let spans_midnight = start_hour > end_hour;
|
||||
let cur_hour = et.hour() as f32 + et.minute() as f32 / 60.;
|
||||
if spans_midnight {
|
||||
return cur_hour > start_hour || cur_hour < end_hour;
|
||||
} else {
|
||||
return start_hour < cur_hour && cur_hour < end_hour;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Data {
|
||||
pub fn new() -> Self {
|
||||
let json = &mut serde_json::Deserializer::from_str(DATA);
|
||||
let json = serde_path_to_error::deserialize(json).unwrap();
|
||||
json
|
||||
}
|
||||
|
||||
pub fn fish_with_meta(&self) -> HashMap<u32, CombinedFish> {
|
||||
self.db_data
|
||||
.fish
|
||||
.iter()
|
||||
.filter_map(|(k, v)| {
|
||||
let corresponding_meta = self.fish_entries.iter().find(|m| &m.id == k);
|
||||
corresponding_meta.map(|m| (k.clone(), CombinedFish { entry: v, meta: m }))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
21
src/main.rs
21
src/main.rs
|
|
@ -4,6 +4,7 @@ use axum::{extract::State, http::StatusCode, response::IntoResponse, routing::ge
|
|||
use data::Data;
|
||||
use maud::{html, Markup};
|
||||
|
||||
pub mod clock;
|
||||
pub mod data;
|
||||
|
||||
pub struct AppState {
|
||||
|
|
@ -33,12 +34,24 @@ where
|
|||
|
||||
#[axum::debug_handler]
|
||||
async fn main_handler(state: State<Arc<AppState>>) -> Result<Markup, AppError> {
|
||||
println!("{:?}", state.data.db_data.fish);
|
||||
let values = state.data.db_data.fish.values();
|
||||
let meta = state.data.fish_with_meta();
|
||||
let values = meta.values();
|
||||
Ok(html! {
|
||||
h1 { "Hello!" }
|
||||
h1 { "Hello! Current ET " (clock::get_current_eorzea_date().format("%H:%M")) }
|
||||
@for fish in values {
|
||||
li { (fish.id) }
|
||||
li {
|
||||
@if fish.is_in_time_range() {
|
||||
"Up! "
|
||||
}
|
||||
(fish.meta.name_en)
|
||||
br;
|
||||
@if fish.entry.start_hour.is_some() && fish.entry.end_hour.is_some() {
|
||||
"From " (fish.entry.start_hour.unwrap()) "h to " (fish.entry.end_hour.unwrap()) "h"
|
||||
}
|
||||
@if fish.entry.weather_set.len() > 0 {
|
||||
" Weather(s) " (fish.entry.weather_set.iter().map(|i| i.to_string()).collect::<Vec<_>>().join(", "))
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue