modules/gui/macosx/library/media-source/VLCMediaSource.h

@@ -47,6 +47,8 @@ extern NSString *VLCMediaSourcePreparsingEnded;
 
 - (void)preparseInputNodeWithinTree:(VLCInputNode *)inputNode;
 - (void)clearChildNodesForNode:(input_item_node_t*)inputNode;
+- (void)generateChildNodesForDirectoryNode:(input_item_node_t*)directoryNode
+                                   withUrl:(NSURL*)directoryUrl;
 
 @property (nonatomic, readonly) NSString *mediaSourceDescription;
 @property (nonatomic, readonly) VLCInputNode *rootNode;

modules/gui/macosx/library/media-source/VLCMediaSource.m

@@ -417,6 +417,13 @@ static const char *const myFoldersDescription = "My Folders";
         return;
     }
 
+    // Clear pre-existing child nodes
+    while (directoryNode->i_children > 0) {
+        input_item_node_t * const child = directoryNode->pp_children[0];
+        input_item_node_RemoveNode(directoryNode, child);
+        input_item_node_Delete(child);
+    }
+
     NSError *error;
     NSArray<NSURL *> *subDirectories = [[NSFileManager defaultManager] contentsOfDirectoryAtURL:directoryUrl
                                                                      includingPropertiesForKeys:@[NSURLIsDirectoryKey]

modules/gui/macosx/library/media-source/VLCMediaSourceBaseDataSource.m

@@ -420,6 +420,7 @@ referenceSizeForHeaderInSection:(NSInteger)section
     newChildDataSource.pathControl = self.pathControl;
     newChildDataSource.tableView = self.tableView;
     newChildDataSource.navigationStack = self.navigationStack;
+    newChildDataSource.parentBaseDataSource = self;
 
     [self setChildDataSource:newChildDataSource];
     [self.navigationStack appendCurrentLibraryState];

modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.h

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class VLCInputNodePathControl;
 @class VLCLibraryMediaSourceViewNavigationStack;
 @class VLCMediaSource;
+@class VLCMediaSourceBaseDataSource;
 
 extern NSString * const VLCMediaSourceDataSourceNodeChanged;
 
@@ -44,6 +45,7 @@ extern NSString * const VLCMediaSourceDataSourceNodeChanged;
 @property (readwrite, weak) NSTableView *tableView;
 @property (readwrite, weak) VLCInputNodePathControl *pathControl;
 @property (readwrite, weak) VLCLibraryMediaSourceViewNavigationStack *navigationStack;
+@property (readwrite, weak) VLCMediaSourceBaseDataSource *parentBaseDataSource;
 
 - (void)setupViews;
 - (VLCInputItem *)mediaSourceInputItemAtRow:(NSInteger)tableViewRow;

modules/gui/macosx/library/media-source/VLCMediaSourceDataSource.m

@@ -22,7 +22,13 @@
 
 #import "VLCMediaSourceDataSource.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
 #import "VLCLibraryMediaSourceViewNavigationStack.h"
+#import "VLCMediaSourceBaseDataSource.h"
 #import "VLCMediaSourceCollectionViewItem.h"
 #import "VLCMediaSource.h"
 
@@ -47,15 +53,65 @@ NSString * const VLCMediaSourceDataSourceNodeChanged = @"VLCMediaSourceDataSourc
 {
     VLCInputItem *_childRootInput;
 }
+
+@property (readwrite) dispatch_source_t observedPathDispatchSource;
+
 @end
 
 @implementation VLCMediaSourceDataSource
 
+- (dispatch_source_t)observeLocalUrl:(NSURL *)url
+                      forVnodeEvents:(dispatch_source_vnode_flags_t)eventsFlags
+                    withEventHandler:(dispatch_block_t)eventHandlerBlock
+{
+    const uintptr_t descriptor = open(url.path.UTF8String, O_EVTONLY);
+    if (descriptor == -1) {
+        return nil;
+    }
+    struct stat fileStat;
+    const int statResult = fstat(descriptor, &fileStat);
+
+    const dispatch_queue_t globalQueue =
+        dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+    const dispatch_source_t fileDispatchSource =
+        dispatch_source_create(DISPATCH_SOURCE_TYPE_VNODE, descriptor, eventsFlags, globalQueue);
+    dispatch_source_set_event_handler(fileDispatchSource, eventHandlerBlock);
+    dispatch_source_set_cancel_handler(fileDispatchSource, ^{
+        close(descriptor);
+    });
+    dispatch_resume(fileDispatchSource);
+    return fileDispatchSource;
+}
+
 - (void)setNodeToDisplay:(nonnull VLCInputNode*)nodeToDisplay
 {
     NSAssert(nodeToDisplay, @"Nil node to display, will not set");
     _nodeToDisplay = nodeToDisplay;
+
+    input_item_node_t * const inputNode = nodeToDisplay.vlcInputItemNode;
+    NSURL * const nodeUrl = [NSURL URLWithString:nodeToDisplay.inputItem.MRL];
+    [self.displayedMediaSource generateChildNodesForDirectoryNode:inputNode withUrl:nodeUrl];
+
     [self reloadData];
+
+    const __weak typeof(self) weakSelf = self;
+
+    self.observedPathDispatchSource = [self observeLocalUrl:nodeUrl
+                                             forVnodeEvents:DISPATCH_VNODE_WRITE | DISPATCH_VNODE_DELETE | DISPATCH_VNODE_RENAME
+                                           withEventHandler:^{
+        const uintptr_t eventFlags = dispatch_source_get_data(weakSelf.observedPathDispatchSource);
+        if (eventFlags & DISPATCH_VNODE_DELETE || eventFlags & DISPATCH_VNODE_RENAME) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [weakSelf.parentBaseDataSource homeButtonAction:weakSelf];
+            });
+        } else {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [weakSelf.displayedMediaSource generateChildNodesForDirectoryNode:inputNode
+                                                                          withUrl:nodeUrl];
+                [weakSelf reloadData];
+            });
+        }
+    }];
 }
 
 - (void)setupViews