🛠 Cleaned up and fixed a few minor issues. Added support for removing wrappers by path.

Author: admkopec

LSFileWrapper.h

@@ -118,7 +118,7 @@ FOUNDATION_EXPORT const unsigned char LSFileWrapperVersionString[];
  *
  *  @warning Should only be called on the LSFileWrapper of type Directory.
  *
- *  @param path The path of child wrapper as NSString.
+ *  @param path Relative path of child wrapper as NSString.
  *
  *  @return Optional stored child wrapper as LSFileWrapper.
  */
@@ -129,7 +129,7 @@ FOUNDATION_EXPORT const unsigned char LSFileWrapperVersionString[];
  *
  *  @warning Should only be called on the LSFileWrapper of type Directory.
  *
- *  @param path The path of child wrapper as NSString.
+ *  @param path Relative path of child wrapper as NSString.
  *  @param create Boolean indicating if LSFileWrapper should be created at specified path when none is found.
  *  @param isDir Boolean indicating if LSFileWrapper that should be created at specified path should be of type Directory.
  *
@@ -175,9 +175,9 @@ FOUNDATION_EXPORT const unsigned char LSFileWrapperVersionString[];
  *
  *  @warning Should only be called on the LSFileWrapper of type Directory.
  *
- *  @param filename Child wrapper's filename which should be removed from the current LSFileWrapper.
+ *  @param path Relative path to child wrapper which should be removed from the current LSFileWrapper tree.
  */
-- (void)removeFileWrapperWithFilename:(nonnull NSString *)filename NS_SWIFT_NAME(removeFileWrapper(with:));
+- (void)removeFileWrapperWithPath:(nonnull NSString *)path NS_SWIFT_NAME(removeFileWrapper(with:));
 
 /**
  *  @brief Adds a new child wrapper of type File with the supplied name to the current LSFileWrapper. If a wrapper is already present with the same name, then the new wrapper will be saved under the returned named to prevent collisions.
@@ -262,7 +262,6 @@ FOUNDATION_EXPORT const unsigned char LSFileWrapperVersionString[];
 
 @property (readonly, strong, nonatomic, nullable) NSString *filename;
 @property (readonly, strong, nonatomic, nullable) NSString *fileType;
-@property (readonly, strong, nonatomic, nullable) NSMutableDictionary<NSString*, LSFileWrapper*> *fileWrappers;
 @property (readonly, strong, nonatomic, nullable) NSURL *writtenURL;
 @property (readonly, nonatomic) BOOL updated;
 @property (readonly, nonatomic) BOOL isDirectory;

LSFileWrapper.m

@@ -160,7 +160,8 @@ - (UIImage *)image
     return nil;
 }
 #elif TARGET_OS_OSX
-- (NSImage *)image {
+- (NSImage *)image
+{
     if (content == nil && writtenURL != nil) {
         content = [[NSImage alloc] initWithContentsOfFile:writtenURL.path];
         cacheFile = YES;
@@ -262,7 +263,8 @@ - (void)setFileWrapper:(LSFileWrapper *)fileWrapper withFilename:(NSString *)fil
     [self setFileWrapper:fileWrapper filename:filename_ replace:YES];
 }
 
-- (void)removeFileWrapper:(LSFileWrapper *)fileWrapper {
+- (void)removeFileWrapper:(LSFileWrapper *)fileWrapper
+{
     if (!isDirectory) {
         @throw [NSException exceptionWithName:NSInternalInconsistencyException
                                        reason:@"LSFileWrapper file is not a directory."
@@ -275,24 +277,26 @@ - (void)removeFileWrapper:(LSFileWrapper *)fileWrapper {
                                      userInfo:nil];
         return;
     }
-    [self removeFileWrapperWithFilename:fileWrapper.filename];
+    [self removeFileWrapperWithPath:fileWrapper.filename];
 }
 
-- (void)removeFileWrapperWithFilename:(NSString *)filename_ {
-    if (!isDirectory) {
-        @throw [NSException exceptionWithName:NSInternalInconsistencyException
-                                       reason:@"LSFileWrapper file is not a directory."
-                                     userInfo:nil];
+- (void)removeFileWrapperWithPath:(NSString *)path
+{
+    NSString *dirpath = [path stringByDeletingLastPathComponent];
+    NSString *filename_ = [path lastPathComponent];
+    LSFileWrapper *dirFileWrapper = [self walkDirectoryPath:dirpath create:NO];
+    
+    if (!dirFileWrapper) {
         return;
     }
-    LSFileWrapper *existing = [fileWrappers objectForKey:filename_];
+    LSFileWrapper *existing = [dirFileWrapper.fileWrappers objectForKey:filename_];
     if (existing.writtenURL) {
         existing.deleted = YES;
     }
     else {
-        [fileWrappers removeObjectForKey:filename_];
+        [[dirFileWrapper fileWrappers] removeObjectForKey:filename_];
     }
-    updated = YES;
+    dirFileWrapper.updated = YES;
 }
 
 - (NSString *)addContent:(id<NSObject>)content_ withFilename:(NSString *)filename_
@@ -332,7 +336,8 @@ - (BOOL)writeUpdatesToURL:(NSURL *)url error:(NSError *__autoreleasing *)outErro
     return [self writeUpdates:updates filemanager:[[NSFileManager alloc] init] error:outError];
 }
 
-- (BOOL)writeToURL:(NSURL *)url error:(NSError *__autoreleasing *)outError {
+- (BOOL)writeToURL:(NSURL *)url error:(NSError *__autoreleasing *)outError
+{
     NSMutableArray *updates = [[NSMutableArray alloc] init];
 
     if (parent) {
@@ -346,7 +351,8 @@ - (BOOL)writeToURL:(NSURL *)url error:(NSError *__autoreleasing *)outError {
 }
 
 #if TARGET_OS_OSX
-- (BOOL)writeToURL:(NSURL *)url forSaveOperation:(NSSaveOperationType)saveOperation originalContentsURL:(nullable NSURL *)absoluteOriginalContentsURL backupDocumentURL:(nullable NSURL *)backupFileURL error:(NSError *__autoreleasing *)outError {
+- (BOOL)writeToURL:(NSURL *)url forSaveOperation:(NSSaveOperationType)saveOperation originalContentsURL:(nullable NSURL *)absoluteOriginalContentsURL backupDocumentURL:(nullable NSURL *)backupFileURL error:(NSError *__autoreleasing *)outError
+{
     switch (saveOperation) {
         case NSAutosaveInPlaceOperation:
             // Auto overwrite
@@ -483,8 +489,10 @@ - (NSString *)setFileWrapper:(LSFileWrapper *)fileWrapper filename:(NSString *)f
                 format = [NSString stringWithFormat:@"%@ %%d", basename];
             }
             while (true) {
+                // Checking both cases for iOS and macOS interoperability
                 LSFileWrapper *existing = [fileWrappers objectForKey:filename_];
-                if (!existing || existing.deleted) {
+                LSFileWrapper *existingCase = [fileWrappers objectForKey:[filename_ lowercaseString]];
+                if ((!existing || existing.deleted) && (!existingCase || existingCase.deleted)) {
                     break;
                 }
                 filename_ = [NSString stringWithFormat:format, ++num];