feat: add FTP_TLS

Author: insoIite

config.yml

@@ -23,6 +23,7 @@ ftp: {}
   #port: 21        # FTP port
   #user: ""        # FTP user
   #password: ""    # FTP password
+  tls: True
   # Remote path on the FTP server
   #remote_path: "" # Example: "/torrents/qbittorrent/"
 

qbit_watcher/ftp.py

@@ -1,7 +1,7 @@
 import os
 import logging
 
-from ftplib import FTP
+from ftplib import FTP_TLS, FTP
 from qbit_watcher.ftp_util import parse_file
 
 LOGGER = logging.getLogger(__name__)
@@ -17,9 +17,17 @@ def get_client(self):
         """
         Returns a ftp connection
         """
-        ftp = FTP()
+        if self.conf['tls']:
+            ftp = FTP_TLS()
+        else:
+            ftp = FTP()
+
         ftp.connect(host=self.conf['domain'], port=self.conf['port'])
         ftp.login(self.conf['user'], self.conf['password'])
+
+        if self.conf['tls']:
+            ftp.prot_p()
+
         ftp.cwd( self.conf['remote_path'])
         LOGGER.info("Successfully connected to '%s' FTP server" % (self.conf['domain']))
         return ftp

requirements.txt

@@ -1,7 +1,7 @@
-pyyaml==5.1.2
-pysftp==0.2.9
-pyinstaller==4.0
-qbittorrent-api==2020.10.11
-watchdog==0.10.3
-win10toast==0.9
-infi.systray==0.1.12
+pyyaml==5.4.1
+pysftp==0.2.9
+pyinstaller==4.0
+qbittorrent-api==2020.10.11
+watchdog==0.10.3
+win10toast==0.9
+infi.systray==0.1.12

setup.py

@@ -12,7 +12,7 @@
     },
     install_requires=[
         "pysftp==0.2.9",
-        "pyyaml==5.1.2",
+        "pyyaml==5.4.1",
         "qbittorrent-api==2020.10.11",
         "watchdog==0.10.3",
         "win10toast==0.9",