tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Simplify asset:// implementation

Browse Source 
* Move asset:// URL handling to DefaultFileSource.
* AssetFileSource implements FileSource interface and follows familiar implementation patterns.
* Move default implementation to platform/default, zip implementation to platform/android.
* Don't bother with modified / expires / etag -- assets are not cached so it doesn't matter.
* Don't bother with interleaving individual IO calls on the implementation thread. That adds a lot of complexity for very little benefit.
This commit is contained in:
John Firebaugh
2016-01-11 12:52:41 -08:00
parent 2126e34e52
commit 86c8446d3a
22 changed files with 287 additions and 731 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
platform/default/default_file_source.cpp
View File

@@ -1,16 +1,32 @@
#include <mbgl/storage/default_file_source.hpp>
#include <mbgl/storage/asset_file_source.hpp>
#include <mbgl/storage/online_file_source.hpp>
#include <mbgl/storage/sqlite_cache.hpp>
#include <mbgl/platform/platform.hpp>
#include <mbgl/util/url.hpp>
namespace {
const std::string assetProtocol = "asset://";
bool isAssetURL(const std::string& url) {
return std::equal(assetProtocol.begin(), assetProtocol.end(), url.begin());
}
} // namespace
namespace mbgl {
class DefaultFileSource::Impl {
public:
Impl(const std::string& cachePath, const std::string& root)
: cache(SharedSQLiteCache::get(cachePath)),
onlineFileSource(cache.get(), root) {
Impl(const std::string& cachePath, const std::string& assetRoot)
: assetFileSource(assetRoot),
cache(SharedSQLiteCache::get(cachePath)),
onlineFileSource(cache.get()) {
}
AssetFileSource assetFileSource;
std::shared_ptr<SQLiteCache> cache;
OnlineFileSource onlineFileSource;
};
@@ -38,7 +54,11 @@ void DefaultFileSource::setMaximumCacheEntrySize(uint64_t size) {
}
std::unique_ptr<FileRequest> DefaultFileSource::request(const Resource& resource, Callback callback) {
return impl->onlineFileSource.request(resource, callback);
if (isAssetURL(resource.url)) {
return impl->assetFileSource.request(resource, callback);
} else {
return impl->onlineFileSource.request(resource, callback);
}
}
} // namespace mbgl