solax-py-library 1.0.0.9__tar.gz → 1.0.0.11__tar.gz

{solax_py_library-1.0.0.9 → solax_py_library-1.0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solax-py-library
-Version: 1.0.0.9
+Version: 1.0.0.11
 Summary: some common tool
 Author: shenlvyu
 Author-email: 13296718439@163.com

{solax_py_library-1.0.0.9 → solax_py_library-1.0.0.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "solax-py-library"
-version = "1.0.0.9"
+version = "1.0.0.11"
 description = "some common tool"
 authors = ["shenlvyu <13296718439@163.com>"]
 readme = "README.md"

{solax_py_library-1.0.0.9 → solax_py_library-1.0.0.11}/solax_py_library/upload/core/upload_service/ftp.py

@@ -24,6 +24,7 @@ class FTPUploadService(BaseUploadService):
         super().__init__(**kwargs)
         config = self._init_config(**kwargs)
         self.host = config.host
+        self.port = config.port
         self.user = config.user
         self.password = config.password
         self.remote_path = config.remote_path
@@ -40,6 +41,7 @@ class FTPUploadService(BaseUploadService):
             self.close()
         try:
             self._client = ftplib.FTP(self.host, timeout=self.timeout)
+            self._client.connect(self.host, self.port, timeout=self.timeout)
             self._client.login(self.user, self.password)
             print(f"Connected to {self.host}")
             self._is_connect = True
@@ -60,8 +62,7 @@ class FTPUploadService(BaseUploadService):
         else:
             raise NotImplementedError
         return FTPParsedData(
-            file_name=upload_data.build_full_path(self.remote_path)
-            + FTPFileType.get_file_suffix(upload_data.file_type),
+            file_name=FTPFileType.get_file_suffix(upload_data.file_type),
             file_path=parsed_data,
         )
 

{solax_py_library-1.0.0.9 → solax_py_library-1.0.0.11}/solax_py_library/upload/test/test_ftp.py

@@ -10,8 +10,9 @@ class FTPTest(unittest.TestCase):
     def test_ftp_upload(self):
         ftp_config = {
             "host": "10.1.31.181",  # 测试host
+            "port": 21,
             "user": "solax",
-            "password": "sly402",
+            "password": "123456",
             "remote_path": "/xixi",
         }
         asyncio.run(

{solax_py_library-1.0.0.9 → solax_py_library-1.0.0.11}/solax_py_library/upload/types/ftp.py

@@ -26,6 +26,7 @@ class FTPData(BaseModel):
 
 class FTPServiceConfig(BaseModel):
     host: str
+    port: int
     user: Optional[str]
     password: Optional[str]
     remote_path: str