Fix encryption options and custom dump names

Author: jan-di

README.md

@@ -83,4 +83,4 @@ services:
 
 ## Credits
 
-Inspired by [kibatic/docker-mysql-backup](https://github.com/kibatic/docker-mysql-backup)
+Inspired by [kibatic/docker-mysql-backup](https://github.com/kibatic/docker-mysql-backup)

main.py

@@ -48,7 +48,7 @@
 
  for i, container in enumerate(containers):
  database = Database(container, global_labels)
- dump_file = f"/dump/{database.dump_file if database.dump_file != None else container.name}.sql"
+ dump_file = f"/dump/{database.dump_name if database.dump_name != None else container.name}.sql"
  failed = False
 
  logging.info(
@@ -160,20 +160,24 @@
  logging.debug(f"Encrypting dump")
  encrypted_dump_file = f"{dump_file}.aes"
 
- try:
- if os.path.exists(encrypted_dump_file):
- os.remove(encrypted_dump_file)
-
- pyAesCrypt.encryptFile(
- dump_file, encrypted_dump_file, database.encryption_key
- )
- os.remove(dump_file)
- except Exception as e:
- logging.error(f"FAILED: Error while encrypting: {e}")
+ if database.encryption_key == None:
+ logging.error(f"FAILED: No encryption key specified!")
  failed = True
-
- processed_dump_size = os.path.getsize(encrypted_dump_file)
- dump_file = encrypted_dump_file
+ else:
+ try:
+ if os.path.exists(encrypted_dump_file):
+ os.remove(encrypted_dump_file)
+
+ pyAesCrypt.encryptFile(
+ dump_file, encrypted_dump_file, database.encryption_key
+ )
+ os.remove(dump_file)
+ except Exception as e:
+ logging.error(f"FAILED: Error while encrypting: {e}")
+ failed = True
+
+ processed_dump_size = os.path.getsize(encrypted_dump_file)
+ dump_file = encrypted_dump_file
 
  else:
  database.encrypt = False

src/database.py

@@ -56,7 +56,7 @@ def _load_labels(self, values):
  if "port" in values: self.port = values["port"]
  if "username" in values: self.username = values["username"]
  if "password" in values: self.password = values["password"]
- if "dump_file" in values: self.dump_file = values["dump_file"]
+ if "dump_name" in values: self.dump_name = values["dump_name"]
  if "compress" in values: self.compress = distutils.util.strtobool(values["compress"])
  if "compression_level" in values: self.compression_level = values["compression_level"]
  if "encrypt" in values: self.encrypt = distutils.util.strtobool(values["encrypt"])

src/settings.py

@@ -23,7 +23,7 @@
  "dump_name": None,
  "compress": "false",
  "compression_level": 6,
- "encrypt": "true",
+ "encrypt": "false",
  "encryption_key": None
 }