Renommage en Logs Reader et bouton marche/arrêt de la lecture
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
818527b758
commit
05c3934b28
9 files changed
+207
-54
No files matched your search
@@ -255,6 +255,14 @@ pub async fn set_refresh_interval(seconds: String) -> Result<Settings, ServerFnE
|
||||
.map_err(internal_error)
|
||||
}
|
||||
|
||||
/// Arrête ou reprend la lecture automatique des logs, conservé entre deux sessions.
|
||||
#[server(endpoint = "set_paused")]
|
||||
pub async fn set_paused(paused: bool) -> Result<(), ServerFnError> {
|
||||
crate::server::set_setting(&pool()?, "paused", if paused { "1" } else { "0" })
|
||||
.await
|
||||
.map_err(internal_error)
|
||||
}
|
||||
|
||||
/// Ordre des fichiers dans la barre latérale, conservé entre deux sessions.
|
||||
#[server(input = Json, endpoint = "set_file_sort")]
|
||||
pub async fn set_file_sort(sort: FileSort) -> Result<(), ServerFnError> {
|
||||
|
||||
+132
-10
@@ -1,7 +1,7 @@
|
||||
use crate::{
|
||||
api::{
|
||||
AddProject, MarkAllRead, MarkRead, RemoveProject, SetFileSort, SetRefreshInterval,
|
||||
get_settings, read_entries, unread_summary,
|
||||
AddProject, MarkAllRead, MarkRead, RemoveProject, SetFileSort, SetPaused,
|
||||
SetRefreshInterval, get_settings, read_entries, unread_summary,
|
||||
},
|
||||
model::{
|
||||
DEFAULT_INTERVAL, EntriesPage, Entry, FaviconState, FileSort, LEVELS, PAGE_SIZE,
|
||||
@@ -72,6 +72,31 @@ struct SettingsCtx {
|
||||
save: ServerAction<SetRefreshInterval>,
|
||||
}
|
||||
|
||||
/// Interrupteur de lecture automatique des logs.
|
||||
#[derive(Clone, Copy)]
|
||||
struct Pause {
|
||||
/// Choix fait dans cette page : il s'applique sans attendre la relecture des réglages.
|
||||
chosen: RwSignal<Option<bool>>,
|
||||
save: ServerAction<SetPaused>,
|
||||
settings: Resource<Result<Settings, ServerFnError>>,
|
||||
}
|
||||
|
||||
impl Pause {
|
||||
fn get(&self) -> bool {
|
||||
self.chosen.get().unwrap_or_else(|| {
|
||||
self.settings
|
||||
.get()
|
||||
.and_then(Result::ok)
|
||||
.is_some_and(|s| s.paused)
|
||||
})
|
||||
}
|
||||
|
||||
fn set(&self, paused: bool) {
|
||||
self.chosen.set(Some(paused));
|
||||
self.save.dispatch(SetPaused { paused });
|
||||
}
|
||||
}
|
||||
|
||||
/// Extrait le message lisible d'une erreur de server function.
|
||||
fn error_message(error: &ServerFnError) -> String {
|
||||
match error {
|
||||
@@ -109,6 +134,13 @@ pub fn App() -> impl IntoView {
|
||||
let settings = Resource::new(move || save.version().get(), |_| get_settings());
|
||||
provide_context(SettingsCtx { settings, save });
|
||||
|
||||
let pause = Pause {
|
||||
chosen: RwSignal::new(None),
|
||||
save: ServerAction::<SetPaused>::new(),
|
||||
settings,
|
||||
};
|
||||
provide_context(pause);
|
||||
|
||||
let interval = move || {
|
||||
settings
|
||||
.get()
|
||||
@@ -117,18 +149,36 @@ pub fn App() -> impl IntoView {
|
||||
.unwrap_or(DEFAULT_INTERVAL)
|
||||
};
|
||||
|
||||
// Polling : le timer est recréé à chaque changement d'intervalle.
|
||||
// Polling : le timer est recréé à chaque changement d'intervalle, et supprimé en pause.
|
||||
Effect::new(move |previous: Option<Option<IntervalHandle>>| {
|
||||
if let Some(Some(handle)) = previous {
|
||||
handle.clear();
|
||||
}
|
||||
if pause.get() {
|
||||
return None;
|
||||
}
|
||||
let seconds = interval();
|
||||
set_interval_with_handle(move || live.bump(), Duration::from_secs(seconds.into())).ok()
|
||||
});
|
||||
|
||||
// À la reprise, rafraîchit tout de suite sans attendre la fin du premier intervalle.
|
||||
Effect::watch(
|
||||
move || pause.get(),
|
||||
move |paused, previous, _| {
|
||||
if previous == Some(&true) && !paused {
|
||||
live.bump();
|
||||
}
|
||||
},
|
||||
false,
|
||||
);
|
||||
|
||||
// Retour sur l'onglet : rafraîchit tout de suite (et marque lu le fichier ouvert).
|
||||
Effect::new(move |_| {
|
||||
let _ = window_event_listener(leptos::ev::focus, move |_| live.bump());
|
||||
let _ = window_event_listener(leptos::ev::focus, move |_| {
|
||||
if !untrack(move || pause.get()) {
|
||||
live.bump();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
Effect::new(move |_| {
|
||||
@@ -137,9 +187,11 @@ pub fn App() -> impl IntoView {
|
||||
}
|
||||
});
|
||||
|
||||
// Favicon : pastille rouge avec le nombre de non-lus, grise si le serveur est injoignable.
|
||||
// Favicon : pastille rouge avec le nombre de non-lus, grise si le serveur est injoignable,
|
||||
// rouge avec le symbole pause si la lecture est arrêtée (prioritaire : plus rien n'est lu).
|
||||
Effect::new(move |_| {
|
||||
let state = match summary.get() {
|
||||
_ if pause.get() => FaviconState::Paused,
|
||||
Some(Ok(s)) if s.total > 0 => FaviconState::Unread(s.total),
|
||||
Some(Err(_)) => FaviconState::Offline,
|
||||
_ => FaviconState::Idle,
|
||||
@@ -152,7 +204,7 @@ pub fn App() -> impl IntoView {
|
||||
let total = move || live.current().map(|s| s.total).unwrap_or(0);
|
||||
|
||||
view! {
|
||||
<Stylesheet id="leptos" href="/pkg/lara_logs_reader.css" />
|
||||
<Stylesheet id="leptos" href="/pkg/logs_reader.css" />
|
||||
// Routes en `SsrMode::Async` : le serveur attend le résumé avant d'envoyer `<head>`,
|
||||
// le titre contient donc déjà le nombre de non-lus.
|
||||
<Transition>
|
||||
@@ -244,14 +296,21 @@ fn Sidebar() -> impl IntoView {
|
||||
}
|
||||
});
|
||||
|
||||
let pause = expect_context::<Pause>();
|
||||
let total = move || live.current().map(|s| s.total).unwrap_or(0);
|
||||
|
||||
view! {
|
||||
<aside class="flex w-80 shrink-0 flex-col gap-4 overflow-y-auto bg-zinc-900 p-4 text-zinc-100">
|
||||
<header class="flex items-center justify-between">
|
||||
<A href="/" attr:class="text-lg font-semibold">
|
||||
"Lara Logs Reader"
|
||||
</A>
|
||||
<div class="flex items-center gap-2">
|
||||
// Sous un `Transition` : l'état vient des réglages, chargés par le serveur.
|
||||
<Transition>
|
||||
<PauseSwitch />
|
||||
</Transition>
|
||||
<A href="/" attr:class="text-lg font-semibold">
|
||||
"Logs Reader"
|
||||
</A>
|
||||
</div>
|
||||
<A href="/settings" attr:class=SMALL_BUTTON attr:title="Réglages">
|
||||
"Réglages"
|
||||
</A>
|
||||
@@ -301,6 +360,9 @@ fn Sidebar() -> impl IntoView {
|
||||
1 => "1 nouveau log".to_string(),
|
||||
n => format!("{n} nouveaux logs"),
|
||||
}}
|
||||
<Show when=move || pause.get()>
|
||||
<span class="ml-1 text-red-400">"· lecture arrêtée"</span>
|
||||
</Show>
|
||||
</span>
|
||||
<Show when=move || { total() > 0 }>
|
||||
<button
|
||||
@@ -344,6 +406,66 @@ fn Sidebar() -> impl IntoView {
|
||||
}
|
||||
}
|
||||
|
||||
/// Bouton marche/arrêt de la lecture automatique des logs : un engrenage qui tourne
|
||||
/// lentement quand elle est active, un bouton rouge quand elle est arrêtée.
|
||||
#[component]
|
||||
fn PauseSwitch() -> impl IntoView {
|
||||
let pause = expect_context::<Pause>();
|
||||
let on = move || !pause.get();
|
||||
view! {
|
||||
<button
|
||||
type="button"
|
||||
aria-pressed=move || on().to_string()
|
||||
aria-label="Lecture automatique des logs"
|
||||
title=move || {
|
||||
if on() {
|
||||
"Lecture des logs active — cliquer pour l'arrêter"
|
||||
} else {
|
||||
"Lecture des logs arrêtée — cliquer pour la reprendre"
|
||||
}
|
||||
}
|
||||
class=move || {
|
||||
if on() {
|
||||
"flex h-7 w-7 shrink-0 items-center justify-center rounded-full text-zinc-300 hover:bg-zinc-800 hover:text-white"
|
||||
} else {
|
||||
"flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-red-600 text-white shadow hover:bg-red-500"
|
||||
}
|
||||
}
|
||||
on:click=move |_| pause.set(on())
|
||||
>
|
||||
<Show
|
||||
when=on
|
||||
fallback=|| {
|
||||
view! {
|
||||
<svg
|
||||
class="h-4 w-4"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="2.5"
|
||||
stroke-linecap="round"
|
||||
>
|
||||
<path d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
|
||||
</svg>
|
||||
}
|
||||
}
|
||||
>
|
||||
<svg
|
||||
class="h-5 w-5 animate-[spin_6s_linear_infinite] motion-reduce:animate-none"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="1.5"
|
||||
stroke-linejoin="round"
|
||||
>
|
||||
<path d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.325.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 0 1 1.37.49l1.296 2.247a1.125 1.125 0 0 1-.26 1.431l-1.003.827c-.293.241-.438.613-.43.992a7.723 7.723 0 0 1 0 .255c-.008.378.137.75.43.991l1.004.827c.424.35.534.955.26 1.43l-1.298 2.247a1.125 1.125 0 0 1-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.47 6.47 0 0 1-.22.128c-.331.183-.581.495-.644.869l-.213 1.281c-.09.543-.56.94-1.11.94h-2.594c-.55 0-1.019-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 0 1-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 0 1-1.369-.49l-1.297-2.247a1.125 1.125 0 0 1 .26-1.431l1.004-.827c.292-.24.437-.613.43-.991a6.932 6.932 0 0 1 0-.255c.007-.38-.138-.751-.43-.992l-1.004-.827a1.125 1.125 0 0 1-.26-1.43l1.297-2.247a1.125 1.125 0 0 1 1.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.086.22-.128.332-.183.582-.495.644-.869l.214-1.28Z" />
|
||||
<path d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
|
||||
</svg>
|
||||
</Show>
|
||||
</button>
|
||||
}
|
||||
}
|
||||
|
||||
#[component]
|
||||
fn UnreadBadge(count: u64) -> impl IntoView {
|
||||
(count > 0).then(|| {
|
||||
@@ -474,7 +596,7 @@ fn HomePage() -> impl IntoView {
|
||||
view! {
|
||||
<div class="mx-auto max-w-xl p-10 text-zinc-600 dark:text-zinc-400">
|
||||
<h1 class="mb-4 text-2xl font-semibold text-zinc-900 dark:text-zinc-100">
|
||||
"Lara Logs Reader"
|
||||
"Logs Reader"
|
||||
</h1>
|
||||
<p class="mb-2">
|
||||
"Ajoutez un projet Laravel avec son chemin dans la barre latérale : tous les fichiers de "
|
||||
|
||||
+5
-5
@@ -2,7 +2,7 @@
|
||||
#[tokio::main]
|
||||
async fn main() {
|
||||
use axum::Router;
|
||||
use lara_logs_reader::{
|
||||
use logs_reader::{
|
||||
app::{App, shell},
|
||||
scanner::Scanner,
|
||||
server,
|
||||
@@ -11,8 +11,8 @@ async fn main() {
|
||||
use leptos_axum::{LeptosRoutes, generate_route_list};
|
||||
use std::{net::SocketAddr, process::exit, sync::Arc};
|
||||
|
||||
let database_url = std::env::var("LLR_DATABASE_URL")
|
||||
.unwrap_or_else(|_| "sqlite://./lara_logs_reader.sqlite?mode=rwc".into());
|
||||
let database_url = std::env::var("LOGS_READER_DATABASE_URL")
|
||||
.unwrap_or_else(|_| "sqlite://./logs_reader.sqlite?mode=rwc".into());
|
||||
let pool = match server::connect_db(&database_url).await {
|
||||
Ok(pool) => pool,
|
||||
Err(e) => {
|
||||
@@ -24,11 +24,11 @@ async fn main() {
|
||||
|
||||
let conf = get_configuration(None).unwrap();
|
||||
let mut leptos_options = conf.leptos_options;
|
||||
if let Ok(addr) = std::env::var("LLR_ADDR") {
|
||||
if let Ok(addr) = std::env::var("LOGS_READER_ADDR") {
|
||||
match addr.parse::<SocketAddr>() {
|
||||
Ok(addr) => leptos_options.site_addr = addr,
|
||||
Err(e) => {
|
||||
eprintln!("LLR_ADDR invalide `{addr}` : {e}");
|
||||
eprintln!("LOGS_READER_ADDR invalide `{addr}` : {e}");
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
+14
-4
@@ -89,6 +89,8 @@ pub struct Entry {
|
||||
pub struct Settings {
|
||||
pub refresh_interval_seconds: u32,
|
||||
pub file_sort: FileSort,
|
||||
/// Lecture automatique des logs arrêtée par l'utilisateur.
|
||||
pub paused: bool,
|
||||
}
|
||||
|
||||
/// Ordre des fichiers dans la liste d'un projet.
|
||||
@@ -162,6 +164,8 @@ pub enum FaviconState {
|
||||
Idle,
|
||||
Unread(u64),
|
||||
Offline,
|
||||
/// Lecture des logs arrêtée par l'utilisateur.
|
||||
Paused,
|
||||
}
|
||||
|
||||
/// Favicon SVG correspondant à l'état, sous forme d'URL `data:`.
|
||||
@@ -189,6 +193,10 @@ pub fn favicon_data_url(state: FaviconState) -> String {
|
||||
<text x='21' y='11' dy='.35em' text-anchor='middle' font-family='Arial,sans-serif' \
|
||||
font-weight='bold' font-size='18' fill='#fff'>!</text>"
|
||||
.to_string(),
|
||||
FaviconState::Paused => "<circle cx='21' cy='11' r='11' fill='#dc2626'/>\
|
||||
<rect x='16.5' y='5.5' width='3.2' height='11' rx='1' fill='#fff'/>\
|
||||
<rect x='22.3' y='5.5' width='3.2' height='11' rx='1' fill='#fff'/>"
|
||||
.to_string(),
|
||||
};
|
||||
let svg = format!(
|
||||
"<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'>\
|
||||
@@ -214,9 +222,9 @@ pub fn favicon_data_url(state: FaviconState) -> String {
|
||||
/// Titre de l'onglet selon le nombre de non-lus.
|
||||
pub fn page_title(unread: u64) -> String {
|
||||
if unread == 0 {
|
||||
"Lara Logs Reader".to_string()
|
||||
"Logs Reader".to_string()
|
||||
} else {
|
||||
format!("({unread}) Lara Logs Reader")
|
||||
format!("({unread}) Logs Reader")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,6 +265,8 @@ mod tests {
|
||||
assert!(decode(favicon_data_url(FaviconState::Unread(3))).contains(">3</text>"));
|
||||
assert!(decode(favicon_data_url(FaviconState::Unread(150))).contains(">99+</text>"));
|
||||
assert!(decode(favicon_data_url(FaviconState::Offline)).contains(">!</text>"));
|
||||
let paused = decode(favicon_data_url(FaviconState::Paused));
|
||||
assert!(paused.contains("%23dc2626") && paused.matches("<rect").count() == 6);
|
||||
assert!(!favicon_data_url(FaviconState::Unread(3)).contains('#'));
|
||||
}
|
||||
|
||||
@@ -307,7 +317,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn title() {
|
||||
assert_eq!(page_title(0), "Lara Logs Reader");
|
||||
assert_eq!(page_title(150), "(150) Lara Logs Reader");
|
||||
assert_eq!(page_title(0), "Logs Reader");
|
||||
assert_eq!(page_title(150), "(150) Logs Reader");
|
||||
}
|
||||
}
|
||||
@@ -95,9 +95,11 @@ pub async fn load_settings(pool: &SqlitePool) -> sqlx::Result<Settings> {
|
||||
.await?
|
||||
.and_then(|v| FileSort::parse(&v))
|
||||
.unwrap_or_default();
|
||||
let paused = setting(pool, "paused").await?.as_deref() == Some("1");
|
||||
Ok(Settings {
|
||||
refresh_interval_seconds,
|
||||
file_sort,
|
||||
paused,
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user