Merge pull request #158 from xscriptor/update/core

update core

Author: xscriptor

README.md

@@ -8,7 +8,7 @@
 <p>A cross-platform system information fetching tool inspired by fastfetch and neofetch, written in Rust.</p>
 
 <a href="https://imgur.com/iKGpg4h">
-<img src="https://i.imgur.com/ihNz93o.gif" width="900" alt="Demo" >
+<img src="https://i.imgur.com/DnqIaKB.gif" width="900" alt="Demo" >
 </a>
 
 

configs/fullconfig.jsonc

@@ -0,0 +1,112 @@
+{
+    "logo_animation": {
+    "plugin": "animate-logo",
+    "style": "frame",
+    "fps": 60,
+    "duration_ms": 7500,
+    "loop": true,
+    "frames_path": "~/.config/xfetch/logos/decryptfull.txt"
+},
+    "logo_path": "~/.config/xfetch/logos/x.txt",
+    "layout": "section",
+    "info_plugins": [
+    {
+      "plugin": "github-stats",
+      "args": {
+        "username": "xscriptor",
+        "max-lines": 4
+      }
+    },
+    {
+      "plugin": "docker"
+    }
+  ],
+    "modules": [
+        {
+            "type": "group",
+            "title": "Hardware",
+            "modules": [
+                "hostname",
+                "cpu",
+                "gpu",
+                "memory",
+                "swap",
+                "disk",
+                "battery"
+            ]
+        },
+        {
+            "type": "group",
+            "title": "Software",
+            "modules": [
+                "os",
+                "kernel",
+                "packages",
+                "shell",
+                "wm",
+                "terminal",
+                "local_ip",
+                "plugin:docker"
+            ]
+        },
+        {
+            "type": "group",
+            "title": "Session",
+            "modules": [
+                "user",
+                "uptime",
+                "datetime",
+                "plugin:github-stats"
+            ]
+        },
+        "palette"
+    ],
+    "show_colors": true,
+    "icons": {
+        "hostname": "",
+        "cpu": "",
+        "gpu": "󰍹",
+        "memory": "",
+        "swap": "󰓅",
+        "disk": "󰋊",
+        "battery": "",
+        "os": "",
+        "kernel": "",
+        "packages": "",
+        "shell": "",
+        "wm": "",
+        "terminal": "",
+        "local_ip": "󰩟",
+        "user": "",
+        "uptime": "󰔛",
+        "datetime": "",
+        "palette": "󰨬",
+        "hardware": "",
+        "plugin:docker": "",
+        "software": "",
+        "session": "",
+        "plugin:github-stats": ""
+    },
+    "colors": {
+        "hostname": "Green",
+        "cpu": "Green",
+        "gpu": "Green",
+        "memory": "Green",
+        "swap": "Green",
+        "disk": "Green",
+        "battery": "Green",
+        "os": "Yellow",
+        "kernel": "Yellow",
+        "packages": "Yellow",
+        "shell": "Yellow",
+        "wm": "Yellow",
+        "terminal": "Yellow",
+        "local_ip": "Yellow",
+        "user": "Magenta",
+        "uptime": "Magenta",
+        "datetime": "Magenta",
+        "palette": "Magenta",
+        "plugin:github-stats": "Cyan",
+        "plugin:docker": "Cyan"
+    }
+}

src/ui/print.rs

@@ -1,6 +1,7 @@
 use crate::config::Config;
 use crate::plugins::AnimationFrame;
 use crossterm::cursor::{Hide, MoveUp, Show};
+use crossterm::terminal::size;
 use crossterm::style::{Color, Print, ResetColor, SetForegroundColor};
 use crossterm::terminal::{Clear, ClearType};
 use crossterm::execute;
@@ -72,17 +73,33 @@ pub fn print_animated_output(
     let mut frame_index = 0;
     let mut first_frame = true;
 
+    let max_content_width = content_lines
+        .iter()
+        .map(|l| visible_width(l))
+        .max()
+        .unwrap_or(0);
+    let line_physical_width = max_logo_width + LOGO_INFO_GAP.len() + max_content_width;
+    let term_width = size().map(|(w, _)| w as usize).unwrap_or(80);
+    let wraps = (line_physical_width + term_width - 1) / term_width;
+    let physical_lines = max_lines * std::cmp::max(1, wraps);
+    let scroll_margin = physical_lines + 4;
+
     let _ = execute!(out, Hide);
 
+    for _ in 0..scroll_margin {
+        let _ = execute!(out, Print("\n"));
+    }
+    let _ = execute!(out, MoveUp(scroll_margin as u16));
+
     loop {
         let frame = &frames[frame_index];
 
         if !first_frame {
-            let _ = execute!(out, MoveUp(max_lines as u16));
+            let _ = execute!(out, MoveUp(scroll_margin as u16));
+            let _ = execute!(out, Clear(ClearType::FromCursorDown));
         }
 
         for i in 0..max_lines {
-            let _ = execute!(out, Clear(ClearType::CurrentLine));
             let ascii_line = frame.lines.get(i).map(|line| line.as_str()).unwrap_or("");
             print_logo_line(&mut out, ascii_line, max_logo_width, config, force_plain_logo);
             let _ = execute!(out, Print(LOGO_INFO_GAP));