Fixed extraction bug when --quiet was specified

src/binwalk/core/module.py

@@ -400,6 +400,12 @@ class Module(object):
                 if display_args:
                     self.config.display.format_strings(self.HEADER_FORMAT, self.RESULT_FORMAT)
                     self.config.display.result(*display_args)
+            else:
+                # If this specific result has been marked to not be displayed to the user (e.g., 
+                # it has been excluded via a -x or -y option), then disable extraction as well.
+                # Note that this does not effect results that are not displayed globally (i.e.,
+                # if --quiet was specified).
+                r.extract = False
 
         return r
 

src/binwalk/modules/extractor.py

@@ -117,10 +117,8 @@ class Extractor(Module):
         if r.valid:
             binwalk.core.common.debug("Extractor callback for %s:%d [%s & %s & %s]" % (r.file.name, r.offset, str(r.valid), str(r.display), str(r.extract)))
         
-        # Only extract valid results displayed to the user and marked for extraction
-        # TODO: Results excluded via -x/-y options should be marked as invalid; filtering on r.display means that
-        #       with -q specified, nothing gets extracted!
-        if r.valid and r.display and r.extract:
+        # Only extract valid results that have been marked for extraction
+        if r.valid and r.extract:
             # Do the extraction
             binwalk.core.common.debug("Attempting extraction...")
             (extraction_directory, dd_file) = self.extract(r.offset, r.description, r.file.name, size, r.name)