Add nativePath() method to BitArchiveItem

xiaoshzx · Apr 29, 2024 · a78cf34 · a78cf34
1 parent 310cf97
commit a78cf34
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/include/bit7z/bitarchiveitem.hpp b/include/bit7z/bitarchiveitem.hpp
@@ -53,6 +53,14 @@ class BitArchiveItem : public BitGenericItem {
          */
         BIT7Z_NODISCARD auto path() const -> tstring override;
 
+        /**
+         * @note Same as path(), but returning a native string (i.e., std::wstring on Windows, std::string elsewhere).
+         *
+         * @return the path of the item in the archive, if available or inferable from the name, or an empty string
+         *         otherwise.
+         */
+        BIT7Z_NODISCARD auto nativePath() const -> native_string;
+
         /**
          * @return the uncompressed size of the item.
          */

diff --git a/src/bitarchiveitem.cpp b/src/bitarchiveitem.cpp
@@ -63,6 +63,15 @@ auto BitArchiveItem::path() const -> tstring {
     return path.getString();
 }
 
+auto BitArchiveItem::nativePath() const -> native_string {
+    BitPropVariant path = itemProperty( BitProperty::Path );
+    if ( path.isEmpty() ) {
+        path = itemProperty( BitProperty::Name );
+        return path.isEmpty() ? native_string{} : path.getNativeString();
+    }
+    return path.getNativeString();
+}
+
 auto BitArchiveItem::size() const -> uint64_t {
     const BitPropVariant size = itemProperty( BitProperty::Size );
     return size.isEmpty() ? 0 : size.getUInt64();