improve modules/backups code

Author: yungwine

modules/backups.py

@@ -3,6 +3,7 @@
 import subprocess
 import time
 import typing
+from typing import Optional
 
 from modules.module import MtcModule
 from mypylib.mypylib import color_print, ip2int, run_as_root, parse
@@ -20,6 +21,8 @@ def create_keyring(self, dir_name: str):
     def create_tmp_ton_dir(self):
         result = self.ton.validatorConsole.Run("getconfig")
         text = parse(result, "---------", "--------")
+        if text is None:
+            raise Exception("Could not get config from validator-console")
         dir_name = self.ton.tempDir + f'/ton_backup_{int(time.time() * 1000)}'
         dir_name_db = dir_name + '/db'
         os.makedirs(dir_name_db)
@@ -29,7 +32,7 @@ def create_tmp_ton_dir(self):
         return dir_name
 
     @staticmethod
-    def run_create_backup(args, user: str = None):
+    def run_create_backup(args, user: Optional[str] = None):
         if user is None:
             user = get_current_user()
         with get_package_resource_path('mytonctrl', 'scripts/create_backup.sh') as backup_script_path:
@@ -54,7 +57,7 @@ def create_backup(self, args: list) -> typing.Union[int, None]:
         return process.returncode
 
     @staticmethod
-    def run_restore_backup(args, user: str = None):
+    def run_restore_backup(args, user: Optional[str] = None):
         if user is None:
             user = get_current_user()
         with get_package_resource_path('mytonctrl', 'scripts/restore_backup.sh') as restore_script_path:

mytoncore/mytoncore.py

@@ -9,6 +9,7 @@
 import subprocess
 import requests
 from fastcrc import crc16
+from typing import Optional
 
 from modules import MODES
 from modules.btc_teleport import BtcTeleportModule
@@ -37,27 +38,22 @@
 class MyTonCore():
 	def __init__(self, local):
 		self.local = local
-		self.walletsDir = None
-		self.dbFile = None
-		self.contractsDir = None
-		self.poolsDir = None
-		self.tempDir = None
-		self.nodeName = None
+		self.walletsDir: Optional[str] = None
+		self.dbFile: Optional[str] = None
+		self.contractsDir: str
+		self.poolsDir: str
+		self.tempDir: str
+		self.nodeName: str
 
 		self.liteClient = LiteClient(self.local)
 		self.validatorConsole = ValidatorConsole(self.local)
 		self.fift = Fift(self.local)
 
 		self.Refresh()
-		self.Init()
-	#end define
 
-	def Init(self):
-		# Check all directorys
 		os.makedirs(self.walletsDir, exist_ok=True)
 		os.makedirs(self.contractsDir, exist_ok=True)
 		os.makedirs(self.poolsDir, exist_ok=True)
-	#end define
 
 	def Refresh(self):
 		if self.dbFile:

mytonctrl/utils.py

@@ -2,6 +2,7 @@
 import pwd
 import subprocess
 import time
+import typing
 
 from mypylib.mypylib import bcolors
 
@@ -63,7 +64,7 @@ def GetColorInt(data, border, logic, ending=None):
 def get_current_user():
     return pwd.getpwuid(os.getuid()).pw_name
 
-def pop_arg_from_args(args: list, arg_name: str):
+def pop_arg_from_args(args: typing.List[str], arg_name: str) -> typing.Optional[str]:
     if arg_name in args:
         arg_index = args.index(arg_name) + 1
         if arg_index >= len(args):
@@ -73,5 +74,5 @@ def pop_arg_from_args(args: list, arg_name: str):
         return value
     return None
 
-def pop_user_from_args(args: list):
+def pop_user_from_args(args: list) -> typing.Optional[str]:
     return pop_arg_from_args(args, '-u')