FAT Disk Image Extractor using mtools.

dtrx/dtrx.py

@@ -601,6 +601,25 @@ def get_filenames(self):
         return BaseExtractor.get_filenames(self)
 
 
+class FATDiskImageExtractor(NoPipeExtractor):
+    file_type = "FAT disk image"
+    list_command = ["mdir", "-b", "-a", "-/", "-i"]
+    extract_command = ["mcopy", "-nspm", "-i"]
+
+    def extract_archive(self):
+        command = self.extract_command + [self.filename, "::", "."]
+        self.extract_pipe = command
+        BaseExtractor.extract_archive(self)
+
+    def get_filenames(self):
+        command = self.list_command + [self.filename, "::"]
+        self.list_pipe = command
+        for line in NoPipeExtractor.get_filenames(self):
+            # mtools prefixes with ::/ for the default drive, remove that.
+            yield re.sub(r"^::[/\\]", "", line)
+        self.archive.close()
+
+
 class ZipExtractor(NoPipeExtractor):
     file_type = "Zip file"
     list_command = ["zipinfo", "-1"]
@@ -1161,6 +1180,12 @@ class ExtractorBuilder(object):
             "extensions": ("tar",),
             "magic": ("POSIX tar archive",),
         },
+        "fat": {
+            "extractors": (FATDiskImageExtractor,),
+            "mimetypes": ("x-msdos", "x-fat"),
+            "extensions": ("ima", "vfd"),
+            "magic": ("DOS/MBR boot sector", "FAT12", "FAT16", "FAT32"),
+        },
         "zip": {
             "extractors": (ZipExtractor, SevenExtractor),
             "mimetypes": ("zip",),

tests/tests.yml

@@ -945,6 +945,7 @@
     gem
     gz
     hdr
+    ima
     jar
     lha
     lrz
@@ -970,6 +971,7 @@
     tgz
     tlz
     txz
+    vfd
     xpi
     xz
     zip