Spontaneous changes

Author: ItsThatOneJack-Dev

src/defaults/configuration.json5

@@ -16,9 +16,9 @@
 
     // The order in which to display widgets.
     "layout":[
-        "hello",
-        "datetime",
-        "credits"
+        "os",
+        "hostname",
+        "architecture"
     ],
 
     ////////////////////// ASCII ART CONFIGURATION //////////////////////
@@ -32,11 +32,13 @@
     // If you define the ascii here, you need to escape backslashes and single or double quotes by using a backslash before it.
     // Example: `\` should become `\\`, and `"` should become `\"`.
     "ascii":[
-        " __  __  ____  _____  _    _  ____  ____  ____  ___  _   _ ",
-        "(  \\/  )( ___)(  _  )( \\/\\/ )( ___)( ___)(_  _)/ __)( )_( )",
-        " )    (  )__)  )(_)(  )    (  )__)  )__)   )( ( (__  ) _ ( ",
-        "(_/\\/\\_)(____)(_____)(__/\\__)(__)  (____) (__) \\___)(_) (_)",
-        "Meowfetch - A terminal fetch utility for cats and humans alike!",
-        ""
+        "{{bold}}{{purple}}______                      __     _       _     ",
+        "{{bold}}{{purple}}|  ___|                    / _|   | |     | |    ",
+        "{{bold}}{{purple}}| |_ __ _ _ __   ___ _   _| |_ ___| |_ ___| |__  ",
+        "{{bold}}{{purple}}|  _/ _` | '_ \\ / __| | | |  _/ _ \\ __/ __| '_ \\ ",
+        "{{bold}}{{purple}}| || (_| | | | | (__| |_| | ||  __/ || (__| | | |",
+        "{{bold}}{{purple}}\\_| \\__,_|_| |_|\\___|\\__, |_| \\___|\\__\\___|_| |_|",
+        "{{bold}}{{purple}}                      __/ |                      ",
+        "{{bold}}{{purple}}                     |___/                       "
     ],
 }

src/defaults/widgets/datetime.py src/defaults/widgets/architecture.pysrc/defaults/widgets/datetime.py renamed to src/defaults/widgets/architecture.py

@@ -1,7 +1,7 @@
 class Widget: # Must be named Widget.
     def __init__(self):
         # It is advised that you process your most intensive logic here.
-        import time
-        self.Value = "It is currently: "+time.ctime()
+        import platform
+        self.Value = "{{gold}}Architecture: {{white}}"+platform.machine()
 
     def Get(self):return self.Value # Must be named Get, but may return anything that can be converted to a string.

src/defaults/widgets/credits.py src/defaults/widgets/hostname.pysrc/defaults/widgets/credits.py renamed to src/defaults/widgets/hostname.py

@@ -1,6 +1,7 @@
 class Widget: # Must be named Widget.
     def __init__(self):
         # It is advised that you process your most intensive logic here.
-        self.Value = "Created by ItsThatOneJack!"
+        import platform
+        self.Value = "{{gold}}Hostname: {{white}}"+platform.node()
 
     def Get(self):return self.Value # Must be named Get, but may return anything that can be converted to a string.

src/defaults/widgets/hello.py src/defaults/widgets/os.pysrc/defaults/widgets/hello.py renamed to src/defaults/widgets/os.py

@@ -1,6 +1,7 @@
 class Widget: # Must be named Widget.
     def __init__(self):
         # It is advised that you process your most intensive logic here.
-        self.Value = "Hello, world!"
+        import platform
+        self.Value = "{{gold}}OS: {{white}}"+platform.uname().system+" "+platform.uname().version
 
     def Get(self):return self.Value # Must be named Get, but may return anything that can be converted to a string.

src/formatting.py

@@ -98,20 +98,10 @@ def ProcessMatch(Match):
             nonlocal ActiveTags, Result
             TagSpec = Match.group(1).strip().lower()
 
-            if TagSpec == "reset":
-                # Close all active tags
-                if ActiveTags:
-                    # Rich requires closing tags in reverse order or all at once
-                    ClosingTag = "[/" + " ".join(ActiveTags) + "]"
-                    Result.append(ClosingTag)
-                    ActiveTags.clear()
-                return ""
-            elif TagSpec == "normal":
-                # Close all active tags (same as reset)
-                if ActiveTags:
-                    ClosingTag = "[/" + " ".join(ActiveTags) + "]"
-                    Result.append(ClosingTag)
-                    ActiveTags.clear()
+            if TagSpec == "reset" or TagSpec == "normal":
+                # Close all active tags in reverse order, one by one
+                while ActiveTags:
+                    Result.append(f"[/{ActiveTags.pop()}]")
                 return ""
             else:
                 # Handle regular tags (colors and styles)
@@ -139,9 +129,9 @@ def ProcessMatch(Match):
         # Join all parts
         FormattedText = "".join(Result)
 
-        # Auto-close any remaining tags at the end
-        if ActiveTags:
-            FormattedText += "[/" + " ".join(ActiveTags) + "]"
+        # Auto-close any remaining tags at the end, in reverse order
+        while ActiveTags:
+            FormattedText += f"[/{ActiveTags.pop()}]"
 
         return FormattedText