pybit7z 0.1.2__tar.gz → 0.2.2__tar.gz

{pybit7z-0.1.2 → pybit7z-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybit7z
-Version: 0.1.2
+Version: 0.2.2
 Summary: A wrapper based on bit7z.
 Author-Email: "l.feng" <msclock@126.com>
 License: Apache-2.0
@@ -85,11 +85,11 @@ pip install pybit7z
 from pybit7z import core
 
 try:
-    extractor = core.Extractor(core.FormatSevenZip)
+    extractor = core.BitFileExtractor(core.FormatSevenZip)
     extractor.extract("path/to/archive.7z", "out/dir/")
 
     # Extracting a specific file inside an archive
-    extractor.extractMatching("path/to/archive.7z", "file.pdf", "out/dir/")
+    extractor.extract_matching("path/to/archive.7z", "file.pdf", "out/dir/")
 
     # Extracting the first file of an archive to a buffer
     buffer: bytes = extractor.extract("path/to/archive.7z")
@@ -108,7 +108,7 @@ from pybit7z import core
 
 try:
     # Opening the archive
-     archive = core.Bit7zArchiveReader("path/to/archive.gz", BitFormat::GZip)
+     archive = core.Bit7zArchiveReader("path/to/archive.gz", core.FormatGZip)
 
     # Testing the archive
     archive.test()
@@ -147,12 +147,12 @@ try:
     compressor.compress_files(files, "protected_archive.zip")
 
     # Updating an existing zip archive
-    compressor.set_update_mode(core.UpdateMode::Append)
+    compressor.set_update_mode(core.UpdateMode.Append)
     compressor.compress_files(files, "existing_archive.zip")
 
     # Compressing a single file into a buffer
-    compressor2 = core.BitFileCompressor(BitFormat::BZip2)
-    buffer: bytes = compressor2.compressFile(files[0])
+    compressor2 = core.BitFileCompressor(core.FormatBZip2)
+    buffer: bytes = compressor2.compress_file(files[0])
 except core.BitException as e:
     ... # handle the exception
 ```
@@ -181,7 +181,7 @@ except core.BitException as e:
 from pybit7z import core
 
 try:
-    arc = core.BitArchiveReader("archive.7z", core.BitFormat::SevenZip)
+    arc = core.BitArchiveReader("archive.7z", core.FormatSevenZip)
 
     # Printing archive metadata
     print("Archive properties:",

{pybit7z-0.1.2 → pybit7z-0.2.2}/README.md

@@ -43,11 +43,11 @@ pip install pybit7z
 from pybit7z import core
 
 try:
-    extractor = core.Extractor(core.FormatSevenZip)
+    extractor = core.BitFileExtractor(core.FormatSevenZip)
     extractor.extract("path/to/archive.7z", "out/dir/")
 
     # Extracting a specific file inside an archive
-    extractor.extractMatching("path/to/archive.7z", "file.pdf", "out/dir/")
+    extractor.extract_matching("path/to/archive.7z", "file.pdf", "out/dir/")
 
     # Extracting the first file of an archive to a buffer
     buffer: bytes = extractor.extract("path/to/archive.7z")
@@ -66,7 +66,7 @@ from pybit7z import core
 
 try:
     # Opening the archive
-     archive = core.Bit7zArchiveReader("path/to/archive.gz", BitFormat::GZip)
+     archive = core.Bit7zArchiveReader("path/to/archive.gz", core.FormatGZip)
 
     # Testing the archive
     archive.test()
@@ -105,12 +105,12 @@ try:
     compressor.compress_files(files, "protected_archive.zip")
 
     # Updating an existing zip archive
-    compressor.set_update_mode(core.UpdateMode::Append)
+    compressor.set_update_mode(core.UpdateMode.Append)
     compressor.compress_files(files, "existing_archive.zip")
 
     # Compressing a single file into a buffer
-    compressor2 = core.BitFileCompressor(BitFormat::BZip2)
-    buffer: bytes = compressor2.compressFile(files[0])
+    compressor2 = core.BitFileCompressor(core.FormatBZip2)
+    buffer: bytes = compressor2.compress_file(files[0])
 except core.BitException as e:
     ... # handle the exception
 ```
@@ -139,7 +139,7 @@ except core.BitException as e:
 from pybit7z import core
 
 try:
-    arc = core.BitArchiveReader("archive.7z", core.BitFormat::SevenZip)
+    arc = core.BitArchiveReader("archive.7z", core.FormatSevenZip)
 
     # Printing archive metadata
     print("Archive properties:",

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/fix_compile_options.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake
+index 1cdb84f..fd9346f 100644
+--- a/cmake/CompilerOptions.cmake
++++ b/cmake/CompilerOptions.cmake
+@@ -70,7 +70,7 @@ if( MSVC )
+         endforeach()
+     endif()
+ else()
+-    target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Werror -Wconversion -Wsign-conversion )
++    target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion )
+ endif()
+
+ # Extra warning flags for Clang

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/fix_dependency.patch

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8ff6f0..855b78d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -194,15 +194,22 @@ include( cmake/BuildOptions.cmake )
+ include( cmake/CompilerOptions.cmake )
+
+ # dependencies
+-include( cmake/Dependencies.cmake )
++# include( cmake/Dependencies.cmake )
++find_package(7zip CONFIG REQUIRED)
++add_library(7-zip ALIAS 7zip::7zip)
+
+ # 7-zip source code
+ target_link_libraries( ${LIB_TARGET} PRIVATE 7-zip )
+
+ # filesystem library (needed if std::filesystem is not available)
++if(0)
+ if( ghc_filesystem_ADDED )
+     target_link_libraries( ${LIB_TARGET} PRIVATE ghc_filesystem )
+ endif()
++else()
++    find_package(ghc_filesystem CONFIG REQUIRED)
++    target_link_libraries(${LIB_TARGET} PRIVATE ghcFilesystem::ghc_filesystem )
++endif()
+
+ # public includes
+ target_include_directories( ${LIB_TARGET} PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/fix_install.patch

@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2eb8634..f8ff6f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -179,7 +179,7 @@ message( STATUS "Language Standard for bit7z: C++${CMAKE_CXX_STANDARD}" )
+ set( LIB_TARGET bit7z${ARCH_POSTFIX} )
+ add_library( ${LIB_TARGET} STATIC )
+ target_sources( ${LIB_TARGET}
+-                PUBLIC ${PUBLIC_HEADERS}
++                # PUBLIC ${PUBLIC_HEADERS}
+                 PRIVATE ${HEADERS} ${SOURCES} )
+
+ # additional target without the architecture suffix in the name
+@@ -246,3 +246,29 @@ endif()
+ if( BIT7Z_BUILD_DOCS )
+     add_subdirectory( docs )
+ endif()
++
++set_target_properties(${LIB_TARGET} PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}")
++
++include(CMakePackageConfigHelpers)
++configure_package_config_file(
++  "${CMAKE_CURRENT_SOURCE_DIR}/unofficial-bit7z-config.cmake.in"
++  "${CMAKE_CURRENT_BINARY_DIR}/unofficial-bit7z-config.cmake"
++  INSTALL_DESTINATION "share/unofficial-bit7z"
++)
++install(
++  FILES "${CMAKE_CURRENT_BINARY_DIR}/unofficial-bit7z-config.cmake"
++  DESTINATION "share/unofficial-bit7z"
++)
++
++include(GNUInstallDirs)
++install(
++    TARGETS ${LIB_TARGET}
++    EXPORT unofficial-bit7z-targets
++    COMPONENT bit7z
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bit7z COMPONENT bit7z_development)
++
++install(EXPORT unofficial-bit7z-targets FILE unofficial-bit7z-targets.cmake NAMESPACE unofficial::bit7z:: DESTINATION share/unofficial-bit7z)
++

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/portfile.cmake

@@ -0,0 +1,46 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO rikyoz/bit7z
+    REF "v${VERSION}"
+    SHA512 c0577b07301b09726fb46164483dc277d681a74a80a90a1aa4881d949be28e6ec26678a0cfbf83e38b4915c8a724078e0771fecefba8c6dfbf9029f8db6063fa
+    HEAD_REF master
+    PATCHES
+      fix_install.patch
+      fix_dependency.patch
+      fix_compile_options.patch
+)
+
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-bit7z-config.cmake.in" DESTINATION "${SOURCE_PATH}")
+
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        regex-matching                  BIT7Z_REGEX_MATCHING
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBIT7Z_AUTO_FORMAT=ON
+        -DBIT7Z_AUTO_PREFIX_LONG_PATHS=ON
+        -DBIT7Z_DISABLE_ZIP_ASCII_PWD_CHECK=OFF
+        -DBIT7Z_PATH_SANITIZATION=ON
+        -DBIT7Z_DISABLE_USE_STD_FILESYSTEM=OFF
+        -DBIT7Z_USE_STD_BYTE=OFF
+        -DBIT7Z_USE_NATIVE_STRING=OFF
+        -DBIT7Z_USE_SYSTEM_CODEPAGE=OFF
+        -DBIT7Z_BUILD_TESTS=OFF
+        -DBIT7Z_BUILD_DOCS=OFF
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-bit7z CONFIG_PATH share/unofficial-bit7z)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/unofficial-bit7z-config.cmake.in

@@ -0,0 +1,10 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(7zip CONFIG)
+find_dependency(ghc_filesystem CONFIG)
+
+include("${CMAKE_CURRENT_LIST_DIR}/unofficial-bit7z-targets.cmake")
+
+check_required_components(bit7z)

pybit7z-0.2.2/cmake/vcpkg/ports/bit7z/vcpkg.json

@@ -0,0 +1,25 @@
+{
+  "name": "bit7z",
+  "version": "4.0.9",
+  "port-version": 1,
+  "description": "A C++ static library offering a clean and simple interface to the 7-zip shared libraries.",
+  "homepage": "https://github.com/rikyoz/bit7z",
+  "license": "MPL-2.0",
+  "dependencies": [
+    "7zip",
+    "ghc-filesystem",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
+  "features": {
+    "regex-matching": {
+      "description": "Enables the support for extracting files matching regular expressions"
+    }
+  }
+}

{pybit7z-0.1.2 → pybit7z-0.2.2}/noxfile.py

@@ -11,7 +11,7 @@ DIR = Path(__file__).parent.resolve()
 nox.options.sessions = ["lint", "pylint", "tests"]
 
 
-@nox.session
+@nox.session(reuse_venv=True)
 def lint(session: nox.Session) -> None:
     """
     Run the linter.
@@ -78,6 +78,16 @@ def docs(session: nox.Session) -> None:
         session.run("sphinx-build", "--keep-going", *shared_args)
 
 
+@nox.session(reuse_venv=True)
+def pyi(session: nox.Session) -> None:
+    """
+    Generate the Pyi type stubs.
+    """
+    session.install("pybind11-stubgen")
+    session.install(".[test]")
+    session.run("pybind11-stubgen", "pybit7z._core", "-o", "src")
+
+
 @nox.session
 def build(session: nox.Session) -> None:
     """

{pybit7z-0.1.2 → pybit7z-0.2.2}/src/_core/CMakeLists.txt

@@ -28,12 +28,14 @@ target_include_interface_directories(
   ${target_name_internal} ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_BINARY_DIR}/git_version)
 
-if(NOT VCPKG_TARGET_ARCHITECTURE MATCHES [[86]])
-  set(bit7z_suffix 64)
-endif()
-
-target_link_libraries(${target_name_internal}
-                      PUBLIC 7zip::7zip unofficial::bit7z::bit7z${bit7z_suffix})
+get_property(
+  imported_targets
+  DIRECTORY
+  PROPERTY IMPORTED_TARGETS)
+list(FILTER imported_targets INCLUDE REGEX [[bit7z::]])
+
+target_link_libraries(${target_name_internal} PUBLIC 7zip::7zip
+                                                     ${imported_targets})
 
 # The main target only contains main logits. Here it is recommended to put the
 # parts that need to be verified and tested in the target target_name_internal

{pybit7z-0.1.2 → pybit7z-0.2.2}/src/_core/src/pybind.cpp

@@ -798,6 +798,19 @@ Returns:
         .def("archive_path",
              &bit7z::BitInputArchive::archivePath,
              py::doc(R"pydoc(the path to the archive (the empty string for buffer/stream archives).)pydoc"))
+        .def(
+            "use_format_property",
+            [](bit7z::BitInputArchive &self, const std::wstring &name, const bit7z::BitPropVariant &property) {
+                self.useFormatProperty(name.c_str(), property);
+            },
+            py::arg("name"),
+            py::arg("property"),
+            py::doc(
+                R"pydoc(Use the given format property to read the archive. See <https://github.com/rikyoz/bit7z/issues/248> for more information.
+
+Args:
+    name: the name of the property.
+    property: the property value.)pydoc"))
         .def("extract_to",
              static_cast<void (bit7z::BitInputArchive::*)(const std::string &) const>(
                  &bit7z::BitInputArchive::extractTo),

{pybit7z-0.1.2 → pybit7z-0.2.2}/src/pybit7z/_core.pyi

@@ -1163,6 +1163,14 @@ class BitInputArchive:
 
         If the archive is not valid, or there's no item at the given index, a BitException is thrown!
         """
+    def use_format_property(self, name: str, property: BitPropVariant) -> None:
+        """
+        Use the given format property to read the archive. See <https://github.com/rikyoz/bit7z/issues/248> for more information.
+
+        Args:
+            name: the name of the property.
+            property: the property value.
+        """
 
 class BitMemCompressor(BitAbstractArchiveCreator):
     def __init__(self, format: BitInOutFormat) -> None:

{pybit7z-0.1.2 → pybit7z-0.2.2}/src/pybit7z/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.2'
-__version_tuple__ = version_tuple = (0, 1, 2)
+__version__ = version = '0.2.2'
+__version_tuple__ = version_tuple = (0, 2, 2)

{pybit7z-0.1.2 → pybit7z-0.2.2}/vcpkg.json

@@ -23,7 +23,7 @@
     },
     {
       "name": "bit7z",
-      "version": "4.0.8"
+      "version": "4.0.9#1"
     },
     {
       "name": "7zip",