feat(oiiotool): eraseattrib_fromfile

src/oiiotool/oiiotool.cpp

@@ -1494,6 +1494,16 @@ set_oiio_attribute(Oiiotool& ot, cspan<const char*> argv)
         OIIO::attribute(p.name(), p.type(), p.data());
 }
 
+static std::vector<std::string>
+get_regex_list_from_file(string_view filename)
+{
+    // helper function that takes a text file and return all regex attribname entries as a list
+    std::ifstream inputFile(filename);
+
+    std::string contents;
+    Filesystem::read_text_file(filename, contents);
+    return Strutil::splits(contents, "\n");
+}
 
 
 // Special OiiotoolOp whose purpose is to set attributes on the top image.
@@ -1503,8 +1513,17 @@ class OpAttribSetter final : public OiiotoolOp {
         : OiiotoolOp(ot, opname, argv, 1)
     {
         inplace(true);  // This action operates in-place
-        attribname = args(1);
-        value      = (nargs() > 2 ? args(2) : "");
+        erase_from_file     = "--eraseattrib_fromfile";
+        erase_from_file_alt = "-eraseattrib_fromfile";
+        if (opname != erase_from_file && opname != erase_from_file_alt) {
+            attribname = args(1);
+        } else {
+            // handle erase attribute using regex text file case
+            // defined it outside to avoid magic number, still not very elegant solution wise
+            regex_file      = args(1);
+            attribname_list = get_regex_list_from_file(regex_file);
+        }
+        value = (nargs() > 2 ? args(2) : "");
     }
     bool setup() override
     {
@@ -1516,7 +1535,15 @@ class OpAttribSetter final : public OiiotoolOp {
         // Because this is an in-place operation, img[0] is the same as
         // img[1].
         if (value.empty()) {
-            img[0]->specmod().erase_attribute(attribname);
+            if (attribname_list.empty()) {
+                img[0]->specmod().erase_attribute(attribname);
+            } else {
+                for (string_view attr : attribname_list) {
+                    //std::cout << "list element:" << attr << std::endl;
+                    img[0]->specmod().erase_attribute(attr);
+                }
+            }
+
         } else {
             TypeDesc type(options()["type"].as_string());
             set_attribute_helper(img[0]->specmod(), attribname, value, type);
@@ -1527,6 +1554,10 @@ class OpAttribSetter final : public OiiotoolOp {
 private:
     string_view attribname;
     string_view value;
+    string_view regex_file;
+    std::vector<std::string> attribname_list;
+    std::string erase_from_file;
+    std::string erase_from_file_alt;
 };
 
 
@@ -6643,6 +6674,9 @@ Oiiotool::getargs(int argc, char* argv[])
     ap.arg("--eraseattrib %s:REGEX")
       .help("Erase attributes matching regex")
       .OTACTION(erase_attribute);
+    ap.arg("--eraseattrib_fromfile %s:REGEXFILE")
+      .help("Erase attributes matching regex list from a txt file")
+      .OTACTION(erase_attribute);
     ap.arg("--caption %s:TEXT")
       .help("Sets caption (ImageDescription metadata)")
       .OTACTION(set_caption);

testsuite/oiiotool-attribs/ref/out-jpeg9d.txt

@@ -1,3 +1,21 @@
+Reading nomakegps.jpg
+nomakegps.jpg        : 2048 x 1536, 3 channel, uint8 jpeg
+    SHA-1: A74C7DF2B01825DCB6881407AE77C11DC56AB741
+    channel list: R, G, B
+    Model: "T-Mobile G1"
+    Orientation: 1 (normal)
+    ResolutionUnit: "none"
+    XResolution: 72
+    YResolution: 72
+    Exif:ColorSpace: 1
+    Exif:ExifVersion: "0230"
+    Exif:FlashPixVersion: "0100"
+    Exif:PixelXDimension: 2048
+    Exif:PixelYDimension: 1536
+    Exif:WhiteBalance: 0 (auto)
+    Exif:YCbCrPositioning: 1
+    jpeg:subsampling: "4:2:0"
+    oiio:ColorSpace: "sRGB"
 Reading nomake.jpg
 nomake.jpg           : 2048 x 1536, 3 channel, uint8 jpeg
     SHA-1: A74C7DF2B01825DCB6881407AE77C11DC56AB741

testsuite/oiiotool-attribs/ref/out.txt

@@ -1,3 +1,21 @@
+Reading nomakegps.jpg
+nomakegps.jpg        : 2048 x 1536, 3 channel, uint8 jpeg
+    SHA-1: 2623446988E34395C6B0A4AA4FC75107C708BF18
+    channel list: R, G, B
+    Model: "T-Mobile G1"
+    Orientation: 1 (normal)
+    ResolutionUnit: "none"
+    XResolution: 72
+    YResolution: 72
+    Exif:ColorSpace: 1
+    Exif:ExifVersion: "0230"
+    Exif:FlashPixVersion: "0100"
+    Exif:PixelXDimension: 2048
+    Exif:PixelYDimension: 1536
+    Exif:WhiteBalance: 0 (auto)
+    Exif:YCbCrPositioning: 1
+    jpeg:subsampling: "4:2:0"
+    oiio:ColorSpace: "sRGB"
 Reading nomake.jpg
 nomake.jpg           : 2048 x 1536, 3 channel, uint8 jpeg
     SHA-1: 2623446988E34395C6B0A4AA4FC75107C708BF18

testsuite/oiiotool-attribs/run.py

@@ -7,6 +7,12 @@
 # Test oiiotool's ability to add and delete attributes
 
 
+# Test --eraseattrib_fromfile to erase from a list of regex matching attributes
+
+command += oiiotool (OIIO_TESTSUITE_IMAGEDIR+"/tahoe-gps.jpg --eraseattrib_fromfile src/regex_list.txt -o nomakegps.jpg")
+command += info_command ("nomakegps.jpg", safematch=True)
+
+
 # Test --eraseattrib ability to erase one specific attribute
 # The result should not have "Make"
 command += oiiotool (OIIO_TESTSUITE_IMAGEDIR+"/tahoe-gps.jpg --eraseattrib Make -o nomake.jpg")

testsuite/oiiotool-attribs/src/regex_list.txt

@@ -0,0 +1,2 @@
+Make
+GPS:.*