Complete rename to fancyfetch

Author: ItsThatOneJack-Dev

src/configurationhandler.py

@@ -1,8 +1,8 @@
-import constants as MeowfetchConstants
+import constants as FancyfetchConstants
 import json5 as JSONFiveLibrary
 
 def FetchConfiguration():
-    with open(MeowfetchConstants.ConfigurationFile, 'r', encoding='UTF-8') as FilePointer:
+    with open(FancyfetchConstants.ConfigurationFile, 'r', encoding='UTF-8') as FilePointer:
         try:
             return JSONFiveLibrary.load(FilePointer) # Return the configuration, parsed into a Python dictionary.
         except Exception as e:

src/defaults/configuration.json5

@@ -32,13 +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":[
-        "{{bold}}{{purple}}______                      __     _       _     ",
-        "{{bold}}{{purple}}|  ___|                    / _|   | |     | |    ",
-        "{{bold}}{{purple}}| |_ __ _ _ __   ___ _   _| |_ ___| |_ ___| |__  ",
-        "{{bold}}{{purple}}|  _/ _` | '_ \\ / __| | | |  _/ _ \\ __/ __| '_ \\ ",
-        "{{bold}}{{purple}}| || (_| | | | | (__| |_| | ||  __/ || (__| | | |",
-        "{{bold}}{{purple}}\\_| \\__,_|_| |_|\\___|\\__, |_| \\___|\\__\\___|_| |_|",
-        "{{bold}}{{purple}}                      __/ |                      ",
-        "{{bold}}{{purple}}                     |___/                       "
+        "<:bold:><:purple:>______                      __     _       _     ",
+        "<:bold:><:purple:>|  ___|                    / _|   | |     | |    ",
+        "<:bold:><:purple:>| |_ __ _ _ __   ___ _   _| |_ ___| |_ ___| |__  ",
+        "<:bold:><:purple:>|  _/ _` | '_ \\ / __| | | |  _/ _ \\ __/ __| '_ \\ ",
+        "<:bold:><:purple:>| || (_| | | | | (__| |_| | ||  __/ || (__| | | |",
+        "<:bold:><:purple:>\\_| \\__,_|_| |_|\\___|\\__, |_| \\___|\\__\\___|_| |_|",
+        "<:bold:><:purple:>                      __/ |                      ",
+        "<:bold:><:purple:>                     |___/                       "
     ],
 }

src/defaults/widgets/architecture.py

@@ -2,6 +2,6 @@ class Widget: # Must be named Widget.
     def __init__(self):
         # It is advised that you process your most intensive logic here.
         import platform
-        self.Value = "{{gold}}Hostname: {{white}}"+platform.node()
+        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/hostname.py

@@ -2,6 +2,7 @@ class Widget: # Must be named Widget.
     def __init__(self):
         # It is advised that you process your most intensive logic here.
         import platform
-        self.Value = "{{gold}}OS: {{white}}"+platform.uname().system+" "+platform.uname().version
+        #self.Value = "{{gold}}OS: {{white}}"+platform.uname().system+" "+platform.uname().version+" ("
+        self.Value = f"<:gold:>OS: <:white:>{platform.uname().system} {platform.uname().version} ({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/os.py

@@ -2,14 +2,15 @@
 from rich.console import Console as RichConsole
 from typing import Dict, Optional
 
-def RemoveDirectives(Text: str):return RegexLibrary.sub(r"\{\{.*?\}\}", "", Text)
+def RemoveDirectives(Text: str):
+    return RegexLibrary.sub(r"<:.*?:>", "", Text)
 
 def EnsureResetEnding(Line):
-        if not Line.endswith("{{reset}}"):
-            return Line + "{{reset}}"
-        return Line
+    if not Line.endswith("<:reset:>"):
+        return Line + "<:reset:>"
+    return Line
 
-class MeowfetchColourFormatter:
+class FancyfetchColourFormatter:
     def __init__(self, CustomColours: Optional[Dict[str, str]] = None):
         self.Console = RichConsole(highlight=False)
 
@@ -47,7 +48,7 @@ def __init__(self, CustomColours: Optional[Dict[str, str]] = None):
         if CustomColours:
             self.ColourMap.update(CustomColours)
 
-        self.TagPattern = RegexLibrary.compile(r"\{\{([^}]+)\}\}")
+        self.TagPattern = RegexLibrary.compile(r"<:([^:]+):>")
 
     def AddColour(self, Name: str, HexCode: str):
         self.ColourMap[Name.lower()] = HexCode
@@ -148,21 +149,24 @@ def GetAvailableStyles(self) -> Dict[str, str]:
 def FormatASCII(Lines, TargetLength:int|None=None):
     def ExtractVisibleText(Line):
         VisibleChars = []
-        InDirective = False
-        BraceCount = 0
+        I = 0
 
-        for I, Char in enumerate(Line):
-            if Char == "{" and I + 1 < len(Line) and Line[I + 1] == "{":
-                InDirective = True
-                BraceCount = 1
-            elif Char == "{" and InDirective:
-                BraceCount += 1
-            elif Char == "}" and InDirective:
-                BraceCount -= 1
-                if BraceCount == 0:
-                    InDirective = False
-            elif not InDirective:
-                VisibleChars.append((Char, I))
+        while I < len(Line):
+            # Check for start of directive <:
+            if I + 1 < len(Line) and Line[I:I+2] == "<:":
+                # Find the end of directive :>
+                EndPos = Line.find(":>", I + 2)
+                if EndPos != -1:
+                    # Skip the entire directive including :>
+                    I = EndPos + 2
+                else:
+                    # Malformed directive, treat as visible character
+                    VisibleChars.append((Line[I], I))
+                    I += 1
+            else:
+                # Regular visible character
+                VisibleChars.append((Line[I], I))
+                I += 1
 
         return VisibleChars
 
@@ -185,29 +189,30 @@ def TruncateToTarget(Line, TargetLen):
             CutoffPos = VisibleChars[TargetLen - 1][1] + 1
 
         Result = []
-        InDirective = False
-        BraceCount = 0
+        I = 0
 
-        for I, Char in enumerate(Line):
-            if I >= CutoffPos and not InDirective:
-                break
-                
-            Result.append(Char)
-            
-            if Char == "{" and I + 1 < len(Line) and Line[I + 1] == "{":
-                InDirective = True
-                BraceCount = 1
-            elif Char == "{" and InDirective:
-                BraceCount += 1
-            elif Char == "}" and InDirective:
-                BraceCount -= 1
-                if BraceCount == 0:
-                    InDirective = False
+        while I < len(Line):
+            if I >= CutoffPos:
+                # Check if we're in the middle of a directive
+                if I + 1 < len(Line) and Line[I:I+2] == "<:":
+                    # Find the end of this directive and include it
+                    EndPos = Line.find(":>", I + 2)
+                    if EndPos != -1:
+                        # Include the complete directive
+                        Result.extend(Line[I:EndPos+2])
+                        I = EndPos + 2
+                    else:
+                        break
+                else:
+                    break
+            else:
+                Result.append(Line[I])
+                I += 1
 
         ResultStr = "".join(Result)
 
-        if not ResultStr.endswith("{{reset}}"):
-            ResultStr += "{{reset}}"
+        if not ResultStr.endswith("<:reset:>"):
+            ResultStr += "<:reset:>"
 
         return ResultStr
 
@@ -227,9 +232,9 @@ def TruncateToTarget(Line, TargetLen):
     for Line in ProcessedLines:
         VisibleLength = GetVisibleLength(Line)
         if VisibleLength < MaxVisibleLength:
-            if Line.endswith("{{reset}}"):
+            if Line.endswith("<:reset:>"):
                 SpacesNeeded = MaxVisibleLength - VisibleLength
-                AlignedLine = Line[:-9] + " " * SpacesNeeded + "{{reset}}"
+                AlignedLine = Line[:-10] + " " * SpacesNeeded + "<:reset:>"
             else:
                 SpacesNeeded = MaxVisibleLength - VisibleLength
                 AlignedLine = Line + " " * SpacesNeeded

src/formatting.py

@@ -1,8 +1,8 @@
-import setup as MeowfetchSetup
-import constants as MeowfetchConstants
-import configurationhandler as MeowfetchConfigurationHandler
-import formatting as MeowfetchFormatting
-import widgets as MeowfetchWidgets
+import setup as FancyfetchSetup
+import constants as FancyfetchConstants
+import configurationhandler as FancyfetchConfigurationHandler
+import formatting as FancyfetchFormatting
+import widgets as FancyfetchWidgets
 
 import shutil as ShellUtilityLibrary
 import os as OperatingSystemLibrary
@@ -18,13 +18,13 @@ def CompareChildren(OriginalDirectory, Directory):
     Files = set(GetChildren(Directory))
     return OriginalFiles - Files
 def HasConfigurationBeenChanged():
-    if (not MeowfetchConstants.WidgetsDirectory.exists()) or (not MeowfetchConstants.ConfigurationFile.exists()):
-        MeowfetchSetup.EnsureConfiguration()
+    if (not FancyfetchConstants.WidgetsDirectory.exists()) or (not FancyfetchConstants.ConfigurationFile.exists()):
+        FancyfetchSetup.EnsureConfiguration()
         print("Your configuration has been regenerated!")
         exit(0)
-    if len(CompareChildren(MeowfetchConstants.WidgetsDirectory, MeowfetchConstants.DefaultWidgetsDirectory)) > 0:
+    if len(CompareChildren(FancyfetchConstants.WidgetsDirectory, FancyfetchConstants.DefaultWidgetsDirectory)) > 0:
         return True
-    if open(MeowfetchConstants.ConfigurationFile, "r").read() != open(MeowfetchConstants.DefaultConfigurationFile, "r").read():
+    if open(FancyfetchConstants.ConfigurationFile, "r").read() != open(FancyfetchConstants.DefaultConfigurationFile, "r").read():
         return True
 
 def OPTION_RegenerateConfiguration():
@@ -36,16 +36,16 @@ def OPTION_RegenerateConfiguration():
         print("Type 'yes' to confirm, or anything else to cancel.")
         Confirmation = input().strip().lower()
         if Confirmation.lower().strip() in "yes":
-            ShellUtilityLibrary.rmtree(MeowfetchConstants.ConfigurationDirectory, ignore_errors=True)
-            MeowfetchSetup.EnsureConfiguration()
+            ShellUtilityLibrary.rmtree(FancyfetchConstants.ConfigurationDirectory, ignore_errors=True)
+            FancyfetchSetup.EnsureConfiguration()
             print("Your configuration has been regenerated!")
             exit(0)
         else:
             print("Configuration regeneration cancelled!")
             exit(0)
 
 def OPTION_Configuration():
-    MeowfetchSetup.EnsureConfiguration()
+    FancyfetchSetup.EnsureConfiguration()
     print("Configuration files are accessible at '~/.config/fancyfetch/'!")
     exit(0)
 
@@ -78,8 +78,8 @@ def Main():
     elif Args.regen:
         OPTION_RegenerateConfiguration()
 
-    MeowfetchSetup.EnsureConfiguration()
-    Configuration = MeowfetchConfigurationHandler.FetchConfiguration()
+    FancyfetchSetup.EnsureConfiguration()
+    Configuration = FancyfetchConfigurationHandler.FetchConfiguration()
 
     CONFIG_DisplayASCII = Configuration.get("display_ascii", True) # Default to True if not set.
     CONFIG_ASCIILocation = Configuration.get("ascii_location", "left") # Default to "left" if not set.
@@ -90,13 +90,13 @@ def Main():
 
     ASCII = CONFIG_ASCII if CONFIG_DisplayASCII else []
     try:
-        Layout = [MeowfetchWidgets.LoadWidget(str(MeowfetchConstants.WidgetsDirectory), X) for X in CONFIG_Layout]
+        Layout = [FancyfetchWidgets.LoadWidget(str(FancyfetchConstants.WidgetsDirectory), X) for X in CONFIG_Layout]
     except ValueError as e:
         print(e.args[0])
         exit(1)
 
-    MeowfetchFormatting.MeowfetchColourFormatter(None).Print(
-        MeowfetchFormatting.Formatter(
+    FancyfetchFormatting.FancyfetchColourFormatter(None).Print(
+        FancyfetchFormatting.Formatter(
             ASCII,
             Layout,
             ShellUtilityLibrary.get_terminal_size().columns,
@@ -110,5 +110,5 @@ def Main():
     try:
         Main()
     except KeyboardInterrupt:
-        print("\nExiting Meowfetch...")
+        print("\nExiting Fancyfetch...")
         exit(0)

src/main.py

@@ -1,11 +1,11 @@
 import shutil as ShellUtilityLibrary
 import os as OperatingSystemLibrary
 
-import constants as MeowfetchConstants
+import constants as FancyfetchConstants
 
 # Functions
 def EnsureConfigurationDirectory():
-    MeowfetchConstants.ConfigurationDirectory.mkdir(exist_ok=True, parents=True)
+    FancyfetchConstants.ConfigurationDirectory.mkdir(exist_ok=True, parents=True)
 
 def CopyDirectoryContents(SourceDirectory, DestinationDirectory):
     for Item in OperatingSystemLibrary.listdir(SourceDirectory):
@@ -19,7 +19,7 @@ def CopyDirectoryContents(SourceDirectory, DestinationDirectory):
             ShellUtilityLibrary.copy(SourceItem, DestinationItem)
 
 def EnsureConfiguration():
-    if not MeowfetchConstants.ConfigurationDirectory.exists():
+    if not FancyfetchConstants.ConfigurationDirectory.exists():
         EnsureConfigurationDirectory()
-        CopyDirectoryContents(MeowfetchConstants.DefaultConfiguationDirectory, MeowfetchConstants.ConfigurationDirectory)
+        CopyDirectoryContents(FancyfetchConstants.DefaultConfiguationDirectory, FancyfetchConstants.ConfigurationDirectory)