Merge pull request 'Deploy online-installer' (#10) from feature/deploy-online-installer into develop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/10

make.py

@@ -92,6 +92,10 @@ if config.check_option("module", "desktop"):
     config.extend_option("config", "updmodule")
     base.set_env("DESKTOP_URL_UPDATES_MAIN_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcast.json")
     base.set_env("DESKTOP_URL_UPDATES_DEV_CHANNEL", "https://download.onlyoffice.com/install/desktop/editors/windows/onlyoffice/appcastdev.json")
+    base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X64", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x64.exe")
+    base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X86", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x86.exe")
+    base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X64_MSI", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x64.msi")
+    base.set_env("DESKTOP_URL_INSTALL_CHANNEL_X86_MSI", "https://download.onlyoffice.com/install/desktop/editors/windows/distrib/onlyoffice/DesktopEditors_x86.msi")
 
 # build
 build_sln.make()

scripts/base.py

@@ -563,10 +563,12 @@ def get_repositories():
   result.update(get_sdkjs_addons())
   result["onlyoffice.github.io"] = [False, False]
   result["web-apps"] = [False, False]
-  result.update(get_web_apps_addons())
   result["dictionaries"] = [False, False]
   result["core-fonts"] = [False, False]
 
+  if config.check_option("module", "server"):
+    result.update(get_web_apps_addons())
+
   if config.check_option("module", "builder"):
     result["document-templates"] = [False, False]
 
@@ -767,8 +769,9 @@ def qt_config(platform):
   if (-1 != platform.find("xp")):
     config_param += " build_xp"
   if ("ios" == platform):
-    set_env("BITCODE_GENERATION_MODE", "bitcode")
-    set_env("ENABLE_BITCODE", "YES")
+    if (config.check_option("bitcode", "yes")):
+      set_env("BITCODE_GENERATION_MODE", "bitcode")
+      set_env("ENABLE_BITCODE", "YES")
     config_param = config_param.replace("desktop", "")
     config_param += " iphoneos device"
     if (-1 == config_param_lower.find("debug")):
@@ -1216,7 +1219,7 @@ def mac_correct_rpath_x2t(dir):
   mac_correct_rpath_library("kernel", ["UnicodeConverter"])
   mac_correct_rpath_library("kernel_network", ["UnicodeConverter", "kernel"])
   mac_correct_rpath_library("graphics", ["UnicodeConverter", "kernel"])
-  mac_correct_rpath_library("doctrenderer", ["UnicodeConverter", "kernel", "kernel_network", "graphics"])
+  mac_correct_rpath_library("doctrenderer", ["UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
   mac_correct_rpath_library("HtmlFile2", ["UnicodeConverter", "kernel", "kernel_network", "graphics"])
   mac_correct_rpath_library("EpubFile", ["UnicodeConverter", "kernel", "HtmlFile2", "graphics"])
   mac_correct_rpath_library("Fb2File", ["UnicodeConverter", "kernel", "graphics"])
@@ -1235,7 +1238,7 @@ def mac_correct_rpath_x2t(dir):
   if is_file("./allthemesgen"):
     cmd("chmod", ["-v", "+x", "./allthemesgen"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./allthemesgen"], True)
-    mac_correct_rpath_binary("./allthemesgen", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "graphics", "kernel_network", "doctrenderer"])
+    mac_correct_rpath_binary("./allthemesgen", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "graphics", "kernel_network", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
   if is_file("./pluginsmanager"):
     cmd("chmod", ["-v", "+x", "./pluginsmanager"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./pluginsmanager"], True)
@@ -1253,13 +1256,13 @@ def mac_correct_rpath_docbuilder(dir):
   cmd("chmod", ["-v", "+x", "./docbuilder"])
   cmd("install_name_tool", ["-add_rpath", "@executable_path", "./docbuilder"], True)
   mac_correct_rpath_binary("./docbuilder", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "PdfFile", "HtmlRenderer", "XpsFile", "DjVuFile", "HtmlFile2", "Fb2File", "EpubFile", "doctrenderer", "DocxRenderer"])  
-  mac_correct_rpath_library("docbuilder.c", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer"])
+  mac_correct_rpath_library("docbuilder.c", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer"])
 
   def add_loader_path_to_rpath(libs):
     for lib in libs:
       cmd("install_name_tool", ["-add_rpath", "@loader_path", "lib" + lib + ".dylib"], True)
 
-  add_loader_path_to_rpath(["icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "docbuilder.c"])
+  add_loader_path_to_rpath(["icuuc.58", "UnicodeConverter", "kernel", "kernel_network", "graphics", "doctrenderer", "PdfFile", "XpsFile", "DjVuFile", "DocxRenderer", "docbuilder.c"])
   os.chdir(cur_dir)
   return
 
@@ -1305,7 +1308,7 @@ def linux_set_origin_rpath_libraries(dir, libs):
   return
 
 def linux_correct_rpath_docbuilder(dir):
-  linux_set_origin_rpath_libraries(dir, ["docbuilder.jni.so", "docbuilder.c.so", "icuuc.so.58", "doctrenderer.so", "graphics.so", "kernel.so", "kernel_network.so", "UnicodeConverter.so"])
+  linux_set_origin_rpath_libraries(dir, ["docbuilder.jni.so", "docbuilder.c.so", "icuuc.so.58", "doctrenderer.so", "graphics.so", "kernel.so", "kernel_network.so", "UnicodeConverter.so", "PdfFile.so", "XpsFile.so", "DjVuFile.so", "DocxRenderer.so"])
   return
 
 def common_check_version(name, good_version, clean_func):
@@ -1427,6 +1430,7 @@ def support_old_versions_plugins(out_dir):
 def generate_sdkjs_plugin_list(dst):
   plugins_list = config.option("sdkjs-plugin").rsplit(", ") \
                + config.option("sdkjs-plugin-server").rsplit(", ")
+  plugins_list = list(filter(None, plugins_list))
   with open(get_path(dst), 'w') as file:
     dump = json.dumps(sorted(plugins_list), indent=4)
     file.write(re.sub(r"^(\s{4})", '\t', dump, 0, re.MULTILINE))

scripts/build_js.py

@@ -41,6 +41,7 @@ def make():
   base.create_dir(out_dir)
 
   # builder
+  base.cmd_in_dir(base_dir + "/../web-apps/translation", "python", ["merge_and_check.py"])
   build_interface(base_dir + "/../web-apps/build")
   build_sdk_builder(base_dir + "/../sdkjs/build")
   base.create_dir(out_dir + "/builder")
@@ -168,6 +169,7 @@ def build_js_develop(root_dir):
   _run_npm(root_dir + external_folder + "/web-apps/build")
   _run_npm_ci(root_dir + external_folder + "/web-apps/build/sprites")
   _run_grunt(root_dir + external_folder + "/web-apps/build/sprites", [])
+  base.cmd_in_dir(root_dir + external_folder + "/web-apps/translation", "python", ["merge_and_check.py"])
 
   old_cur = os.getcwd()
   old_product_version = base.get_env("PRODUCT_VERSION")

scripts/core_common/modules/hunspell.py

@@ -3,6 +3,11 @@ sys.path.append('../../../scripts')
 import base
 import os
 
+def clean():
+  if base.is_dir("hunspell"):
+    base.delete_dir_with_access_error("hunspell")
+  return
+
 def make(build_js = True):
 
   old_cur_dir = os.getcwd()
@@ -11,6 +16,8 @@ def make(build_js = True):
   core_common_dir = base.get_script_dir() + "/../../core/Common"
 
   os.chdir(core_common_dir + "/3dParty/hunspell")
+
+  base.common_check_version("hunspell", "1", clean)
   base.cmd("python", ["./before.py"])
 
   if (build_js):

scripts/core_common/modules/v8_89.py

@@ -137,6 +137,11 @@ def make():
   else:
     base.replaceInFile("depot_tools/gclient_paths.py", "@functools.lru_cache", "")
 
+  if ("mac" == base.host_platform()):
+    if not base.is_file("v8/build/config/compiler/BUILD.gn.bak"):
+      base.copy_file("v8/build/config/compiler/BUILD.gn", "v8/build/config/compiler/BUILD.gn.bak")
+      base.replaceInFile("v8/build/config/compiler/BUILD.gn", "\"-Wloop-analysis\",", "\"-Wloop-analysis\", \"-D_Float16=short\",")
+
   if not base.is_file("v8/third_party/jinja2/tests.py.bak"):
     base.copy_file("v8/third_party/jinja2/tests.py", "v8/third_party/jinja2/tests.py.bak")
     base.replaceInFile("v8/third_party/jinja2/tests.py", "from collections import Mapping", "try:\n    from collections.abc import Mapping\nexcept ImportError:\n    from collections import Mapping")

scripts/deploy_desktop.py

@@ -102,6 +102,7 @@ def make():
 
     base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop", "", "../dictionaries")
     base.copy_dir(git_dir + "/document-templates/new", root_dir + "/converter/empty")
+    base.copy_dir(git_dir + "/desktop-apps/common/templates", root_dir + "/converter/templates")
 
     # dictionaries
     base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries")
@@ -182,6 +183,7 @@ def make():
         base.copy_file(git_dir + "/desktop-apps/win-linux/extras/projicons/" + apps_postfix + "/projicons.exe", root_dir + "/DesktopEditors.exe")
         if not isWindowsXP:
           base.copy_file(git_dir + "/desktop-apps/win-linux/extras/update-daemon/" + apps_postfix + "/updatesvc.exe", root_dir + "/updatesvc.exe")
+          base.copy_file(git_dir + "/desktop-apps/win-linux/extras/online-installer/" + apps_postfix + "/online-installer.exe", root_dir + "/online-installer.exe")
         base.copy_file(git_dir + "/desktop-apps/win-linux/" + apps_postfix + "/DesktopEditors.exe", root_dir + "/editors.exe")
         base.copy_file(git_dir + "/desktop-apps/win-linux/res/icons/desktopeditors.ico", root_dir + "/app.ico")
       elif (0 == platform.find("linux")):

scripts/deploy_server.py

@@ -114,7 +114,7 @@ def make():
     js_dir = root_dir
     base.copy_dir(base_dir + "/js/" + branding + "/builder/sdkjs", js_dir + "/sdkjs")
     base.copy_dir(base_dir + "/js/" + branding + "/builder/web-apps", js_dir + "/web-apps")
-    base.copy_file(js_dir + "/web-apps/apps/api/documents/api.js", js_dir + "/web-apps/apps/api/documents/api.js.tpl")
+    base.move_file(js_dir + "/web-apps/apps/api/documents/api.js", js_dir + "/web-apps/apps/api/documents/api.js.tpl")
     for file in glob.glob(js_dir + "/web-apps/apps/*/*/*.js.map") \
               + glob.glob(js_dir + "/web-apps/apps/*/mobile/dist/js/*.js.map"):
       base.delete_file(file)
@@ -122,7 +122,7 @@ def make():
     base.create_x2t_js_cache(converter_dir, "server")
 
     # add embed worker code
-    base.cmd_in_dir(git_dir + "/sdkjs/common/embed", "python", ["make.py", js_dir + "/web-apps/apps/api/documents/api.js"])
+    base.cmd_in_dir(git_dir + "/sdkjs/common/embed", "python", ["make.py", js_dir + "/web-apps/apps/api/documents/api.js.tpl"])
     
     # plugins
     base.create_dir(js_dir + "/sdkjs-plugins")

scripts/develop/dependence.py

@@ -904,16 +904,7 @@ def install_gruntcli():
 
 def install_mysqlserver():
   if (host_platform == 'windows'):
-    program_files = os.environ["ProgramFiles(x86)"]
-    mysql_installer_path = f"\"{program_files}\MySQL\MySQL Installer for Windows\MySQLInstallerConsole.exe\""
-    mysql_installer_params = " community install server;"
-    mysql_installer_params += "8.0.21" + ";"
-    mysql_installer_params += "x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid="
-    mysql_installer_params += "3306" + ';'
-    mysql_installer_params += "enable_tcpip=true;port=" + "3306" + ";"
-    mysql_installer_params += "rootpasswd=" + "onlyoffice"
-    mysql_installer_params += " -silent"
-    base.cmd2(mysql_installer_path, [mysql_installer_params])
+    return os.system('"' + os.environ['ProgramFiles(x86)'] + '\\MySQL\\MySQL Installer for Windows\\MySQLInstallerConsole" community install server;' + install_params['MySQLServer']['version'] + ';x64:*:type=config;openfirewall=true;generallog=true;binlog=true;serverid=' + config.option("db-port") + 'enable_tcpip=true;port=' + config.option("db-port") + ';rootpasswd=' + config.option("db-pass") + ' -silent')
   elif (host_platform == 'linux'):
     os.system('sudo kill ' + base.run_command('sudo fuser -vn tcp ' + config.option("db-port"))['stdout'])
     code = os.system('sudo ufw enable && sudo ufw allow 22 && sudo ufw allow 3306')

scripts/package_desktop.py

@@ -3,6 +3,7 @@
 
 import os
 import re
+import base
 import package_utils as utils
 import package_common as common
 import package_branding as branding
@@ -64,6 +65,7 @@ def make_windows():
   make_zip()
   make_inno()
   make_advinst()
+  make_onlineinst()
 
   utils.set_cwd(common.workspace_dir)
   return
@@ -188,6 +190,18 @@ def make_advinst():
     utils.set_summary("desktop advinst deploy", ret)
   return
 
+def make_onlineinst():
+  if not common.platform in ["windows_x64", "windows_x86"]:
+    return
+  onlineinst_file = "%s-%s-%s.exe" % ("OnlineInstaller", package_version, suffix)
+  ret = (base.move_file("online-installer.exe", onlineinst_file) != "");
+
+  # if common.deploy and ret:
+  #     utils.log_h2("desktop onlineinst deploy")
+  #     ret = s3_upload([onlineinst_file], "desktop/win/onlineinst/")
+  #     utils.set_summary("desktop onlineinst deploy", ret)
+  return
+
 #
 # macOS
 #

sln.json

@@ -90,7 +90,8 @@
     "[win,linux]desktop-apps/win-linux/ASCDocumentEditor.pro",
     
     "[win]desktop-apps/win-linux/extras/projicons/ProjIcons.pro",
-    "[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro"
+    "[win,!win_xp]desktop-apps/win-linux/extras/update-daemon/UpdateDaemon.pro",
+    "[win,!win_xp]desktop-apps/win-linux/extras/online-installer/OnlineInstaller.pro"
   ],
 
   "mobile" : [

tests/puppeteer/config_chrome.json

@@ -1,4 +0,0 @@
-{
-  "browser" : "chrome",
-  "browserUrl" : "C:/Program Files/Google/Chrome/Application/chrome.exe"
-}

tests/puppeteer/config_firefox.json

@@ -1,4 +0,0 @@
-{
-  "browser" : "firefox",
-  "browserUrl" : "C:/Program Files/Mozilla Firefox/firefox.exe"
-}

tests/puppeteer/install.py

@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-sys.path.append('../../scripts')
-import base
-import os
-
-os.environ["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"
-base.cmd("npm", ["i", "puppeteer"])

tests/puppeteer/run.py

@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-sys.path.append('../../scripts')
-import base
-import os
-import glob
-import json
-
-def get_tests_in_dir(directory):
-  files = []
-  for file in glob.glob(directory + "/*.js"):
-    if base.is_file(file):
-      files.append(file)
-    elif is_dir(file):
-      files += get_tests_in_dir(file)
-  return files
-
-params = sys.argv[1:]
-if (0 == len(params)):
-  print("use: run.py path_to_config [path_to_test]")
-  exit(0)
-
-config_path = params[0]
-test_file = "./tests"
-
-if (1 < len(params)):
-  test_file = params[1]
-
-tests_array = [test_file]
-if base.is_dir(test_file):
-  tests_array = get_tests_in_dir(test_file)
-
-config_content = "{}"
-with open(config_path, "r") as config_path_loader:
-  config_content = config_path_loader.read()
-
-print(config_content)
-
-config = json.loads(config_content)
-os.environ["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true"
-if "browser" in config:
-  print("browser: " + config["browser"])
-  os.environ["PUPPETEER_PRODUCT"] = config["browser"]
-
-if "browserUrl" in config:
-  print("browserUrl: " + config["browserUrl"])
-  os.environ["PUPPETEER_EXECUTABLE_PATH"] = config["browserUrl"]
-
-if not base.is_dir("./work_directory"):
-  base.create_dir("./work_directory")
-  base.create_dir("./work_directory/cache")
-  base.create_dir("./work_directory/downloads")
-
-for test in tests_array:
-  print("run test: " + test)
-  run_file = test + ".runned.js"
-  base.copy_file("./tester.js", run_file)
-  test_content = base.readFile(test)
-  test_content = test_content.replace("await Tester.", "Tester.")
-  test_content = test_content.replace("Tester.", "await Tester.")
-  base.replaceInFile(run_file, "\"%%CODE%%\"", test_content)
-  base.cmd("node", [run_file])
-  base.delete_file(run_file)

tests/puppeteer/tester.js

@@ -1,171 +0,0 @@
-const puppeteer = require('puppeteer')
-const pathfs = require('path')
-const fs = require('fs');
-
-function TesterImpl()
-{
-  this.browser = null;
-  this.page = null;
-  this.width = 1500;
-  this.height = 800;
-  this.pixelRatio = 1;
-
-  this.cacheDir = pathfs.resolve("./work_directory/cache");
-  this.downloadsDir = pathfs.resolve("./work_directory/downloads");
-  this.downloadCounter = 0;
-
-  this.load = async function(url)
-  {
-    const head = { x: 100, y: 200 };
-    this.browser = await puppeteer.launch({
-      headless: false,
-      product: process.env["PUPPETEER_PRODUCT"],
-      args: [
-        "--disable-infobars", 
-        `--window-size=${this.width+head.x},${this.height+head.y}`, 
-        "--disk-cache-dir=" + this.cacheDir
-      ],
-      defaultViewport : {width: this.width, height: this.height, deviceScaleFactor : this.pixelRatio }
-    });
-
-    this.page = await this.browser.newPage();
-    await this.page.setViewport({ width: this.width, height: this.height });
-    let waitObject = (process.env["PUPPETEER_PRODUCT"] === "firefox") ? { waitUntil: "networkidle0", timeout: 15000 } : {};
-    await this.page.goto(url + "&autotest=enabled", waitObject);
-    console.log("[tester] pageLoaded");
-    return this.page;
-  };
-
-  this.close = async function(nosleep)
-  {
-    if (true !== nosleep)
-      await this.waitAutosave();
-    await this.browser.close();
-  };
-
-  this.sleep = async function(ms) 
-  {
-    return await new Promise(resolve => setTimeout(resolve, ms));
-  };
-
-  this.waitEditor = async function() 
-  {
-    // TODO: wait first onEndRecalculate
-    await this.sleep(5000);
-    console.log("[tester] editorReady");
-  };
-
-  this.waitAutosave = async function() 
-  {
-    await this.sleep(5000);    
-  };
-
-  this.evaluateInMainFrame = async function(code)
-  {
-    return await this.page.evaluate(code);
-  };
-  this.evaluateInEditorFrame = async function(code)
-  {
-    const frame = await this.page.frames().find(frame => frame.name() === 'frameEditor');
-    if (!frame)
-      return;
-    return await frame.evaluate(code);
-  };
-
-  this.click = async function(id)
-  {
-    let res = await this.evaluateInEditorFrame("document.getElementById(\"" + id + "\").click(); \"[tester] clicked: " + id + "\"");
-    //console.log(res);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.mouseClick = async function(x, y, options)
-  {
-    let res = await this.page.mouse.click(x, y, options);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.eval = async function(code)
-  {
-    let res = await this.evaluateInEditorFrame(code);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.keyDown = async function(key)
-  {
-    // https://pptr.dev/api/puppeteer.keyinput
-    let res = await this.page.keyboard.down(key);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.keyUp = async function(key)
-  {
-    // https://pptr.dev/api/puppeteer.keyinput
-    let res = await this.page.keyboard.up(key);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.keyClick = async function(key)
-  {
-    // https://pptr.dev/api/puppeteer.keyinput
-    let res = await this.page.keyboard.down(key);
-    res = await this.page.keyboard.up(key);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.keyPress = async function(key)
-  {
-    // https://pptr.dev/api/puppeteer.keyinput
-    let res = await this.page.keyboard.press(key);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.input = async function(text)
-  {
-    let res = await this.page.keyboard.type(text);
-    await this.sleep(200);
-    return res;
-  };
-
-  this.downloadFile = async function(format, path)
-  {
-    const tmpDir = pathfs.resolve(this.downloadsDir, "./tmp" + this.downloadCounter++);
-    fs.mkdirSync(tmpDir);
-
-    // emulate download
-    const client = await this.page.target().createCDPSession();
-    await client.send("Page.setDownloadBehavior", {
-      behavior: "allow",
-      downloadPath: tmpDir
-    });
-
-    await this.evaluateInEditorFrame("document.querySelectorAll('[data-layout-name=\"toolbar-file\"]')[0].click();");
-    await this.sleep(200);
-    await this.evaluateInEditorFrame("document.getElementsByClassName(\"svg-format-" + format + "\")[0].click();");
-    await this.sleep(200);
-    await this.evaluateInEditorFrame("document.getElementById(\"fm-btn-return\").click();");
-
-    await this.sleep(2000);
-
-    const files = fs.readdirSync(tmpDir);
-    fs.copyFileSync(pathfs.resolve(tmpDir, "./" + files[0]), pathfs.resolve(path));
-    fs.rmSync(tmpDir, { recursive: true, force: true });
-  };
-}
-
-const Tester = new TesterImpl;
-
-try {
-  (async () => {    
-    "%%CODE%%"
-  })();
-} catch (err) {
-  console.error(err);
-}

tests/puppeteer/tests/bold.js

@@ -1,27 +0,0 @@
-Tester.load("path_to_file");
-Tester.waitEditor();
-
-// down Enter
-Tester.keyClick("Enter");
-
-// type text
-Tester.input("Hello World!");
-
-Tester.keyPress("ArrowLeft");
-Tester.keyDown("Shift");
-for (let i = 0; i < 5; i++)
-  Tester.keyPress("ArrowLeft");
-Tester.keyUp("Shift");
-
-// bold
-Tester.click("id-toolbar-btn-bold");
-// italic
-Tester.mouseClick(115, 105);
-
-// if needed
-Tester.waitAutosave();
-
-Tester.downloadFile("docx", "./work_directory/new.docx")
-Tester.downloadFile("odt", "./work_directory/new.odt")
-
-Tester.close(true);

tools/common/desktop_templates.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+
+import sys
+sys.path.append('../../scripts')
+import base
+import os
+import glob
+import base64
+
+sys.stdin.reconfigure(encoding='utf-8')
+sys.stdout.reconfigure(encoding='utf-8')
+
+def get_files(dir):
+  arr_files = []
+  for file in glob.glob(dir + "/*"):
+    if base.is_file(file):
+      arr_files.append(file)      
+    elif base.is_dir(file):
+      arr_files += get_files(file)
+  return arr_files
+
+def get_local_path(base, src_dir):
+  test1 = base.replace("\\", "/")
+  test2 = src_dir.replace("\\", "/")
+  return test2[len(test1)+1:]
+
+params = sys.argv[1:]
+
+if (3 > len(params)):
+  print("use: convert.py path_to_x2t_directory path_to_input_directory path_to_output_directory")
+  exit(0)
+
+base.configure_common_apps()
+
+x2t_directory = params[0]
+src_directory = params[1]
+dst_directory = params[2]
+
+if base.is_dir(dst_directory):
+  base.delete_dir(dst_directory)
+base.create_dir(dst_directory)
+
+src_files = get_files(src_directory)
+
+for file in src_files:
+  directory = os.path.dirname(file)
+  name = os.path.basename(file)
+  directory_out_file = dst_directory + "/" + get_local_path(src_directory, directory)
+  if not base.is_dir(directory_out_file):
+    os.makedirs(directory_out_file, exist_ok=True)
+  name_without_ext = os.path.splitext(name)[0]
+  name_ext = os.path.splitext(name)[1][1:]
+
+  dst_ext = name_ext
+  if ("docx" == name_ext) or ("dotx" == name_ext):
+    dst_ext = "dotx"
+  elif ("pptx" == name_ext) or ("potx" == name_ext):
+    dst_ext = "potx"
+  elif ("xlsx" == name_ext) or ("xltx" == name_ext):
+    dst_ext = "xltx"
+
+  dst_name = name_without_ext
+  if (len(dst_name) < 4) or (dst_name[0:4] != "[32]"):
+    dst_name = "[32]" + base64.b32encode(name_without_ext.encode("utf-8")).decode("utf-8")
+
+  dst_file = directory_out_file + "/" + dst_name + "." + dst_ext
+
+  os.makedirs(directory_out_file, exist_ok=True)
+  base.cmd_in_dir(x2t_directory, "x2t", [file, dst_file])
+
+  print(name_without_ext + " => " + dst_name)

version

@@ -1 +1 @@
-8.1.1
+8.2.0