- ListItemを右クリックするとエラーが発生する問題を修正。 - アクセス不可能なフォルダにアクセスできないように。

Author: Dolphin-kun

YMM4FileExplorer/FileExplorerControl.xaml

@@ -15,6 +15,10 @@
     <UserControl.Resources>
         <helpers:BytesToHumanReadableStringConverter x:Key="BytesConverter"/>
 
+        <ContextMenu x:Key="ItemContextMenu">
+            <MenuItem Header="大きく表示" Click="ShowLargePreview_Click"/>
+        </ContextMenu>
+        
         <!-- 詳細ListView -->
         <Style x:Key="DetailsViewItemContainerStyle" TargetType="ListViewItem">
             <Setter Property="ContextMenu" Value="{StaticResource ItemContextMenu}"/>
@@ -90,11 +94,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
-
-        <ContextMenu x:Key="ItemContextMenu">
-            <MenuItem Header="大きく表示" Click="ShowLargePreview_Click"/>
-        </ContextMenu>
-
+        
         <!-- ProgressBar -->
         <Style x:Key="CircularProgressBar" TargetType="ProgressBar">
             <Setter Property="Template">
@@ -351,9 +351,8 @@
                       Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
                       Visibility="Collapsed"/>
 
-        <DockPanel x:Name="LargePreviewPane"
+        <DockPanel x:Name="LargePreviewPanel"
                    Grid.Row="1" Grid.Column="4"
-                   MinWidth="200"
                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
                    Visibility="Collapsed">
             <Border BorderBrush="{DynamicResource {x:Static theme:YMM4Colors.IconBrushKey}}" BorderThickness="0.5" Margin="5,0,5,5">

YMM4FileExplorer/FileExplorerControl.xaml.cs

@@ -65,7 +65,7 @@ public FileExplorerControl(string initialPath = "C:\\")
             FileExplorerControl_Loaded();
             this.Unloaded += FileExplorerControl_Unloaded;
 
-            GoHomeCommand = new ActionCommand(_=> true, async _ =>
+            GoHomeCommand = new ActionCommand(_ => true, async _ =>
             {
                 string? targetPath = string.IsNullOrEmpty(_currentDirectory)
                     ? _initialPath
@@ -296,6 +296,18 @@ private async Task ExpandNodeAsync(TreeViewItem item)
 
                     foreach (var dir in directories)
                     {
+                        if (!CanAccessDirectory(dir.FullName))
+                        {
+                            var inaccessibleItem = new TreeViewItem
+                            {
+                                Header = await CreateTreeViewItemHeaderAsync(dir.Name, dir.FullName),
+                                Tag = dir.FullName,
+                                IsEnabled = false // 選択不可
+                            };
+                            item.Items.Add(inaccessibleItem);
+                            continue;
+                        }
+
                         var subItem = new TreeViewItem
                         {
                             Header = await CreateTreeViewItemHeaderAsync(dir.Name, dir.FullName),
@@ -304,9 +316,7 @@ private async Task ExpandNodeAsync(TreeViewItem item)
 
                         try
                         {
-                            bool hasSubDirs = await Task.Run(
-                                () => Directory.EnumerateDirectories(dir.FullName).Any()
-                            );
+                            bool hasSubDirs = CanAccessDirectory(dir.FullName) && Directory.EnumerateDirectories(dir.FullName).Any();
 
                             if (hasSubDirs)
                             {
@@ -341,7 +351,6 @@ private async Task UpdateTreeView(string path)
         {
             if (!Directory.Exists(path)) return;
 
-           
             var dirInfo = new DirectoryInfo(path);
             if (dirInfo.Parent == null)
             {
@@ -373,10 +382,50 @@ private async Task UpdateTreeView(string path)
 
             try
             {
-                var directories = await Task.Run(() =>
-                    dirInfo.GetDirectories()
-                           .Where(dir => FileExplorerSettings.Default.ShowHiddenFiles || !dir.Attributes.HasFlag(FileAttributes.Hidden))
-                           .ToList());
+                var directories = new List<DirectoryInfo>();
+
+                try
+                {
+                    foreach (var dir in dirInfo.EnumerateDirectories())
+                    {
+                        if (!CanAccessDirectory(dir.FullName))
+                        {
+                            var inaccessibleItem = new TreeViewItem
+                            {
+                                Header = await CreateTreeViewItemHeaderAsync(dir.Name, dir.FullName),
+                                Tag = dir.FullName,
+                                IsEnabled = false // 選択できないように
+                            };
+                            rootItem.Items.Add(inaccessibleItem);
+                            continue;
+                        }
+
+                        // 通常のフォルダ
+                        var subItem = new TreeViewItem
+                        {
+                            Header = await CreateTreeViewItemHeaderAsync(dir.Name, dir.FullName),
+                            Tag = dir.FullName
+                        };
+
+                        if (CanAccessDirectory(dir.FullName))
+                        {
+                            try
+                            {
+                                if (Directory.EnumerateDirectories(dir.FullName).Any())
+                                    subItem.Items.Add(null);
+                            }
+                            catch { /* アクセス不可は無視 */ }
+                        }
+
+                        subItem.Expanded += Folder_Expanded;
+                        rootItem.Items.Add(subItem);
+
+                    }
+                }
+                catch (UnauthorizedAccessException)
+                {
+                    Debug.WriteLine($"ディレクトリ列挙自体にアクセスできません: {dirInfo.FullName}");
+                }
 
                 foreach (var dir in directories)
                 {
@@ -460,18 +509,30 @@ private async Task HandlePathSelection(string path, bool addToHistory = true)
             if (!Directory.Exists(path)) return;
 
             _watcher?.Dispose();
+            _watcher = null;
+
             SearchTextBox.Text = string.Empty;
             _currentDirectory = path;
             await LoadFilesAsync(path);
 
-            _watcher = new FileSystemWatcher(path)
+            if (CanAccessDirectory(path))
             {
-                NotifyFilter = NotifyFilters.FileName | NotifyFilters.DirectoryName,
-                EnableRaisingEvents = true,
-            };
-            _watcher.Created += OnFileSystemChanged;
-            _watcher.Deleted += OnFileSystemChanged;
-            _watcher.Renamed += OnFileSystemChanged;
+                try
+                {
+                    _watcher = new FileSystemWatcher(path)
+                    {
+                        NotifyFilter = NotifyFilters.FileName | NotifyFilters.DirectoryName,
+                        EnableRaisingEvents = true,
+                    };
+                    _watcher.Created += OnFileSystemChanged;
+                    _watcher.Deleted += OnFileSystemChanged;
+                    _watcher.Renamed += OnFileSystemChanged;
+                }
+                catch (Exception ex)
+                {
+                    _watcher = null;
+                }
+            }
 
             PathChanged?.Invoke(path);
             if (addToHistory && !_isNavigatingViaHistory)
@@ -480,6 +541,19 @@ private async Task HandlePathSelection(string path, bool addToHistory = true)
             }
         }
 
+        private bool CanAccessDirectory(string path)
+        {
+            try
+            {
+                Directory.GetDirectories(path);
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         private async Task LoadFilesAsync(string path)
         {
             var fileCollection = new ObservableCollection<FileItem>();
@@ -494,12 +568,10 @@ await Task.Run(async () =>
                     //ディレクトリ
                     foreach (var dir in Directory.EnumerateDirectories(path))
                     {
+                        if (!CanAccessDirectory(dir)) continue;
                         var info = new DirectoryInfo(dir);
 
-                        if (
-                            !FileExplorerSettings.Default.ShowHiddenFiles
-                            && info.Attributes.HasFlag(FileAttributes.Hidden)
-                        )
+                        if (!FileExplorerSettings.Default.ShowHiddenFiles && info.Attributes.HasFlag(FileAttributes.Hidden))
                             continue;
 
                         var icon = await ShellIcon.GetIconAsync(dir, true);
@@ -554,6 +626,16 @@ await Application.Current.Dispatcher.InvokeAsync(() =>
                 });
 
             }
+            catch (UnauthorizedAccessException)
+            {
+                fileCollection.Add(new FileItem
+                {
+                    Name = "アクセス不可能なフォルダです",
+                    FullPath = path,
+                    Type = "",
+                    IsDirectory = true,
+                });
+            }
             catch (Exception ex)
             {
                 Debug.WriteLine($"ファイルの読み込みに失敗: {ex.Message}");
@@ -1023,7 +1105,7 @@ private async void ShowLargePreview_Click(object sender, RoutedEventArgs e)
             PreviewName.Text = selectedItem.Name;
             PreviewColumn.Width = new GridLength(300);
             LargePreviewSplitter.Visibility = Visibility.Visible;
-            LargePreviewPane.Visibility = Visibility.Visible;
+            LargePreviewPanel.Visibility = Visibility.Visible;
 
             if (selectedItem.IsDirectory || string.IsNullOrEmpty(selectedItem.FullPath))
             {
@@ -1233,7 +1315,7 @@ private void ClosePreview_Click(object sender, RoutedEventArgs e)
 
             PreviewContentHost.Content = null;
 
-            LargePreviewPane.Visibility = Visibility.Collapsed;
+            LargePreviewPanel.Visibility = Visibility.Collapsed;
             LargePreviewSplitter.Visibility = Visibility.Collapsed;
             PreviewColumn.Width = new GridLength(0, GridUnitType.Auto);
         }
@@ -1555,7 +1637,7 @@ private async Task NavigateHistory()
                 await SelectTreeViewItemByPathAsync(pathToNavigate);
             }
 
-            if (Directory.Exists(pathToNavigate))
+            if (Directory.Exists(pathToNavigate) && CanAccessDirectory(pathToNavigate))
             {
                 _currentDirectory = pathToNavigate;
 

YMM4FileExplorer/YMM4FileExplorer.csproj

@@ -6,7 +6,7 @@
 		<Nullable>enable</Nullable>
 		<UseWPF>true</UseWPF>
 
-		<Version>1.5.2</Version>
+		<Version>1.5.3</Version>
 
 		<!--Pdb内にソースコードのフルパスを含めない-->
 		<RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</RepoRoot>