frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Auxiliary commit to revert individual files from 0d9a8b8a3a4a09609a339f54c7d8a9384c561282"

Browse Source 
This reverts commit 80737d926ad151a07b2493dd1685ed502975cb2e.
This commit is contained in:
LordGrey 2023-11-06 21:41:53 +01:00
parent 0d9a8b8a3a
commit e237d08296
3 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
cmake/Dependencies.cmake
View File

@ -231,34 +231,26 @@ macro(DeployLinux TARGET)
if (EXISTS ${QT_PLUGINS_DIR}/${PLUGIN}) if (EXISTS ${QT_PLUGINS_DIR}/${PLUGIN})
file(GLOB files "${QT_PLUGINS_DIR}/${PLUGIN}/*.so") file(GLOB files "${QT_PLUGINS_DIR}/${PLUGIN}/*.so")
foreach(file ${files}) foreach(file ${files})
if ("${file}" STREQUAL "libqsqlmimer.so") get_prerequisites(${file} PLUGINS 0 1 "" "")
continue() foreach(DEPENDENCY ${PLUGINS})
else() get_filename_component(resolved ${DEPENDENCY} NAME_WE)
get_prerequisites(${file} PLUGINS 0 1 "" "") list(FIND SYSTEM_LIBS_SKIP ${resolved} _index)
foreach(DEPENDENCY ${PLUGINS}) if (${_index} GREATER -1)
get_filename_component(resolved ${DEPENDENCY} NAME_WE) continue() # Skip system libraries
list(FIND SYSTEM_LIBS_SKIP ${resolved} _index) else()
if (${_index} GREATER -1) gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file)
continue() # Skip system libraries get_filename_component(resolved_file ${resolved_file} ABSOLUTE)
else() gp_append_unique(PREREQUISITE_LIBS ${resolved_file})
gp_resolve_item("${file}" "${DEPENDENCY}" "" "" resolved_file) get_filename_component(file_canonical ${resolved_file} REALPATH)
get_filename_component(resolved_file ${resolved_file} ABSOLUTE) gp_append_unique(PREREQUISITE_LIBS ${file_canonical})
gp_append_unique(PREREQUISITE_LIBS ${resolved_file}) endif()
get_filename_component(file_canonical ${resolved_file} REALPATH) endforeach()
gp_append_unique(PREREQUISITE_LIBS ${file_canonical})
endif() install(
endforeach() FILES ${file}
endif() DESTINATION "share/hyperion/lib/${PLUGIN}"
if ("${file}" STREQUAL "libqsqlmimer.so") COMPONENT "Hyperion"
continue() )
else()
install(
FILES ${file}
DESTINATION "share/hyperion/lib/${PLUGIN}"
COMPONENT "Hyperion"
)
endif()
endforeach() endforeach()
endif() endif()
endforeach() endforeach()

BIN
help/db/hyperion.db
View File

Binary file not shown.

4
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -36,8 +36,6 @@ void JsonClientConnection::readRequest()
// remove message data from buffer // remove message data from buffer
_receiveBuffer = _receiveBuffer.mid(bytes); _receiveBuffer = _receiveBuffer.mid(bytes);
std::cout << "JsonClientConnection::readRequest | [" << _socket->peerAddress().toString().toStdString() << "] Received: [" << message.toStdString() << "]" << std::endl;
// handle message // handle message
_jsonAPI->handleMessage(message); _jsonAPI->handleMessage(message);
@ -51,8 +49,6 @@ qint64 JsonClientConnection::sendMessage(QJsonObject message)
QJsonDocument writer(message); QJsonDocument writer(message);
QByteArray data = writer.toJson(QJsonDocument::Compact) + "\n"; QByteArray data = writer.toJson(QJsonDocument::Compact) + "\n";
std::cout << "JsonClientConnection::sendMessage | [" << _socket->peerAddress().toString().toStdString() << "] Send: [" << data.constData() << "]" << std::endl;
if (!_socket || (_socket->state() != QAbstractSocket::ConnectedState)) return 0; if (!_socket || (_socket->state() != QAbstractSocket::ConnectedState)) return 0;
return _socket->write(data.data(), data.size()); return _socket->write(data.data(), data.size());
} }