@@ -12,10 +12,11 @@ * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFObject.h" +#import "OFArchiveEntry.h" OF_ASSUME_NONNULL_BEGIN @class OFArray OF_GENERIC(ObjectType); @class OFData; @@ -27,51 +28,33 @@ /** * @class OFLHAArchiveEntry OFLHAArchiveEntry.h ObjFW/OFLHAArchiveEntry.h * * @brief A class which represents an entry in an LHA archive. */ -@interface OFLHAArchiveEntry: OFObject +@interface OFLHAArchiveEntry: OFObject { OFString *_fileName, *_Nullable _directoryName, *_compressionMethod; - uint32_t _compressedSize, _uncompressedSize; - OFDate *_date; + unsigned long long _compressedSize, _uncompressedSize; + OFDate *_modificationDate; uint8_t _headerLevel; uint16_t _CRC16; uint8_t _operatingSystemIdentifier; OFString *_Nullable _fileComment; - OFNumber *_Nullable _mode, *_Nullable _UID, *_Nullable _GID; - OFString *_Nullable _owner, *_Nullable _group; - OFDate *_Nullable _modificationDate; + OFNumber *_Nullable _POSIXPermissions, *_Nullable _ownerAccountID; + OFNumber *_Nullable _groupOwnerAccountID; + OFString *_Nullable _ownerAccountName; + OFString *_Nullable _groupOwnerAccountName; OFMutableArray OF_GENERIC(OFData *) *_extensions; OF_RESERVE_IVARS(OFLHAArchiveEntry, 4) } -/** - * @brief The file name of the entry. - */ -@property (readonly, copy, nonatomic) OFString *fileName; - /** * @brief The compression method of the entry. */ @property (readonly, copy, nonatomic) OFString *compressionMethod; -/** - * @brief The compressed size of the entry's file. - */ -@property (readonly, nonatomic) uint32_t compressedSize; - -/** - * @brief The uncompressed size of the entry's file. - */ -@property (readonly, nonatomic) uint32_t uncompressedSize; - -/** - * @brief The date of the file. - */ -@property (readonly, retain, nonatomic) OFDate *date; - /** * @brief The LHA level of the file. */ @property (readonly, nonatomic) uint8_t headerLevel; @@ -83,70 +66,16 @@ /** * @brief The operating system identifier of the file. */ @property (readonly, nonatomic) uint8_t operatingSystemIdentifier; -/** - * @brief The comment of the file. - */ -@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) - OFString *fileComment; - -/** - * @brief The mode of the entry. - */ -@property OF_NULLABLE_PROPERTY (readonly, retain, nonatomic) OFNumber *mode; - -/** - * @brief The UID of the owner. - */ -@property OF_NULLABLE_PROPERTY (readonly, retain, nonatomic) OFNumber *UID; - -/** - * @brief The GID of the group. - */ -@property OF_NULLABLE_PROPERTY (readonly, retain, nonatomic) OFNumber *GID; - -/** - * @brief The owner of the file. - */ -@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *owner; - -/** - * @brief The group of the file. - */ -@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *group; - -/** - * @brief The date of the last modification of the file. - */ -@property OF_NULLABLE_PROPERTY (readonly, retain, nonatomic) - OFDate *modificationDate; - /** * @brief The LHA extensions of the file. */ @property (readonly, copy, nonatomic) OFArray OF_GENERIC(OFData *) *extensions; -/** - * @brief Creates a new OFLHAArchiveEntry with the specified file name. - * - * @param fileName The file name for the OFLHAArchiveEntry - * @return A new, autoreleased OFLHAArchiveEntry - */ -+ (instancetype)entryWithFileName: (OFString *)fileName; - - (instancetype)init OF_UNAVAILABLE; - -/** - * @brief Initializes an already allocated OFLHAArchiveEntry with the specified - * file name. - * - * @param fileName The file name for the OFLHAArchiveEntry - * @return An initialized OFLHAArchiveEntry - */ -- (instancetype)initWithFileName: (OFString *)fileName; @end OF_ASSUME_NONNULL_END #import "OFMutableLHAArchiveEntry.h"