Add OwlCore.Storage to GlobalUsings

d2dyno1 · d2dyno1 · commit f651fa2150c9 · 2025-03-19T23:18:07.000+01:00
diff --git a/src/Files.App.Storage/GlobalUsings.cs b/src/Files.App.Storage/GlobalUsings.cs
@@ -23,6 +23,7 @@
 global using global::Files.Core.Storage.Enums;
 global using global::Files.Core.Storage.EventArguments;
 global using global::Files.Core.Storage.Extensions;
+global using global::OwlCore.Storage;
 
 // Files.App.Storage
 
diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorable.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorable.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using FluentFTP;
-using OwlCore.Storage;
 
 namespace Files.App.Storage.Storables
 {
diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFile.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFile.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.IO;
-using OwlCore.Storage;
 
 namespace Files.App.Storage.Storables
 {
diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFolder.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFolder.cs
@@ -3,10 +3,8 @@
 
 using Files.Shared.Helpers;
 using FluentFTP;
-using OwlCore.Storage;
 using System.IO;
 using System.Runtime.CompilerServices;
-using IFolderWatcher = OwlCore.Storage.IFolderWatcher;
 
 namespace Files.App.Storage.Storables
 {
diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageService.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageService.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using FluentFTP;
-using OwlCore.Storage;
 using System.IO;
 
 namespace Files.App.Storage.Storables
diff --git a/src/Files.App.Storage/Storables/NativeStorageLegacy/NativeStorageService.cs b/src/Files.App.Storage/Storables/NativeStorageLegacy/NativeStorageService.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
 using OwlCore.Storage.System.IO;
 
 namespace Files.App.Storage.Storables
diff --git a/src/Files.App/Actions/Start/PinToStartAction.cs b/src/Files.App/Actions/Start/PinToStartAction.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Actions
 {
 	internal sealed class PinToStartAction : IAction
diff --git a/src/Files.App/Actions/Start/UnpinFromStartAction.cs b/src/Files.App/Actions/Start/UnpinFromStartAction.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Actions
 {
 	internal sealed class UnpinFromStartAction : IAction
diff --git a/src/Files.App/Data/AppModels/SingleFileDatabaseModel.cs b/src/Files.App/Data/AppModels/SingleFileDatabaseModel.cs
@@ -4,7 +4,6 @@
 using Files.Shared.Extensions;
 using Files.Shared.Utils;
 using System.IO;
-using OwlCore.Storage;
 
 namespace Files.App.Data.AppModels
 {
diff --git a/src/Files.App/Data/Contracts/IFileTagsService.cs b/src/Files.App/Data/Contracts/IFileTagsService.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Data.Contracts
 {
 	/// <summary>
diff --git a/src/Files.App/Data/Contracts/IImageService.cs b/src/Files.App/Data/Contracts/IImageService.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using Files.Shared.Utils;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Contracts
 {
diff --git a/src/Files.App/Data/Contracts/INetworkService.cs b/src/Files.App/Data/Contracts/INetworkService.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Data.Contracts
 {
 	public interface INetworkService
diff --git a/src/Files.App/Data/Contracts/IRemovableDrivesService.cs b/src/Files.App/Data/Contracts/IRemovableDrivesService.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Data.Contracts
 {
 	/// <summary>
diff --git a/src/Files.App/Data/Contracts/IStartMenuService.cs b/src/Files.App/Data/Contracts/IStartMenuService.cs
@@ -1,5 +1,4 @@
 ﻿using Files.Core.Storage;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Contracts
 {
diff --git a/src/Files.App/Data/Contracts/ImagingService.cs b/src/Files.App/Data/Contracts/ImagingService.cs
@@ -5,7 +5,6 @@
 using Files.Core.Storage.Storables;
 using Files.Shared.Utils;
 using Windows.Storage.FileProperties;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Contracts
 {
diff --git a/src/Files.App/Data/Exceptions/FileAlreadyExistsException.cs b/src/Files.App/Data/Exceptions/FileAlreadyExistsException.cs
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -7,7 +7,6 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
-using OwlCore.Storage;
 using ByteSize = ByteSizeLib.ByteSize;
 
 namespace Files.App.Data.Items
diff --git a/src/Files.App/Data/Items/ShelfItem.cs b/src/Files.App/Data/Items/ShelfItem.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using Files.Shared.Utils;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Items
 {
diff --git a/src/Files.App/Data/Items/WidgetFileTagCardItem.cs b/src/Files.App/Data/Items/WidgetFileTagCardItem.cs
@@ -3,7 +3,6 @@
 
 using Files.Shared.Utils;
 using System.Windows.Input;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Items
 {
diff --git a/src/Files.App/Data/Models/DrivesViewModel.cs b/src/Files.App/Data/Models/DrivesViewModel.cs
@@ -5,7 +5,6 @@
 using Files.Core.Storage.Storables;
 using Microsoft.Extensions.Logging;
 using System.IO;
-using OwlCore.Storage;
 
 namespace Files.App.Data.Models
 {
diff --git a/src/Files.App/Data/Models/IStorageDeviceWatcher.cs b/src/Files.App/Data/Models/IStorageDeviceWatcher.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Data.Models
 {
 	/// <summary>
diff --git a/src/Files.App/Data/Models/TaggedItemModel.cs b/src/Files.App/Data/Models/TaggedItemModel.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.App.Data.Models
 {
 	/// <summary>
diff --git a/src/Files.App/GlobalUsings.cs b/src/Files.App/GlobalUsings.cs
@@ -39,7 +39,6 @@
 global using global::Files.App.Data.Contexts;
 global using global::Files.App.Data.Contracts;
 global using global::Files.App.Data.EventArguments;
-global using global::Files.App.Data.Exceptions;
 global using global::Files.App.Data.Factories;
 global using global::Files.App.Data.Items;
 global using global::Files.App.Data.Models;
@@ -72,6 +71,7 @@
 global using global::Files.Core.Storage.Enums;
 global using global::Files.Core.Storage.EventArguments;
 global using global::Files.Core.Storage.Extensions;
+global using global::OwlCore.Storage;
 
 // Files.App.Storage
 
diff --git a/src/Files.App/Services/App/FileTagsService.cs b/src/Files.App/Services/App/FileTagsService.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.Runtime.CompilerServices;
-using OwlCore.Storage;
 
 namespace Files.App.Services
 {
diff --git a/src/Files.App/Services/Storage/StorageDevicesService.cs b/src/Files.App/Services/Storage/StorageDevicesService.cs
@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Logging;
 using System.IO;
 using Windows.Storage;
-using OwlCore.Storage;
 using OwlCore.Storage.System.IO;
 
 namespace Files.App.Services
diff --git a/src/Files.App/Services/Storage/StorageNetworkService.cs b/src/Files.App/Services/Storage/StorageNetworkService.cs
@@ -9,7 +9,6 @@
 using Windows.Win32.Foundation;
 using Windows.Win32.NetworkManagement.WNet;
 using Windows.Win32.Security.Credentials;
-using OwlCore.Storage;
 
 namespace Files.App.Services
 {
diff --git a/src/Files.App/Services/Windows/WindowsStartMenuService.cs b/src/Files.App/Services/Windows/WindowsStartMenuService.cs
@@ -1,6 +1,5 @@
 ﻿using Files.Core.Storage;
 using Windows.UI.StartScreen;
-using OwlCore.Storage;
 
 namespace Files.App.Services
 {
diff --git a/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs b/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
@@ -11,7 +11,6 @@
 using Windows.Devices.Enumeration;
 using Windows.Devices.Portable;
 using Windows.Storage;
-using OwlCore.Storage;
 
 namespace Files.App.Utils
 {
diff --git a/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs b/src/Files.App/Utils/Storage/Helpers/FilesystemTasks.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Files.App.Data.Exceptions;
 using System.IO;
 using System.Runtime.InteropServices;
 using Windows.Storage;
diff --git a/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs b/src/Files.App/Utils/Storage/StorageItems/FtpStorageFolder.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using Files.App.Data.Exceptions;
 using Files.App.Storage.Storables;
 using FluentFTP;
 using System.IO;
@@ -222,7 +221,7 @@ public override IAsyncOperation<BaseStorageFile> CreateFileAsync(string desiredN
 				if (result is FtpStatus.Skipped)
 				{
 					if (options is CreationCollisionOption.FailIfExists)
-						throw new FileAlreadyExistsException("File already exists.", desiredName);
+						throw new FileAlreadyExistsException(desiredName);
 
 					return null;
 				}
diff --git a/src/Files.Core.Storage/Extensions/StorageExtensions.File.cs b/src/Files.Core.Storage/Extensions/StorageExtensions.File.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System.IO;
-using OwlCore.Storage;
 using OwlCore.Storage.System.IO;
 
 namespace Files.Core.Storage.Extensions
diff --git a/src/Files.Core.Storage/Extensions/StorageExtensions.Folder.cs b/src/Files.Core.Storage/Extensions/StorageExtensions.Folder.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.Core.Storage.Extensions
 {
 	public static partial class StorageExtensions
diff --git a/src/Files.Core.Storage/Extensions/StorageExtensions.Service.cs b/src/Files.Core.Storage/Extensions/StorageExtensions.Service.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.Core.Storage.Extensions
 {
 	public static partial class StorageExtensions
diff --git a/src/Files.Core.Storage/GlobalUsings.cs b/src/Files.Core.Storage/GlobalUsings.cs
@@ -23,3 +23,4 @@
 global using global::Files.Core.Storage.Enums;
 global using global::Files.Core.Storage.EventArguments;
 global using global::Files.Core.Storage.Extensions;
+global using global::OwlCore.Storage;
diff --git a/src/Files.Core.Storage/IStorageService.cs b/src/Files.Core.Storage/IStorageService.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.Core.Storage
 {
 	/// <summary>
diff --git a/src/Files.Core.Storage/Storables/DirectStorage/IDirectCopy.cs b/src/Files.Core.Storage/Storables/DirectStorage/IDirectCopy.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.Core.Storage.Storables
 {
 	/// <summary>
diff --git a/src/Files.Core.Storage/Storables/DirectStorage/IDirectMove.cs b/src/Files.Core.Storage/Storables/DirectStorage/IDirectMove.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) Files Community
 // Licensed under the MIT License.
 
-using OwlCore.Storage;
-
 namespace Files.Core.Storage.Storables
 {
 	/// <summary>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using FluentFTP;`
`5`		`-using OwlCore.Storage;`
`6`	`5`
`7`	`6`	`namespace Files.App.Storage.Storables`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`	`4`	`using System.IO;`
`5`		`-using OwlCore.Storage;`
`6`	`5`
`7`	`6`	`namespace Files.App.Storage.Storables`
`8`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,8 @@`
`3`	`3`
`4`	`4`	`using Files.Shared.Helpers;`
`5`	`5`	`using FluentFTP;`
`6`		`-using OwlCore.Storage;`
`7`	`6`	`using System.IO;`
`8`	`7`	`using System.Runtime.CompilerServices;`
`9`		`-using IFolderWatcher = OwlCore.Storage.IFolderWatcher;`
`10`	`8`
`11`	`9`	`namespace Files.App.Storage.Storables`
`12`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Copyright (c) Files Community`
`2`	`2`	`// Licensed under the MIT License.`
`3`	`3`
`4`		`-using OwlCore.Storage;`
`5`		`-`
`6`	`4`	`namespace Files.App.Actions`
`7`	`5`	`{`
`8`	`6`	`internal sealed class PinToStartAction : IAction`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using Files.Shared.Extensions;`
`5`	`5`	`using Files.Shared.Utils;`
`6`	`6`	`using System.IO;`
`7`		`-using OwlCore.Storage;`
`8`	`7`
`9`	`8`	`namespace Files.App.Data.AppModels`
`10`	`9`	`{`