add a bunch of stuff for adding and seeing watches
This commit is contained in:
parent
1f8e642612
commit
4896223b83
10 changed files with 153 additions and 30 deletions
|
@ -32,7 +32,7 @@ impl DbId {
|
||||||
Self(Ulid::new())
|
Self(Ulid::new())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn from_str(s: &str) -> Result<Self, ulid::DecodeError> {
|
pub fn from_string(s: &str) -> Result<Self, ulid::DecodeError> {
|
||||||
let id = Ulid::from_string(s)?;
|
let id = Ulid::from_string(s)?;
|
||||||
Ok(id.into())
|
Ok(id.into())
|
||||||
}
|
}
|
||||||
|
@ -58,7 +58,7 @@ impl Display for DbId {
|
||||||
|
|
||||||
impl Debug for DbId {
|
impl Debug for DbId {
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.debug_tuple("DbId").field(&self.bytes()).finish()
|
f.debug_tuple("DbId").field(&self.as_string()).finish()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
97
src/import_utils.rs
Normal file
97
src/import_utils.rs
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
use sqlx::{query, query_scalar, SqlitePool};
|
||||||
|
|
||||||
|
use crate::{db_id::DbId, Watch};
|
||||||
|
|
||||||
|
const USER_EXISTS_QUERY: &str = "select count(*) from witches where id = $1";
|
||||||
|
const ADD_WATCH_QUERY: &str = "insert into watches (id, title, kind, metadata_url, length, release_date, added_by) values ($1, $2, $3, $4, $5, $6, $7)";
|
||||||
|
|
||||||
|
const OMEGA_ID: u128 = u128::MAX;
|
||||||
|
|
||||||
|
//-************************************************************************
|
||||||
|
// utility functions for building CLI tools, currently just for benchmarking
|
||||||
|
//-************************************************************************
|
||||||
|
pub async fn add_watch(db_pool: &SqlitePool, watch: &Watch) {
|
||||||
|
if query(ADD_WATCH_QUERY)
|
||||||
|
.bind(watch.id)
|
||||||
|
.bind(&watch.title)
|
||||||
|
.bind(watch.kind)
|
||||||
|
.bind(&watch.metadata_url)
|
||||||
|
.bind(watch.length)
|
||||||
|
.bind(watch.release_date)
|
||||||
|
.bind(watch.added_by)
|
||||||
|
.execute(db_pool)
|
||||||
|
.await
|
||||||
|
.is_ok()
|
||||||
|
{
|
||||||
|
println!("{}", watch.id);
|
||||||
|
} else {
|
||||||
|
eprintln!("failed to add \"{}\"", watch.title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn add_user(
|
||||||
|
db_pool: &SqlitePool,
|
||||||
|
username: &str,
|
||||||
|
displayname: Option<&str>,
|
||||||
|
email: Option<&str>,
|
||||||
|
id: Option<DbId>,
|
||||||
|
) {
|
||||||
|
let pwhash = "you shall not password";
|
||||||
|
let id: DbId = id.unwrap_or_else(DbId::new);
|
||||||
|
if query(crate::signup::CREATE_QUERY)
|
||||||
|
.bind(id)
|
||||||
|
.bind(username)
|
||||||
|
.bind(displayname)
|
||||||
|
.bind(email)
|
||||||
|
.bind(pwhash)
|
||||||
|
.execute(db_pool)
|
||||||
|
.await
|
||||||
|
.is_ok()
|
||||||
|
{
|
||||||
|
println!("{id}");
|
||||||
|
} else {
|
||||||
|
eprintln!("failed to add user \"{username}\"");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn ensure_omega(db_pool: &SqlitePool) -> DbId {
|
||||||
|
if !check_omega_exists(db_pool).await {
|
||||||
|
add_user(
|
||||||
|
db_pool,
|
||||||
|
"The Omega User",
|
||||||
|
Some("I am the end of all watches."),
|
||||||
|
None,
|
||||||
|
Some(OMEGA_ID.into()),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
OMEGA_ID.into()
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn check_omega_exists(db_pool: &SqlitePool) -> bool {
|
||||||
|
let id: DbId = OMEGA_ID.into();
|
||||||
|
let count = query_scalar(USER_EXISTS_QUERY)
|
||||||
|
.bind(id)
|
||||||
|
.fetch_one(db_pool)
|
||||||
|
.await
|
||||||
|
.unwrap_or(0);
|
||||||
|
dbg!(count);
|
||||||
|
count > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
//-************************************************************************
|
||||||
|
//tests
|
||||||
|
//-************************************************************************
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn ensure_omega_user() {
|
||||||
|
let p = crate::db::get_db_pool().await;
|
||||||
|
assert!(!check_omega_exists(&p).await);
|
||||||
|
ensure_omega(&p).await;
|
||||||
|
assert!(check_omega_exists(&p).await);
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,8 +4,11 @@ extern crate justerror;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
pub mod test_utils;
|
pub mod test_utils;
|
||||||
|
|
||||||
/// This is used in the bin crate and in tests.
|
/// Some public interfaces for interacting with the database outside of the web
|
||||||
|
/// app
|
||||||
pub use db::get_db_pool;
|
pub use db::get_db_pool;
|
||||||
|
pub use db_id::DbId;
|
||||||
|
pub mod import_utils;
|
||||||
|
|
||||||
// everything else is private to the crate
|
// everything else is private to the crate
|
||||||
mod db;
|
mod db;
|
||||||
|
@ -19,7 +22,6 @@ mod util;
|
||||||
mod watches;
|
mod watches;
|
||||||
|
|
||||||
// things we want in the crate namespace
|
// things we want in the crate namespace
|
||||||
use db_id::DbId;
|
|
||||||
use optional_optional_user::OptionalOptionalUser;
|
use optional_optional_user::OptionalOptionalUser;
|
||||||
use templates::*;
|
use templates::*;
|
||||||
use users::User;
|
use users::User;
|
||||||
|
|
|
@ -126,7 +126,7 @@ pub async fn get_signup_success(
|
||||||
State(pool): State<SqlitePool>,
|
State(pool): State<SqlitePool>,
|
||||||
) -> Response {
|
) -> Response {
|
||||||
let id = id.trim();
|
let id = id.trim();
|
||||||
let id = DbId::from_str(id).unwrap_or_default();
|
let id = DbId::from_string(id).unwrap_or_default();
|
||||||
let user: User = {
|
let user: User = {
|
||||||
query_as(ID_QUERY)
|
query_as(ID_QUERY)
|
||||||
.bind(id)
|
.bind(id)
|
||||||
|
|
|
@ -11,7 +11,7 @@ pub fn get_test_user() -> User {
|
||||||
username: "test_user".to_string(),
|
username: "test_user".to_string(),
|
||||||
// corresponding to a password of "a":
|
// corresponding to a password of "a":
|
||||||
pwhash: "$argon2id$v=19$m=19456,t=2,p=1$GWsCH1w5RYaP9WWmq+xw0g$hmOEqC+MU+vnEk3bOdkoE+z01mOmmOeX08XyPyjqua8".to_string(),
|
pwhash: "$argon2id$v=19$m=19456,t=2,p=1$GWsCH1w5RYaP9WWmq+xw0g$hmOEqC+MU+vnEk3bOdkoE+z01mOmmOeX08XyPyjqua8".to_string(),
|
||||||
id: DbId::from_str("00041061050R3GG28A1C60T3GF").unwrap(),
|
id: DbId::from_string("00041061050R3GG28A1C60T3GF").unwrap(),
|
||||||
displayname: Some("Test User".to_string()),
|
displayname: Some("Test User".to_string()),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,8 +80,10 @@ pub struct PostAddNewWatch {
|
||||||
pub title: String,
|
pub title: String,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub private: bool,
|
pub private: bool,
|
||||||
pub kind: Option<ShowKind>,
|
pub kind: ShowKind,
|
||||||
|
#[serde(default, deserialize_with = "empty_string_as_none")]
|
||||||
pub year: Option<String>, // need a date-picker or something
|
pub year: Option<String>, // need a date-picker or something
|
||||||
|
#[serde(default, deserialize_with = "empty_string_as_none")]
|
||||||
pub metadata_url: Option<String>,
|
pub metadata_url: Option<String>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub watched_already: bool,
|
pub watched_already: bool,
|
||||||
|
@ -114,6 +116,14 @@ pub async fn post_add_new_watch(
|
||||||
{
|
{
|
||||||
let watch_id = DbId::new();
|
let watch_id = DbId::new();
|
||||||
let witch_watch_id = DbId::new();
|
let witch_watch_id = DbId::new();
|
||||||
|
let release_date = form.year.map(|year| match year.trim().parse::<i32>() {
|
||||||
|
Ok(year) => {
|
||||||
|
let years = (year - 1970) as i64;
|
||||||
|
let days = (years as f32 * 365.2425) as i64;
|
||||||
|
Some(days * 24 * 60 * 60)
|
||||||
|
}
|
||||||
|
Err(_) => None,
|
||||||
|
});
|
||||||
let mut tx = pool
|
let mut tx = pool
|
||||||
.begin()
|
.begin()
|
||||||
.await
|
.await
|
||||||
|
@ -122,7 +132,7 @@ pub async fn post_add_new_watch(
|
||||||
.bind(watch_id)
|
.bind(watch_id)
|
||||||
.bind(&form.title)
|
.bind(&form.title)
|
||||||
.bind(form.kind)
|
.bind(form.kind)
|
||||||
.bind(&form.year)
|
.bind(release_date)
|
||||||
.bind(form.metadata_url)
|
.bind(form.metadata_url)
|
||||||
.bind(user.id)
|
.bind(user.id)
|
||||||
.execute(&mut tx)
|
.execute(&mut tx)
|
||||||
|
@ -148,8 +158,7 @@ pub async fn post_add_new_watch(
|
||||||
tracing::error!("Got error: {err}");
|
tracing::error!("Got error: {err}");
|
||||||
WatchAddErrorKind::UnknownDBError
|
WatchAddErrorKind::UnknownDBError
|
||||||
})?;
|
})?;
|
||||||
let id = watch_id.to_string();
|
let location = format!("/watch/{watch_id}");
|
||||||
let location = format!("/watch/{id}");
|
|
||||||
Ok(Redirect::to(&location))
|
Ok(Redirect::to(&location))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -177,12 +186,9 @@ pub async fn get_watch(
|
||||||
"".to_string()
|
"".to_string()
|
||||||
};
|
};
|
||||||
let id = id.trim();
|
let id = id.trim();
|
||||||
let id = DbId::from_str(id).unwrap_or_default();
|
let id = DbId::from_string(id).unwrap_or_default();
|
||||||
let watch: Option<Watch> = query_as(GET_WATCH_QUERY)
|
let q = query_as(GET_WATCH_QUERY).bind(id);
|
||||||
.bind(id)
|
let watch: Option<Watch> = q.fetch_one(&pool).await.ok();
|
||||||
.fetch_one(&pool)
|
|
||||||
.await
|
|
||||||
.ok();
|
|
||||||
|
|
||||||
GetWatchPage {
|
GetWatchPage {
|
||||||
watch,
|
watch,
|
||||||
|
@ -213,22 +219,30 @@ pub async fn get_search_watch(
|
||||||
) -> impl IntoResponse {
|
) -> impl IntoResponse {
|
||||||
let user = auth.current_user;
|
let user = auth.current_user;
|
||||||
|
|
||||||
let search = if search.0 != EMPTY_SEARCH_QUERY_STRUCT {
|
let (search_string, qstring) = if search.0 != EMPTY_SEARCH_QUERY_STRUCT {
|
||||||
let s = search.0;
|
let s = search.0;
|
||||||
format!("{s:?}")
|
let q = if let Some(title) = &s.title {
|
||||||
|
title
|
||||||
|
} else if let Some(search) = &s.search {
|
||||||
|
search
|
||||||
} else {
|
} else {
|
||||||
"".to_string()
|
""
|
||||||
|
};
|
||||||
|
(format!("{s:?}"), format!("%{}%", q.trim()))
|
||||||
|
} else {
|
||||||
|
("".to_string(), "%".to_string())
|
||||||
};
|
};
|
||||||
|
|
||||||
// until tantivy search
|
// until tantivy search
|
||||||
let watches: Vec<Watch> = query_as("select * from watches")
|
let watches: Vec<Watch> = query_as("select * from watches where title like ?")
|
||||||
|
.bind(&qstring)
|
||||||
.fetch_all(&pool)
|
.fetch_all(&pool)
|
||||||
.await
|
.await
|
||||||
.unwrap_or_default();
|
.unwrap();
|
||||||
|
|
||||||
SearchWatchesPage {
|
SearchWatchesPage {
|
||||||
watches,
|
watches,
|
||||||
user,
|
user,
|
||||||
search,
|
search: search_string,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ pub mod templates;
|
||||||
#[derive(
|
#[derive(
|
||||||
Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, sqlx::Type,
|
Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize, sqlx::Type,
|
||||||
)]
|
)]
|
||||||
#[repr(i64)]
|
#[repr(i32)]
|
||||||
pub enum ShowKind {
|
pub enum ShowKind {
|
||||||
Movie = 0,
|
Movie = 0,
|
||||||
Series = 1,
|
Series = 1,
|
||||||
|
@ -67,12 +67,22 @@ impl From<i64> for ShowKind {
|
||||||
)]
|
)]
|
||||||
pub struct Watch {
|
pub struct Watch {
|
||||||
pub id: DbId,
|
pub id: DbId,
|
||||||
pub kind: ShowKind,
|
|
||||||
pub title: String,
|
pub title: String,
|
||||||
|
pub kind: ShowKind,
|
||||||
pub metadata_url: Option<String>,
|
pub metadata_url: Option<String>,
|
||||||
pub length: Option<i64>,
|
pub length: Option<i64>,
|
||||||
pub release_date: Option<i64>,
|
pub release_date: Option<i64>,
|
||||||
added_by: DbId, // this shouldn't be exposed to randos
|
pub added_by: DbId, // this shouldn't be exposed to randos in the application
|
||||||
created_at: i64,
|
}
|
||||||
last_updated: i64,
|
|
||||||
|
impl Watch {
|
||||||
|
pub fn year(&self) -> Option<String> {
|
||||||
|
if let Some(year) = self.release_date {
|
||||||
|
let date = chrono::NaiveDateTime::from_timestamp_opt(year, 0)?;
|
||||||
|
let year = format!("{}", date.format("%Y"));
|
||||||
|
Some(year)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
{% when Some with (watch) %}
|
{% when Some with (watch) %}
|
||||||
|
|
||||||
<div class="watch">
|
<div class="watch">
|
||||||
<span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.release_date, "when??") %}
|
<span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.year(), "when??") %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -17,7 +17,7 @@ Hello, {{ usr.username }}! It's nice to see you.
|
||||||
<div class="watchlist">
|
<div class="watchlist">
|
||||||
<ul>
|
<ul>
|
||||||
{% for watch in watches %}
|
{% for watch in watches %}
|
||||||
<li><span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.release_date, "when??") %}: </li>
|
<li><span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.year(), "when??") %}: </li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<div class="watchlist">
|
<div class="watchlist">
|
||||||
<ul>
|
<ul>
|
||||||
{% for watch in watches %}
|
{% for watch in watches %}
|
||||||
<li><span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.release_date, "when??") %}: </li>
|
<li><span class="watchtitle">{{watch.title}}</span> -- {% call m::get_or_default(watch.year(), "when??") -%}: {{watch.kind}} </li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue