Merge pull request #2 from Egor-oop/backup-optimization

Backup optimization

Author: Egor-oop

router_move/backup.py

@@ -1,12 +1,11 @@
 import socket
-from router_move.backup_mikrotik import backup_mikrotik
-from router_move.backup_eltex import backup_eltex
-from router_move.backup_cisco import backup_cisco
+from backup_mikrotik import backup_mikrotik
+from backup_eltex import backup_eltex
+from backup_cisco import backup_cisco
 import sys
 
 
 def run_backup(directory: str) -> None:
-    paths = sys.path
     try:
         backup_mikrotik(directory)
         backup_eltex(directory)
@@ -16,4 +15,7 @@ def run_backup(directory: str) -> None:
 
 
 if __name__ == '__main__':
-    run_backup('/Users/egorgulido/Desktop')
+    try:
+        run_backup(sys.argv[1])
+    except IndexError:
+        print('Please, provide a path to a directory to make backups')

router_move/backup_cisco.py

@@ -2,36 +2,33 @@
 import telnetlib
 import datetime
 import os
-from router_move.fetch_devices import fetch_devices
+from fetch_devices import fetch_devices
 
 
 def backup_cisco(directory: str) -> None:
     devices = fetch_devices('cisco')
-
     day = str(datetime.date.today())
     path = f'{directory}/{day}/cisco'
     if not os.path.isdir(path):
         os.makedirs(path)
 
-    os.chdir(path)
-
     for device in devices:
         try:
-            tn = telnetlib.Telnet(device.ip)
+            tn = telnetlib.Telnet(device[2])
             tn.read_until(b"ame:")
-            tn.write(device.user_name.encode("ascii") + b"\n")
+            tn.write(device[3].encode("ascii") + b"\n")
             tn.read_until(b"Password:")
-            tn.write(device.user_password.encode("ascii") + b"\n")
+            tn.write(device[4].encode("ascii") + b"\n")
             tn.write(b"terminal length 0\n")
             tn.write(b"sh run\n")
             tn.write(b"exit\n")
             output = tn.read_until(b'\nend')
             output = output.decode("ascii")
             output = output.splitlines()
 
-            filename = f'{device.name}_backup.rsc'
+            filename = f'{path}/{device[1]}_backup.rsc'
             if os.path.isfile(filename):
-                filename = f'{device.name}_{secrets.token_urlsafe(6)}_backup.rsc'
+                filename = f'{path}/{device[1]}_{secrets.token_urlsafe(6)}_backup.rsc'
 
             fp = open(filename, "w")
             fp.write('\n'.join(output[5:]))

router_move/backup_eltex.py

@@ -2,26 +2,23 @@
 import telnetlib
 import datetime
 import os
-from router_move.fetch_devices import fetch_devices
+from fetch_devices import fetch_devices
 
 
 def backup_eltex(directory: str) -> None:
     devices = fetch_devices('eltex')
-
     day = str(datetime.date.today())
     path = f'{directory}/{day}/eltex'
     if not os.path.isdir(path):
         os.makedirs(path)
 
-    os.chdir(path)
-
     for device in devices:
         try:
-            tn = telnetlib.Telnet(device.ip)
+            tn = telnetlib.Telnet(device[2])
             tn.read_until(b"ame:")
-            tn.write(device.user_name.encode("ascii") + b"\n")
+            tn.write(device[3].encode("ascii") + b"\n")
             tn.read_until(b"Password:")
-            tn.write(device.user_password.encode("ascii") + b"\n")
+            tn.write(device[4].encode("ascii") + b"\n")
             tn.read_until(b'#')
             tn.write(b'terminal datadump\n')
             tn.read_until(b'#')
@@ -31,9 +28,9 @@ def backup_eltex(directory: str) -> None:
             output = output.decode("ascii")
 
             output = output[:-4]
-            filename = f'{device.name}_backup.rsc'
+            filename = f'{path}/{device[1]}_backup.rsc'
             if os.path.isfile(filename):
-                filename = f'{device.name}_{secrets.token_urlsafe(6)}_backup.rsc'
+                filename = f'{path}/{device[1]}_{secrets.token_urlsafe(6)}_backup.rsc'
 
             fp = open(filename, "w")
             fp.write(output)

router_move/backup_mikrotik.py

@@ -1,28 +1,35 @@
-from router_move import libapi
-from router_move.fetch_devices import fetch_devices
+import libapi
+from fetch_devices import fetch_devices
 import ftplib
 import os
 import datetime
 import secrets
-# from app import Device
 
 
 def backup_mikrotik(directory: str) -> None:
     devices = fetch_devices('mikrotik')
+
+    day = str(datetime.date.today())
+
+    path = f'{directory}/{day}/mikrotik'
+
+    if not os.path.isdir(path):
+        os.makedirs(path)
+
     for device in devices:
-        print("Connect to {}:".format(device.ip))
-        filename = f'{device.name}_backup.rsc'
+        print("Connect to {}:".format(device[2]))
+        filename = f'{device[1]}_backup.rsc'
 
         # Создание сокета и объекта устройства
         try:
-            s = libapi.socketOpen(device.ip)
+            s = libapi.socketOpen(device[2])
         except Exception as e:
             continue
         dev_api = libapi.ApiRos(s)
 
         # Авторизация на устройстве
         try:
-            if not dev_api.login(device.user_name, device.user_password):
+            if not dev_api.login(device[3], device[4]):
                 break
         except Exception as e:
             continue
@@ -38,48 +45,40 @@ def backup_mikrotik(directory: str) -> None:
         # Закрытие сокета
         libapi.socketClose(s)
 
-    day = str(datetime.date.today())
-
-    path = f'{directory}/{day}/mikrotik'
-
-    if not os.path.isdir(path):
-        os.makedirs(path)
-
-    os.chdir(path)
     filename_pattern = '{}_backup.rsc'
     for device in devices:
-        print("Connect to {}:".format(device.ip))
-        filename = filename_pattern.format(device.name)
+        print("Connect to {}:".format(device[2]))
+        filename = filename_pattern.format(device[1])
 
         try:
-            with ftplib.FTP(device.ip, device.user_name, device.user_password) as con:
-                if os.path.isfile(filename):
-                    filename = f'{device.name}_{secrets.token_urlsafe(6)}_backup.rsc'
-                with open(filename, "wb") as f:
-                    con.retrbinary('RETR ' + filename_pattern.format(device.name), f.write)
+            with ftplib.FTP(device[2], device[3], device[4]) as con:
+                if os.path.isfile(f'{path}/{filename}'):
+                    filename = f'{device[1]}_{secrets.token_urlsafe(6)}_backup.rsc'
+                with open(f'{path}/{filename}', "wb") as f:
+                    con.retrbinary('RETR ' + filename_pattern.format(device[1]), f.write)
                 print("    File transfer: done")
         except Exception as e:
             continue
 
     for device in devices:
-        print("Connect to {}:".format(device.ip))
+        print("Connect to {}:".format(device[2],))
 
         # Создание сокета и объекта устройства
         try:
-            s = libapi.socketOpen(device.ip)
+            s = libapi.socketOpen(device[2],)
         except Exception as e:
             continue
         dev_api = libapi.ApiRos(s)
 
         # Авторизация на устройстве
         try:
-            if not dev_api.login(device.user_name, device.user_password):
+            if not dev_api.login(device[3], device[4]):
                 break
         except Exception as e:
             continue
 
         # Команда для добавление bridge-интерфейса
-        command = ["/file/remove", f"=numbers={device.name}_backup"]
+        command = ["/file/remove", f"=numbers={device[1]}_backup"]
 
         # Выполнение команды на устройстве
         dev_api.writeSentence(command)

router_move/create_folder.py

@@ -1,7 +1,12 @@
-from router_move import app
-from router_move.models import Device
+import sqlite3
+import os
 
 
 def fetch_devices(device_type: str) -> list:
-    with app.app_context():
-        return Device.query.filter_by(device_type=device_type).all()
+    path = os.path.dirname(os.path.abspath(__file__))
+    con = sqlite3.connect(f'{path}/database.db')
+    cur = con.cursor()
+    res = cur.execute(f"SELECT * FROM device WHERE device_type='{device_type}'")
+    devices = res.fetchall()
+    con.close()
+    return devices

router_move/fetch_devices.py

@@ -13,7 +13,6 @@
         <div class="tree-text">
             <a href="/devices">Devices</a></button><br>
             <a href="/backup">Backup</a></button><br>
-            <a href="/statistic">Statistic</a></button>
         </div>
     </div>
     <div class="main">

router_move/templates/authorization.html

@@ -5,8 +5,6 @@
 
 from crontab import CronTab
 
-from router_move.backup import run_backup
-
 
 @app.route('/', methods=['POST', 'GET'])
 @app.route('/devices', methods=['POST', 'GET'])
@@ -64,7 +62,7 @@ def backups():
             directory = BackupDirectory(request.form['directory'])
             db.session.add(directory)
             db.session.commit()
-        run_backup(directory.path)
+        os.system(f'/usr/bin/python3 {os.path.dirname(__file__)}/backup.py {BackupDirectory.query.all()[-1].path}')
     context = {'directory': directory.path}
     return render_template('backup.html', **context)
 
@@ -80,48 +78,18 @@ def backupsettings():
             if job.comment == 'startbackup':
                 my_cron.remove(job)
 
-        job = my_cron.new(command=f'/usr/bin/python3 {os.path.dirname(__file__)}/backup.py', comment='startbackup')
+        job = my_cron.new(
+            command=f'/usr/bin/python3 {os.path.dirname(__file__)}/backup.py {BackupDirectory.query.all()[-1].path}',
+            comment='startbackup')
 
         if request.form.get('day') != 'star':
             job.day.on(request.form.get('day'))
         if request.form.get('hours') != 'star':
             job.hour.on(request.form.get('hours'))
         if request.form.get('minute') != 'star':
             job.minute.on(request.form.get('minute'))
-        '''
-        job.day.on(request.form.get('day'))
-        job.hour.on(request.form.get('hours'))
-        job.minute.on(request.form.get('minute'))
-        '''
         job.dow.on(*weekdays_list)
 
         my_cron.write()
 
     return render_template('backupsettings.html')
-
-
-@app.route('/statistic')
-def statistic():
-    # with connection.cursor() as cur:
-    #     cur.execute('''SELECT * FROM statistic''')
-    #     results = cur.fetchall()
-    #     statistic_list = []
-    #     for result in results:
-    #         statistic_list.append(result)
-    #
-    # context = {'destatistic': statistic_list}
-    # connection.commit()
-    return render_template('statistic.html')
-
-
-@app.route('/authorization', methods=['POST', 'GET'])
-def authorization():
-    # if request.method == 'POST':
-    #     with connection.cursor() as cur:d
-    #         login = cur.execute("SELECT name FROM users;")
-    #         passwd = cur.execute("SELECT passwd FROM users;")
-    #
-    #         if request.form.get('login') == login:
-    #             if request.form.get('passwd') == passwd:
-    #                 redirect('/devices')
-    return render_template('authorization.html')