Fix logger and support colors

Fix logger and support colors

Author: SilianZ

container/cluster.py

@@ -17,7 +17,7 @@
 import utils
 import stats
 import web
-from logger import logger
+import logger
 from tqdm import tqdm
 
 PY_VERSION = "1.0.0"
@@ -127,7 +127,7 @@ async def check_file(self):
         total = len(filelist)
         byte = 0
         miss = []
-        pbar = tqdm(total=total, unit=' file(s)', unit_scale=True)
+        pbar = tqdm(file=logger.PRINTSTDOUT, total=total, unit=' file(s)', unit_scale=True)
         pbar.set_description("Checking files")
         for i, file in enumerate(filelist):
             filepath = str(self.dir) + f"/{file.hash[:2]}/{file.hash}"

container/config.py

@@ -11,7 +11,7 @@ def __init__(self, path: str) -> None:
 
     def load(self):
         with open(self.file, "r", encoding="utf-8") as f:
-            self.cfg = yaml.load(f.read(), Loader=yaml.FullLoader)
+            self.cfg = yaml.load(f.read(), Loader=yaml.FullLoader) or {}
 
     def get(self, key, default_):
         value = self.cfg.get(key, default_)

container/logger.py

@@ -1,4 +1,48 @@
-from loguru import logger
-from pathlib import Path
+from enum import Enum
+import inspect
+import io
+import sys
+import time
+STDOUT = sys.stdout
+class Stdout(io.StringIO):
+    def write(self, __s: str) -> int:
+        return STDOUT.write(__s)
+    def flush(self) -> None:
+        return STDOUT.flush()
+    def seek(self, __cookie: int, __whence: int = 0) -> int:
+        return STDOUT.seek(__cookie, __whence)
+sys.stdout = Stdout()
 
-logger.add(Path("./logs/{time}.log"), rotation="3 hours")
+class PrintStdout(io.StringIO):
+    def write(self, __s: str) -> int:
+        info(__s.lstrip("\r"), flush=True)
+        return len(__s)
+PRINTSTDOUT = PrintStdout()
+
+class Level(Enum):  
+    DEBUG = 0
+    INFO = 1
+    WARNING = 2
+    ERROR = 3
+LevelColors: dict[Level, str] = {
+    Level.DEBUG: "reset",
+    Level.INFO: "green",
+    Level.WARNING: "yellow",
+    Level.ERROR: "red"
+}
+
+def logger(*values, level: Level, flush: bool = False, stack: list[inspect.FrameInfo]):
+    stackname = stack[1].function + str(stack[1].lineno)
+    print(*(f"<<<flush:{flush},time:{time.time()},stack:{stackname},color:{LevelColors.get(level, 'reset')}>>>[{level.name.upper()}]", *values))
+
+def info(*values, flush: bool = False):
+    return logger(*values, flush=flush, level=Level.INFO, stack=inspect.stack())
+
+def error(*values, flush: bool = False):
+    return logger(*values, flush=flush, level=Level.ERROR, stack=inspect.stack())
+
+def warning(*values, flush: bool = False):
+    return logger(*values, flush=flush, level=Level.WARNING, stack=inspect.stack())
+
+def debug(*values, flush: bool = False):
+    return logger(*values, flush=flush, level=Level.DEBUG, stack=inspect.stack())

container/web.py

@@ -19,7 +19,7 @@
 import config
 import filetype
 import urllib.parse as urlparse
-from logger import logger
+import logger 
 
 
 class Route:
@@ -556,6 +556,7 @@ async def main():
             if server:
                 server.close()
             logger.error(traceback.format_exc())
+            await asyncio.sleep(2)
 
 @app.get("/favicon.ico")
 async def _():

main.py

@@ -1,12 +1,67 @@
+import os
 from pathlib import Path
 import queue
+import re
 import subprocess
 import threading
+import traceback
 from typing import Optional
 import sys
 import time
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEvent, FileSystemEventHandler
+
+class PrintColor:
+    def __init__(self) -> None:
+        self.ansi = (  
+            (sys.platform != 'Pocket PC') and  
+            (  
+                (sys.platform != 'win32') or  
+                ('ANSICON' in os.environ)  
+            ) and  
+            (  
+                sys.stdout.isatty() or  
+                (sys.platform == 'win32')  
+            ) and  
+            (  
+                'TERM' not in os.environ or  
+                (  
+                    os.environ['TERM'].lower() in ('xterm', 'linux', 'screen', 'vt100', 'cygwin', 'ansicon') and  
+                    os.environ['TERM'].lower() not in ('dumb', 'emacs', 'emacs-24', 'xterm-mono')  
+                )  
+            )  
+        )
+        self.colors = {  
+            'reset': '\033[0m',  
+            'red': '\033[31m',  
+            'green': '\033[32m',  
+            'yellow': '\033[33m',  
+            'blue': '\033[34m',  
+            'magenta': '\033[35m',  
+            'cyan': '\033[36m',  
+            'white': '\033[37m',  
+            'black': '\033[30m',  
+        }  
+        self.open_tag_pattern = r'<(\w+)>'  
+        self.close_tag_pattern = r'<(\w+)/>'  
+
+    def parse(self, text: str):  
+        current_color = self.colors['reset']  
+        open_tags = re.findall(self.open_tag_pattern, text)  
+        for tag in open_tags:  
+            if tag in self.colors:  
+                text = text.replace(f'<{tag}>', self.colors[tag], 1)  
+                current_color = self.colors[tag]  
+            else:  
+                text = text.replace(f'<{tag}>', '', 1)  
+        close_tags = re.findall(self.close_tag_pattern, text)  
+        for tag in close_tags:  
+            if tag == tag.lower() and self.colors.get(tag.lower(), '') == current_color:  
+                text = text.replace(f'<{tag}/>', self.colors['reset'], 1)  
+                current_color = self.colors['reset']  
+        return text  
+
+printColor = PrintColor()    
 encoding = sys.getdefaultencoding()
 process: Optional[subprocess.Popen] = None
 stdout = None
@@ -55,10 +110,23 @@ def _err():
             else:
                 output.put(line)
 
-def _parse(params):
+def _parse(params: str):
     kwargs = {}
-    if "flush" in params:
-        kwargs["flush"] = True
+    for item in params.split(","):
+        k, v = item.split(":", 1)
+        if v == "True":
+            v = True
+        elif v == "False":
+            v = False
+        else:
+            try:
+                v = float(v)
+            except:
+                try:
+                    v = int(v)
+                except:
+                    ...
+        kwargs[k] = v
     return kwargs
 def _print():
     global output, last_output_length, last_flush
@@ -71,22 +139,28 @@ def _print():
                 msg = msg.decode("gbk")
             except:
                 msg = repr(msg)
-        msg = msg.removesuffix("\n")
-        date = time.localtime()
-        date = f"[{date.tm_year:04d}-{date.tm_mon:02d}-{date.tm_mday:02d} {date.tm_hour:02d}:{date.tm_min:02d}:{date.tm_sec:02d}]"
-        kwargs: dict = {}
-        flush: bool = False
-        if msg.startswith("<<<") and ">>>" in msg:
-            kwargs = _parse(msg[3:msg.find(">>>")])
-            msg = msg[msg.find(">>>") + 3:]
-            flush = kwargs.get("flush", False)
-        text = f"{date} {msg}"
-        if flush:
-            sys.stdout.write('\r' + ' ' * (last_output_length + 16) + '\r')
-            sys.stdout.flush()
-            last_output_length = len(text)
-        print(text + ('\n' if not flush else ''), end='', flush=flush)
-        last_flush = flush
+        try:
+            msg = msg.removesuffix("\n")
+            date = time.localtime()
+            kwargs: dict = {}
+            flush: bool = False
+            if msg.startswith("<<<") and ">>>" in msg:
+                kwargs = _parse(msg[3:msg.find(">>>")])
+                msg = msg[msg.find(">>>") + 3:]
+                flush = kwargs.get("flush", False)
+                if 'time' in kwargs:
+                    date = time.localtime(kwargs["time"])
+            date = f"[{date.tm_year:04d}-{date.tm_mon:02d}-{date.tm_mday:02d} {date.tm_hour:02d}:{date.tm_min:02d}:{date.tm_sec:02d}]"
+            text = printColor.parse(f"<{kwargs.get('color', 'reset')}>{date} {msg}")
+            if flush:
+                sys.stdout.write('\r' + ' ' * (last_output_length + 16) + '\r')
+                sys.stdout.flush()
+                last_output_length = len(text)
+            print(text + ('\n' if not flush else ''), end='', flush=flush)
+            last_flush = flush
+        except:
+            traceback.print_exc()
+            ...
 
 class MyHandler(FileSystemEventHandler):
     def on_any_event(self, event: FileSystemEvent) -> None: