feat: added drive detectors

egorozh · Aug 24, 2024 · 82e5eb0 · 82e5eb0
1 parent 522e6fd
commit 82e5eb0
Show file tree

Hide file tree

Showing 13 changed files with 282 additions and 88 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,31 +1,33 @@
 <Project>
-	<PropertyGroup>
-		<Nullable>Enable</Nullable>
-
-		<Version>8.0.0-preview2</Version>
+    <PropertyGroup>
+        <Nullable>Enable</Nullable>
 
-		<Company>Egorozh</Company>
-		<Product>CrossPlatform File Operations</Product>
-		<Authors>Egorozh</Authors>
-		<PackageProjectUrl>https://github.com/egorozh/WindowsOperations</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/egorozh/WindowsOperations</RepositoryUrl>
-		<PackageTags>Windows, MacOs, Files, FileOperations, File operations</PackageTags>
+        <IsAotCompatible>true</IsAotCompatible>
+
+        <Version>8.0.0-preview4</Version>
 
-		<PackageLicenseFile>LICENSE</PackageLicenseFile>
-		<PackageReadmeFile>README.md</PackageReadmeFile>
-	</PropertyGroup>
+        <Company>Egorozh</Company>
+        <Product>CrossPlatform File Operations</Product>
+        <Authors>Egorozh</Authors>
+        <PackageProjectUrl>https://github.com/egorozh/FileOperations</PackageProjectUrl>
+        <RepositoryUrl>https://github.com/egorozh/FileOperations</RepositoryUrl>
+        <PackageTags>Windows, MacOs, Files, FileOperations, File operations</PackageTags>
 
-	<ItemGroup>
-		<None Include="..\..\LICENSE">
-			<Pack>True</Pack>
-			<PackagePath></PackagePath>
-		</None>
-	</ItemGroup>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+    </PropertyGroup>
 
-	<ItemGroup>
-		<None Include="..\..\README.md">
-			<Pack>True</Pack>
-			<PackagePath></PackagePath>
-		</None>
-	</ItemGroup>
+    <ItemGroup>
+        <None Include="..\..\LICENSE">
+            <Pack>True</Pack>
+            <PackagePath />
+        </None>
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Include="..\..\README.md">
+            <Pack>True</Pack>
+            <PackagePath />
+        </None>
+    </ItemGroup>
 </Project>
diff --git a/src/FileOperations.Abstractions/Enums/DriveDetectType.cs b/src/FileOperations.Abstractions/Enums/DriveDetectType.cs
@@ -0,0 +1,13 @@
+namespace FileOperations.Abstractions.Enums;
+
+/// <summary>
+/// Type of notification about adding or removing a logical disk in the system
+/// </summary>
+public enum DriveDetectType
+{
+    Unknown,
+
+    Added,
+
+    Removed
+}
diff --git a/src/FileOperations.Abstractions/FileOperations.Abstractions.csproj b/src/FileOperations.Abstractions/FileOperations.Abstractions.csproj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-
-
+
         <Description>File operations abstractions for cross platform implementations</Description>
         <PackageId>Egorozh.FileOperations.Abstractions</PackageId>
     </PropertyGroup>

diff --git a/src/FileOperations.Abstractions/IDriveDetector.cs b/src/FileOperations.Abstractions/IDriveDetector.cs
@@ -0,0 +1,8 @@
+using FileOperations.Abstractions.Enums;
+
+namespace FileOperations.Abstractions;
+
+public interface IDriveDetector
+{
+    event Action<DriveDetectType, string> DriveChanged;
+}
diff --git a/src/FileOperations.Abstractions/IFileOperations.cs b/src/FileOperations.Abstractions/IFileOperations.cs
@@ -10,4 +10,7 @@ public interface IFileOperations
 
 
     void DeleteFile(string file, RecycleOption recycle);
+
+
+    string[] GetLogicalDrives();
 }
diff --git a/src/FileOperations.Abstractions/IPlatformFoldersProvider.cs b/src/FileOperations.Abstractions/IPlatformFoldersProvider.cs
@@ -0,0 +1,30 @@
+namespace FileOperations.Abstractions;
+
+public interface IPlatformFoldersProvider
+{
+    /// <summary>
+    /// <para>
+    /// Windows: %APPDATA%\
+    /// </para>
+    /// <para>
+    /// macOS: $HOME/Library/Application Support/
+    /// </para>
+    /// <para>
+    /// Linux: $HOME/.config/
+    /// </para>
+    /// </summary>
+    string GetAppDataPath();
+
+
+    string? GetDesktopFolderPath();
+
+    string? GetDownloadFolderPath();
+
+    string? GetDocumentsFolderPath();
+
+    string? GetMoviesFolderPath();
+
+    string? GetMusicFolderPath();
+
+    string? GetPicturesFolderPath();
+}
diff --git a/src/FileOperations.MacOs/MacOsDriveDetector.cs b/src/FileOperations.MacOs/MacOsDriveDetector.cs
@@ -0,0 +1,10 @@
+using System;
+using FileOperations.Abstractions;
+using FileOperations.Abstractions.Enums;
+
+namespace FileOperations.MacOs;
+
+public class MacOsDriveDetector : IDriveDetector
+{
+    public event Action<DriveDetectType, string>? DriveChanged;
+}
diff --git a/src/FileOperations.MacOs/MacOsFileOperations.cs b/src/FileOperations.MacOs/MacOsFileOperations.cs
@@ -1,21 +1,13 @@
 using System.IO;
-using AppKit;
+using System.Linq;
 using FileOperations.Abstractions;
 using FileOperations.Abstractions.Enums;
 using Foundation;
 
-
 namespace FileOperations.MacOs;
 
-
-/// <summary>
-/// Use <see cref="Initialize"/> for working api
-/// </summary>
 public class MacOsFileOperations : IFileOperations
 {
-    public static void Initialize() => NSApplication.Init();
-
-
     public void DeleteDirectory(string directory, DeleteDirectoryOption onDirectoryNotEmpty,
         RecycleOption recycle = RecycleOption.DeletePermanently)
     {
@@ -40,14 +32,19 @@ public void DeleteFile(string file, RecycleOption recycle)
         File.Delete(file);
     }
 
+    public string[] GetLogicalDrives()
+    {
+        string driveName = Directory.GetLogicalDrives().First();
+
+        return [driveName];
+    }
 
     private void MoveToRecycleBin(string path, bool isDir)
     {
         NSFileManager fileManager = NSFileManager.DefaultManager;
 
         var url = new NSUrl(path, isDir: isDir);
 
-        if (url is not null)
-            fileManager.TrashItem(url, out var res, out var error);
+        fileManager.TrashItem(url, out var res, out var error);
     }
 }
diff --git a/src/FileOperations.MacOs/MacOsPlatformFoldersProvider.cs b/src/FileOperations.MacOs/MacOsPlatformFoldersProvider.cs
@@ -0,0 +1,37 @@
+using System;
+using System.IO;
+using FileOperations.Abstractions;
+
+namespace FileOperations.MacOs;
+
+public class MacOsPlatformFoldersProvider : IPlatformFoldersProvider
+{
+    public string GetAppDataPath()
+    {
+        string home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        string appDataPath = Path.Combine(home, "Library", "Application Support");
+
+        return appDataPath;
+    }
+
+    public string? GetDesktopFolderPath() => Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
+
+    public string? GetDownloadFolderPath()
+    {
+        return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "Downloads");
+    }
+
+    public string? GetDocumentsFolderPath() => Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);
+
+
+    public string? GetMoviesFolderPath()
+    {
+        return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+            "Movies");
+    }
+
+    public string? GetMusicFolderPath() => Environment.GetFolderPath(Environment.SpecialFolder.MyMusic);
+
+    public string? GetPicturesFolderPath() => Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
+}
diff --git a/src/FileOperations.Windows/FileOperations.Windows.csproj b/src/FileOperations.Windows/FileOperations.Windows.csproj
@@ -1,33 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
-
-		<Description>File operations for Windows</Description>
-		<PackageId>Egorozh.FileOperations.Windows</PackageId>
-		<RootNamespace>FileOperations.Windows</RootNamespace>
-
-	</PropertyGroup>
-
-
-	<ItemGroup>
-		<Compile Update="Resources\SR.Designer.cs">
-			<DependentUpon>SR.resx</DependentUpon>
-			<DesignTime>True</DesignTime>
-			<AutoGen>True</AutoGen>
-		</Compile>
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Update="Resources\SR.resx">
-			<SubType>Designer</SubType>
-			<LastGenOutput>SR.Designer.cs</LastGenOutput>
-			<Generator>PublicResXFileCodeGenerator</Generator>
-		</EmbeddedResource>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\FileOperations.Abstractions\FileOperations.Abstractions.csproj" />
-	</ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+
+        <Description>File operations for Windows</Description>
+        <PackageId>Egorozh.FileOperations.Windows</PackageId>
+        <RootNamespace>FileOperations.Windows</RootNamespace>
+
+    </PropertyGroup>
+
+
+    <ItemGroup>
+        <Compile Update="Resources\SR.Designer.cs">
+            <DependentUpon>SR.resx</DependentUpon>
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+        </Compile>
+    </ItemGroup>
+
+    <ItemGroup>
+        <EmbeddedResource Update="Resources\SR.resx">
+            <SubType>Designer</SubType>
+            <LastGenOutput>SR.Designer.cs</LastGenOutput>
+            <Generator>PublicResXFileCodeGenerator</Generator>
+        </EmbeddedResource>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\FileOperations.Abstractions\FileOperations.Abstractions.csproj" />
+
+        <PackageReference Include="System.Management" Version="8.0.0" />
+    </ItemGroup>
 
 </Project>
diff --git a/src/FileOperations.Windows/WindowsDriveDetector.cs b/src/FileOperations.Windows/WindowsDriveDetector.cs
@@ -0,0 +1,67 @@
+using System.Management;
+using FileOperations.Abstractions;
+using FileOperations.Abstractions.Enums;
+
+namespace FileOperations.Windows;
+
+public class WindowsDriveDetector : IDriveDetector
+{
+    #region Private Fields
+
+    private const string QUERY = "SELECT * FROM Win32_VolumeChangeEvent WHERE EventType = 2 or EventType = 3";
+
+    #endregion
+
+
+    #region Events
+
+    public event Action<DriveDetectType, string>? DriveChanged;
+
+    #endregion
+
+
+    #region Constructor
+
+    public WindowsDriveDetector()
+    {
+        ManagementEventWatcher watcher = new()
+        {
+            Query = new WqlEventQuery(QUERY)
+        };
+
+        watcher.EventArrived += WatcherOnEventArrived;
+
+        watcher.Start();
+    }
+
+    #endregion
+
+
+    #region Private Methods
+
+    private void WatcherOnEventArrived(object sender, EventArrivedEventArgs e)
+    {
+        string? driveName = e.NewEvent.Properties["DriveName"].Value.ToString();
+
+        bool res = int.TryParse(e.NewEvent.Properties["EventType"].Value.ToString(), out int eventTypeValue);
+
+        if (res && driveName != null)
+            RaiseDriveChanged(driveName, eventTypeValue);
+    }
+
+
+    private void RaiseDriveChanged(string driveName, int eventType)
+    {
+        DriveDetectType type = eventType switch
+        {
+            2 => DriveDetectType.Added,
+            3 => DriveDetectType.Removed,
+
+            _ => DriveDetectType.Unknown
+        };
+
+        DriveChanged?.Invoke(type, driveName);
+    }
+
+    #endregion
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,7 @@ public interface IFileOperations


		void DeleteFile(string file, RecycleOption recycle);


		string[] GetLogicalDrives();
		}