Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/wasm remote 2 #1288

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Feature/wasm remote 2 #1288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
74023d8
add httpserver to the remote cotrol
thibaudk Aug 9, 2021
c035986
try to add a thread for the web socket connection
Toine-ddt Aug 9, 2021
e2d4b35
Update .gitignore
Toine-ddt Aug 9, 2021
e6028a2
Do not block score with the http server for the remotecontrol
jcelerier Aug 11, 2021
b9f71f6
rm some useless include
Toine-ddt Aug 12, 2021
de1831f
modify some variable and path
Toine-ddt Aug 12, 2021
c43b2aa
clean code
Toine-ddt Aug 12, 2021
2304b1a
get ip address and set in remote.html
Toine-ddt Aug 16, 2021
703d9b7
add comments and clean code
Toine-ddt Aug 16, 2021
ed8d1aa
detect ip address which start with 172.
Toine-ddt Aug 16, 2021
0d54c99
detect ip address with socket / set keep_alive = false
Toine-ddt Aug 18, 2021
49bb138
clean code
Toine-ddt Aug 18, 2021
c231ef0
add qml-remote submodule
thibaudk Aug 9, 2021
0fd3ef5
changes from the review
Toine-ddt Aug 19, 2021
c8b914c
changes from the review
Toine-ddt Aug 19, 2021
819619e
load remote.html, read and write ip address
Toine-ddt Aug 20, 2021
48f0036
Update CMakeLists.txt
Toine-ddt Aug 20, 2021
be79bdb
Update ApplicationPlugin.cpp
Toine-ddt Aug 20, 2021
b1914f3
Update ApplicationPlugin.hpp
Toine-ddt Aug 20, 2021
ab4893e
clean code
Toine-ddt Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plugins/score-plugin-remotecontrol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ set(SRCS
"${CMAKE_CURRENT_SOURCE_DIR}/score_plugin_remotecontrol.cpp"
)

file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/RemoteControl/build-wasm/ DESTINATION ${CMAKE_BINARY_DIR}/src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/)
#file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/RemoteControl/build-wasm/ DESTINATION ${CMAKE_BINARY_DIR}/src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/)

add_library(${PROJECT_NAME} ${SRCS} ${HDRS} ${QRCS})

Expand Down
6 changes: 6 additions & 0 deletions src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ ApplicationPlugin::ApplicationPlugin(const score::GUIApplicationContext& app)
{
}

ApplicationPlugin::~ApplicationPlugin()
{
std::remove((m_server.m_buildWasmPath + "remote.html").c_str());
std::rename((m_server.m_buildWasmPath + "remote.html~").c_str(), (m_server.m_buildWasmPath + "remote.html").c_str());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... what is happening here ?

}

void ApplicationPlugin::on_createdDocument(score::Document& doc)
{
doc.model().addPluginModel(new DocumentPlugin{
Expand Down
1 change: 1 addition & 0 deletions src/plugins/score-plugin-remotecontrol/RemoteControl/ApplicationPlugin.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class ApplicationPlugin final : public score::GUIApplicationPlugin
{
public:
ApplicationPlugin(const score::GUIApplicationContext& app);
~ApplicationPlugin();

protected:
void on_createdDocument(score::Document& doc) override;
Expand Down
17 changes: 8 additions & 9 deletions src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ HttpServer::do_session(
void
HttpServer::set_ip_address(std::string address)
{
QDebug << "buildWasmPath :" << buildWasmPath;
std::rename(buildWasmPath + "remote.html", buildWasmPath + "remote.html~");
qDebug() << "buildWasmPath :" << QString::fromStdString(m_buildWasmPath);
std::rename((m_buildWasmPath + "remote.html").c_str(), (m_buildWasmPath + "remote.html~").c_str());

std::ifstream old_file(buildWasmPath + "remote.html~");
std::ofstream new_file(buildWasmPath + "remote.html");
std::ifstream old_file(m_buildWasmPath + "remote.html~");
std::ofstream new_file(m_buildWasmPath + "remote.html");

std::string addr = "\"" + address + "\"";

Expand Down Expand Up @@ -289,11 +289,10 @@ HttpServer::open_server()
{
auto const address2 = net::ip::make_address("0.0.0.0");
auto const port = static_cast<unsigned short>(std::atoi("8080"));
// auto const m_docRoot = std::make_shared<std::string>("./src/plugins/score-plugin-remotecontrol/CMakeFiles/score_plugin_remotecontrol.dir/RemoteControl/build-wasm/");
std::string packagesPath = score::AppContext().settings<Library::Settings::Model>().getPackagesPath().toUtf8().constData();
QDebug << "packagesPath :" << packagesPath;
buildWasmPath = packagesPath + "/build-wasm/";
auto const m_docRoot = std::make_shared<std::string>(buildWasmPath);
std::string packagesPath = score::AppContext().settings<Library::Settings::Model>().getPackagesPath().toStdString();
qDebug() << "packagesPath :" << QString::fromStdString(packagesPath);
m_buildWasmPath = packagesPath + "/build-wasm/";
auto const m_docRoot = std::make_shared<std::string>(m_buildWasmPath);

bool is_ip_address_set = false;

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/score-plugin-remotecontrol/RemoteControl/HttpServer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,6 @@ class HttpServer

std::thread m_serverThread;
int m_listenSocket{};
std::string buildWasmPath;
std::string m_buildWasmPath;
};
}