Merge branch 'develop' into feature/appimage-build

build

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,7 +3,7 @@ name: Bug Report
 about: Report an issue with build_tools you've discovered.
 ---
 
-**Describe your problem**:
+# Describe your problem:
 
 *Be clear in your description of the problem.
 Open an issue with a descriptive title and a summary in complete sentences.*

.github/workflows/check.yml

@@ -3,9 +3,12 @@ name: Markdown check
 on:
   workflow_dispatch:
   push:
+    branches:
+      - '*'
     paths:
       - '*.md'
       - 'develop/*.md'
+      - 'scripts/**.md'
 
 jobs:
   markdownlint:
@@ -14,5 +17,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: DavidAnson/markdownlint-cli2-action@v9
         with:
-          globs: '*.md,develop/*.md'
-          separator: ','
+          globs: '*.md,develop/*.md,scripts/**.md'
+          separator: ','

.gitignore

@@ -7,3 +7,8 @@ config
 *.*~
 **~
 *.DS_Store
+scripts/license_checker/reports
+tests/puppeteer/node_modules
+tests/puppeteer/work_directory
+tests/puppeteer/package.json
+tests/puppeteer/package-lock.json

build.pro

@@ -85,6 +85,8 @@ addSubProject(epubfile,         $$CORE_ROOT_DIR/EpubFile/CEpubFile.pro,\
                                       kernel unicodeconverter graphics doctrenderer)
     addSubProject(pluginsmanager, $$CORE_ROOT_DIR/DesktopEditor/pluginsmanager/pluginsmanager.pro,\
                                       kernel)
+    addSubProject(vboxtester,     $$CORE_ROOT_DIR/DesktopEditor/vboxtester/vboxtester.pro,\
+                                      kernel)
 }
 
 !no_tests {

scripts/base.py

@@ -633,9 +633,15 @@ def qt_config(platform):
   if config.check_option("module", "mobile"):
     config_param += " support_web_socket"
 
+  is_disable_pch = False
   if ("ios" == platform):
-    config_param += " disable_precompiled_header"
+    is_disable_pch = True
   if (0 == platform.find("android")):
+    is_disable_pch = True
+  if not config.check_option("config", "debug"):
+    is_disable_pch = True
+
+  if is_disable_pch:
     config_param += " disable_precompiled_header"
 
   if ("linux_arm64" == platform):
@@ -1070,6 +1076,10 @@ def mac_correct_rpath_x2t(dir):
     cmd("chmod", ["-v", "+x", "./pluginsmanager"])
     cmd("install_name_tool", ["-add_rpath", "@executable_path", "./pluginsmanager"], True)
     mac_correct_rpath_binary("./pluginsmanager", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network"])
+  if is_file("./vboxtester"):
+    cmd("chmod", ["-v", "+x", "./vboxtester"])
+    cmd("install_name_tool", ["-add_rpath", "@executable_path", "./vboxtester"], True)
+    mac_correct_rpath_binary("./vboxtester", ["icudata.58", "icuuc.58", "UnicodeConverter", "kernel", "kernel_network"])
   os.chdir(cur_dir)
   return
 

scripts/deploy_core.py

@@ -59,6 +59,7 @@ def make():
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "standardtester")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "x2ttester")
     base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "ooxml_crypt")
+    base.copy_exe(core_build_dir + "/bin/" + platform_postfix, archive_dir, "vboxtester")
 
 
     if base.is_file(archive_dir + ".7z"):

scripts/develop/dependence.py

@@ -174,7 +174,7 @@ def check_nodejs():
   nodejs_min_version_major = int(major_minor_min_version[0])
   if len(major_minor_min_version) > 1:
     nodejs_min_version_minor = int(major_minor_min_version[1])
-  nodejs_max_version = '14'
+  nodejs_max_version = '18'
   nodejs_max_version_minor = float("inf")
   major_minor_max_version = nodejs_max_version.split('.')
   nodejs_max_version_major = int(major_minor_max_version[0])
@@ -182,7 +182,7 @@ def check_nodejs():
     nodejs_max_version_minor = int(major_minor_max_version[1])
 
   if (nodejs_min_version_major > nodejs_cur_version_major or nodejs_cur_version_major > nodejs_max_version_major):
-    print('Installed Node.js version must be 14.14 to 14.x')
+    print('Installed Node.js version must be 14.14 to 18.x')
     isNeedReinstall = True
   elif (nodejs_min_version_major == nodejs_cur_version_major):
     if (nodejs_min_version_minor > nodejs_cur_version_minor):

scripts/develop/print_repositories.py

@@ -35,8 +35,12 @@ config.parse_defaults()
 repositories = base.get_repositories()
 
 # Add other repositories
+if (config.check_option("module", "desktop")):
+  repositories['appimage-desktopeditors'] = [False, False]
+
 if config.check_option("module", "builder"):
   repositories['document-builder-package'] = [False, False]
+  repositories['appimage-documentbuilder'] = [False, False]
 
 if (config.check_option("module", "server")):
   repositories['document-server-package'] = [False, False]

scripts/license_checker/Readme.md

@@ -0,0 +1,179 @@
+# license_checker
+
+## Overview
+
+**license_checker** allow you to automatically check
+licenses inside specified code files.
+
+## How to use
+
+### Running
+
+**Note**: Pyhton 3.9 and above required
+(otherwise `TypeError: 'type' object is not subscriptable`)
+
+* Linux
+
+  ```bash
+  python3 license_checker.py
+  ```
+
+* Windows
+
+  ```bash
+  python license_checker.py
+  ```
+
+## How to configure
+
+The checker settings are specified in the `config.json`.
+The path to the license template is indicated there.
+
+### How to specify a license template
+
+The license template is a plain text
+file where the license text is indicated
+as you would like to see the license at
+the beginning of the file.
+
+### How to configure `config.json`
+
+#### Сonfig parameters
+
+* `basePath` specifies which folder the
+paths will be relative to.
+**For example:**
+
+  ```json
+  "basePath": "../../../"
+  ```
+
+* `reportFolder` specifies in which folder to
+save text files with reports.
+**For example:**
+
+  ```json
+  "reportFolder": "build_tools/scripts/license_checker/reports"
+  ```
+
+* `licensePath` specifies the path to the license template.
+**For example:**
+
+  ```json
+  "licensePath": "build_tools/scripts/license_checker/license_template.txt"
+  ```
+
+* `printChecking` specifies whether to output
+information about which file is
+being checked to the console.
+**For example:**
+
+  ```json
+  "printChecking": false
+  ```
+
+* `printReports` specifies whether to output
+reports to the console.
+**For example:**
+
+  ```json
+  "printReports": false
+  ```
+
+* `fix` specifies which categories of reports
+should be repaired automatically.
+Possible array values:
+`"OUTDATED"`,
+`"NO_LICENSE"`,
+`"INVALID_LICENSE"`,
+`"LEN_MISMATCH"`.
+**For example:**
+
+  ```json
+  "fix": ["OUTDATED", "NO_LICENSE"],
+  ```
+
+  Automatically repair files where the license is outdated or not found.
+
+* `configs` license check and repair configurations.
+
+  * `dir` folder to check.
+  **For example:**
+
+    ```json
+    "dir": "sdkjs"
+    ```
+
+  * `fileExtensions` file extensions to check.
+  **For example:**
+
+    ```json
+    "fileExtensions": [".js"]
+    ```
+  
+  * `startMultiComm` the line that starts the multiline comment.
+  **For example:**
+
+    ```json
+    "startMultiComm": "/*"
+    ```
+
+  * `endMultiComm` the line that ends the multiline comment.
+  You should carefully consider the formatting
+  of the string, all spaces are taken into account.
+  This affects how the license check works.
+  **For example:**
+
+    ```json
+    "endMultiComm": " */"
+    ```
+
+    Space at the beginning for a prettier comment.
+
+  * `prefix` the line on which each comment
+  line will begin, except for the
+  beginning and end.
+  **For example:**
+
+      ```json
+      "prefix": " *"
+      ```
+
+      Space at the beginning for a prettier comment.
+  * `ignoreListDir` folder paths to ignore.
+  **For example:**
+
+    ```json
+    "ignoreListDir": [
+      "sdkjs/deploy",
+      "sdkjs/develop",
+      "sdkjs/configs",
+      "sdkjs/common/AllFonts.js",
+      "sdkjs/slide/themes/themes.js"
+    ]
+    ```
+
+  * `ignoreListDirName` folder names to ignore.
+  **For example:**
+
+    ```json
+    "ignoreListDirName": [
+      "node_modules",
+      "vendor"
+    ]
+    ```
+
+  * `ignoreListFile` file paths to ignore.
+  **For example:**
+
+    ```json
+    "ignoreListFile": [
+      "sdkjs/develop/awesomeFileToIgnore.js",
+    ]
+    ```
+
+  Any number of configurations can be
+  specified, they can overlap
+  if we need to check
+  files in the same folder in different ways.
+

scripts/license_checker/config.json

@@ -0,0 +1,223 @@
+{
+	"basePath": "../../../",
+	"reportFolder": "build_tools/scripts/license_checker/reports",
+	"licensePath": "build_tools/scripts/license_checker/header.license",
+	"printChecking": false,
+	"printReports": false,
+	"fix": ["OUTDATED"],
+	"configs": [
+		{
+			"dir": "core",
+			"fileExtensions": [".h", ".c", ".hpp", ".cpp", ".hxx", ".cxx", ".cs", ".js", ".m", ".mm", ".license"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"core/build",
+				"core/Common/cfcpp/test",
+				"core/Common/js",
+				"core/DesktopEditor/agg-2.4",
+				"core/DesktopEditor/cximage",
+				"core/DesktopEditor/freetype_names/freetype-2.5.3",
+				"core/DesktopEditor/freetype-2.5.2",
+				"core/DesktopEditor/freetype-2.10.4",
+				"core/DesktopEditor/raster/JBig2",
+				"core/DesktopEditor/raster/Jp2",
+				"core/DesktopEditor/xml/libxml2",
+				"core/DesktopEditor/xmlsec",		
+				"core/DjVuFile/libdjvu",
+				"core/DjVuFile/wasm",
+				"core/EpubFile",
+				"core/OOXML/PPTXFormat/Limit/pri",
+				"core/Fb2File",
+				"core/HtmlFile2",
+				"core/HtmlFile2",
+				"core/OdfFile/Common/utf8cpp",
+				"core/OfficeUtils/js/emsdk",
+				"core/OfficeUtils/src/zlib-1.2.11",
+				"core/PdfFile/lib",
+				"core/UnicodeConverter/icubuilds-mac",
+				"core/UnicodeConverter/icubuilds-win32"
+			],
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor",
+				"3dParty"
+			],
+			"ignoreListFile": [
+				"core/Test/CoAuthoring/settings.js",
+				"core/OdfFile/Projects/Linux/precompiled.h",
+				"core/MsBinaryFile/Projects/XlsFormatLib/Linux/precompiled.h"
+			],
+			"allowListFile": [
+				"core/DesktopEditor/freetype_names/FontMaps/FontMaps.cpp",
+				"core/Common/3dParty/openssl/test/main.cpp ",
+				"core/Common/3dParty/openssl/common/common_openssl.h",
+				"core/Common/3dParty/openssl/common/common_openssl.cpp"
+			]
+		},
+		{
+			"dir": "core-ext",
+			"fileExtensions": [".h", ".c", ".hpp", ".cpp", ".hxx", ".cxx", ".m", ".mm"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"core-ext/AutoTester",
+				"core-ext/cell_android",
+				"core-ext/cell_android",
+				"core-ext/desktop-sdk-private",
+				"core-ext/docbuilder",
+				"core-ext/Registration",
+				"core-ext/slide_android",
+				"core-ext/test",
+				"core-ext/word_android",
+				"core-ext/word_ios"
+			],
+			"ignoreListFile": [
+				"core-ext/native_base/json.hpp",
+				"core-ext/native_base/android_base/libeditors/src/main/cpp/workaround/swab/swab.h"
+			]
+			
+		},
+		{
+			"dir": "sdkjs",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"sdkjs/deploy",
+				"sdkjs/develop",
+				"sdkjs/configs"
+			],
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor"
+			],
+			"ignoreListFile": [
+				"sdkjs/common/externs/jquery-3.2.js",
+				"sdkjs/common/externs/socket.io.js",
+				"sdkjs/common/Native/jquery_native.js",
+				"sdkjs/common/AllFonts.js",
+				"sdkjs/slide/themes/themes.js"
+			]
+		},
+		{
+			"dir": "sdkjs-forms",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor"
+			]
+		},
+		{
+			"dir": "sdkjs-ooxml",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor"
+			]
+		},
+		{
+			"dir": "web-apps",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor",
+				"search"
+			],
+			"ignoreListDir": [
+				"web-apps/apps/common/mobile",
+				"web-apps/apps/documenteditor/mobile",
+				"web-apps/apps/spreadsheeteditor/mobile",
+				"web-apps/apps/presentationeditor/mobile",
+				"web-apps/build/plugins/grunt-inline"
+			],
+			"ignoreListFile": [
+				"web-apps/apps/api/documents/api.js",
+				"web-apps/apps/common/main/lib/mods/perfect-scrollbar.js",
+				"web-apps/apps/common/main/lib/core/application.js",
+				"web-apps/apps/common/main/lib/core/keymaster.js",
+				"web-apps/apps/presentationeditor/embed/resources/less/watch.js"
+			]
+		},
+		{
+			"dir": "web-apps-mobile",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDirName": [
+				"node_modules",
+				"vendor"
+			]
+		},
+		{
+			"dir": "server",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"server/FileConverter/bin"
+			],
+			"ignoreListDirName": [
+				"node_modules"
+			]
+		},
+		{
+			"dir": "server-lockstorage",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"server/FileConverter/bin"
+			],
+			"ignoreListDirName": [
+				"node_modules"
+			]
+		},
+		{
+			"dir": "server-license",
+			"fileExtensions": [".js"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDir": [
+				"server/FileConverter/bin"
+			],
+			"ignoreListDirName": [
+				"node_modules"
+			]
+		},
+		{
+			"dir": "editors-ios",
+			"fileExtensions": [".h", ".c", ".hpp", ".cpp", ".hxx", ".cxx", ".m", ".mm"],
+			"startMultiComm": "/*",
+			"endMultiComm": " */",
+			"prefix": " *",
+			"ignoreListDirName": [
+				"vendor",
+				"Vendor",
+				"3dParty"
+			],
+			"allowListFile": [
+				"editors-ios/Vendor/ThreadSafeMutable/ThreadSafeMutableArray.h",
+				"editors-ios/Vendor/ThreadSafeMutable/ThreadSafeMutableArray.m",
+				"editors-ios/Vendor/ThreadSafeMutable/ThreadSafeMutableDictionary.h",
+				"editors-ios/Vendor/ThreadSafeMutable/ThreadSafeMutableDictionary.m"
+			]
+		}
+	]
+}

scripts/license_checker/header.license

@@ -0,0 +1,28 @@
+(c) Copyright Ascensio System SIA 2010-2023
+
+This program is a free software product. You can redistribute it and/or
+modify it under the terms of the GNU Affero General Public License (AGPL)
+version 3 as published by the Free Software Foundation. In accordance with
+Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+that Ascensio System SIA expressly excludes the warranty of non-infringement
+of any third-party rights.
+
+This program is distributed WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+
+You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+street, Riga, Latvia, EU, LV-1050.
+
+The  interactive user interfaces in modified source and object code versions
+of the Program must display Appropriate Legal Notices, as required under
+Section 5 of the GNU AGPL version 3.
+
+Pursuant to Section 7(b) of the License you must retain the original Product
+logo when distributing the program. Pursuant to Section 7(e) we decline to
+grant you any rights under trademark law for use of our trademarks.
+
+All the Product's GUI elements, including illustrations and icon sets, as
+well as technical writing content are licensed under the terms of the
+Creative Commons Attribution-ShareAlike 4.0 International. See the License
+terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode

scripts/license_checker/license_checker.py

@@ -0,0 +1,360 @@
+import os
+import re
+import enum
+import json
+import codecs
+
+CONFIG_PATH = 'config.json'
+
+class ErrorType(enum.Enum):
+	INVALID_LICENSE = 1
+	NO_LICENSE = 2
+	OUTDATED = 3
+	LEN_MISMATCH = 4
+
+FIX_TYPES = {
+	'OUTDATED': ErrorType.OUTDATED,
+	'NO_LICENSE': ErrorType.NO_LICENSE,
+	'INVALID_LICENSE': ErrorType.INVALID_LICENSE,
+	'LEN_MISMATCH': ErrorType.LEN_MISMATCH
+}
+
+class Config(object):
+	"""
+	License checker configuration.
+	Attributes:
+		dir: Directory to check.
+		fileExtensions: file extensions to check.
+		startMultiComm: characters to start a multi-line comment.
+		endMultiComm: characters to end a multi-line comment.
+		prefix: prefix for multiline comments
+		ignoreListDir: Ignored folder paths.
+		ignoreListDirName: Ignored folder names.
+		ignoreListFile: Ignored file paths.
+		allowListFile: allow file paths.
+	"""
+	def __init__(self,
+		dir: str,
+		fileExtensions: list[str],
+		startMultiComm: str,
+		endMultiComm: str,
+		prefix: str = '',
+		allowListFile: list[str] = [],
+		ignoreListDir: list[str] = [],
+		ignoreListDirName: list[str] = [],
+		ignoreListFile: list[str] = []) -> None:
+
+		self._dir = dir
+		self._fileExtensions = fileExtensions
+		self._startMultiComm = startMultiComm
+		self._endMultiComm = endMultiComm
+		self._prefix = prefix
+		self._allowListFile = allowListFile
+		self._ignoreListDir = ignoreListDir
+		self._ignoreListDirName = ignoreListDirName
+		self._ignoreListFile = ignoreListFile
+
+	def getDir(self) -> str:
+		return self._dir
+	def getFileExtensions(self) -> list[str]:
+		return self._fileExtensions
+	def getStartMultiComm(self) -> str:
+		return self._startMultiComm
+	def getEndMultiComm(self) -> str:
+		return self._endMultiComm
+	def getPrefix(self) -> str:
+		return self._prefix
+	def getAllowListFile(self) -> list[str]:
+		return self._allowListFile
+	def getIgnoreListDir(self) -> list[str]:
+		return self._ignoreListDir
+	def getIgnoreListDirName(self) -> list[str]:
+		return self._ignoreListDirName
+	def getIgnoreListFile(self) -> list[str]:
+		return self._ignoreListFile
+
+with open(CONFIG_PATH, 'r') as j:
+	_json: dict = json.load(j)
+	BASE_PATH: str = _json.get('basePath') or '../../../'
+	REPORT_FOLDER: str = _json.get('reportFolder') or 'build_tools/scripts/license_checker/reports'
+	LICENSE_TEMPLATE_PATH: str = _json.get('licensePath') or 'build_tools/scripts/license_checker/header.license'
+	if (_json.get('fix')):
+		try:
+			FIX: list[ErrorType] = list(map(lambda x: FIX_TYPES[x], _json.get('fix')))
+		except KeyError:
+			raise Exception(f'KeyError. "fix" cannot process value. It must be an array of strings. Check {CONFIG_PATH}. Possible array values: "OUTDATED", "NO_LICENSE", "INVALID_LICENSE", "LEN_MISMATCH"')
+	else:
+		FIX = False
+	PRINT_CHECKING: bool = _json.get('printChecking')
+	PRINT_REPORTS: bool = _json.get('printReports')
+	CONFIGS: list[Config] = []
+	for i in _json.get('configs'):
+		CONFIGS.append(Config(**i))
+
+os.chdir(BASE_PATH)
+
+with open(LICENSE_TEMPLATE_PATH, 'r') as f:
+	LICENSE: list[str] = f.readlines()
+	if not LICENSE:
+		raise Exception(f'Error getting license template. Cannot read {LICENSE_TEMPLATE_PATH} file. Is not it empty?')	
+
+def getLicense(start: str, prefix: str, end: str) -> list[str]:
+	"""Returns a valid license for any kind of comment prefix."""
+	result = [start]
+	for i in LICENSE:
+		if i == '\n':
+			result.append(prefix)
+		else:
+			result.append(f'{" ".join([prefix, i.strip()])}')
+	result.append(prefix)
+	result.append(end)
+	return result
+
+class Error(object):
+	def __init__(self, errorType: ErrorType) -> None:
+		self._errorType = errorType
+		self._errorMessages = {
+			ErrorType.INVALID_LICENSE: 'Detected license is invalid',
+			ErrorType.NO_LICENSE: 'The license was not found',
+			ErrorType.OUTDATED: 'Detected license is outdated',
+			ErrorType.LEN_MISMATCH: 'Detected license length does not match pattern'
+		}
+	def getErrorType(self) -> ErrorType:
+		return self._errorType
+	def getErrorMessage(self) -> str:
+		return self._errorMessages.get(self._errorType)
+		
+class Report(object):
+	def __init__(self, pathToFile: str, error: Error, message:str = '') -> None:
+		self._pathToFile = pathToFile
+		self._error = error
+		self._message = message
+	def getPathToFile(self) -> str:
+		return self._pathToFile
+	def getError(self) -> Error:
+		return self._error
+	def getMessage(self) -> str:
+		return self._message
+	def report(self) -> str:
+		return f'{self.getPathToFile()}: {self.getError().getErrorMessage()}. {self.getMessage()}.'
+
+class Checker(object):
+	def __init__(self, config: Config) -> None:
+		self._config = config
+		self._reports: list[Report] = []
+	def getReports(self):
+		return self._reports
+	def getLicense(self):
+		return getLicense(start=self._config.getStartMultiComm(), prefix=self._config.getPrefix(), end=self._config.getEndMultiComm())
+	def _checkLine(self, line: str, prefix: str) -> bool:
+		"""Checks if a line has a prefix."""
+		"""Trim to catch invalid license without leading spaces"""
+		prefix = prefix.lstrip()
+		if (re.search(re.escape(prefix), line)):
+			return True
+		else:
+			return False
+	def findLicense(self, lines: list[str]) -> list[str]:
+		"""Looks for consecutive comments in a list of strings."""
+		result = []
+		isStarted = False
+		for line in lines:
+			if line == '\n': continue
+			if (self._checkLine(line=line, prefix=self._config.getStartMultiComm())):
+				result.append(line)
+				isStarted = True
+			elif(self._checkLine(line=line, prefix=self._config.getEndMultiComm())):
+				result.append(line)
+				break
+			elif (isStarted):
+				result.append(line)
+			else:
+				break
+		return result
+	def _checkLicense(self, test: list[str], pathToFile: str) -> Report:
+		license = self.getLicense()
+		if len(license) != len(test):
+			return Report(pathToFile=pathToFile,
+				error=Error(errorType=ErrorType.LEN_MISMATCH),
+				message=f'Found {len(test)} lines, expected {len(license)}')
+		invalidLinesCount = 0
+		lastWrongLine = 0
+		for i in range(len(license)):
+			if (license[i] != test[i].strip('\n')):
+				invalidLinesCount += 1
+				lastWrongLine = i
+		if (invalidLinesCount == 1):
+			r = r'\d\d\d\d\-\d\d\d\d'
+			testDate = re.search(r, test[lastWrongLine])
+			licenseDate = re.search(r, license[lastWrongLine])
+
+			if testDate and licenseDate:
+				testDate = testDate.group()
+				licenseDate = licenseDate.group()
+			else:
+				return Report(pathToFile=pathToFile,
+				error=Error(errorType=ErrorType.INVALID_LICENSE),
+				message=f'Something wrong...')
+
+			testLastYear = testDate.split('-')[1]
+			licenseLastYear = licenseDate.split('-')[1]
+			if (int(testLastYear) < int(licenseLastYear)):
+				return Report(pathToFile=pathToFile,
+					error=Error(errorType=ErrorType.OUTDATED),
+					message=f'Found date {testDate}, expected {licenseDate}')
+			else:
+				return Report(pathToFile=pathToFile,
+					error=Error(errorType=ErrorType.INVALID_LICENSE),
+					message=f"Found something similar to the date: {testDate}, but it's not correct. Expected: {licenseDate}")
+		elif (invalidLinesCount > 0):
+			return Report(pathToFile=pathToFile,
+				error=Error(errorType=ErrorType.INVALID_LICENSE),
+				message=f'Found {invalidLinesCount} wrong lines out of {len(license)}')
+	def checkFile(self, pathToFile: str) -> None:
+		"""Checks a file for a valid license."""
+		with open(pathToFile, 'r', encoding="utf-8-sig") as file:
+			test = self.findLicense(lines=file.readlines())
+			if test:
+				result = self._checkLicense(test=test, pathToFile=pathToFile)
+				if result:
+					self._reports.append(result)
+			else:
+				self._reports.append(Report(pathToFile=pathToFile, error=Error(errorType=ErrorType.NO_LICENSE)))
+		return
+
+class Walker(object):
+	def __init__(self, config: Config) -> None:
+		self._config = config
+		self._checker = Checker(config=self._config)
+	def getChecker(self):
+		return self._checker
+	def getConfig(self):
+		return self._config
+	def _getFiles(self) -> list[str]:
+		result = []
+		for address, dirs, files in os.walk(self._config.getDir()):
+			for i in files:
+				if (os.path.join(address, i) in list(map(lambda x: os.path.normpath(x), self._config.getAllowListFile()))):
+					filename, file_extension = os.path.splitext(i)
+					if file_extension in self._config.getFileExtensions():
+						result.append(os.path.join(address, i))
+			else:
+				for i in self._config.getIgnoreListDirName():
+					if(re.search(re.escape(i), address)):
+						break
+				else:
+					for i in self._config.getIgnoreListDir():
+						if(re.search(re.escape(os.path.normpath(i)), address)):
+							break
+					else:
+						for i in files:
+							if not (os.path.join(address, i) in list(map(lambda x: os.path.normpath(x), self._config.getIgnoreListFile()))):
+								filename, file_extension = os.path.splitext(i)
+								if file_extension in self._config.getFileExtensions():
+									result.append(os.path.join(address, i))
+		return result
+	def checkFiles(self) -> list[Report]:
+		files = self._getFiles()
+		for file in files:
+			if (PRINT_CHECKING):
+				print(f'Checking {file}...')
+			# self._checker.checkFile(file)
+			try:
+				self._checker.checkFile(file)
+			except Exception as e:
+				print(file)	
+				print(e)			
+		return self._checker.getReports()
+
+class Fixer(object):
+	def __init__(self, walker: Walker) -> int:
+		self._walker = walker
+		self._checker = self._walker.getChecker()
+		self._config = self._walker.getConfig()
+	def fix(self):
+		count = 0
+		for report in self._checker.getReports():
+			if ((not FIX and report.getError().getErrorType() == ErrorType.NO_LICENSE) or (report.getError().getErrorType() == ErrorType.NO_LICENSE and report.getError().getErrorType() in FIX)):
+				self._addLicense(report.getPathToFile())
+				count += 1
+			elif ((not FIX and report.getError().getErrorType() != ErrorType.NO_LICENSE) or (report.getError().getErrorType() != ErrorType.NO_LICENSE and report.getError().getErrorType() in FIX)):
+				self._fixLicense(report.getPathToFile())
+				count += 1
+		return count
+	def _addLicense(self, pathToFile: str):
+		buffer = []
+		with open(pathToFile, 'r', encoding="utf8") as file:
+			buffer = file.readlines()
+		with open(pathToFile, 'w', encoding="utf8") as file:
+			license = self._checker.getLicense()
+			file.writelines(map(lambda x: "".join([x, '\n']), license))
+			file.writelines(buffer)
+		return
+	def _fixLicense(self, pathToFile: str):
+		buffer = []
+		writeEncoding = "utf8"
+		with open(pathToFile, 'r', encoding="utf8") as file:
+			buffer = file.readlines()
+			if buffer and buffer[0].startswith(codecs.decode(codecs.BOM_UTF8)):
+				writeEncoding = "utf-8-sig"
+			oldLicense = self._checker.findLicense(buffer)
+			for i in oldLicense:
+				buffer.remove(i)
+		with open(pathToFile, 'w', encoding=writeEncoding) as file:
+			license = self._checker.getLicense()
+			file.writelines(map(lambda x: "".join([x, '\n']), license))
+			file.writelines(buffer)
+		return
+
+
+walkers: list[Walker] = []
+reports: list[Report] = []
+
+def fix(walkers):
+	count = 0
+	if FIX:
+		print(f'Fixing selected files...')
+	else:
+		print(f'Fixing all {len(reports)} files...')
+	for walker in walkers:
+		fixer = Fixer(walker=walker)
+		count += fixer.fix()
+	print(f'Fixed {count} files.')
+
+def writeReports(reports: list[Report]) -> None:
+	files: dict[str, list[Report]] = dict()
+	for i in ErrorType:
+		files[i.name] = []
+	for i in reports:
+		files[i.getError().getErrorType().name].append(i)
+	for i in ErrorType:
+		with open(f'{REPORT_FOLDER}/{i.name}.txt', 'w') as f:
+			f.writelines(map(lambda x: "".join([x.report(), '\n']), files.get(i.name)))
+
+for config in CONFIGS:
+	walkers.append(Walker(config=config))
+
+print('Checking files...')
+
+for walker in walkers:
+	reports = reports + walker.checkFiles()
+
+if reports:
+	if not os.path.exists(REPORT_FOLDER):
+		os.mkdir(REPORT_FOLDER)
+	if PRINT_REPORTS:
+		print('\n'.join(map(lambda report: report.report(), reports)))
+	print(f'{len(reports)} invalid licenses were found.')
+	print(f'Saving reports in {REPORT_FOLDER}')
+	writeReports(reports=reports)
+	if FIX:
+		fix(walkers=walkers)
+	# else:
+		# choice = str(input(f'Fix it automatically? [Y/N] ')).lower()
+		# if choice == 'y':
+			# fix(walkers=walkers)
+else:
+	print('All licenses are ok.')
+
+# os.system('pause')
+

scripts/package_builder.py

@@ -9,6 +9,8 @@ def make():
   utils.log_h1("BUILDER")
   if utils.is_windows():
     make_windows()
+  elif utils.is_macos():
+    make_macos()
   elif utils.is_linux():
     make_linux()
   else:
@@ -118,6 +120,36 @@ def make_inno():
     utils.set_summary("builder inno deploy", ret)
   return
 
+def make_macos():
+  company = branding.company_name.lower()
+  product = branding.builder_product_name.replace(" ","").lower()
+  source_dir = "build_tools/out/%s/%s/%s" % (common.prefix, company, product)
+  arch_list = {
+    "darwin_x86_64": "x86_64",
+    "darwin_arm64": "arm64"
+  }
+  suffix = arch_list[common.platform]
+  builder_tar = "../%s-%s-%s-%s-%s.tar.xz" % \
+    (company, product, common.version, common.build, suffix)
+
+  utils.set_cwd(source_dir)
+
+  if common.clean:
+    utils.log_h2("builder clean")
+    utils.delete_files("../*.tar*")
+
+  utils.log_h2("builder build")
+  ret = utils.sh("tar --xz -cvf %s *" % builder_tar, creates=builder_tar, verbose=True)
+  utils.set_summary("builder build", ret)
+
+  if common.deploy and ret:
+    utils.log_h2("builder deploy")
+    ret = aws_s3_upload([builder_tar], "mac/", "Portable")
+    utils.set_summary("builder deploy", ret)
+
+  utils.set_cwd(common.workspace_dir)
+  return
+
 def make_linux():
   utils.set_cwd("document-builder-package")
 
@@ -165,5 +197,27 @@ def make_linux():
       if "rpm" in branding.builder_make_targets:
         utils.set_summary("builder rpm deploy", False)
 
+  utils.set_cwd(common.workspace_dir)
+
+  make_appimage()
+  return
+
+def make_appimage():
+  if not onlyoffice:
+    return
+  if not utils.is_file("document-builder-package/deb/onlyoffice-documentbuilder_%s-%s_amd64.deb" % (common.version, common.build))
+    return
+
+  utils.set_cwd("appimage-documentbuilder")
+
+  rc = utils.sh("make clean", verbose=True)
+  common.summary["builder appimage clean"] = rc
+
+  # args = []
+  # if common.platform == "linux_aarch64":
+  #   args += ["-e", "UNAME_M=aarch64"]
+  rc = utils.sh("make testing", verbose=True)
+  common.summary["builder appimage build"] = rc
+
   utils.set_cwd(common.workspace_dir)
   return

scripts/package_core.py

@@ -71,6 +71,7 @@ def deploy_closure_maps(license):
     utils.log_err("BRANCH_NAME variable is undefined")
     utils.set_summary("closure maps " + license + " deploy", False)
     return
+
   if not maps:
     utils.log_err("files do not exist")
     utils.set_summary("closure maps " + license + " deploy", False)

scripts/package_desktop.py

@@ -239,7 +239,7 @@ def make_update_files():
 
   changes_dir = common.workspace_dir + "\\" + utils.get_path(branding.desktop_changes_dir) + "\\" + common.version
 
-  if common.deploy:
+  if common.deploy and utils.glob_path(changes_dir + "\\*.html"):
     utils.log_h2("desktop update files deploy")
     ret = aws_s3_upload(
         utils.glob_path(changes_dir + "\\*.html"),
@@ -601,5 +601,27 @@ def make_linux():
       if "urpmi" in branding.desktop_make_targets:
         utils.set_summary("desktop urpmi deploy", False)
 
+  utils.set_cwd(common.workspace_dir)
+
+  make_appimage()
+  return
+
+def make_appimage():
+  if not onlyoffice:
+    return
+  if not utils.is_file("desktop-apps/win-linux/package/linux/deb/onlyoffice-desktopeditors_%s-%s_amd64.deb" % (common.version, common.build))
+    return
+
+  utils.set_cwd("appimage-desktopeditors")
+
+  rc = utils.sh("make clean", verbose=True)
+  common.summary["desktop appimage clean"] = rc
+
+  # args = []
+  # if common.platform == "linux_aarch64":
+  #   args += ["-e", "UNAME_M=aarch64"]
+  rc = utils.sh("make testing", verbose=True)
+  common.summary["desktop appimage build"] = rc
+
   utils.set_cwd(common.workspace_dir)
   return

tests/puppeteer/config_chrome.json

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

tests/puppeteer/config_firefox.json

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

tests/puppeteer/install.py

@@ -0,0 +1,9 @@
+#!/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

@@ -0,0 +1,64 @@
+#!/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

@@ -0,0 +1,171 @@
+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

@@ -0,0 +1,27 @@
+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/README.md

@@ -1,10 +1,10 @@
-## Overview
+# Overview
 
-**change_autor.py** is a tool for change autor and last modifiend in all documents in folder. 
+**change_autor.py** is a tool for change autor and last modifiend in all documents in folder.
 
 ## How to use
 
-1. Place the files to be changed in a folder, e.g. **input**. 
+1. Place the files to be changed in a folder, e.g. **input**.
 2. Create a folder in which the modified files will be stored, e.g. **output**.
 3. Call the file *change_autor.py* as shown below.
 
@@ -17,10 +17,11 @@ ________________________
 
 ## How to use
 
-1. Place the files to be changed in a folder, e.g. **input**. 
+1. Place the files to be changed in a folder, e.g. **input**.
 2. Create a folder in which the converted files will be stored, e.g. **output**.
 3. Call the file *convert_directory.py* as shown below.
 
 ```bash
-convert_directory.py path_to_builder_directory path_to_input_folder path_to_output_folder format_ext
+convert_directory.py path_to_builder_directory
+path_to_input_folder path_to_output_folder format_ext
 ```