diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2016-09-28 16:01:06 +0200 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-09-30 14:57:26 +0200 |
commit | 1bf12e20a65a3e0e8212e0c24db5a136096896e7 (patch) | |
tree | 33e8cd7ac2d4fca6185bff1349fbb50e7fda8eb0 /platform/default/default_file_source.cpp | |
parent | eca126d804e96b4ca9ef1ff447448420a32747ee (diff) | |
download | qtlocation-mapboxgl-1bf12e20a65a3e0e8212e0c24db5a136096896e7.tar.gz |
[core] LocalFileSource implementation and tests
Diffstat (limited to 'platform/default/default_file_source.cpp')
-rw-r--r-- | platform/default/default_file_source.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 099890a035..7b52637c15 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -1,5 +1,6 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/asset_file_source.hpp> +#include <mbgl/storage/local_file_source.hpp> #include <mbgl/storage/online_file_source.hpp> #include <mbgl/storage/offline_database.hpp> #include <mbgl/storage/offline_download.hpp> @@ -164,7 +165,8 @@ DefaultFileSource::DefaultFileSource(const std::string& cachePath, uint64_t maximumCacheSize) : thread(std::make_unique<util::Thread<Impl>>(util::ThreadContext{"DefaultFileSource", util::ThreadPriority::Low}, cachePath, maximumCacheSize)), - assetFileSource(std::make_unique<AssetFileSource>(assetRoot)) { + assetFileSource(std::make_unique<AssetFileSource>(assetRoot)), + localFileSource(std::make_unique<LocalFileSource>()) { } DefaultFileSource::~DefaultFileSource() = default; @@ -203,6 +205,8 @@ std::unique_ptr<AsyncRequest> DefaultFileSource::request(const Resource& resourc if (isAssetURL(resource.url)) { return assetFileSource->request(resource, callback); + } else if (LocalFileSource::acceptsURL(resource.url)) { + return localFileSource->request(resource, callback); } else { return std::make_unique<DefaultFileRequest>(resource, callback, *thread); } |