diffoscope 251__tar.gz → 253__tar.gz

{diffoscope-251/diffoscope.egg-info → diffoscope-253}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 251
+Version: 253
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -8,7 +8,7 @@ Author-email: diffoscope@lists.reproducible-builds.org
 License: GPL-3+
 Project-URL: Issues, https://salsa.debian.org/reproducible-builds/diffoscope/-/issues
 Project-URL: Merge requests, https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX

{diffoscope-251 → diffoscope-253}/diffoscope/__init__.py

@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
 
-VERSION = "251"
+VERSION = "253"

diffoscope-253/diffoscope/comparators/7z.py

@@ -0,0 +1,101 @@
+#
+# diffoscope: in-depth comparison of files, archives, and directories
+#
+# Copyright © 2023 Chris Lamb <lamby@debian.org>
+#
+# diffoscope is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# diffoscope is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
+
+import os
+import re
+import logging
+import subprocess
+
+from diffoscope.exc import RequiredToolNotFound
+from diffoscope.tools import tool_required
+from diffoscope.tempfiles import get_temporary_directory
+from diffoscope.difference import Difference
+
+from .utils.archive import Archive
+from .utils.file import File
+from .utils.command import Command, our_check_output
+
+logger = logging.getLogger(__name__)
+
+
+class SevenZList(Command):
+    @tool_required("7z")
+    def cmdline(self):
+        return (
+            "7z",
+            "l",
+            self.path,
+        )
+
+    def filter(self, line):
+        val = line.decode("utf-8")
+        if val.startswith("Listing archive: ") or val.startswith("Path = "):
+            return b""
+        return line
+
+
+class SevenZContainer(Archive):
+    @tool_required("7z")
+    def open_archive(self):
+        self._temp_dir = get_temporary_directory(suffix="7z")
+
+        try:
+            our_check_output(
+                ("7z", "e", os.path.abspath(self.source.path)),
+                cwd=self._temp_dir.name,
+                stderr=subprocess.DEVNULL,
+            )
+        except subprocess.CalledProcessError:
+            return False
+
+        return self
+
+    def close_archive(self):
+        self._temp_dir.cleanup()
+
+    def get_member_names(self):
+        return os.listdir(self._temp_dir.name)
+
+    def extract(self, member_name, dest_dir):
+        return os.path.join(self._temp_dir.name, member_name)
+
+
+class SevenZFile(File):
+    DESCRIPTION = "Filesystem image"
+    FILE_TYPE_RE = re.compile(r"^DOS/MBR boot sector;")
+    CONTAINER_CLASSES = [SevenZContainer]
+
+    def compare_details(self, other, source=None):
+        return [
+            Difference.from_operation(
+                SevenZList, self.path, other.path, source="7z l"
+            )
+        ]
+
+    @classmethod
+    def recognizes(cls, file):
+        if not super().recognizes(file):
+            return False
+
+        try:
+            cmd = SevenZList(file.path)
+            cmd.start()
+        except RequiredToolNotFound:
+            return False
+
+        return b"Type = gzip\n" not in cmd.output

{diffoscope-251 → diffoscope-253}/diffoscope/comparators/__init__.py

@@ -3,7 +3,7 @@
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
 # Copyright ©      2015  Helmut Grohne <helmut@subdivi.de>
-# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2023 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -75,6 +75,7 @@ class ComparatorManager:
         ("ffprobe.FfprobeFile",),
         ("gnumeric.GnumericFile",),
         ("gzip.GzipFile",),
+        ("7z.SevenZFile",),
         ("haskell.HiFile",),
         ("icc.IccFile",),
         ("iso9660.Iso9660File",),

{diffoscope-251 → diffoscope-253}/diffoscope/comparators/elf.py

@@ -2,7 +2,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2015-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2015-2023 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -265,7 +265,7 @@ class ObjdumpDisassembleSection(ObjdumpSection):
 
     def filter(self, line):
         # Apply this filter first as super() removes offsets
-        line = ObjdumpDisassembleSection.RE_SYMBOL_COMMENT.sub(r"\1", line)
+        line = ObjdumpDisassembleSection.RE_SYMBOL_COMMENT.sub(rb"\1", line)
         return super().filter(line)
 
 

{diffoscope-251 → diffoscope-253}/diffoscope/external_tools.py

@@ -23,6 +23,7 @@ that might resolve to, for example, `/usr/bin/abootimg`.
 """
 
 EXTERNAL_TOOLS = {
+    "7z": {"debian": "p7zip-full"},
     "aapt2": {"debian": "aapt"},
     "abootimg": {"debian": "abootimg", "guix": "abootimg"},
     "androguard": {"debian": "androguard"},

{diffoscope-251 → diffoscope-253}/diffoscope/main.py

@@ -4,7 +4,7 @@
 # diffoscope: in-depth comparison of files, archives, and directories
 #
 # Copyright © 2014-2015 Jérémy Bobbio <lunar@debian.org>
-# Copyright © 2016-2022 Chris Lamb <lamby@debian.org>
+# Copyright © 2016-2023 Chris Lamb <lamby@debian.org>
 #
 # diffoscope is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -773,6 +773,9 @@ def main(args=None):
             raise
         logger.error("No space left on device. Diffoscope exiting.")
         sys.exit(2)
+    except MemoryError:
+        logger.error("Out of memory. Diffoscope exiting.")
+        sys.exit(2)
     except KeyboardInterrupt:
         logger.error("Keyboard Interrupt")
         sys.exit(2)

{diffoscope-251 → diffoscope-253/diffoscope.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: diffoscope
-Version: 251
+Version: 253
 Summary: in-depth comparison of files, archives, and directories
 Home-page: https://diffoscope.org/
 Author: Diffoscope developers
@@ -8,7 +8,7 @@ Author-email: diffoscope@lists.reproducible-builds.org
 License: GPL-3+
 Project-URL: Issues, https://salsa.debian.org/reproducible-builds/diffoscope/-/issues
 Project-URL: Merge requests, https://salsa.debian.org/reproducible-builds/diffoscope/-/merge_requests
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
 Classifier: Operating System :: POSIX

{diffoscope-251 → diffoscope-253}/diffoscope.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ diffoscope.egg-info/dependency_links.txt
 diffoscope.egg-info/entry_points.txt
 diffoscope.egg-info/requires.txt
 diffoscope.egg-info/top_level.txt
+diffoscope/comparators/7z.py
 diffoscope/comparators/__init__.py
 diffoscope/comparators/android.py
 diffoscope/comparators/apk.py
@@ -149,6 +150,7 @@ tests/test_source.py
 tests/test_tools.py
 tests/test_versions.py
 tests/comparators/__init__.py
+tests/comparators/test_7z.py
 tests/comparators/test_android.py
 tests/comparators/test_apk.py
 tests/comparators/test_archive.py

{diffoscope-251 → diffoscope-253}/setup.py

@@ -62,7 +62,7 @@ setup(
     extras_require=extras_require,
     python_requires=">=3.7",
     classifiers=[
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
         "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
         "Operating System :: POSIX",

diffoscope-253/tests/comparators/test_7z.py

@@ -0,0 +1,74 @@
+#
+# diffoscope: in-depth comparison of files, archives, and directories
+#
+# Copyright © 2023 Chris Lamb <lamby@debian.org>
+#
+# diffoscope is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# diffoscope is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with diffoscope.  If not, see <https://www.gnu.org/licenses/>.
+
+import shutil
+import pytest
+
+from diffoscope.comparators.lz4 import Lz4File
+from diffoscope.comparators.binary import FilesystemFile
+from diffoscope.comparators.utils.specialize import specialize
+
+from ..utils.data import load_fixture, assert_diff
+from ..utils.tools import skip_unless_tools_exist
+from ..utils.nonexisting import assert_non_existing
+
+lz4a = load_fixture("test1.lz4")
+lz4b = load_fixture("test2.lz4")
+
+
+def test_identification(lz4a):
+    assert isinstance(lz4a, Lz4File)
+
+
+def test_no_differences(lz4a):
+    difference = lz4a.compare(lz4a)
+    assert difference is None
+
+
+@pytest.fixture
+def differences(lz4a, lz4b):
+    return lz4a.compare(lz4b).details
+
+
+@skip_unless_tools_exist("lz4")
+def test_content_source(differences):
+    assert differences[0].source1 == "test1"
+    assert differences[0].source2 == "test2"
+
+
+@skip_unless_tools_exist("lz4")
+def test_content_source_without_extension(tmpdir, lz4a, lz4b):
+    path1 = str(tmpdir.join("test1"))
+    path2 = str(tmpdir.join("test2"))
+    shutil.copy(lz4a.path, path1)
+    shutil.copy(lz4b.path, path2)
+    lz4a = specialize(FilesystemFile(path1))
+    lz4b = specialize(FilesystemFile(path2))
+    difference = lz4a.compare(lz4b).details
+    assert difference[0].source1 == "test1-content"
+    assert difference[0].source2 == "test2-content"
+
+
+@skip_unless_tools_exist("lz4")
+def test_content_diff(differences):
+    assert_diff(differences[0], "text_ascii_expected_diff")
+
+
+@skip_unless_tools_exist("lz4")
+def test_compare_non_existing(monkeypatch, lz4a):
+    assert_non_existing(monkeypatch, lz4a)