OLD | NEW |
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-2017 eyeo GmbH | 3 * Copyright (C) 2006-2017 eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 const std::string& path, const std::string& content) | 92 const std::string& path, const std::string& content) |
93 : IoThread(jsEngine, callback), path(path), content(content) | 93 : IoThread(jsEngine, callback), path(path), content(content) |
94 { | 94 { |
95 } | 95 } |
96 | 96 |
97 void Run() | 97 void Run() |
98 { | 98 { |
99 std::string error; | 99 std::string error; |
100 try | 100 try |
101 { | 101 { |
102 std::shared_ptr<std::iostream> stream(new std::stringstream); | 102 std::unique_ptr<std::iostream> stream(new std::stringstream); |
103 *stream << content; | 103 *stream << content; |
104 fileSystem->Write(path, stream); | 104 fileSystem->Write(path, *stream); |
105 } | 105 } |
106 catch (std::exception& e) | 106 catch (std::exception& e) |
107 { | 107 { |
108 error = e.what(); | 108 error = e.what(); |
109 } | 109 } |
110 catch (...) | 110 catch (...) |
111 { | 111 { |
112 error = "Unknown error while writing to " + path; | 112 error = "Unknown error while writing to " + path; |
113 } | 113 } |
114 | 114 |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 "_fileSystem.resolve requires 1 parameter")); | 342 "_fileSystem.resolve requires 1 parameter")); |
343 | 343 |
344 std::string resolved = jsEngine->GetFileSystem()->Resolve(converted[0]->AsSt
ring()); | 344 std::string resolved = jsEngine->GetFileSystem()->Resolve(converted[0]->AsSt
ring()); |
345 | 345 |
346 return Utils::ToV8String(isolate, resolved); | 346 return Utils::ToV8String(isolate, resolved); |
347 } | 347 } |
348 | 348 |
349 } | 349 } |
350 | 350 |
351 | 351 |
352 JsValuePtr FileSystemJsObject::Setup(JsEnginePtr jsEngine, JsValuePtr obj) | 352 JsValuePtr FileSystemJsObject::Setup(JsEngine& jsEngine, const JsValuePtr& obj) |
353 { | 353 { |
354 obj->SetProperty("read", jsEngine->NewCallback(::ReadCallback)); | 354 obj->SetProperty("read", jsEngine.NewCallback(::ReadCallback)); |
355 obj->SetProperty("write", jsEngine->NewCallback(::WriteCallback)); | 355 obj->SetProperty("write", jsEngine.NewCallback(::WriteCallback)); |
356 obj->SetProperty("move", jsEngine->NewCallback(::MoveCallback)); | 356 obj->SetProperty("move", jsEngine.NewCallback(::MoveCallback)); |
357 obj->SetProperty("remove", jsEngine->NewCallback(::RemoveCallback)); | 357 obj->SetProperty("remove", jsEngine.NewCallback(::RemoveCallback)); |
358 obj->SetProperty("stat", jsEngine->NewCallback(::StatCallback)); | 358 obj->SetProperty("stat", jsEngine.NewCallback(::StatCallback)); |
359 obj->SetProperty("resolve", jsEngine->NewCallback(::ResolveCallback)); | 359 obj->SetProperty("resolve", jsEngine.NewCallback(::ResolveCallback)); |
360 return obj; | 360 return obj; |
361 } | 361 } |
OLD | NEW |