version 4.7.3

PIValueTree::child(PIStringList) fix
PIJSON::new* now accept optional initial fields
2025-07-17 11:17:53 +03:00 · 2025-07-17 11:16:47 +03:00 · 2025-07-09 12:41:23 +03:00 · 2025-06-26 10:52:36 +03:00 · 2025-06-26 10:52:04 +03:00
8 changed files with 79 additions and 58 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 project(PIP)
 set(PIP_MAJOR    4)
 set(PIP_MINOR    7)
-set(PIP_REVISION 2)
+set(PIP_REVISION 3)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
@@ -45,9 +45,7 @@ ExternalProject_Add(cmake
 	set(GIT_CMAKE_DIR "${CMAKE_CURRENT_BINARY_DIR}/cmake-src")
 endif()

-if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
-	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-endif()
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT "x${GIT_CMAKE_DIR}" STREQUAL "x")
 	list(APPEND CMAKE_MODULE_PATH "${GIT_CMAKE_DIR}")
 endif()
@@ -117,7 +115,6 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 		file(GLOB_RECURSE ASRC "${SOURCES}/*.cpp" "${SOURCES}/*.c")
 		list(APPEND CPPS ${ASRC})
 	endif()
-	#message("${NAME} HS = ${HS}")
 	list(APPEND HDRS ${HS})
 	list(APPEND PHDRS ${PHS})

--- a/lang/pip_ru.btf
+++ b/lang/pip_ru.btf
--- a/lang/pip_ru.ts
+++ b/lang/pip_ru.ts
@@ -20,7 +20,7 @@
 <context>
    <name>PIFile</name>
    <message>
-        <location filename="../libs/main/io_devices/pifile.cpp" line="299"/>
+        <location filename="../libs/main/io_devices/pifile.cpp" line="300"/>
        <source>Downsize is not supported yet :-(</source>
        <translation>Уменьшение размера не поддерживается</translation>
    </message>
@@ -46,50 +46,50 @@
 <context>
    <name>PICrypt</name>
    <message>
-        <location filename="../libs/crypt/picrypt.cpp" line="205"/>
+        <location filename="../libs/crypt/picrypt.cpp" line="187"/>
        <source>internal error: bad hash size</source>
        <translation>внутренняя ошибка: плохой размер хэша</translation>
    </message>
    <message>
-        <location filename="../libs/crypt/picrypt.cpp" line="39"/>
+        <location filename="../libs/crypt/picrypt.cpp" line="35"/>
        <source>Error while initialize sodium!</source>
        <translation>Ошибка инициализации sodium!</translation>
    </message>
    <message>
-        <location filename="../libs/crypt/picrypt.cpp" line="209"/>
+        <location filename="../libs/crypt/picrypt.cpp" line="190"/>
        <source>invalid key size %1, should be %2, filled with zeros</source>
        <translation>неверный размер ключа %1, должен быть %2, заполненный нулями</translation>
    </message>
    <message>
        <location filename="../libs/crypt/picrypt.cpp" line="29"/>
        <source>Warning: PICrypt is disabled, to enable install sodium library and rebuild pip</source>
-        <translation>Предупреждение: PICrypt неактивен, для активации установите библиотеку sodium и пересоберите PIP</translation>
+        <translation type="vanished">Предупреждение: PICrypt неактивен, для активации установите библиотеку sodium и пересоберите PIP</translation>
    </message>
 </context>
 <context>
    <name>PIBinLog</name>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="436"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="438"/>
        <source>Read record error</source>
        <translation>Ошибка чтения записи</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="432"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="434"/>
        <source>End of BinLog file</source>
        <translation>Конец BinLog файла</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="776"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="778"/>
        <source>Error, can&apos;t open &quot;%1&quot;</source>
        <translation>Ошибка, невозможно открыть &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="262"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="264"/>
        <source>Creating directory &quot;%1&quot;</source>
        <translation>Создание директории &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="785"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="787"/>
        <source>Error, can&apos;t create &quot;%1&quot;</source>
        <translation>Ошибка, невозможно создать &quot;%1&quot;</translation>
    </message>
@@ -99,32 +99,32 @@
        <translation>Ошибка, Файл пуст &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="789"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="791"/>
        <source>Start join binlogs to &quot;%1&quot;</source>
        <translation>Начало слияния логов в &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="514"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="516"/>
        <source>BinLogFile has too old verion</source>
        <translation>BinLogFile очень старой версии</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="513"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="515"/>
        <source>BinLogFile has invalid version</source>
        <translation>BinLogFile неверной версии</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="515"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="517"/>
        <source>BinLogFile has too new version</source>
        <translation>BinLogFile очень новой версии</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="386"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="388"/>
        <source>Can&apos;t find record with id = %1</source>
        <translation>Невозможно найти запись с ID = %1</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="803"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="805"/>
        <source>Error, can&apos;t write to file &quot;%1&quot;</source>
        <translation>Ошибка, невозможно записать в &quot;%1&quot;</translation>
    </message>
@@ -139,12 +139,12 @@
        <translation>Предупреждение: Пустой BinLog файл &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="825"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="827"/>
        <source>Finish join binlogs, total time %1</source>
        <translation>Завершение слияния логов, общее время %1</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="440"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="442"/>
        <source>too small read buffer: %1, data size: %2</source>
        <translation>слишком маленький буфер: %1, размер данных: %2</translation>
    </message>
@@ -154,22 +154,22 @@
        <translation>Ошибка: Невозможно записать заголовок в &quot;%1&quot;</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="319"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="321"/>
        <source>Error: can`t write with id = 0! ID must be &gt; 0</source>
        <translation>Ошибка: Невозможно записать с ID = 0! ID должен быть &gt; 0</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="495"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="497"/>
        <source>BinLogFile signature is corrupted or invalid file</source>
        <translation>Неверный заголовок BinLogFile, либо файл поврежден</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="295"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="297"/>
        <source>Can&apos;t create new file, maybe path &quot;%1&quot; is invalid</source>
        <translation>Невозможно создать новый файл, возможно путь &quot;%1&quot; неверен</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="286"/>
+        <location filename="../libs/main/io_devices/pibinarylog.cpp" line="288"/>
        <source>Can&apos;t create new file, maybe LogDir &quot;%1&quot; is invalid</source>
        <translation>Невозможно создать новый файл, возможно LogDir &quot;%1&quot; неверен</translation>
    </message>
@@ -182,22 +182,22 @@
 <context>
    <name>PIOpenCL</name>
    <message>
-        <location filename="../libs/opencl/piopencl.cpp" line="509"/>
+        <location filename="../libs/opencl/piopencl.cpp" line="549"/>
        <source>Error: empty range</source>
        <translation>Ошибка: пустой диапазон</translation>
    </message>
    <message>
-        <location filename="../libs/opencl/piopencl.cpp" line="586"/>
+        <location filename="../libs/opencl/piopencl.cpp" line="626"/>
        <source>setArgValue invalid index %1</source>
        <translation>setArgValue неверный индекс %1</translation>
    </message>
    <message>
-        <location filename="../libs/opencl/piopencl.cpp" line="616"/>
+        <location filename="../libs/opencl/piopencl.cpp" line="656"/>
        <source>bindArgValue invalid index %1</source>
        <translation>bindArgValue неверный индекс %1</translation>
    </message>
    <message>
-        <location filename="../libs/opencl/piopencl.cpp" line="592"/>
+        <location filename="../libs/opencl/piopencl.cpp" line="632"/>
        <source>setArgValue set scalar to &quot;%1 %2&quot;</source>
        <translation>setArgValue устанавливается скаляр в &quot;%1 %2&quot;</translation>
    </message>
@@ -207,7 +207,7 @@
        <translation>Ошибка: Платформы OpenCL не найдены!</translation>
    </message>
    <message>
-        <location filename="../libs/opencl/piopencl.cpp" line="622"/>
+        <location filename="../libs/opencl/piopencl.cpp" line="662"/>
        <source>bindArgValue set buffer to &quot;%1 %2&quot;</source>
        <translation>bindArgValue устанавливается буфер в &quot;%1 %2&quot;</translation>
    </message>
@@ -253,47 +253,47 @@
 <context>
    <name>PIString</name>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1774"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1787"/>
        <source>B</source>
        <translation>Б</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1794"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1807"/>
        <source>EiB</source>
        <translation>ЭиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1791"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1804"/>
        <source>GiB</source>
        <translation>ГиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1789"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1802"/>
        <source>KiB</source>
        <translation>КиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1790"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1803"/>
        <source>MiB</source>
        <translation>МиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1793"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1806"/>
        <source>PiB</source>
        <translation>ПиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1792"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1805"/>
        <source>TiB</source>
        <translation>ТиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1796"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1809"/>
        <source>YiB</source>
        <translation>ЙиБ</translation>
    </message>
    <message>
-        <location filename="../libs/main/text/pistring.cpp" line="1795"/>
+        <location filename="../libs/main/text/pistring.cpp" line="1808"/>
        <source>ZiB</source>
        <translation>ЗиБ</translation>
    </message>
@@ -301,17 +301,17 @@
 <context>
    <name>PIThread</name>
    <message>
-        <location filename="../libs/main/thread/pithread.cpp" line="667"/>
+        <location filename="../libs/main/thread/pithread.cpp" line="668"/>
        <source>Warning, terminate!</source>
        <translation>Предупреждение, прекращение потока!</translation>
    </message>
    <message>
-        <location filename="../libs/main/thread/pithread.cpp" line="785"/>
+        <location filename="../libs/main/thread/pithread.cpp" line="781"/>
        <source>Error: Can`t start new thread: %1</source>
        <translation>Ошибка: Невозможно начать новый поток: %1</translation>
    </message>
    <message>
-        <location filename="../libs/main/thread/pithread.cpp" line="572"/>
+        <location filename="../libs/main/thread/pithread.cpp" line="573"/>
        <source>[PIThread &quot;%1&quot;] Warning, terminate on destructor!</source>
        <translation>[PIThread &quot;%1&quot;] Предупреждение, прекращение в деструкторе!</translation>
    </message>
@@ -358,17 +358,17 @@
 <context>
    <name>PIEthernet</name>
    <message>
-        <location filename="../libs/main/io_devices/piethernet.cpp" line="1233"/>
+        <location filename="../libs/main/io_devices/piethernet.cpp" line="1272"/>
        <source>Can`t get interfaces: %1</source>
        <translation>Невозможно получить интерфейсы: %1</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/piethernet.cpp" line="903"/>
+        <location filename="../libs/main/io_devices/piethernet.cpp" line="942"/>
        <source>Can`t accept new connection, %1</source>
        <translation>Невозможно принять новое соединение, %1</translation>
    </message>
    <message>
-        <location filename="../libs/main/io_devices/piethernet.cpp" line="1096"/>
+        <location filename="../libs/main/io_devices/piethernet.cpp" line="1135"/>
        <source>Error allocating memory needed to call GetAdaptersInfo</source>
        <translation>Ошибка выделения памяти для вызова GetAdaptersInfo</translation>
    </message>
@@ -445,12 +445,12 @@
 <context>
    <name>PISystemTime</name>
    <message>
-        <location filename="../libs/main/types/pisystemtime.cpp" line="335"/>
+        <location filename="../libs/main/types/pisystemtime.cpp" line="343"/>
        <source>fromSystemTime() Warning: null frequency</source>
        <translation>fromSystemTime() Предупреждение: нулевая частота</translation>
    </message>
    <message>
-        <location filename="../libs/main/types/pisystemtime.cpp" line="325"/>
+        <location filename="../libs/main/types/pisystemtime.cpp" line="333"/>
        <source>toSystemTime() Warning: invalid hertz: %1</source>
        <translation>toSystemTime() Предупреждение: неверная частота: %1</translation>
    </message>
@@ -510,7 +510,7 @@
 <context>
    <name>PIStreamPacker</name>
    <message>
-        <location filename="../libs/io_utils/pistreampacker.cpp" line="218"/>
+        <location filename="../libs/io_utils/pistreampacker.cpp" line="168"/>
        <source>Warning! Not recommended to use with non-reliable device</source>
        <translation>Предупреждение! Не рекомендуется использовать с ненадежными устройствами</translation>
    </message>
--- a/libs/main/io_devices/piethernet.cpp
+++ b/libs/main/io_devices/piethernet.cpp
@@ -1243,9 +1243,12 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 #		else
 			if (s != -1) {
 				struct ifreq ir;
-				strcpy(ir.ifr_name, cif->ifa_name);
+				memset(&ir, 0, sizeof(ir));
+				strncpy(ir.ifr_name, cif->ifa_name, sizeof(ir.ifr_name));
 				if (ioctl(s, SIOCGIFHWADDR, &ir) == 0) {
 					ci.mac = macFromBytes(PIByteArray(ir.ifr_hwaddr.sa_data, 6));
+				}
+				if (ioctl(s, SIOCGIFMTU, &ir) == 0) {
 					ci.mtu = ir.ifr_mtu;
 				}
 			}
--- a/libs/main/io_devices/piethernet.h
+++ b/libs/main/io_devices/piethernet.h
@@ -325,10 +325,10 @@ public:
 	//! Network interface descriptor
 	struct PIP_EXPORT Interface {
 		//! System index
-		int index;
+		int index = -1;

 		//! MTU
-		int mtu;
+		int mtu   = 0;

 		//! System name
 		PIString name;
@@ -351,6 +351,9 @@ public:
 		//! Flags of interface
 		InterfaceFlags flags;

+		//! Returns if interface is active
+		bool isValid() const { return name.isNotEmpty(); }
+
 		//! Returns if interface is active
 		bool isActive() const { return flags[PIEthernet::ifActive]; }

--- a/libs/main/serialization/pijson.cpp
+++ b/libs/main/serialization/pijson.cpp
@@ -204,16 +204,21 @@
 //!


-PIJSON PIJSON::newObject() {
+PIJSON PIJSON::newObject(const PIVariantMap & fields) {
 	PIJSON ret;
 	ret.c_type = Object;
+	auto it    = fields.makeIterator();
+	while (it.next())
+		ret[it.key()] = it.value();
 	return ret;
 }


-PIJSON PIJSON::newArray() {
+PIJSON PIJSON::newArray(const PIVariantVector & fields) {
 	PIJSON ret;
 	ret.c_type = Array;
+	for (const auto & i: fields)
+		ret << i;
 	return ret;
 }

@@ -325,6 +330,15 @@ PIJSON & PIJSON::operator<<(const PIJSON & element) {
 }


+PIJSON & PIJSON::operator<<(const PIVariant & element) {
+	c_type = Array;
+	PIJSON e;
+	e = element;
+	c_array << e;
+	return *this;
+}
+
+
 PIJSON & PIJSON::operator=(const PIJSON & v) {
 	c_type   = v.c_type;
 	c_value  = v.c_value;
--- a/libs/main/serialization/pijson.h
+++ b/libs/main/serialization/pijson.h
@@ -160,6 +160,10 @@ public:
 	//! \~russian Устанавливает тип элемента в \a PIJSON::Array и добавляет элемент в массив.
 	PIJSON & operator<<(const PIJSON & element);

+	//! \~english Set element type to \a PIJSON::Array and add element to the end of array.
+	//! \~russian Устанавливает тип элемента в \a PIJSON::Array и добавляет элемент в массив.
+	PIJSON & operator<<(const PIVariant & value);
+

 	//! \~english Returns element from map with key "key" if type is \a PIJSON::Object, otherwise returns invalid %PIJSON.
 	//! \~russian Возвращает элемент из словаря по ключу "key" если тип \a PIJSON::Object, иначе возвращает недействительный %PIJSON.
@@ -183,8 +187,8 @@ public:
 	//! \~russian Разбирает текстовое представление JSON "str" и возвращает его корневой элемент.
 	static PIJSON fromJSON(PIString str);

-	static PIJSON newObject();
-	static PIJSON newArray();
+	static PIJSON newObject(const PIVariantMap & fields = {});
+	static PIJSON newArray(const PIVariantVector & fields = {});
 	static PIJSON newString(const PIString & v = PIString());

 private:
--- a/libs/main/types/pivaluetree.cpp
+++ b/libs/main/types/pivaluetree.cpp
@@ -183,7 +183,7 @@ const PIValueTree & PIValueTree::child(const PIStringList & path) const {
 	if (_is_null || path.isEmpty()) return *this;
 	const PIValueTree * ret = &child(path[0]);
 	for (int i = 1; i < path.size_s(); ++i)
-		ret = &child(path[i]);
+		ret = &(ret->child(path[i]));
 	return *ret;
 }
Author	SHA1	Message	Date
peri4	9504792586	version 4.7.3	2025-07-17 11:17:53 +03:00
peri4	1b51d09c58	PIValueTree::child(PIStringList) fix	2025-07-17 11:16:47 +03:00
peri4	ed3d4c4217	PIJSON::new* now accept optional initial fields	2025-07-09 12:41:23 +03:00
Бычков Андрей	7b52f6d70d	fix get mtu (#186 ) Reviewed-on: #186	2025-06-26 10:52:36 +03:00
andrey.bychkov	19fe33383a	Fix cmake module path (#185 ) Если в cmake передаётся кастомная папка с cmake-модулями, например в toolchain файле, то pip перестаёт добавлять ./cmake в путь поиска модулей. Это приводит к ошибке `can't find PIPMacros.cmake`. Не очень понимаю зачем так было сделано, поэтому просто убрал условие пустого CMAKE_MODULE_PATH. Reviewed-on: #185 Co-authored-by: andrey.bychkov <andrey@signalmodelling.ru> Co-committed-by: andrey.bychkov <andrey@signalmodelling.ru>	2025-06-26 10:52:04 +03:00