Added UDF support with 7z

wummel · Nov 9, 2024 · c129b47 · c129b47
1 parent 2561095
commit c129b47
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ APE (.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), BZIP3 (.bz3),
 CAB (.cab), CHM (.chm), COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms),
 FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh),
 LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar, .cbr),
-RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz),
+RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), UDF (.udf), XZ (.xz),
 ZIP (.zip, .jar, .cbz), ZOO (.zoo) and ZSTANDARD (.zst) archive formats.
 
 It relies on helper applications to handle those archive formats

diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -1,5 +1,6 @@
 3.0.4 (released xx.xx.xxxx)
-  *
+  * Added support for UDF (.udf) archives with 7z.
+  Closes: GH bug #80
 
 3.0.3 (released 04.11.2024)
   * Fix UnicodeDecode errors when logging, especially on windows systems.

diff --git a/doc/patool.1 b/doc/patool.1
@@ -31,7 +31,7 @@ BZIP3 (.bz3), CAB (.cab), CHM (.chm), COMPRESS (.Z), CPIO (.cpio),
 DEB (.deb), DMS (.dms),
 FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh),
 LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar, .cbr),
-RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz), ZIP (.zip, .jar, .cbz),
+RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), UDF (.udf), XZ (.xz), ZIP (.zip, .jar, .cbz),
 ZOO (.zoo), ZPAQ (.zpaq) and ZSTANDARD (.zst) archive formats.
 .br
 It relies on helper applications to handle those archive formats

diff --git a/doc/patool.txt b/doc/patool.txt
@@ -23,9 +23,9 @@ DESCRIPTION
        (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms), FLAC (.flac),  GZIP
        (.gz),  ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh), LZIP (.lz),
        LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar,  .cbr),  RZIP
-       (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz), ZIP (.zip, .jar,
-       .cbz), ZOO (.zoo), ZPAQ (.zpaq) and  ZSTANDARD  (.zst)  archive
-       formats.
+       (.rz),  SHN (.shn), TAR (.tar, .cbt), UDF (.udf), XZ (.xz), ZIP
+       (.zip, .jar, .cbz), ZOO  (.zoo),  ZPAQ  (.zpaq)  and  ZSTANDARD
+       (.zst) archive formats.
        It  relies  on helper applications to handle those archive for‐
        mats (for example xz for XZ (.xz) archives).
 

diff --git a/doc/web/source/index.md b/doc/web/source/index.md
@@ -25,7 +25,7 @@ APE (.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), BZIP3 (.bz3),
 CAB (.cab), CHM (.chm), COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms),
 FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh),
 LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar, .cbr),
-RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), XZ (.xz),
+RZIP (.rz), SHN (.shn), TAR (.tar, .cbt), UDF (.udf), XZ (.xz),
 ZIP (.zip, .jar, .cbz), ZOO (.zoo) and ZSTANDARD (.zst) archive formats.
 
 It relies on helper applications to handle those archive formats

diff --git a/patoolib/__init__.py b/patoolib/__init__.py
@@ -82,6 +82,7 @@
     'shar',
     'shn',
     'tar',
+    'udf',
     'vhd',
     'wim',
     'xz',
@@ -142,6 +143,7 @@
     'application/x-rzip': 'rzip',
     'application/x-shar': 'shar',
     'application/x-tar': 'tar',
+    'application/x-iso13346-image': 'udf',
     'application/x-vhd': 'vhd',
     'application/x-xz': 'xz',
     'application/x-zip-compressed': 'zip',
@@ -329,6 +331,11 @@
         None: ('tar', 'star', 'bsdtar', 'py_tarfile'),
         'extract': ('unar',),
     },
+    'udf': {
+        'extract': ('7z',),
+        'list': ('7z',),
+        'test': ('7z',),
+    },
     'vhd': {
         'extract': (
             '7z',
@@ -444,6 +451,13 @@
             '7zzs',
         )
     },
+    'udf': {
+        None: (
+            '7z',
+            '7zz',
+            '7zzs',
+        )
+    },
     'vhd': {
         None: (
             '7z',

diff --git a/patoolib/programs/p7zip.py b/patoolib/programs/p7zip.py
@@ -54,7 +54,7 @@ def extract_7z_singlefile(
 
 extract_zip = extract_rar = extract_cab = extract_chm = extract_arj = extract_cpio = (
     extract_rpm
-) = extract_deb = extract_iso = extract_vhd = extract_wim = extract_7z
+) = extract_deb = extract_iso = extract_udf = extract_vhd = extract_wim = extract_7z
 
 
 def list_7z(archive, compression, cmd, verbosity, interactive, password=None):
@@ -72,9 +72,9 @@ def list_7z(archive, compression, cmd, verbosity, interactive, password=None):
 
 list_bzip2 = list_gzip = list_zip = list_compress = list_rar = list_cab = list_chm = (
     list_arj
-) = list_cpio = list_rpm = list_deb = list_iso = list_xz = list_lzma = list_vhd = (
-    list_wim
-) = list_7z
+) = list_cpio = list_rpm = list_deb = list_iso = list_xz = list_lzma = list_udf = (
+    list_vhd
+) = list_wim = list_7z
 
 
 def test_7z(archive, compression, cmd, verbosity, interactive, password=None):
@@ -92,9 +92,9 @@ def test_7z(archive, compression, cmd, verbosity, interactive, password=None):
 
 test_bzip2 = test_gzip = test_zip = test_compress = test_rar = test_cab = test_chm = (
     test_arj
-) = test_cpio = test_rpm = test_deb = test_iso = test_xz = test_lzma = test_vhd = (
-    test_wim
-) = test_7z
+) = test_cpio = test_rpm = test_deb = test_iso = test_xz = test_lzma = test_udf = (
+    test_vhd
+) = test_wim = test_7z
 
 
 def create_7z(

diff --git a/patoolib/programs/p7zz.py b/patoolib/programs/p7zz.py
@@ -28,23 +28,23 @@
 
 extract_zip = extract_rar = extract_cab = extract_chm = extract_arj = extract_cpio = (
     extract_rpm
-) = extract_deb = extract_iso = extract_vhd = extract_wim = extract_7z
+) = extract_deb = extract_iso = extract_udf = extract_vhd = extract_wim = extract_7z
 
 from .p7zip import list_7z
 
 list_bzip2 = list_gzip = list_zip = list_compress = list_rar = list_cab = list_chm = (
     list_arj
-) = list_cpio = list_rpm = list_deb = list_iso = list_xz = list_lzma = list_vhd = (
-    list_wim
-) = list_7z
+) = list_cpio = list_rpm = list_deb = list_iso = list_xz = list_lzma = list_udf = (
+    list_vhd
+) = list_wim = list_7z
 
 from .p7zip import test_7z
 
 test_bzip2 = test_gzip = test_zip = test_compress = test_rar = test_cab = test_chm = (
     test_arj
-) = test_cpio = test_rpm = test_deb = test_iso = test_xz = test_lzma = test_vhd = (
-    test_wim
-) = test_7z
+) = test_cpio = test_rpm = test_deb = test_iso = test_xz = test_lzma = test_udf = (
+    test_vhd
+) = test_wim = test_7z
 
 # ruff: noqa: F401
 from .p7zip import (

diff --git a/tests/archives/test_7z.py b/tests/archives/test_7z.py
@@ -44,6 +44,7 @@ def test_7z(self):
         self.archive_list('t.rpm')
         self.archive_list('t.deb')
         self.archive_list('t.iso')
+        self.archive_list('t.udf')
         self.archive_list('t.vhd')
         self.archive_extract('t.txt.gz', check=Content.Singlefile)
         self.archive_extract('t.txt.bz2', check=Content.Singlefile)
@@ -57,6 +58,7 @@ def test_7z(self):
         self.archive_extract('t.rpm', check=None)
         self.archive_extract('t.deb', check=None)
         self.archive_extract('t.iso')
+        self.archive_extract('t.udf')
         self.archive_extract('t.vhd', check=None)
         self.archive_test('t.txt.gz')
         self.archive_test('t.txt.bz2')
@@ -70,6 +72,7 @@ def test_7z(self):
         self.archive_test('t.rpm')
         self.archive_test('t.deb')
         self.archive_test('t.iso')
+        self.archive_test('t.udf')
         self.archive_test('t.vhd')
         self.archive_create('t.txt.gz', check=Content.Singlefile)
         self.archive_create('t.txt.bz2', check=Content.Singlefile)

diff --git a/tests/data/t.udf b/tests/data/t.udf