summaryrefslogtreecommitdiff
path: root/render-test/file_source.cpp
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-01-03 16:01:40 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-01-08 13:07:12 +0200
commitf0d2a2f636bf45889cf8082ba42e0d22875c1e3a (patch)
tree342ff7d577d03c68cb5b56a5f19a0105a0ad5a4c /render-test/file_source.cpp
parent26cfddaf47bfeacc2ef739c32c9de2eae94af787 (diff)
downloadqtlocation-mapboxgl-f0d2a2f636bf45889cf8082ba42e0d22875c1e3a.tar.gz
[render-test] Effectively use the offline cache for fixtures
Diffstat (limited to 'render-test/file_source.cpp')
-rw-r--r--render-test/file_source.cpp62
1 files changed, 49 insertions, 13 deletions
diff --git a/render-test/file_source.cpp b/render-test/file_source.cpp
index 0968f1d2f0..04ebf43b1b 100644
--- a/render-test/file_source.cpp
+++ b/render-test/file_source.cpp
@@ -1,4 +1,5 @@
#include <mbgl/storage/resource_options.hpp>
+#include <mbgl/util/logging.hpp>
#include "file_source.hpp"
@@ -7,21 +8,53 @@ namespace mbgl {
std::atomic_size_t requestCount{0};
std::atomic_size_t transferredSize{0};
std::atomic_bool active{false};
+std::atomic_bool offline{true};
-ProxyFileSource::ProxyFileSource(const std::string& cachePath,
- const std::string& assetPath,
- bool supportCacheOnlyRequests_)
- : DefaultFileSource(cachePath, assetPath, supportCacheOnlyRequests_) {}
-
-ProxyFileSource::ProxyFileSource(const std::string& cachePath,
- std::unique_ptr<FileSource>&& assetFileSource_,
- bool supportCacheOnlyRequests_)
- : DefaultFileSource(cachePath, std::move(assetFileSource_), supportCacheOnlyRequests_) {}
+ProxyFileSource::ProxyFileSource(const std::string& cachePath, const std::string& assetPath)
+ : DefaultFileSource(cachePath, assetPath, false) {}
ProxyFileSource::~ProxyFileSource() = default;
std::unique_ptr<AsyncRequest> ProxyFileSource::request(const Resource& resource, Callback callback) {
- auto result = DefaultFileSource::request(resource, [=](Response response) {
+ auto transformed = resource;
+
+ // If offline, force always loading the resource from the cache
+ // so we don't make any network request.
+ if (offline) {
+ transformed.loadingMethod = Resource::LoadingMethod::CacheOnly;
+ }
+
+ // This is needed for compatibility with the style tests that
+ // are using local:// instead of http:// which is the schema
+ // we support for cached files.
+ if (transformed.url.compare(0, 8, "local://") == 0) {
+ transformed.url.replace(0, 8, "http://");
+
+ if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
+ transformed.tileData->urlTemplate.replace(0, 8, "http://");
+ }
+ }
+
+ if (transformed.url.compare(0, 22, "http://localhost:2900/") == 0) {
+ transformed.url.replace(0, 22, "http://");
+
+ if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
+ transformed.tileData->urlTemplate.replace(0, 22, "http://");
+ }
+ }
+
+ return DefaultFileSource::request(transformed, [=](Response response) {
+ if (transformed.loadingMethod == Resource::LoadingMethod::CacheOnly && response.noContent) {
+ if (transformed.kind == Resource::Kind::Tile && transformed.tileData) {
+ mbgl::Log::Info(mbgl::Event::Database,
+ "Resource not found in cache: %s (%s)",
+ transformed.url.c_str(),
+ transformed.tileData->urlTemplate.c_str());
+ } else {
+ mbgl::Log::Info(mbgl::Event::Database, "Resource not found in cache: %s", transformed.url.c_str());
+ }
+ }
+
std::size_t size = response.data != nullptr ? response.data->size() : 0;
if (active) {
requestCount++;
@@ -29,18 +62,21 @@ std::unique_ptr<AsyncRequest> ProxyFileSource::request(const Resource& resource,
}
callback(response);
});
- return result;
}
std::shared_ptr<FileSource> FileSource::createPlatformFileSource(const ResourceOptions& options) {
- auto fileSource = std::make_shared<ProxyFileSource>(
- options.cachePath(), options.assetPath(), options.supportsCacheOnlyRequests());
+ auto fileSource = std::make_shared<ProxyFileSource>(options.cachePath(), options.assetPath());
fileSource->setAccessToken(options.accessToken());
fileSource->setAPIBaseURL(options.baseURL());
return fileSource;
}
// static
+void ProxyFileSource::setOffline(bool status) {
+ offline = status;
+}
+
+// static
void ProxyFileSource::setTrackingActive(bool active_) {
active = active_;
requestCount = 0;