Skip to content

Code Quality: Update structure of storage projects #15407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 16, 2024
Merged

Code Quality: Update structure of storage projects #15407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7683e6
Init
0x5bfa May 16, 2024
0d252a4
Update
0x5bfa May 16, 2024
27eade0
Revert
0x5bfa May 16, 2024
92d13c4
Update src/Files.Core.Storage/Contracts/IWatcher.cs
0x5bfa May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/Files.App.Storage/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
91 changes: 0 additions & 91 deletions src/Files.App.Storage/NativeStorage/NativeFolderWatcher.cs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...iles.App.Storage/FtpStorage/FtpHelpers.cs → ...torage/Storables/FtpStorage/FtpHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

using Files.Shared.Extensions;
using FluentFTP;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace Files.App.Storage.FtpStorage
{
Expand Down
1 change: 0 additions & 1 deletion ...iles.App.Storage/FtpStorage/FtpManager.cs → ...torage/Storables/FtpStorage/FtpManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 0 additions & 5 deletions ...les.App.Storage/FtpStorage/FtpStorable.cs → ...orage/Storables/FtpStorage/FtpStorable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
7 changes: 0 additions & 7 deletions ....App.Storage/FtpStorage/FtpStorageFile.cs → ...ge/Storables/FtpStorage/FtpStorageFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
12 changes: 0 additions & 12 deletions ...pp.Storage/FtpStorage/FtpStorageFolder.cs → .../Storables/FtpStorage/FtpStorageFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions ...p.Storage/FtpStorage/FtpStorageService.cs → ...Storables/FtpStorage/FtpStorageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
7 changes: 0 additions & 7 deletions ...s.App.Storage/NativeStorage/NativeFile.cs → ...age/Storables/NativeStorage/NativeFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
21 changes: 1 addition & 20 deletions ...App.Storage/NativeStorage/NativeFolder.cs → ...e/Storables/NativeStorage/NativeFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down Expand Up @@ -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));
}
}
}
}
5 changes: 0 additions & 5 deletions ...p.Storage/NativeStorage/NativeStorable.cs → ...Storables/NativeStorage/NativeStorable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 0 additions & 4 deletions ...age/NativeStorage/NativeStorageService.cs → ...les/NativeStorage/NativeStorageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 0 additions & 5 deletions ...Storage/WindowsStorage/WindowsStorable.cs → ...orables/WindowsStorage/WindowsStorable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 0 additions & 8 deletions ...rage/WindowsStorage/WindowsStorageFile.cs → ...bles/WindowsStorage/WindowsStorageFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
11 changes: 0 additions & 11 deletions ...ge/WindowsStorage/WindowsStorageFolder.cs → ...es/WindowsStorage/WindowsStorageFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
5 changes: 0 additions & 5 deletions ...e/WindowsStorage/WindowsStorageService.cs → ...s/WindowsStorage/WindowsStorageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 8 additions & 0 deletions src/Files.App/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading