Reformat Rust code
This commit is contained in:
5
.idea/inspectionProfiles/Project_Default.xml
generated
5
.idea/inspectionProfiles/Project_Default.xml
generated
@@ -1,6 +1,11 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
|
||||
<Languages>
|
||||
<language minSize="54" name="Rust" />
|
||||
</Languages>
|
||||
</inspection_tool>
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
<option name="processLiterals" value="true" />
|
||||
|
||||
271
src/main.rs
271
src/main.rs
@@ -1,35 +1,39 @@
|
||||
use diesel::prelude::*;
|
||||
use anyhow::{anyhow, Result, Context};
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use askama_axum::Template;
|
||||
use axum::{extract::{Path, State}, http::{Method, header, StatusCode, Request, Uri}, response::{IntoResponse, Response, Html}, routing::{get, post}, Json, Router, Form, http};
|
||||
use axum::http::HeaderValue;
|
||||
use deadpool_diesel::sqlite::{Runtime, Manager, Pool};
|
||||
use axum::{
|
||||
extract::{Path, State},
|
||||
http,
|
||||
http::{header, Method, Request, StatusCode, Uri},
|
||||
response::{Html, IntoResponse, Response},
|
||||
routing::{get, post},
|
||||
Form, Json, Router,
|
||||
};
|
||||
use clap::Parser;
|
||||
use tower::{ServiceBuilder};
|
||||
use deadpool_diesel::sqlite::{Manager, Pool, Runtime};
|
||||
use diesel::prelude::*;
|
||||
use serde::Deserialize;
|
||||
use tower::ServiceBuilder;
|
||||
use tower_http::{
|
||||
cors::{Any, CorsLayer},
|
||||
trace::{TraceLayer, DefaultOnResponse},
|
||||
services::ServeDir,
|
||||
LatencyUnit
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use tracing::{
|
||||
info, error, debug, info_span, enabled,
|
||||
instrument, Level, Span
|
||||
trace::{DefaultOnResponse, TraceLayer},
|
||||
LatencyUnit,
|
||||
};
|
||||
use tracing::{debug, enabled, error, info, info_span, instrument, Level, Span};
|
||||
|
||||
pub mod models;
|
||||
pub mod schema;
|
||||
|
||||
use self::models::*;
|
||||
|
||||
#[derive(Parser,Clone)]
|
||||
#[derive(Parser, Clone)]
|
||||
struct Config {
|
||||
#[arg(long,env)]
|
||||
#[arg(long, env)]
|
||||
database_url: String,
|
||||
#[arg(long,env)]
|
||||
#[arg(long, env)]
|
||||
http_host: String,
|
||||
#[arg(long,env)]
|
||||
#[arg(long, env)]
|
||||
http_port: u16,
|
||||
}
|
||||
|
||||
@@ -41,10 +45,7 @@ struct AppContext {
|
||||
|
||||
async fn establish_connection(database_url: &str) -> Pool {
|
||||
let manager = Manager::new(database_url, Runtime::Tokio1);
|
||||
let pool = Pool::builder(manager)
|
||||
.max_size(8)
|
||||
.build()
|
||||
.unwrap();
|
||||
let pool = Pool::builder(manager).max_size(8).build().unwrap();
|
||||
let _ = pool.get().await.expect("DB connection failed"); // Test if DB connection was fine
|
||||
pool
|
||||
}
|
||||
@@ -82,10 +83,9 @@ async fn main() -> Result<()> {
|
||||
.on_response(
|
||||
DefaultOnResponse::new()
|
||||
.level(Level::DEBUG)
|
||||
.latency_unit(LatencyUnit::Millis)
|
||||
.latency_unit(LatencyUnit::Millis),
|
||||
);
|
||||
let middlewares = ServiceBuilder::new()
|
||||
.layer(tracelayer).layer(cors);
|
||||
let middlewares = ServiceBuilder::new().layer(tracelayer).layer(cors);
|
||||
// Launch Web Server
|
||||
let app = Router::new()
|
||||
// TODO: Serve a mano di favicon
|
||||
@@ -100,190 +100,211 @@ async fn main() -> Result<()> {
|
||||
.with_state(context.clone());
|
||||
// Run our app with hyper
|
||||
let listener = tokio::net::TcpListener::bind((config.http_host.as_str(), config.http_port))
|
||||
.await.context(format!("Failed to bind Web Service on {}:{}", config.http_host, config.http_port))?;
|
||||
.await
|
||||
.context(format!(
|
||||
"Failed to bind Web Service on {}:{}",
|
||||
config.http_host, config.http_port
|
||||
))?;
|
||||
info!("Listening on {}:{}", config.http_host, config.http_port);
|
||||
axum::serve(listener, app).await.context("Failed to serve Web Service")?;
|
||||
axum::serve(listener, app)
|
||||
.await
|
||||
.context("Failed to serve Web Service")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path="feed.html")]
|
||||
#[template(path = "feed.html")]
|
||||
struct FeedTemplate {
|
||||
feed: RssFeed
|
||||
feed: RssFeed,
|
||||
}
|
||||
|
||||
async fn get_feed(
|
||||
State(ctx): State<AppContext>,
|
||||
Path(feed_id): Path<i32>
|
||||
) -> FeedTemplate {
|
||||
async fn get_feed(State(ctx): State<AppContext>, Path(feed_id): Path<i32>) -> FeedTemplate {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
}).await.unwrap();
|
||||
let result = conn
|
||||
.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
if let Some(feed) = result {
|
||||
FeedTemplate{ feed }
|
||||
FeedTemplate { feed }
|
||||
} else {
|
||||
FeedTemplate{
|
||||
feed: RssFeed{
|
||||
FeedTemplate {
|
||||
feed: RssFeed {
|
||||
id: -1,
|
||||
name: "ERROR".to_string(),
|
||||
feed_url: "ERROR".to_string(),
|
||||
last_pub_date: Some("ERROR".to_string())
|
||||
}
|
||||
last_pub_date: Some("ERROR".to_string()),
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path="feed_form.html")]
|
||||
#[template(path = "feed_form.html")]
|
||||
struct FeedFormTemplate {
|
||||
feed: RssFeed
|
||||
feed: RssFeed,
|
||||
}
|
||||
|
||||
async fn get_feed_form(
|
||||
State(ctx): State<AppContext>,
|
||||
Path(feed_id): Path<i32>
|
||||
Path(feed_id): Path<i32>,
|
||||
) -> impl IntoResponse {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
}).await.unwrap();
|
||||
let result = conn
|
||||
.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
if let Some(feed) = result {
|
||||
FeedFormTemplate{ feed }
|
||||
FeedFormTemplate { feed }
|
||||
} else {
|
||||
FeedFormTemplate{
|
||||
feed: RssFeed{
|
||||
FeedFormTemplate {
|
||||
feed: RssFeed {
|
||||
id: -1,
|
||||
name: "ERROR".to_string(),
|
||||
feed_url: "ERROR".to_string(),
|
||||
last_pub_date: Some("ERROR".to_string())
|
||||
}
|
||||
last_pub_date: Some("ERROR".to_string()),
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(path="feed_inline.html")]
|
||||
#[template(path = "feed_inline.html")]
|
||||
struct FeedInlineTemplate {
|
||||
feed: RssFeed
|
||||
feed: RssFeed,
|
||||
}
|
||||
|
||||
async fn get_feed_inline(
|
||||
State(ctx): State<AppContext>,
|
||||
Path(feed_id): Path<i32>
|
||||
Path(feed_id): Path<i32>,
|
||||
) -> impl IntoResponse {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
}).await.unwrap();
|
||||
let result = conn
|
||||
.interact(move |conn| {
|
||||
rss_feeds
|
||||
.find(feed_id)
|
||||
.select(RssFeed::as_select())
|
||||
.first(conn)
|
||||
.optional()
|
||||
.expect("Error loading feeds")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
if let Some(feed) = result {
|
||||
FeedInlineTemplate{ feed }
|
||||
FeedInlineTemplate { feed }
|
||||
} else {
|
||||
FeedInlineTemplate{
|
||||
feed: RssFeed{
|
||||
FeedInlineTemplate {
|
||||
feed: RssFeed {
|
||||
id: -1,
|
||||
name: "ERROR".to_string(),
|
||||
feed_url: "ERROR".to_string(),
|
||||
last_pub_date: Some("ERROR".to_string())
|
||||
}
|
||||
last_pub_date: Some("ERROR".to_string()),
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Deserialize, AsChangeset)]
|
||||
#[diesel(table_name = crate::schema::rss_feeds)]
|
||||
struct PostForm{
|
||||
struct PostForm {
|
||||
name: String,
|
||||
feed_url: String,
|
||||
}
|
||||
|
||||
async fn post_feed(
|
||||
State(ctx): State<AppContext>,
|
||||
Form(post): Form<PostForm>,
|
||||
) -> impl IntoResponse {
|
||||
async fn post_feed(State(ctx): State<AppContext>, Form(post): Form<PostForm>) -> impl IntoResponse {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(move |conn| {
|
||||
let new_feed = NewRssFeed{name: post.name.as_str(), feed_url: post.feed_url.as_str() };
|
||||
diesel::insert_into(rss_feeds)
|
||||
.values(&new_feed)
|
||||
.returning(RssFeed::as_select())
|
||||
.get_result(conn)
|
||||
.expect("Error saving new feed")
|
||||
}).await.unwrap();
|
||||
FeedTemplate{ feed: result }
|
||||
let result = conn
|
||||
.interact(move |conn| {
|
||||
let new_feed = NewRssFeed {
|
||||
name: post.name.as_str(),
|
||||
feed_url: post.feed_url.as_str(),
|
||||
};
|
||||
diesel::insert_into(rss_feeds)
|
||||
.values(&new_feed)
|
||||
.returning(RssFeed::as_select())
|
||||
.get_result(conn)
|
||||
.expect("Error saving new feed")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
FeedTemplate { feed: result }
|
||||
}
|
||||
|
||||
async fn put_feed(
|
||||
State(ctx): State<AppContext>,
|
||||
Path(feed_id): Path<i32>,
|
||||
Form(post): Form<PostForm>
|
||||
Form(post): Form<PostForm>,
|
||||
) -> impl IntoResponse {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(move |conn| {
|
||||
diesel::update(rss_feeds.find(feed_id))
|
||||
.set(post)
|
||||
.returning(RssFeed::as_select())
|
||||
.get_result(conn)
|
||||
.expect("Error updating feed")
|
||||
}).await.unwrap();
|
||||
FeedTemplate{ feed: result }
|
||||
let result = conn
|
||||
.interact(move |conn| {
|
||||
diesel::update(rss_feeds.find(feed_id))
|
||||
.set(post)
|
||||
.returning(RssFeed::as_select())
|
||||
.get_result(conn)
|
||||
.expect("Error updating feed")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
FeedTemplate { feed: result }
|
||||
}
|
||||
|
||||
|
||||
#[derive(Template)]
|
||||
#[template(source="\
|
||||
#[template(
|
||||
source = "\
|
||||
{% for feed in feeds %}
|
||||
{% include \"feed.html\" %}
|
||||
{% endfor %}", ext="html")]
|
||||
{% endfor %}",
|
||||
ext = "html"
|
||||
)]
|
||||
struct FeedsTemplate {
|
||||
feeds: Vec<RssFeed>
|
||||
feeds: Vec<RssFeed>,
|
||||
}
|
||||
|
||||
async fn get_list_feed(
|
||||
State(ctx): State<AppContext>,
|
||||
) -> FeedsTemplate {
|
||||
async fn get_list_feed(State(ctx): State<AppContext>) -> FeedsTemplate {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let result = conn.interact(|conn| {
|
||||
rss_feeds
|
||||
.select(RssFeed::as_select())
|
||||
.load(conn)
|
||||
.expect("Error loading feeds")
|
||||
}).await.unwrap();
|
||||
FeedsTemplate{ feeds: result }
|
||||
let result = conn
|
||||
.interact(|conn| {
|
||||
rss_feeds
|
||||
.select(RssFeed::as_select())
|
||||
.load(conn)
|
||||
.expect("Error loading feeds")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
FeedsTemplate { feeds: result }
|
||||
}
|
||||
|
||||
async fn delete_feed(
|
||||
State(ctx): State<AppContext>,
|
||||
Path(feed_id): Path<i32>,
|
||||
) -> impl IntoResponse {
|
||||
async fn delete_feed(State(ctx): State<AppContext>, Path(feed_id): Path<i32>) -> impl IntoResponse {
|
||||
let conn = ctx.pool.get().await.unwrap();
|
||||
use self::schema::rss_feeds::dsl::*;
|
||||
let num_deleted = conn.interact(move |conn| {
|
||||
diesel::delete(rss_feeds.find(feed_id))
|
||||
.execute(conn)
|
||||
.expect("Error deleting posts")
|
||||
}).await.unwrap();
|
||||
let num_deleted = conn
|
||||
.interact(move |conn| {
|
||||
diesel::delete(rss_feeds.find(feed_id))
|
||||
.execute(conn)
|
||||
.expect("Error deleting posts")
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
if num_deleted == 0 {
|
||||
(StatusCode::NOT_FOUND, "Not found")
|
||||
} else {
|
||||
@@ -296,12 +317,10 @@ async fn delete_feed(
|
||||
#[derive(Template)]
|
||||
#[template(path = "index.html")]
|
||||
struct IndexTemplate {
|
||||
feeds: FeedsTemplate
|
||||
feeds: FeedsTemplate,
|
||||
}
|
||||
|
||||
async fn index(
|
||||
State(ctx): State<AppContext>,
|
||||
) -> IndexTemplate {
|
||||
async fn index(State(ctx): State<AppContext>) -> IndexTemplate {
|
||||
let feeds = get_list_feed(State(ctx)).await;
|
||||
IndexTemplate { feeds }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user