gru/routeros_backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poprawa eksport na export

Browse Source
This commit is contained in:
Mateusz Gruszczyński 2025-02-23 13:08:37 +01:00
parent 378fd7aade
commit 7c8d3a0c86
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app.py
View File

@ -507,10 +507,10 @@ def scheduled_auto_backup():
db.session.add(b) db.session.add(b)
db.session.commit() db.session.commit()
notify(s, f"Auto-export dla routera {r.name} OK", True) notify(s, f"Auto-export dla routera {r.name} OK", True)
log_operation(f"Automatyczny eksport dla routera {r.name} wykonany pomyślnie at {datetime.utcnow()}.") log_operation(f"Automatyczny export dla routera {r.name} wykonany pomyślnie at {datetime.utcnow()}.")
except Exception as e: except Exception as e:
notify(s, f"Auto-export dla routera {r.name} FAILED: {e}", False) notify(s, f"Auto-export dla routera {r.name} FAILED: {e}", False)
log_operation(f"Automatyczny eksport dla routera {r.name} FAILED at {datetime.utcnow()}: {e}") log_operation(f"Automatyczny export dla routera {r.name} FAILED at {datetime.utcnow()}: {e}")
def scheduled_auto_binary_backup(): def scheduled_auto_binary_backup():
with app.app_context(): with app.app_context():
@ -875,8 +875,8 @@ def router_export(router_id):
notify(get_settings(), f"Export {router.name} OK", True) notify(get_settings(), f"Export {router.name} OK", True)
log_operation(f"Export wykonany dla routera {router.name} at {datetime.utcnow()}") log_operation(f"Export wykonany dla routera {router.name} at {datetime.utcnow()}")
if request.headers.get("X-Requested-With") == "XMLHttpRequest": if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return {"status": "success", "message": "Eksport zakończony."} return {"status": "success", "message": "export zakończony."}
flash("Eksport zakończony.") flash("Export zakończony.")
except Exception as e: except Exception as e:
notify(get_settings(), f"Export {router.name} FAIL: {e}", False) notify(get_settings(), f"Export {router.name} FAIL: {e}", False)
log_operation(f"Export dla routera {router.name} FAILED: {e}") log_operation(f"Export dla routera {router.name} FAILED: {e}")
@ -1058,7 +1058,7 @@ def view_export(backup_id):
flash("Brak dostępu do backupu.") flash("Brak dostępu do backupu.")
return redirect(url_for('all_files')) return redirect(url_for('all_files'))
if b.backup_type != 'export': if b.backup_type != 'export':
flash("Wybrany backup nie jest plikiem eksportu.") flash("Wybrany backup nie jest plikiem exportu.")
return redirect(url_for('all_files')) return redirect(url_for('all_files'))
try: try:
with open(b.file_path, 'r', encoding='utf-8') as f: with open(b.file_path, 'r', encoding='utf-8') as f:
@ -1082,10 +1082,10 @@ def send_export_email(backup_id):
flash("Nie skonfigurowano ustawień SMTP w panelu.") flash("Nie skonfigurowano ustawień SMTP w panelu.")
return redirect(url_for('settings_view')) return redirect(url_for('settings_view'))
subject = f"RouterOS Export: {os.path.basename(b.file_path)}" subject = f"RouterOS Export: {os.path.basename(b.file_path)}"
body = f"Przesyłam eksport {os.path.basename(b.file_path)} z routera {b.router.name}." body = f"Przesyłam export {os.path.basename(b.file_path)} z routera {b.router.name}."
if send_mail_with_attachment(s.smtp_host, s.smtp_port, s.smtp_login, s.smtp_password, if send_mail_with_attachment(s.smtp_host, s.smtp_port, s.smtp_login, s.smtp_password,
s.smtp_login, subject, body, b.file_path): s.smtp_login, subject, body, b.file_path):
flash("Wysłano eksport mailem.") flash("Wysłano export mailem.")
else: else:
flash("Błąd wysyłki mailowej.") flash("Błąd wysyłki mailowej.")
#return redirect(url_for('router_details', router_id=b.router_id)) #return redirect(url_for('router_details', router_id=b.router_id))

2
templates/advanced_schedule.html
View File

@ -42,7 +42,7 @@
</div> </div>
<div class="mb-3 form-check"> <div class="mb-3 form-check">
<input type="checkbox" class="form-check-input" id="enable_auto_export" name="enable_auto_export" {% if settings.enable_auto_export %}checked{% endif %}> <input type="checkbox" class="form-check-input" id="enable_auto_export" name="enable_auto_export" {% if settings.enable_auto_export %}checked{% endif %}>
<label class="form-check-label" for="enable_auto_export">Włącz automatyczny eksport</label> <label class="form-check-label" for="enable_auto_export">Włącz automatyczny export</label>
</div> </div>
<button type="submit" class="btn btn-primary">Zapisz ustawienia</button> <button type="submit" class="btn btn-primary">Zapisz ustawienia</button>
</form> </form>