media-scraper etc.: rename cards-oxymoron "scraper"

This isn't generic to local-builds; it has special knowledge of the
gif pathnames.

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

diff --git a/library/cards-oxymoron.toml b/library/cards-oxymoron.toml
index 128bb874b01739890796f450d529e3d3ab942b3f..7c97f87dd62a3a042c1c54e18e8965de6cbc1783 100644 (file)
--- a/library/cards-oxymoron.toml
+++ b/library/cards-oxymoron.toml
@@ -3,7 +3,7 @@
 # There is NO WARRANTY.
 
 [scraper]
-method = "local-build"
+method = "cards-oxymoron"
 spdx = "GPL-2.0-or-later"
 filename_prefix = "cards/src/"
 filename_suffix = ".gif"

diff --git a/media-scraper b/media-scraper
index 27c54af2901474ea12b093eee975b7577c58e038..00e98d349588156ba3cec5d665ecf9cda70e9531 100755 (executable)
--- a/media-scraper
+++ b/media-scraper
@@ -142,7 +142,7 @@ sub method_wikimedia ($$$) {
 
 sub methodisoffline_wikimedia { 0 }
 
-sub method_local_build {
+sub method_cards_oxymoron {
   my ($scraper, $methname) = @_;
   return sub {
     my ($lbase, $ldest, $rstem) = @_;
@@ -161,8 +161,8 @@ sub method_local_build {
     $!=$?=0; system qw(convert), $lgif, $ldest and die "$! $?";
   }
 }
-sub methodlic_local_build { undef }
-sub methodisoffline_local_build ($$) { 1 }
+sub methodlic_cards_oxymoron { undef }
+sub methodisoffline_cards_oxymoron ($$) { 1 }
 
 our $offline;
 

diff --git a/src/shapelib-toml.rs b/src/shapelib-toml.rs
index d5042bd65920dc5ad1c6beb48b34dcb519cce272..ff86c643dc8ec61da875a5a4da801087405069ec 100644 (file)
--- a/src/shapelib-toml.rs
+++ b/src/shapelib-toml.rs
@@ -222,6 +222,8 @@ pub struct Scraper {
   ///  Wikimedia does.  In this case
   ///  [`scraper`](LibraryTomlFile::scraper) is a table containing the
   ///  fields of [`WikimediaScraper`], not just `method`.
+  ///
+  ///  * `"cards-oxymoron`": Special for that subdirectory.
   pub method: String,
 }