Skip to content

Commit 1f6ed6d

Browse files
committed
Fix column types in webp.mbtiles, add ignore on invalid escape hatch to new_sources_url in case tile sources from URLs produce this error
1 parent 522dd04 commit 1f6ed6d

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

martin/src/file_config.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,12 @@ async fn resolve_int<T: SourceConfigExtras>(
270270
let dup = if dup { "duplicate " } else { "" };
271271
let id = idr.resolve(&id, url.to_string());
272272
configs.insert(id.clone(), source);
273-
results.push(cfg.custom.new_sources_url(id.clone(), url.clone()).await?);
273+
let src_result = cfg.custom.new_sources_url(id.clone(), url.clone()).await;
274+
match src_result {
275+
Err(FileError::IgnoreOnInvalid(_, _)) => {}
276+
Err(e) => return Err(e),
277+
Ok(src) => results.push(src),
278+
};
274279
info!("Configured {dup}source {id} from {}", sanitize_url(&url));
275280
} else {
276281
let can = source.abs_path()?;
@@ -313,7 +318,12 @@ async fn resolve_int<T: SourceConfigExtras>(
313318

314319
let id = idr.resolve(id, url.to_string());
315320
configs.insert(id.clone(), FileConfigSrc::Path(path));
316-
results.push(cfg.custom.new_sources_url(id.clone(), url.clone()).await?);
321+
let src_result = cfg.custom.new_sources_url(id.clone(), url.clone()).await;
322+
match src_result {
323+
Err(FileError::IgnoreOnInvalid(_, _)) => {}
324+
Err(e) => return Err(e),
325+
Ok(src) => results.push(src),
326+
};
317327
info!("Configured source {id} from URL {}", sanitize_url(&url));
318328
} else {
319329
let is_dir = path.is_dir();

tests/fixtures/mbtiles/webp.mbtiles

12 KB
Binary file not shown.

0 commit comments

Comments
 (0)