bundles: Allow differing source file name

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bundles.rs b/src/bundles.rs
index 29a84f9de150d88357934a9af9f6cc6407961e3c..1cd162661bc45c15365dd22e1f4d5e649e68acb6 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -756,10 +756,10 @@ fn image_usvg(zfname: &str, input: File, output: File,
 fn make_usvg(za: &mut IndexedZip, progress_count: &mut usize,
              mut for_progress: &mut dyn progress::Originator,
              dir_inzip: &str, svg_dir: &str,
-             item: &GoodItemName, _src_name: &str) {
+             item: &GoodItemName, src_name: &str) {
   let (format, mut zf) = 'format: loop {
     for format in PictureFormat::iter() {
-      let input_basename = format!("{}/{}.{}", dir_inzip, item, format);
+      let input_basename = format!("{}/{}.{}", dir_inzip, src_name, format);
       if let Some(zf) = za.by_name_caseless(input_basename)? {
         break 'format (format, zf);
       }

diff --git a/src/shapelib-toml.rs b/src/shapelib-toml.rs
index 58a4b2554720ba635199cdad2a5144d603e0cda8..d28c3946c967dfefa02a1a2a241a056a857bd601 100644 (file)
--- a/src/shapelib-toml.rs
+++ b/src/shapelib-toml.rs
@@ -237,7 +237,9 @@ pub struct FileData {
 
   /// The core of the remote file name, for pieces which are scraped.
   ///
-  /// Not used by Otter during runtime or when loading pieces.
+  /// In bundles, is the source file name if it isn't `-`.
+  /// In builtin libs,
+  /// not used by Otter during runtime or when loading.
   ///
   /// When [`scraper.method`](LibraryTomlFile::scraper) is `"none"`,
   /// this field is not used and is conventionally set to "`-`".