datacomshell 0.26.5__tar.gz → 0.26.7__tar.gz

{datacomshell-0.26.5 → datacomshell-0.26.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datacomshell
-Version: 0.26.5
+Version: 0.26.7
 Summary: Add your description here
 Author: Saven
 Author-email: Saven <2416844857@qq.com>

{datacomshell-0.26.5 → datacomshell-0.26.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datacomshell"
-version = "0.26.5"
+version = "0.26.7"
 description = "Add your description here"
 authors = [
     { name = "Saven", email = "2416844857@qq.com" },

{datacomshell-0.26.5 → datacomshell-0.26.7}/src/datacomshell/AsyncTelnetClientUtil.py

@@ -1,7 +1,7 @@
 from typing import Optional, Union, Tuple, cast
 from datacomshell.Auth import Auth, AuthState, UsernamePasswordAuth
 from telnetlib3 import TelnetReader, TelnetReaderUnicode, TelnetWriter, TelnetWriterUnicode, open_connection
-from datetime import datetime
+from datetime import datetime, timezone
 import asyncio
 import aiofiles
 from aiofiles.threadpool.text import AsyncTextIOWrapper
@@ -74,7 +74,7 @@ class AsyncTelnetClientUtil(object):
 
         self.__log_folder_path: str | None = log_folder_path
         self.__log_new_second: float = log_new_second
-        self.__timestemp: float = datetime.now().timestamp()
+        self.__timestemp: float = self.__datetime().timestamp()
         self.__log_file: AsyncTextIOWrapper | None = None
 
         self.__is_log = True if log_folder_path != None else False
@@ -120,7 +120,10 @@ class AsyncTelnetClientUtil(object):
         )
 
         await instance.__initConnect()
-        await instance.__create_log_file()
+
+        if instance.__is_log:
+            await instance.__create_log_file()
+
         print(f"""
               [I] connect success: {instance.__host}:{instance.__port}
               [I] login type: {instance.__auth.get_auth_type().name}
@@ -128,8 +131,11 @@ class AsyncTelnetClientUtil(object):
               """)
         return instance
 
+    def __datetime(self):
+        return datetime.now(timezone.utc)
+
     def __command_wrapper(self, command: str) -> str:
-        return command + '\r\n'
+        return command + '\n'
 
     async def __read_wait_wrapper(self, read) -> bytes:
         return await asyncio.wait_for(read, timeout=self.__exc_command_timout)
@@ -185,37 +191,42 @@ class AsyncTelnetClientUtil(object):
 
     async def __close_log_file(self):
         if self.__log_file != None:
+            end_datetime = self.__datetime().strftime('%Y-%m-%d_%H-%M-%S-%f')
+            await self.__log_file.write(f'================ [end]:{end_datetime} ================')
             await self.__log_file.close()
 
     async def __create_log_file(self):
         await self.__close_log_file()
-        filename = datetime.now().strftime('%Y-%m-%d_%H-%M-%S-%f') + '.log'
+        filename = self.__datetime().strftime('%Y-%m-%d_%H-%M-%S-%f') + '.log'
 
         if self.__log_folder_path == None:
             raise RuntimeError('[IE] log_folder_path error')
 
-        self.__timestemp = datetime.now().timestamp()
+        self.__timestemp = self.__datetime().timestamp()
         en_path = self.__log_folder_path + '/' + filename
         self.__log_file = await aiofiles.open(en_path, 'a', encoding='utf-8')
 
-        await self.__log_file.write(f'================ {filename} ================')
+        await self.__log_file.write(f'================ [start]:{filename} ================')
 
     async def __log(self, message: str):
         if self.__is_log != True:
             return
 
-        curren_timestemp: float = datetime.now().timestamp()
+        curren_timestemp: float = self.__datetime().timestamp()
         diff = curren_timestemp - self.__timestemp
 
         # 新建
-        if diff > self.__log_new_second:
+        if diff > self.__log_new_second or self.__log_file == None:
             await self.__create_log_file()
 
+        lines = message.splitlines()
+        non_empty_lines = [line for line in lines if line.strip() != '']
+
         # 记录
         if self.__log_file == None:
             raise RuntimeError('[IE] log_file is None')
         else:
-            await self.__log_file.write(message)
+            await self.__log_file.write('\n'.join(non_empty_lines) + '\n')
 
     async def execute(self, command: str) -> bytes:
         if self.__reader == None and self.__writer == None:
@@ -225,7 +236,7 @@ class AsyncTelnetClientUtil(object):
         _reader = cast(_READER_TYPE, self.__reader)
         _writer = cast(TelnetWriterUnicode, self.__writer)
 
-        _writer.write('\r\n')
+        _writer.write('\n')
         _writer.write(self.__command_wrapper(command))
         _writer.write(_DEFAULT_ENDING)
         await _writer.drain()
@@ -251,7 +262,7 @@ class AsyncTelnetClientUtil(object):
         _writer = cast(TelnetWriterUnicode, self.__writer)
 
         if self.__log_file != None:
-            await self.__log_file.close()
+            await self.__close_log_file()
 
         _reader.close()
         _writer.close()