From 1e191446e02216061e189493de5b28ab0f85ecbe Mon Sep 17 00:00:00 2001
From: Oleg Korshul <Oleg.Korshul@onlyoffice.com>
Date: Tue, 14 Apr 2020 21:40:43 +0300
Subject: [PATCH] .

---
 scripts/base.py           | 24 ++++++++++++++----------
 scripts/config.py         |  5 +++++
 scripts/deploy_desktop.py |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/scripts/base.py b/scripts/base.py
index fd513b7..8c76c0d 100644
--- a/scripts/base.py
+++ b/scripts/base.py
@@ -567,12 +567,9 @@ def web_apps_addons_checkout():
 
 def sdkjs_plugins_checkout():
   plugins_list_config = config.option("sdkjs-plugin")
-  if ("" == plugins_list_config):
-    plugins_list_config = "default"
-  plugins_list_string = plugins_list_config.replace("default", "photoeditor, macros, ocr, translator, speech, thesaurus, youtube, highlightcode")
   if ("" == plugins_list_config):
     return
-  plugins_list = plugins_list_string.rsplit(", ")
+  plugins_list = plugins_list_config.rsplit(", ")
   plugins_dir = get_script_dir() + "/../../sdkjs-plugins"
   if is_dir(plugins_dir + "/.git"):
     delete_dir_with_access_error(plugins_dir);
@@ -803,24 +800,31 @@ def copy_sdkjs_plugin(src_dir, dst_dir, name, is_name_as_guid=False):
   if not is_dir(src_dir_path):
     src_dir_path = src_dir + "/" + name
   if not is_name_as_guid:
-    base.copy_dir_content(src_dir_path, dst_dir + "/" + name, "", ".git")
+    dst_dir_path = dst_dir + "/" + name
+    if is_dir(dst_dir_path):
+      delete_dir(dst_dir_path)
+    create_dir(dst_dir_path)
+    copy_dir_content(src_dir_path, dst_dir_path, "", ".git")
     return
   config_content = readFile(src_dir_path + "/config.json")
   index_start = config_content.find("\"asc.{")
   index_start += 5
-  index_end = config_content.find(index_start, "}")
+  index_end = config_content.find("}", index_start)
+  index_end += 1
   guid = config_content[index_start:index_end]
+  dst_dir_path = dst_dir + "/" + guid
+  if is_dir(dst_dir_path):
+    delete_dir(dst_dir_path)
+  create_dir(dst_dir_path)
+  copy_dir_content(src_dir_path, dst_dir + "/" + guid, "", ".git")
   return
 
 def copy_sdkjs_plugins(dst_dir, is_name_as_guid=False):
   plugins_dir = get_script_dir() + "/../../sdkjs-plugins"
   plugins_list_config = config.option("sdkjs-plugin")
-  if ("" == plugins_list_config):
-    plugins_list_config = "default"
-  plugins_list_string = plugins_list_config.replace("default", "photoeditor, macros, ocr, translator, speech, thesaurus, youtube, highlightcode")
   if ("" == plugins_list_config):
     return
-  plugins_list = plugins_list_string.rsplit(", ")
+  plugins_list = plugins_list_config.rsplit(", ")
   for name in plugins_list:
     copy_sdkjs_plugin(plugins_dir, dst_dir, name, is_name_as_guid)
   return  
\ No newline at end of file
diff --git a/scripts/config.py b/scripts/config.py
index ab66e9e..6f9dd0e 100644
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -65,6 +65,11 @@ def parse():
     if ("" != base.get_env("ProgramFiles(x86)")):
       options["vs-path"] = base.get_env("ProgramFiles(x86)") + "/Microsoft Visual Studio 14.0/VC"
 
+  # check sdkjs-plugins
+  if (option("sdkjs-plugin") == ""):
+    options["sdkjs-plugin"] = "default"
+  options["sdkjs-plugin"] = options["sdkjs-plugin"].replace("default", "photoeditor, macros, ocr, translator, speech, thesaurus, youtube, highlightcode")
+
   global sdkjs_addons
   sdkjs_addons = {}
   sdkjs_addons["comparison"] = "sdkjs-comparison"
diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py
index c9b2132..e19a8d6 100644
--- a/scripts/deploy_desktop.py
+++ b/scripts/deploy_desktop.py
@@ -173,7 +173,7 @@ def make():
     base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins-ui.js", root_dir + "/editors/sdkjs-plugins/v1/plugins-ui.js")
     base.download("https://onlyoffice.github.io/sdkjs-plugins/v1/plugins.css", root_dir + "/editors/sdkjs-plugins/v1/plugins.css")
 
-    base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/{8D67F3C5-7736-4BAE-A0F2-8C7127DC4BB8}", root_dir + "/editors/sdkjs-plugins/{8D67F3C5-7736-4BAE-A0F2-8C7127DC4BB8}")
+    base.copy_sdkjs_plugin(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins", root_dir + "/editors/sdkjs-plugins", "manager", True)
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/common/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}", root_dir + "/editors/sdkjs-plugins/{14A8FC87-8E26-4216-B34E-F27F053B2EC4}")
     #base.copy_dir(git_dir + "/desktop-sdk/ChromiumBasedEditors/plugins/encrypt/ui/engine/database/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}", root_dir + "/editors/sdkjs-plugins/{9AB4BBA8-A7E5-48D5-B683-ECE76A020BB1}")