File system path resolving

src/FileSystemJsObject.cpp

 #include <AdblockPlus/FileSystem.h>
 #include <stdexcept>
 #include <sstream>
 #include <vector>
 
 #include <AdblockPlus/JsValue.h>
 #include "FileSystemJsObject.h"
 #include "Utils.h"
 #include "Thread.h"
 #include "Utils.h"
@@ skipping 166 matching lines @@
       JsValueList params;
       params.push_back(errorValue);
       callback->Call(params);
       delete this;
     }
 
   private:
     std::string path;
   };
 
+
   class StatThread : public IoThread
   {
   public:
     StatThread(JsEnginePtr jsEngine, JsValuePtr callback,
                const std::string& path)
       : IoThread(jsEngine, callback), path(path)
     {
     }
 
     void Run()
@@ skipping 108 matching lines @@
       return v8::ThrowException(v8::String::New(
         "_fileSystem.stat requires 2 parameters"));
     if (!converted[1]->IsFunction())
       return v8::ThrowException(v8::String::New(
         "Second argument to _fileSystem.stat must be a function"));
     StatThread* const statThread = new StatThread(jsEngine, converted[1],
         converted[0]->AsString());
     statThread->Start();
     return v8::Undefined();
   }
+
+  v8::Handle<v8::Value> ResolveCallback(const v8::Arguments& arguments)
+  {
+    AdblockPlus::JsEnginePtr jsEngine = AdblockPlus::JsEngine::FromArguments(arguments);
+    AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
+
+    if (converted.size() != 1)
+      return v8::ThrowException(v8::String::New(
+        "_fileSystem.resolve requires 1 parameter"));
+
+    std::string resolved = jsEngine->GetFileSystem()->Resolve(converted[0]->AsString());
+
+    return v8::String::New(resolved.c_str(), resolved.length());

[Wladimir Palant, 2013/04/24 09:17:35]

Please use Utils::ToV8String() here.

+  }
+
 }
 
+
 JsValuePtr FileSystemJsObject::Setup(JsEnginePtr jsEngine, JsValuePtr obj)
 {
   obj->SetProperty("read", jsEngine->NewCallback(::ReadCallback));
   obj->SetProperty("write", jsEngine->NewCallback(::WriteCallback));
   obj->SetProperty("move", jsEngine->NewCallback(::MoveCallback));
   obj->SetProperty("remove", jsEngine->NewCallback(::RemoveCallback));
   obj->SetProperty("stat", jsEngine->NewCallback(::StatCallback));
+  obj->SetProperty("resolve", jsEngine->NewCallback(::ResolveCallback));
   return obj;
 }