zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Now escapes filenames for run html, js, md and python

merge-requests/365/head
eidheim 10 years ago
parent
55a32e27f7
commit
4a94a2a8a1
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/project.cc

10
src/project.cc
Unescape View File

@ -484,7 +484,7 @@ void Project::Markdown::compile_and_run() {
} }
std::stringstream stdin_stream, stdout_stream; std::stringstream stdin_stream, stdout_stream;
auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, "markdown "+Notebook::get().get_current_view()->file_path.string()); auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, "markdown "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string()));
if(exit_status==0) { if(exit_status==0) {
boost::system::error_code ec; boost::system::error_code ec;
auto temp_path=boost::filesystem::temp_directory_path(ec); auto temp_path=boost::filesystem::temp_directory_path(ec);
@ -499,7 +499,7 @@ void Project::Markdown::compile_and_run() {
auto uri=temp_path.string(); auto uri=temp_path.string();
#ifdef __APPLE__ #ifdef __APPLE__
Terminal::get().process("open \""+uri+"\""); Terminal::get().process("open "+filesystem::escape_argument(uri));
#else #else
#ifdef __linux #ifdef __linux
uri="file://"+uri; uri="file://"+uri;
@ -514,7 +514,7 @@ void Project::Markdown::compile_and_run() {
} }
void Project::Python::compile_and_run() { void Project::Python::compile_and_run() {
auto command="python "+Notebook::get().get_current_view()->file_path.string(); auto command="python "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string());
Terminal::get().print("Running "+command+"\n"); Terminal::get().print("Running "+command+"\n");
Terminal::get().async_process(command, Notebook::get().get_current_view()->file_path.parent_path(), [command](int exit_status) { Terminal::get().async_process(command, Notebook::get().get_current_view()->file_path.parent_path(), [command](int exit_status) {
Terminal::get().async_print(command+" returned: "+std::to_string(exit_status)+'\n'); Terminal::get().async_print(command+" returned: "+std::to_string(exit_status)+'\n');
@ -522,7 +522,7 @@ void Project::Python::compile_and_run() {
} }
void Project::JavaScript::compile_and_run() { void Project::JavaScript::compile_and_run() {
auto command="node "+Notebook::get().get_current_view()->file_path.string(); auto command="node "+filesystem::escape_argument(Notebook::get().get_current_view()->file_path.string());
Terminal::get().print("Running "+command+"\n"); Terminal::get().print("Running "+command+"\n");
Terminal::get().async_process(command, Notebook::get().get_current_view()->file_path.parent_path(), [command](int exit_status) { Terminal::get().async_process(command, Notebook::get().get_current_view()->file_path.parent_path(), [command](int exit_status) {
Terminal::get().async_print(command+" returned: "+std::to_string(exit_status)+'\n'); Terminal::get().async_print(command+" returned: "+std::to_string(exit_status)+'\n');
@ -532,7 +532,7 @@ void Project::JavaScript::compile_and_run() {
void Project::HTML::compile_and_run() { void Project::HTML::compile_and_run() {
auto uri=Notebook::get().get_current_view()->file_path.string(); auto uri=Notebook::get().get_current_view()->file_path.string();
#ifdef __APPLE__ #ifdef __APPLE__
Terminal::get().process("open \""+uri+"\""); Terminal::get().process("open "+filesystem::escape_argument(uri));
#else #else
#ifdef __linux #ifdef __linux
uri="file://"+uri; uri="file://"+uri;

Write Preview
Loading…
Cancel
Save