Merge branch 'dev' of https://sa2systems.ru:88/com/pycomsdk into dev

comsdk/communication.py

@@ -178,7 +178,10 @@ class LocalCommunication(BaseCommunication):
                 command_line += 'cd {} && {}'.format(working_dir, command)
         #self._print_exec_msg(command_line, is_remote=False)
         #res = subprocess.call([command_line], shell=True)
+<<<<<<< HEAD
     #    print(command_line)
+=======
+>>>>>>> ebfc68c5c8e9bd0bb9dbfa793484ea58d4e5a1e7
         res = subprocess.run(command_line, shell=True)
         return [], []
 

comsdk/research.py

@@ -312,15 +312,19 @@ class ResearchDoesNotExist(Exception):
 
 
 def make_suitable_name(name: str) -> str:
+    return '-'.join(name.split())
+
+
+def make_suitable_task_name(name: str) -> str:
     return '_'.join(name.split())
 
 
 def make_suitable_research_dir(descr: str) -> str:
-    return '_'.join([str(date.today()), make_suitable_name(descr)])
+    return '-'.join([str(date.today()), make_suitable_name(descr)])
 
 
 def get_task_full_name(task_number: int, task_name: str) -> str:
-    return str(task_number) + '-' + make_suitable_name(task_name)
+    return str(task_number) + '-' + make_suitable_task_name(task_name)
 
 
 def split_task_dir(task_dir: str) -> (int, str):