RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 08:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using DirectoryInfo/DriveInfo

Browse Source
This commit is contained in:
Dean Herbert 2020-05-13 18:08:43 +09:00
parent 8500f8fe76
commit 2c83417c41
1 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
osu.Game.Tests/Visual/Settings/TestSceneDirectorySelector.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -8,11 +9,11 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites; using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osuTK; using osuTK;
namespace osu.Game.Tests.Visual.Settings namespace osu.Game.Tests.Visual.Settings
@ -28,18 +29,17 @@ namespace osu.Game.Tests.Visual.Settings
public class DirectorySelector : CompositeDrawable public class DirectorySelector : CompositeDrawable
{ {
private Storage root;
private FillFlowContainer directoryFlow; private FillFlowContainer directoryFlow;
private CurrentDirectoryDisplay current;
[Resolved] [Resolved]
private GameHost host { get; set; } private GameHost host { get; set; }
private readonly Bindable<string> currentDirectory = new Bindable<string>(); [Cached]
private readonly Bindable<DirectoryInfo> currentDirectory = new Bindable<DirectoryInfo>();
public DirectorySelector(Storage root = null) public DirectorySelector(string initialPath = null)
{ {
this.root = root; currentDirectory.Value = new DirectoryInfo(initialPath ??= Environment.GetFolderPath(Environment.SpecialFolder.UserProfile));
} }
protected override void LoadComplete() protected override void LoadComplete()
@ -48,9 +48,6 @@ namespace osu.Game.Tests.Visual.Settings
Padding = new MarginPadding(10); Padding = new MarginPadding(10);
if (root == null)
root = host.GetStorage("/Users/");
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new FillFlowContainer new FillFlowContainer
@ -59,9 +56,8 @@ namespace osu.Game.Tests.Visual.Settings
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
Children = new Drawable[] Children = new Drawable[]
{ {
current = new CurrentDirectoryDisplay new CurrentDirectoryDisplay
{ {
CurrentDirectory = { BindTarget = currentDirectory },
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 50, Height = 50,
}, },
@ -79,29 +75,39 @@ namespace osu.Game.Tests.Visual.Settings
}, },
}; };
currentDirectory.BindValueChanged(updateDisplay); currentDirectory.BindValueChanged(updateDisplay, true);
currentDirectory.Value = root.GetFullPath(string.Empty);
} }
private void updateDisplay(ValueChangedEvent<string> directory) private void updateDisplay(ValueChangedEvent<DirectoryInfo> directory)
{ {
root = host.GetStorage(directory.NewValue);
directoryFlow.Clear(); directoryFlow.Clear();
directoryFlow.Add(new ParentDirectoryRow(getParentPath()) { CurrentDirectory = { BindTarget = currentDirectory }, }); if (directory.NewValue == null)
{
foreach (var dir in root.GetDirectories(string.Empty)) // var drives = DriveInfo.GetDrives();
directoryFlow.Add(new DirectoryRow(dir, root.GetFullPath(dir)) { CurrentDirectory = { BindTarget = currentDirectory }, }); //
// foreach (var drive in drives)
// directoryFlow.Add(new DirectoryRow(drive.RootDirectory));
} }
else
{
directoryFlow.Add(new ParentDirectoryRow(currentDirectory.Value.Parent));
private string getParentPath() => Path.GetFullPath(Path.Combine(root.GetFullPath(string.Empty), "..")); foreach (var dir in currentDirectory.Value.GetDirectories().OrderBy(d => d.Name))
{
if ((dir.Attributes & FileAttributes.Hidden) == 0)
directoryFlow.Add(new DirectoryRow(dir));
}
}
}
public class CurrentDirectoryDisplay : CompositeDrawable public class CurrentDirectoryDisplay : CompositeDrawable
{ {
public readonly Bindable<string> CurrentDirectory = new Bindable<string>(); [Resolved]
private Bindable<DirectoryInfo> currentDirectory { get; set; }
public CurrentDirectoryDisplay() [BackgroundDependencyLoader]
private void load()
{ {
FillFlowContainer flow; FillFlowContainer flow;
@ -118,26 +124,26 @@ namespace osu.Game.Tests.Visual.Settings
}, },
}; };
CurrentDirectory.BindValueChanged(dir => currentDirectory.BindValueChanged(dir =>
{ {
flow.Clear(); flow.Clear();
flow.Add(new OsuSpriteText { Text = "Current Directory: " }); flow.Add(new OsuSpriteText
var pieces = dir.NewValue.Split(Path.DirectorySeparatorChar);
pieces[0] = "/";
for (int i = 0; i < pieces.Length; i++)
{ {
flow.Add(new DirectoryRow(pieces[i], Path.Combine(pieces.Take(i + 1).ToArray())) Text = "Current Directory: ",
{ Font = OsuFont.Default.With(size: DirectoryRow.HEIGHT),
CurrentDirectory = { BindTarget = CurrentDirectory },
RelativeSizeAxes = Axes.Y,
Size = new Vector2(100, 1)
}); });
flow.Add(new DirectoryRow(null, "Computer"));
DirectoryInfo traverse = dir.NewValue;
while (traverse != null)
{
flow.Add(new DirectoryRow(traverse));
traverse = traverse.Parent;
} }
}); }, true);
} }
} }
@ -145,48 +151,48 @@ namespace osu.Game.Tests.Visual.Settings
{ {
public override IconUsage Icon => FontAwesome.Solid.Folder; public override IconUsage Icon => FontAwesome.Solid.Folder;
public ParentDirectoryRow(string fullPath) public ParentDirectoryRow(DirectoryInfo directory)
: base("..", fullPath) : base(directory, "..")
{ {
} }
} }
private class DirectoryRow : OsuButton private class DirectoryRow : CompositeDrawable
{ {
private readonly string fullPath; public const float HEIGHT = 20;
public readonly Bindable<string> CurrentDirectory = new Bindable<string>(); private readonly DirectoryInfo directory;
public DirectoryRow(string display, string fullPath) [Resolved]
private Bindable<DirectoryInfo> currentDirectory { get; set; }
public DirectoryRow(DirectoryInfo directory, string display = null)
{ {
this.fullPath = fullPath; this.directory = directory;
RelativeSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
Height = 20; Height = HEIGHT;
BackgroundColour = OsuColour.Gray(0.1f); AddRangeInternal(new Drawable[]
AddRange(new Drawable[]
{ {
new SpriteIcon new SpriteIcon
{ {
Icon = Icon, Icon = Icon,
Size = new Vector2(20) Size = new Vector2(HEIGHT)
}, },
new OsuSpriteText new OsuSpriteText
{ {
X = 25, X = HEIGHT + 5,
Text = display, Text = display ?? directory.Name,
Font = OsuFont.Default.With(size: 20) Font = OsuFont.Default.With(size: HEIGHT)
} }
}); });
Action = PerformDirectoryTraversal;
} }
protected virtual void PerformDirectoryTraversal() protected override bool OnClick(ClickEvent e)
{ {
CurrentDirectory.Value = fullPath; currentDirectory.Value = directory;
return true;
} }
public virtual IconUsage Icon => FontAwesome.Regular.Folder; public virtual IconUsage Icon => FontAwesome.Regular.Folder;