get rid of mypylib.dir

Author: yungwine

mypylib/__init__.py

@@ -7,7 +7,6 @@
     "parse",
     "ping",
     "get_request",
-    "dir",
     "b2mb",
     "search_file_in_dir",
     "search_dir_in_dir",

mypylib/mypylib.py

@@ -331,24 +331,21 @@ def get_my_path(self):
 	#end define
 
 	def get_my_work_dir(self):
-		'''return "/usr/local/bin/test/" or "/home/user/.local/share/test/"'''
 		if self.check_root_permission():
-			# https://ru.wikipedia.org/wiki/FHS
-			program_files_dir = "/usr/local/bin/"
+			program_files_dir = "/usr/local/bin"
 		else:
-			# https://habr.com/ru/post/440620/
-			user_home_dir = dir(os.getenv("HOME"))
-			program_files_dir = dir(os.getenv("XDG_DATA_HOME", user_home_dir + ".local/share/"))
-		my_work_dir = dir(program_files_dir + self.my_name)
+			program_files_dir = os.getenv("XDG_DATA_HOME")
+			if not program_files_dir:
+				user_home_dir = os.getenv("HOME")
+				if user_home_dir is None:
+					raise Exception("HOME environment variable is not set")
+				program_files_dir = os.path.join(user_home_dir, ".local", "share")
+		my_work_dir = os.path.join(program_files_dir, self.my_name, "")
 		return my_work_dir
-	#end define
 
 	def get_my_temp_dir(self):
-		'''return "/tmp/test/"'''
-		temp_files_dir = "/tmp/"  # https://ru.wikipedia.org/wiki/FHS
-		my_temp_dir = dir(temp_files_dir + self.my_name)
+		my_temp_dir = os.path.join("/tmp", self.my_name, "")
 		return my_temp_dir
-	#end define
 
 	def get_lang(self):
 		lang = os.getenv("LANG", "en")
@@ -788,12 +785,6 @@ def get_request(url: str) -> str:
 	return text
 #end define
 
-def dir(input_dir: str) -> str:
-	if input_dir[-1:] != '/':
-		input_dir += '/'
-	return input_dir
-#end define
-
 def b2mb(item: int | str) -> float:
 	return round(int(item) / 1000 / 1000, 2)
 #end define

tests/conftest.py

@@ -7,7 +7,7 @@
 from mypyconsole.mypyconsole import MyPyConsole
 from mytoncore.mytoncore import MyTonCore
 from mytonctrl.mytonctrl import Init
-from mypylib.mypylib import MyPyClass, dir as ensure_dir, Dict
+from mypylib.mypylib import MyPyClass
 from tests.helpers import remove_colors
 
 
@@ -18,10 +18,10 @@ def __init__(self, file_path: str, work_dir: str, temp_dir: str):
         super().__init__(file_path)
 
     def get_my_work_dir(self):
-        return ensure_dir(self._work_dir)
+        return self._work_dir
 
     def get_my_temp_dir(self):
-        return ensure_dir(self._temp_dir)
+        return self._temp_dir
 
     def self_test(self):
         pass
@@ -39,8 +39,8 @@ def write_log(self):
 
 @pytest.fixture()
 def local(tmp_path):
-    work_dir = str(tmp_path / "work")
-    temp_dir = str(tmp_path / "tmp")
+    work_dir = str(tmp_path / "work") + '/'
+    temp_dir = str(tmp_path / "tmp") + '/'
     file_path = str(tmp_path / "tests_runner.py")
     os.makedirs(work_dir, exist_ok=True)
     os.makedirs(temp_dir, exist_ok=True)