fix: log's return issue

esurfingpy/__init__.py

@@ -1,7 +0,0 @@
-from .auto import relogin
-from .cli import cli
-from .esurfing import ESurfing, login, logout, get_parameters
-from .gui import Gui
-from .log import log
-from .net import Net, is_online
-from .ocr import ocr_image

esurfingpy/__version__.py

@@ -1,3 +1,3 @@
-__version__ = "0.6.2"
-__date__ = "2023/04/02"
+__version__ = "0.6.3"
+__date__ = "2023/10/07"
 __url__ = "https://github.com/Pandaft/ESurfingPy-CLI/"

esurfingpy/auto.py

@@ -1,7 +1,7 @@
 import time
 
+from . import log
 from .esurfing import ESurfing
-from .log import log
 from .net import Net, is_online
 
 

esurfingpy/esurfing.py

@@ -6,8 +6,7 @@
 import requests
 import rsa
 
-from . import ocr
-from .log import log
+from . import log, ocr
 
 DEFAULT_ESURFING_URL = "enet.10000.gd.cn:10001"
 

esurfingpy/log.py

@@ -5,35 +5,37 @@
 logging.basicConfig(
     level="INFO",
     format="%(message)s",
-    datefmt="[%X]",
-    handlers=[RichHandler()]
+    datefmt="[%Y-%m-%d %H:%M:%S]",
+    handlers=[RichHandler(
+        show_path=False,
+        markup=True,
+        rich_tracebacks=True,
+    )]
 )
 
+logger = logging.getLogger("rich")
 
-class Logger(logging.Logger):
 
-    def __new__(cls, name):
-        return logging.getLogger(name)
+def debug(msg, *args, **kwargs):
+    logger.debug(msg, *args, **kwargs)
+    return msg
 
-    def debug(self, msg: object, *args, **kwargs) -> object:
-        super().debug(msg, *args, **kwargs)
-        return msg
 
-    def info(self, msg: object, *args, **kwargs) -> object:
-        super().info(msg, *args, **kwargs)
-        return msg
+def info(msg, *args, **kwargs):
+    logger.info(msg, *args, **kwargs)
+    return msg
 
-    def warning(self, msg: object, *args, **kwargs) -> object:
-        super().warning(msg, *args, **kwargs)
-        return msg
 
-    def error(self, msg: object, *args, **kwargs) -> object:
-        super().error(msg, *args, **kwargs)
-        return msg
+def warning(msg, *args, **kwargs):
+    logger.warning(msg, *args, **kwargs)
+    return msg
 
-    def critical(self, msg: object, *args, **kwargs) -> object:
-        super().critical(msg, *args, **kwargs)
-        return msg
 
+def error(msg, *args, **kwargs):
+    logger.error(msg, *args, **kwargs)
+    return msg
 
-log = Logger("rich")
+
+def critical(msg, *args, **kwargs):
+    logger.critical(msg, *args, **kwargs)
+    return msg

esurfingpy/net.py

@@ -3,7 +3,7 @@
 import requests
 from psutil import net_io_counters
 
-from .log import log
+from . import log
 
 
 class Net:

main.py

@@ -1,10 +1,11 @@
 import sys
 
-import esurfingpy
+from esurfingpy import log
+from esurfingpy.cli import cli, Gui
 
 if __name__ == '__main__':
     if len(sys.argv) == 1:
-        esurfingpy.log.warning("无参数运行，即将打开图形界面……")
-        esurfingpy.Gui().run()
+        log.warning("无参数运行，即将打开图形界面……")
+        Gui().run()
     else:
-        esurfingpy.cli()
+        cli()