refactor: simplify specs display layout

README.md

@@ -30,6 +30,8 @@ Current scope:
 - manage rotation order and switch interval
 - enable or disable custom panels without the vendor web UI
 - drive the AOOSTAR LCD directly through the native `aoostar-rs` serial implementation
+- show native system specs in either a card view or an htop-style meter view
+- toggle a built-in `ricardo.gif` animation directly from the Web UI
 
 Start it from the workspace root:
 
@@ -40,11 +42,12 @@ cargo run -p aster-webui -- --config-dir /config --bind 0.0.0.0:8080
 Important:
 
 - the current web UI writes compatible `Monitor3.json` and `/config/img/*` assets
-- animated GIF uploads currently use the first frame only
 - the native display loop runs automatically and uses the default AOOSTAR USB UART unless
   `--device`, `--usb`, `--simulate`, or `--disable-display` is specified
 - the native path currently targets custom image panels; built-in vendor sensor themes are not yet
   reimplemented in the web UI
+- the Web UI currently exposes animated playback through the built-in `Ricardo` toggle rather than
+  arbitrary uploaded GIF rotation
 
 ## Native Container Variant
 

crates/aster-webui/src/system.rs

@@ -157,96 +157,74 @@ pub(crate) fn render_system_panel(mode: &str) -> RgbImage {
 fn render_system_panel_cards() -> RgbImage {
     let system = collect_system_view();
     let mut canvas = RgbImage::from_pixel(DISPLAY_WIDTH, DISPLAY_HEIGHT, Rgb([10, 14, 18]));
-    let host_name = System::host_name().unwrap_or_else(|| "Unraid".into());
-    let timestamp = Local::now().format("%d.%m.%Y %H:%M:%S").to_string();
 
     draw_filled_rect_mut(
         &mut canvas,
-        Rect::at(0, 0).of_size(DISPLAY_WIDTH, 84),
+        Rect::at(0, 0).of_size(DISPLAY_WIDTH, 64),
-        Rgb([18, 27, 36]),
+        Rgb([14, 20, 28]),
     );
     draw_filled_rect_mut(
         &mut canvas,
-        Rect::at(0, 84).of_size(DISPLAY_WIDTH, DISPLAY_HEIGHT - 84),
+        Rect::at(0, 64).of_size(DISPLAY_WIDTH, DISPLAY_HEIGHT - 64),
         Rgb([8, 11, 15]),
     );
 
     draw_text_line(
         &mut canvas,
         Rgb([216, 253, 114]),
-        28,
+        24,
-        20,
+        16,
-        36.0,
+        30.0,
-        "AOOSTAR Native Specs",
+        "SYSTEM SPECS",
-    );
-    draw_text_line(
-        &mut canvas,
-        Rgb([146, 163, 181]),
-        30,
-        58,
-        20.0,
-        &format!("{host_name}  |  {timestamp}"),
     );
 
     let cards = [
         (
-            24,
+            20,
-            106,
+            84,
-            "CPU",
+            "CPU USAGE",
             format!("{} %", system.cpu_usage_percent),
-            format!(
+            format!("Load {}", system.load_avg_one),
-                "Load {} / {} / {}",
-                system.load_avg_one, system.load_avg_five, system.load_avg_fifteen
-            ),
             Rgb([124, 231, 191]),
         ),
         (
-            332,
+            334,
-            106,
+            84,
-            "Memory",
+            "RAM USAGE",
             format!("{} %", system.mem_usage_percent),
             format!("{} / {}", system.mem_used, system.mem_total),
             Rgb([125, 196, 255]),
         ),
         (
-            640,
+            648,
-            106,
+            84,
-            "Storage",
+            "GPU TEMP",
-            format!(
+            system.temperature_gpu.as_deref().unwrap_or("-").to_string(),
-                "C {}%  U {}%",
+            format!("CPU {}", system.temperature_cpu.as_deref().unwrap_or("-")),
-                system.cache_usage_percent, system.user_usage_percent
-            ),
-            format!(
-                "/mnt/cache {} / {}  |  /mnt/user {} / {}",
-                system.cache_used, system.cache_total, system.user_used, system.user_total
-            ),
             Rgb([255, 199, 115]),
         ),
         (
-            24,
+            20,
-            236,
+            226,
-            "Swap",
+            "CACHE",
-            format!("{} %", system.swap_usage_percent),
+            format!("{} %", system.cache_usage_percent),
-            format!("{} / {}", system.swap_used, system.swap_total),
+            format!("{} / {}", system.cache_used, system.cache_total),
             Rgb([194, 167, 255]),
         ),
         (
-            332,
+            334,
-            236,
+            226,
-            "Temperatures",
+            "USER",
-            format!("CPU {}", system.temperature_cpu.as_deref().unwrap_or("-")),
+            format!("{} %", system.user_usage_percent),
-            format!("GPU {}", system.temperature_gpu.as_deref().unwrap_or("-")),
+            format!("{} / {}", system.user_used, system.user_total),
             Rgb([255, 127, 115]),
         ),
         (
-            640,
+            648,
-            236,
+            226,
-            "System",
+            "SWAP",
-            system.uptime.clone(),
+            format!("{} %", system.swap_usage_percent),
-            format!(
+            format!("{} / {}", system.swap_used, system.swap_total),
-                "{} cores  |  {} procs",
-                system.cpu_count, system.process_count
-            ),
             Rgb([216, 253, 114]),
         ),
     ];
@@ -261,53 +239,36 @@ fn render_system_panel_cards() -> RgbImage {
 fn render_system_panel_meters() -> RgbImage {
     let system = collect_system_view();
     let mut canvas = RgbImage::from_pixel(DISPLAY_WIDTH, DISPLAY_HEIGHT, Rgb([9, 13, 17]));
-    let host_name = System::host_name().unwrap_or_else(|| "Unraid".into());
-    let timestamp = Local::now().format("%d.%m.%Y %H:%M:%S").to_string();
 
     draw_filled_rect_mut(
         &mut canvas,
-        Rect::at(0, 0).of_size(DISPLAY_WIDTH, 72),
+        Rect::at(0, 0).of_size(DISPLAY_WIDTH, 56),
-        Rgb([15, 23, 30]),
+        Rgb([14, 20, 28]),
     );
     draw_text_line(
         &mut canvas,
         Rgb([216, 253, 114]),
-        26,
+        24,
-        18,
+        14,
-        32.0,
+        28.0,
-        "AOOSTAR System Monitor",
+        "HTOP STYLE",
-    );
-    draw_text_line(
-        &mut canvas,
-        Rgb([146, 163, 181]),
-        28,
-        48,
-        18.0,
-        &format!("{host_name}  |  {timestamp}"),
     );
 
     draw_meter_row(
         &mut canvas,
-        26,
+        24,
-        102,
+        84,
-        "CPU",
+        "CPU USAGE",
         &format!("{}%", system.cpu_usage_percent),
         parse_metric_percent(&system.cpu_usage_percent),
         Rgb([110, 231, 183]),
-        &format!(
+        &format!("Load {}   {} cores", system.load_avg_one, system.cpu_count),
-            "Load {} / {} / {}   {} cores   {} procs",
-            system.load_avg_one,
-            system.load_avg_five,
-            system.load_avg_fifteen,
-            system.cpu_count,
-            system.process_count
-        ),
     );
     draw_meter_row(
         &mut canvas,
-        26,
+        24,
-        170,
+        178,
-        "RAM",
+        "RAM USAGE",
         &format!("{}%", system.mem_usage_percent),
         parse_metric_percent(&system.mem_usage_percent),
         Rgb([120, 189, 247]),
@@ -315,46 +276,16 @@ fn render_system_panel_meters() -> RgbImage {
     );
     draw_meter_row(
         &mut canvas,
-        26,
+        24,
-        238,
+        272,
-        "GPU",
+        "GPU TEMP",
         system.temperature_gpu.as_deref().unwrap_or("-"),
         normalize_temperature_bar(system.temperature_gpu.as_deref()),
         Rgb([241, 132, 121]),
         &format!(
-            "Temp meter   CPU {}   Cache {}%   User {}%",
+            "CPU {}   {} procs",
             system.temperature_cpu.as_deref().unwrap_or("-"),
-            system.cache_usage_percent,
+            system.process_count
-            system.user_usage_percent
-        ),
-    );
-
-    draw_filled_rect_mut(
-        &mut canvas,
-        Rect::at(26, 308).of_size(908, 42),
-        Rgb([12, 18, 24]),
-    );
-    draw_hollow_rect_mut(
-        &mut canvas,
-        Rect::at(26, 308).of_size(908, 42),
-        Rgb([31, 44, 58]),
-    );
-    draw_text_line(
-        &mut canvas,
-        Rgb([146, 163, 181]),
-        42,
-        321,
-        18.0,
-        &format!(
-            "Swap {}%  {} / {}   Cache {} / {}   User {} / {}   Uptime {}",
-            system.swap_usage_percent,
-            system.swap_used,
-            system.swap_total,
-            system.cache_used,
-            system.cache_total,
-            system.user_used,
-            system.user_total,
-            system.uptime
         ),
     );
 
@@ -439,10 +370,10 @@ fn draw_meter_row(
     accent: Rgb<u8>,
     meta: &str,
 ) {
-    draw_text_line(canvas, accent, x, y, 19.0, label);
+    draw_text_line(canvas, accent, x, y, 21.0, label);
-    draw_text_line(canvas, Rgb([237, 242, 247]), x + 112, y, 19.0, value);
+    draw_text_line(canvas, Rgb([237, 242, 247]), x + 248, y, 21.0, value);
-    draw_meter_bar(canvas, x, y + 28, 840, 20, percent, accent);
+    draw_meter_bar(canvas, x, y + 32, 900, 24, percent, accent);
-    draw_text_line(canvas, Rgb([146, 163, 181]), x, y + 56, 17.0, meta);
+    draw_text_line(canvas, Rgb([146, 163, 181]), x, y + 64, 18.0, meta);
 }
 
 fn draw_meter_bar(
@@ -457,12 +388,12 @@ fn draw_meter_bar(
     draw_filled_rect_mut(
         canvas,
         Rect::at(x, y).of_size(width, height),
-        Rgb([19, 27, 35]),
+        Rgb([15, 21, 28]),
     );
     draw_hollow_rect_mut(
         canvas,
         Rect::at(x, y).of_size(width, height),
-        Rgb([36, 50, 67]),
+        Rgb([52, 68, 86]),
     );
     let fill_width =
         ((width.saturating_sub(2)) as f32 * (percent.clamp(0.0, 100.0) / 100.0)).round() as u32;
@@ -505,9 +436,9 @@ fn draw_metric_card(
     draw_hollow_rect_mut(canvas, Rect::at(x, y).of_size(284, 112), Rgb([36, 50, 67]));
     draw_filled_rect_mut(canvas, Rect::at(x + 1, y + 1).of_size(6, 110), accent);
 
-    draw_text_line(canvas, accent, x + 20, y + 16, 19.0, title);
+    draw_text_line(canvas, accent, x + 20, y + 16, 18.0, title);
-    draw_text_line(canvas, Rgb([237, 242, 247]), x + 20, y + 44, 28.0, value);
+    draw_text_line(canvas, Rgb([237, 242, 247]), x + 20, y + 44, 30.0, value);
-    draw_text_line(canvas, Rgb([146, 163, 181]), x + 20, y + 82, 18.0, meta);
+    draw_text_line(canvas, Rgb([146, 163, 181]), x + 20, y + 84, 17.0, meta);
 }
 
 fn draw_text_line(canvas: &mut RgbImage, color: Rgb<u8>, x: i32, y: i32, size: f32, text: &str) {

crates/aster-webui/src/ui.rs

@@ -63,6 +63,12 @@ const INDEX_HTML: &str = r##"<!DOCTYPE html>
       gap: 16px;
       margin-bottom: 14px;
     }
+    .topbar-actions {
+      display: inline-flex;
+      gap: 8px;
+      align-items: center;
+      flex-wrap: wrap;
+    }
     .brand {
       display: flex;
       align-items: center;
@@ -145,7 +151,7 @@ const INDEX_HTML: &str = r##"<!DOCTYPE html>
     .subtle { color: var(--faint); font-size: .82rem; }
     .controls {
       display: grid;
-      grid-template-columns: 132px minmax(220px, 1fr) 180px auto;
+      grid-template-columns: 132px minmax(220px, 1fr) 180px;
       gap: 10px;
       align-items: end;
     }
@@ -482,8 +488,9 @@ const INDEX_HTML: &str = r##"<!DOCTYPE html>
           <p>AOOSTAR display control</p>
         </div>
       </div>
-      <div class="actions">
+      <div class="topbar-actions">
         <button id="apply" class="primary" type="button">Apply Rotation</button>
+        <button id="disable" class="danger" type="button">Disable</button>
         <button id="refresh" class="ghost" type="button">Refresh</button>
       </div>
     </header>
@@ -517,9 +524,6 @@ const INDEX_HTML: &str = r##"<!DOCTYPE html>
                   <option value="meters">Htop Style</option>
                 </select>
               </label>
-              <div class="actions">
-                <button id="disable" class="danger" type="button">Disable</button>
-              </div>
             </div>
           <div class="toggle-row">
             <label class="toggle-pill"><input id="specsEnabled" type="checkbox"> System Specs</label>

unraid-aoostar-rs-template.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<Container version="2">
-  <Name>aoostar-rs</Name>
-  <Repository>git.mp-mueller.de/magges/aoostar-rs:latest</Repository>
-  <Registry>https://git.mp-mueller.de</Registry>
-  <Network>bridge</Network>
-  <MyIP />
-  <Shell>bash</Shell>
-  <Privileged>false</Privileged>
-  <Support>https://git.mp-mueller.de/magges/aoostar-rs</Support>
-  <Project>https://git.mp-mueller.de/magges/aoostar-rs</Project>
-  <Overview>AOOSTAR Rust WebUI fuer das Frontdisplay, gebaut aus der Gitea-Registry.</Overview>
-  <Category>Tools:Utilities Other:</Category>
-  <WebUI>http://[IP]:[PORT:8080]/</WebUI>
-  <TemplateURL />
-  <Icon>/plugins/dynamix.docker.manager/images/custom/aoostar-rs.svg</Icon>
-  <ExtraParams>--restart unless-stopped --device=/dev/ttyACM0:/dev/ttyACM0</ExtraParams>
-  <PostArgs />
-  <CPUset />
-  <DateInstalled />
-  <DonateText />
-  <DonateLink />
-  <Description>Native aster-webui aus aoostar-rs mit persistentem /config und USB-Geraetedurchreichung fuer das AOOSTAR-Display.</Description>
-
-  <Networking>
-    <Mode>bridge</Mode>
-    <Publish>
-      <Port>
-        <HostPort>8081</HostPort>
-        <ContainerPort>8080</ContainerPort>
-        <Protocol>tcp</Protocol>
-      </Port>
-    </Publish>
-  </Networking>
-
-  <Config Name="WebUI Port" Target="8080" Default="8081" Mode="tcp" Description="Port fuer das aoostar-rs WebUI" Type="Port" Display="always" Required="true" Mask="false">8081</Config>
-  <Config Name="AppData" Target="/config" Default="/mnt/user/appdata/aoostar-rs/config" Mode="rw" Description="Persistente Konfiguration und generierte Assets" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/aoostar-rs/config</Config>
-  <Config Name="Cache Mount" Target="/mnt/cache" Default="/mnt/cache" Mode="ro" Description="Read-only Zugriff fuer Storage-Statistiken auf dem Cache" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/cache</Config>
-  <Config Name="User Mount" Target="/mnt/user" Default="/mnt/user" Mode="ro" Description="Read-only Zugriff fuer Storage-Statistiken auf dem User-Share" Type="Path" Display="advanced" Required="false" Mask="false">/mnt/user</Config>
-  <Config Name="PORT" Target="PORT" Default="8080" Mode="" Description="Port im Container" Type="Variable" Display="advanced" Required="true" Mask="false">8080</Config>
-  <Config Name="ASTER_DEVICE" Target="ASTER_DEVICE" Default="/dev/ttyACM0" Mode="" Description="Serielles Geraet fuer das AOOSTAR-Display" Type="Variable" Display="always" Required="false" Mask="false">/dev/ttyACM0</Config>
-  <Config Name="ASTER_USB" Target="ASTER_USB" Default="" Mode="" Description="Alternative USB Vendor:Product Kennung statt Device-Pfad" Type="Variable" Display="advanced" Required="false" Mask="false"></Config>
-  <Config Name="ASTER_SIMULATE" Target="ASTER_SIMULATE" Default="0" Mode="" Description="1 startet ohne echte Hardware im Simulationsmodus" Type="Variable" Display="advanced" Required="false" Mask="false">0</Config>
-  <Config Name="ASTER_WRITE_ONLY" Target="ASTER_WRITE_ONLY" Default="0" Mode="" Description="1 schreibt nur aufs Display ohne Ruecklesen" Type="Variable" Display="advanced" Required="false" Mask="false">0</Config>
-  <Config Name="ASTER_DISABLE_DISPLAY" Target="ASTER_DISABLE_DISPLAY" Default="0" Mode="" Description="1 deaktiviert den Displayzugriff komplett" Type="Variable" Display="advanced" Required="false" Mask="false">0</Config>
-</Container>