Code Quality: Update structure of storage projects (#15407)

Co-authored-by: Yair <[email protected]>
files-community · May 16, 2024 · 9b4aec7 · 9b4aec7
1 parent e86757a
commit 9b4aec7
Show file tree

Hide file tree

Showing 48 changed files with 237 additions and 282 deletions.
diff --git a/src/Files.App.Storage/GlobalUsings.cs b/src/Files.App.Storage/GlobalUsings.cs
@@ -0,0 +1,31 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+// System
+global using global::System;
+global using global::System.Collections;
+global using global::System.Collections.Generic;
+global using global::System.Collections.ObjectModel;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
+global using global::System.ComponentModel;
+global using global::System.Diagnostics;
+global using global::System.Text.Json;
+global using global::System.Text.Json.Serialization;
+global using SystemIO = global::System.IO;
+
+// Files.Core.Storage
+
+global using global::Files.Core.Storage;
+global using global::Files.Core.Storage.Contracts;
+global using global::Files.Core.Storage.DirectStorage;
+global using global::Files.Core.Storage.Enums;
+global using global::Files.Core.Storage.EventArguments;
+global using global::Files.Core.Storage.ExtendableStorage;
+global using global::Files.Core.Storage.Extensions;
+global using global::Files.Core.Storage.LocatableStorage;
+global using global::Files.Core.Storage.ModifiableStorage;
+global using global::Files.Core.Storage.MutableStorage;
+global using global::Files.Core.Storage.NestedStorage;
+global using global::Files.Core.Storage.StorageEnumeration;
diff --git a/src/Files.App.Storage/NativeStorage/NativeFolderWatcher.cs b/src/Files.App.Storage/NativeStorage/NativeFolderWatcher.cs
diff --git a/...iles.App.Storage/FtpStorage/FtpHelpers.cs → ...torage/Storables/FtpStorage/FtpHelpers.cs b/...iles.App.Storage/FtpStorage/FtpHelpers.cs → ...torage/Storables/FtpStorage/FtpHelpers.cs
@@ -3,9 +3,6 @@
 
 using Files.Shared.Extensions;
 using FluentFTP;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.FtpStorage
 {

diff --git a/...iles.App.Storage/FtpStorage/FtpManager.cs → ...torage/Storables/FtpStorage/FtpManager.cs b/...iles.App.Storage/FtpStorage/FtpManager.cs → ...torage/Storables/FtpStorage/FtpManager.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections.Generic;
 using System.Net;
 
 namespace Files.App.Storage.FtpStorage

diff --git a/...les.App.Storage/FtpStorage/FtpStorable.cs → ...orage/Storables/FtpStorage/FtpStorable.cs b/...les.App.Storage/FtpStorage/FtpStorable.cs → ...orage/Storables/FtpStorage/FtpStorable.cs
@@ -1,12 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.NestedStorage;
 using FluentFTP;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.FtpStorage
 {

diff --git a/....App.Storage/FtpStorage/FtpStorageFile.cs → ...ge/Storables/FtpStorage/FtpStorageFile.cs b/....App.Storage/FtpStorage/FtpStorageFile.cs → ...ge/Storables/FtpStorage/FtpStorageFile.cs
@@ -1,14 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using Files.Core.Storage.NestedStorage;
-using System;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.FtpStorage
 {

diff --git a/...pp.Storage/FtpStorage/FtpStorageFolder.cs → .../Storables/FtpStorage/FtpStorageFolder.cs b/...pp.Storage/FtpStorage/FtpStorageFolder.cs → .../Storables/FtpStorage/FtpStorageFolder.cs
@@ -1,22 +1,10 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.DirectStorage;
-using Files.Core.Storage.Enums;
-using Files.Core.Storage.ExtendableStorage;
-using Files.Core.Storage.Extensions;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using Files.Core.Storage.NestedStorage;
 using Files.Shared.Helpers;
 using FluentFTP;
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.FtpStorage
 {

diff --git a/...p.Storage/FtpStorage/FtpStorageService.cs → ...Storables/FtpStorage/FtpStorageService.cs b/...p.Storage/FtpStorage/FtpStorageService.cs → ...Storables/FtpStorage/FtpStorageService.cs
@@ -1,12 +1,8 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
 using FluentFTP;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.FtpStorage
 {

diff --git a/...s.App.Storage/NativeStorage/NativeFile.cs → ...age/Storables/NativeStorage/NativeFile.cs b/...s.App.Storage/NativeStorage/NativeFile.cs → ...age/Storables/NativeStorage/NativeFile.cs
@@ -1,14 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.ExtendableStorage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using Files.Core.Storage.NestedStorage;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.NativeStorage
 {

diff --git a/...App.Storage/NativeStorage/NativeFolder.cs → ...e/Storables/NativeStorage/NativeFolder.cs b/...App.Storage/NativeStorage/NativeFolder.cs → ...e/Storables/NativeStorage/NativeFolder.cs
@@ -1,21 +1,8 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.DirectStorage;
-using Files.Core.Storage.Enums;
-using Files.Core.Storage.ExtendableStorage;
-using Files.Core.Storage.Extensions;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using Files.Core.Storage.MutableStorage;
-using Files.Core.Storage.NestedStorage;
-using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.NativeStorage
 {
@@ -176,11 +163,5 @@ public virtual Task<INestedFolder> CreateFolderAsync(string desiredName, bool ov
 			_ = Directory.CreateDirectory(path);
 			return Task.FromResult<INestedFolder>(new NativeFolder(path));
 		}
-
-		/// <inheritdoc/>
-		public Task<IFolderWatcher> GetFolderWatcherAsync(CancellationToken cancellationToken = default)
-        {
-            return Task.FromResult<IFolderWatcher>(new NativeFolderWatcher(this));
-        }
-    }
+	}
 }
diff --git a/...p.Storage/NativeStorage/NativeStorable.cs → ...Storables/NativeStorage/NativeStorable.cs b/...p.Storage/NativeStorage/NativeStorable.cs → ...Storables/NativeStorage/NativeStorable.cs
@@ -1,12 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.NestedStorage;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.Storage.NativeStorage
 {

diff --git a/...age/NativeStorage/NativeStorageService.cs → ...les/NativeStorage/NativeStorageService.cs b/...age/NativeStorage/NativeStorageService.cs → ...les/NativeStorage/NativeStorageService.cs
@@ -1,12 +1,8 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
 using Files.Shared.Helpers;
-using System;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
 
 namespace Files.App.Storage.NativeStorage

diff --git a/...Storage/WindowsStorage/WindowsStorable.cs → ...orables/WindowsStorage/WindowsStorable.cs b/...Storage/WindowsStorage/WindowsStorable.cs → ...orables/WindowsStorage/WindowsStorable.cs
@@ -1,12 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.NestedStorage;
 using Files.Shared.Helpers;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
 
 namespace Files.App.Storage.WindowsStorage

diff --git a/...rage/WindowsStorage/WindowsStorageFile.cs → ...bles/WindowsStorage/WindowsStorageFile.cs b/...rage/WindowsStorage/WindowsStorageFile.cs → ...bles/WindowsStorage/WindowsStorageFile.cs
@@ -1,15 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.ExtendableStorage;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using Files.Core.Storage.NestedStorage;
-using System;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
 
 namespace Files.App.Storage.WindowsStorage

diff --git a/...ge/WindowsStorage/WindowsStorageFolder.cs → ...es/WindowsStorage/WindowsStorageFolder.cs b/...ge/WindowsStorage/WindowsStorageFolder.cs → ...es/WindowsStorage/WindowsStorageFolder.cs
@@ -1,19 +1,8 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.Enums;
-using Files.Core.Storage.LocatableStorage;
-using Files.Core.Storage.ModifiableStorage;
-using System;
-using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
-using Files.Core.Storage.DirectStorage;
-using Files.Core.Storage.ExtendableStorage;
-using Files.Core.Storage.NestedStorage;
 
 namespace Files.App.Storage.WindowsStorage
 {

diff --git a/...e/WindowsStorage/WindowsStorageService.cs → ...s/WindowsStorage/WindowsStorageService.cs b/...e/WindowsStorage/WindowsStorageService.cs → ...s/WindowsStorage/WindowsStorageService.cs
@@ -1,11 +1,6 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
 
 namespace Files.App.Storage.WindowsStorage

diff --git a/src/Files.App/GlobalUsings.cs b/src/Files.App/GlobalUsings.cs
@@ -72,9 +72,17 @@
 // Files.Core.Storage
 
 global using global::Files.Core.Storage;
+global using global::Files.Core.Storage.Contracts;
+global using global::Files.Core.Storage.DirectStorage;
 global using global::Files.Core.Storage.Enums;
+global using global::Files.Core.Storage.EventArguments;
+global using global::Files.Core.Storage.ExtendableStorage;
+global using global::Files.Core.Storage.Extensions;
 global using global::Files.Core.Storage.LocatableStorage;
+global using global::Files.Core.Storage.ModifiableStorage;
+global using global::Files.Core.Storage.MutableStorage;
 global using global::Files.Core.Storage.NestedStorage;
+global using global::Files.Core.Storage.StorageEnumeration;
 
 // Files.Shared
 global using global::Files.Shared;